Merge branch 'master' into cla

21 files changed, 147 insertions, 86 deletions

diff --git a/.gitignore b/.gitignore
index bb74ea4..a3589f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+@companion-app/
 5DB5/
 5db5/
 abook/
@@ -52,6 +53,7 @@ Element/
 emacs/
 EmeraldWallet/
 enchant/
+enigma/
 Epic/
 Etherdyne/
 evolution/
@@ -111,6 +113,7 @@ kde.org/
 keepassxc/
 khal/
 kicad/
+kid3rc
 Kitware/
 kritadisplayrc
 kritarc
@@ -121,6 +124,7 @@ lbry/
 LBRY/
 LBRY-GTK/
 lbry-viewer/
+libaccounts-glib/
 libfm/
 libreoffice/
 LibrePCB/
@@ -165,7 +169,7 @@ notmuch/
 npm/
 nssdb/
 NuGet/
-nvim/plugged/
+nvim/lazy-lock.json
 nwg-look/
 nwg-outputs/
 obs-studio/
@@ -193,6 +197,7 @@ Portmaster/
 PreSonus/
 print-manager/
 profanity/profrc
+Proton/
 Proton AG/
 protonfixes/
 protonmail/
@@ -238,6 +243,7 @@ SNAPSHOT PLAYER/
 snownews/urls.opml
 solaar/
 sonobus/
+spicy/
 spotifyd/
 spotify-tui/
 straw-viewer/
diff --git a/Makefile b/Makefile
index 898fe9e..d850e2a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
 VIM := $(shell command -v vim 2>/dev/null)
-NVIM := $(shell command -v nvim 2>/dev/null)
 ZCONFS := zsh/zshenv zsh/zshrc
 SCONFS := sh/profile
 DCONFS := doas.conf
@@ -30,15 +29,6 @@ else
 	@echo "vim not installed."
 endif
 
-vimplug-nvim: installers/vimplug_nvim.sh
-ifdef NVIM
-	@echo "Installing vim-plug for nvim..."
-	@$(shell installers/vimplug_nvim.sh)
-	@echo "Done."
-else
-	@echo "nvim not installed."
-endif
-
 doas-conf: $(DCONFS)
 	@echo "Installing doas config files..."
 	@echo "doas.conf..."
diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc
index 8c1d035..d0152f7 100644
--- a/gtk-2.0/gtkrc
+++ b/gtk-2.0/gtkrc
@@ -1,12 +1,12 @@
 # DO NOT EDIT! This file will be overwritten by nwg-look.
 # Any customization should be done in ~/.gtkrc-2.0.mine instead.
 
-gtk-theme-name="Flat-Remix-GTK-Green-Darkest"
+gtk-theme-name="Flat-Remix-GTK-Red-Darkest"
 gtk-icon-theme-name="Cosmic"
-gtk-font-name="Cantarell 11"
+gtk-font-name="Noto Sans,  10"
 gtk-cursor-theme-name="BreezeX-Black"
-gtk-cursor-theme-size=36
-gtk-toolbar-style=GTK_TOOLBAR_ICONS
+gtk-cursor-theme-size=32
+gtk-toolbar-style=3
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
 gtk-button-images=0
 gtk-menu-images=0
diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini
index 85d3ba5..c597fa3 100644
--- a/gtk-3.0/settings.ini
+++ b/gtk-3.0/settings.ini
@@ -1,10 +1,10 @@
 [Settings]
-gtk-theme-name=Flat-Remix-GTK-Green-Darkest
+gtk-theme-name=Flat-Remix-GTK-Red-Darkest
 gtk-icon-theme-name=Cosmic
-gtk-font-name=Cantarell 11
+gtk-font-name=Noto Sans,  10
 gtk-cursor-theme-name=BreezeX-Black
 gtk-cursor-theme-size=32
-gtk-toolbar-style=GTK_TOOLBAR_ICONS
+gtk-toolbar-style=3
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
 gtk-button-images=0
 gtk-menu-images=0
@@ -14,4 +14,10 @@ gtk-xft-antialias=1
 gtk-xft-hinting=1
 gtk-xft-hintstyle=hintslight
 gtk-xft-rgba=rgb
-gtk-application-prefer-dark-theme=0
+gtk-application-prefer-dark-theme=1
+gtk-decoration-layout=icon:minimize,maximize,close
+gtk-enable-animations=true
+gtk-modules=colorreload-gtk-module
+gtk-primary-button-warps-slider=true
+gtk-sound-theme-name=ocean
+gtk-xft-dpi=98304
diff --git a/hypr/hypridle.conf b/hypr/hypridle.conf
index f25f081..4d18296 100644
--- a/hypr/hypridle.conf
+++ b/hypr/hypridle.conf
@@ -6,7 +6,7 @@ general {
 
 listener {
     timeout = 150                                # 2.5min.
-    on-timeout = brightnessctl -s set 10         # set monitor backlight to minimum, avoid 0 on OLED monitor.
+    on-timeout = brightnessctl set 0             # set monitor backlight to minimum, avoid 0 on OLED monitor.
     on-resume = brightnessctl -r                 # monitor backlight restore.
 }
 
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index d894c0c..3db087f 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -69,7 +69,13 @@ input {
     follow_mouse = 1
     mouse_refocus = false
     touchpad {
-        natural_scroll = no
+      disable_while_typing = true
+      natural_scroll = false
+      tap_button_map = "lrm"
+      clickfinger_behavior = true
+      tap-to-click = true
+      drag_lock = false
+      tap-and-drag = true
     }
     float_switch_override_focus = 0
     sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
@@ -84,7 +90,7 @@ general {
     border_size = 2
     #col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
     #col.inactive_border = rgba(595959aa)
-    col.active_border = rgba(198844ee)
+    col.active_border = rgba(ec0101ee)
     col.inactive_border = rgba(1b1d1cee)
     layout = master
 }
@@ -102,7 +108,7 @@ misc {
     disable_splash_rendering = true
     enable_swallow = true
     swallow_regex = ^(kitty)$
-    swallow_exception_regex = ^(.*ueberzug|n?vim .*|love .*)$
+    swallow_exception_regex = ^(wev|.*ueberzug|n?vi?m? .*)$
     vfr = true
     vrr = 1
 }
@@ -190,7 +196,7 @@ plugin {
 # Example windowrule v1
 # windowrule = float, ^(kitty)$
 # Example windowrule v2
-# windowrulev2 = float, class:^(kitty)$, title:^(kitty)$
+# windowrule = float, class:^(kitty)$, title:^(kitty)$
 # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
 windowrulev2 = float, class:^(lxqt-policykit-agent)$
 windowrulev2 = tile, class:^(REAPER)$, title:^(REAPER v[0-9.]* - Registered to [A-Za-z ]* \(Licensed for personal/small business use\))$
diff --git a/installers/vimplug_nvim.sh b/installers/vimplug_nvim.sh
deleted file mode 100755
index feddd03..0000000
--- a/installers/vimplug_nvim.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \
-       https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
diff --git a/kitty/kitty.conf b/kitty/kitty.conf
index 095607b..59a7f5e 100644
--- a/kitty/kitty.conf
+++ b/kitty/kitty.conf
@@ -1151,7 +1151,7 @@ color8 #969896
 #: black
 
 color1 #89231d
-color9 #cc342b
+color9 #ec0101
 
 #: red
 
@@ -1170,8 +1170,8 @@ color12 #3971ed
 
 #: blue
 
-color5  #784e93
-color13 #a36ac7
+color5  #6e3c85
+color13 #8400c1
 
 #: magenta
 
diff --git a/nvim/init.lua b/nvim/init.lua
index cf11420..4b295d5 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -1,5 +1,6 @@
 require('options')
 require('keymaps')
+require('lsp')
 require('plugins')
 require('colorscheme')
 require('term')
diff --git a/nvim/lua/lsp.lua b/nvim/lua/lsp.lua
new file mode 100644
index 0000000..343c76b
--- /dev/null
+++ b/nvim/lua/lsp.lua
@@ -0,0 +1,22 @@
+-- Remove Global Default Key mapping
+vim.keymap.del("n", "grn")
+vim.keymap.del("n", "gra")
+vim.keymap.del("n", "grr")
+vim.keymap.del("n", "gri")
+vim.keymap.del("n", "gO")
+
+-- Create keymapping
+-- LspAttach: After an LSP Client performs "initialize" and attaches to a buffer.
+vim.api.nvim_create_autocmd("LspAttach", {
+  callback = function(args)
+    local keymap = vim.keymap
+    local lsp = vim.lsp
+    local bufopts = { noremap = true, silent = true }
+
+    keymap.set("n", "gr", lsp.buf.references, bufopts)
+    keymap.set("n", "gd", lsp.buf.definition, bufopts)
+    keymap.set("n", "<space>rn", lsp.buf.rename, bufopts)
+    keymap.set("n", "K", lsp.buf.hover, bufopts)
+    keymap.set("n", "<space>f", lsp.buf.format, bufopts)
+  end
+})
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index 0801939..8056494 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -12,6 +12,26 @@ end
 vim.opt.rtp:prepend(lazypath)
 
 require("lazy").setup({
+  -- LSP manager
+	{ "mason-org/mason.nvim", opts = {} },
+  {
+    "mason-org/mason-lspconfig.nvim",
+    dependencies = {
+      "mason-org/mason.nvim",
+      "neovim/nvim-lspconfig",
+    },
+    opts = {
+      ensure_installed = { "pylsp", "clangd", "rust_analyzer", "zls" },
+    },
+  },
+  {
+		"neovim/nvim-lspconfig",
+		config = function()
+			local lspconfig = require("lspconfig")
+
+			lspconfig.pylsp.setup({})
+		end,
+  },
   "tanvirtin/monokai.nvim",
   'preservim/nerdtree',
   'ziglang/zig.vim',
diff --git a/sh/aliases b/sh/aliases
index 1b6606e..4fc427f 100644
--- a/sh/aliases
+++ b/sh/aliases
@@ -18,12 +18,14 @@ case `uname -s` in
     alias ls="ls -h"
     ;;
   "Linux")
-    alias ls="ls -h $COLOR_FLAGS_GNU"
+    #alias ls="ls -h $COLOR_FLAGS_GNU"
+    alias ls="eza"
     ;;
 esac
 alias ll='ls -l'
-alias la='ls -A'
-alias lla='ls -lA'
+alias lt='ls -l --total-size'
+alias la='ls -a'
+alias lla='ls -la'
 alias lb='lsblk'
 alias md='mkdir -p'
 alias ch='cd $HOME'
@@ -33,7 +35,8 @@ alias nv='nvim'
 alias v='nvim'
 
 ## Change utils
-alias rm='rm -i'
+#alias rm='rm -i'
+alias rm='trash-put'
 alias cp='cp -i'
 alias srsync='rsync -KPUcrtvyz'
 
diff --git a/sh/profile b/sh/profile
index 61b224c..e9ca8e5 100644
--- a/sh/profile
+++ b/sh/profile
@@ -56,9 +56,9 @@ export XCURSOR_PATH="/usr/share/icons:$XDG_DATA_HOME/icons"
 export PYTHONSTARTUP="$XDG_CONFIG_HOME"/python/pythonrc
 
 # Scaling
-export QT_AUTO_SCREEN_SCALE_FACTOR=0
-export QT_SCALE_FACTOR=1
-export QT_SCREEN_SCALE_FACTORS="1;1;1"
+#export QT_AUTO_SCREEN_SCALE_FACTOR=0
+#export QT_SCALE_FACTOR=1
+#export QT_SCREEN_SCALE_FACTORS="1;1;1"
 export GDK_SCALE=1
 export GDK_DPI_SCALE=1
 
diff --git a/tofi/colors b/tofi/colors
index a5f480c..5dcbb04 100644
--- a/tofi/colors
+++ b/tofi/colors
@@ -1,10 +1,10 @@
 background-color = #000000
-outline-color = #39c1ed
-border-color = #39c1ed
+outline-color = #ec0101
+border-color = #ec0101
 text-color = #ffffff
-prompt-color = #39c1ed
+prompt-color = #ec0101
 prompt-background = #000000
-placeholder-color = #39c1ed
+placeholder-color = #ec0101
 placeholder-background = #000000
 input-color = #ffffff
 input-background = #000000
@@ -12,6 +12,6 @@ default-result-background = #000000
 alternate-result-color = #ffffff
 alternate-result-background = #000000
 selection-color = #000000
-selection-match-color = #198844
-selection-background = #39c1ed
+selection-match-color = #6e3c85
+selection-background = #ec0101
 
diff --git a/tofi/themes/colors b/tofi/themes/colors
index 047c875..5dcbb04 100644
--- a/tofi/themes/colors
+++ b/tofi/themes/colors
@@ -1,10 +1,10 @@
 background-color = #000000
-outline-color = #198844
-border-color = #198844
+outline-color = #ec0101
+border-color = #ec0101
 text-color = #ffffff
-prompt-color = #198844
+prompt-color = #ec0101
 prompt-background = #000000
-placeholder-color = #198844
+placeholder-color = #ec0101
 placeholder-background = #000000
 input-color = #ffffff
 input-background = #000000
@@ -12,6 +12,6 @@ default-result-background = #000000
 alternate-result-color = #ffffff
 alternate-result-background = #000000
 selection-color = #000000
-selection-match-color = #39c1ed
-selection-background = #198844
+selection-match-color = #6e3c85
+selection-background = #ec0101
 
diff --git a/waybar/config b/waybar/config
index 146b66c..a6d299b 100644
--- a/waybar/config
+++ b/waybar/config
@@ -9,7 +9,7 @@
 
     "modules-left":[ "hyprland/workspaces", "custom/launcher", "hyprland/window"],
     "modules-center":[],
-    "modules-right":[ "idle_inhibitor", "pulseaudio", "cpu", "memory", "network", "clock", "tray"],
+    "modules-right":[ "tray", "mpd", "idle_inhibitor", "wireplumber", "cpu", "memory", "temperature#cpu", "temperature#gpu", "network", "clock", "custom/power"],
 
     // Modules configuration
 
@@ -158,24 +158,13 @@
         "max-length": 22,
         "on-click-right": "bash ~/.config/rofi/wifi_menu/rofi_wifi_menu"
     },
-    "pulseaudio": {
+    "wireplumber": {
         // "scroll-step": 1, // %, can be a float
         "format": "{volume}% {icon}",
-        "format-bluetooth": "{volume}% {icon}",
-        "format-bluetooth-muted": "{icon} {format_source}",
-        "format-muted": "{format_source}",
-        "format-source": "",
-        "format-source-muted": "",
-        "format-icons": {
-            "headphone": "",
-            "hands-free": "",
-            "headset": "",
-            "phone": "",
-            "portable": "",
-            "car": "",
-            "default": ["", "", ""]
-        },
-        "on-click": "pavucontrol"
+        "format-muted": "{volume}% ",
+        "format-icons": ["", "", ""],
+        "on-click": "volsv -t",
+        "scroll-step": 0.1
     },
     "custom/launcher":{
         "format": "",
diff --git a/waybar/style.css b/waybar/style.css
index cf76ed2..f8cc3c9 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -45,7 +45,7 @@ window#waybar.hidden {
 
 /*
 #workspaces button:hover {
-    background: #39c1ed;
+    background: #6e3c85;
     color: black;
     border-bottom: 3px solid #ffffff;
 
@@ -53,12 +53,12 @@ window#waybar.hidden {
 */
 
 #workspaces button.active {
-    background: #198844;
+    background: #EC0101;
 }
 
 /*
 #workspaces button.active:hover {
-    background: #39c1ed;
+    background: #6e3c85;
     color: black;
     border-bottom: 3px solid #ffffff;
 }
@@ -81,7 +81,7 @@ window#waybar.hidden {
 #temperature,
 #backlight,
 #network,
-#pulseaudio,
+#wireplumber,
 #custom-media,
 #custom-launcher,
 #custom-power,
@@ -125,7 +125,7 @@ window#waybar.hidden {
 }
 
 #battery.charging, #battery.plugged {
-    color: #26A65B;
+    color: #EC0101;
     background-color: #1b1d1c;
 }
 
@@ -156,7 +156,7 @@ label:focus {
 }
 
 #memory {
-    background-color: #1b1d1c;
+    background-color: #EC0101;
     color: #ffffff;
 }
 
@@ -166,12 +166,12 @@ label:focus {
 }
 
 #backlight {
-    background-color: #198844;
+    background-color: #EC0101;
     color: #ffffff;
 }
 
 #network {
-    background-color: #198844;
+    background-color: #EC0101;
     color: #ffffff;
 }
 
@@ -180,14 +180,14 @@ label:focus {
     color: #ffffff;
 }
 
-#pulseaudio {
-    background-color: #1b1d1c;
+#wireplumber {
+    background-color: #EC0101;
     color: #ffffff;
 }
 
-#pulseaudio.muted {
+#wireplumber.muted {
     background-color: #1b1d1c;
-    color: #198844;
+    color: #EC0101;
 }
 
 #custom-media {
@@ -276,6 +276,23 @@ label:focus {
     background-color: #eb4d4b;
 }
 
+#tray {
+    background-color: transparent;
+    color: #ffffff;
+}
+
+#tray > .passive {
+    -gtk-icon-effect: dim;
+    background-color: #EC0101;
+    color: #ffffff;
+}
+
+#tray > .needs-attention {
+    -gtk-icon-effect: highlight;
+    background-color: #EC0101;
+    color: #ffffff;
+}
+
 #idle_inhibitor {
     background-color: #1b1d1c;
     border-radius: 20px 0px 0px 20px;
@@ -283,7 +300,7 @@ label:focus {
 }
 
 #idle_inhibitor.activated {
-    background-color: #198844;
+    background-color: #EC0101;
     color: #ffffff;
     border-radius: 20px 0px 0px 20px;
 
diff --git a/xsettingsd/xsettingsd.conf b/xsettingsd/xsettingsd.conf
index e762fa9..622b06f 100644
--- a/xsettingsd/xsettingsd.conf
+++ b/xsettingsd/xsettingsd.conf
@@ -1,4 +1,4 @@
-Net/ThemeName "Flat-Remix-GTK-Green-Darkest"
+Net/ThemeName "Flat-Remix-GTK-Red-Darkest"
 Net/IconThemeName "Cosmic"
 Gtk/CursorThemeName "BreezeX-Black"
 Net/EnableEventSounds 1
diff --git a/yay/config.json b/yay/config.json
index 2b64b70..c06f416 100644
--- a/yay/config.json
+++ b/yay/config.json
@@ -10,7 +10,7 @@
 	"pacmanconf": "/etc/pacman.conf",
 	"redownload": "no",
 	"answerclean": "All",
-	"answerdiff": "",
+	"answerdiff": "All",
 	"answeredit": "",
 	"answerupgrade": "",
 	"gitbin": "git",
@@ -36,8 +36,8 @@
 	"provides": true,
 	"pgpfetch": true,
 	"cleanmenu": true,
-	"diffmenu": false,
-	"editmenu": true,
+	"diffmenu": true,
+	"editmenu": false,
 	"combinedupgrade": false,
 	"useask": false,
 	"batchinstall": false,
diff --git a/zsh/zshenv b/zsh/zshenv
index df0371e..3719ef4 100644
--- a/zsh/zshenv
+++ b/zsh/zshenv
@@ -2,5 +2,6 @@
 unset HISTFILE
 export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
 export skip_global_compinit=1
+fpath=($XDG_CONFIG_HOME/functions $fpath)
 [ -f /etc/profile ] && . /etc/profile
 [ -f "$XDG_CONFIG_HOME/sh/profile" ] && . "$XDG_CONFIG_HOME/sh/profile"
diff --git a/zsh/zshrc b/zsh/zshrc
index 9acd42f..dffdc65 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -44,9 +44,13 @@ bindkey "${key[End]}" end-of-line
 bindkey "${key[PageUp]}" history-substring-search-up
 bindkey "${key[PageDown]}" history-substring-search-down
 
-MYPROMPT=$'%S%F{002}[%n@%m]\UE0B2%F{015}%s%~%S%F{002}\UE0B0%#%s\UE0B0%f '
+if (env | grep -Fq 'DISTROBOX'); then
+  MYPROMPT=$'%F{000}%K{004}[%n@%m]%F{013}\UE0B2%K{013}%F{000}%~%F{013}%K{004}\UE0B0%F{000}%#%F{004}%k\UE0B0%f '
+else
+  MYPROMPT=$'%F{000}%K{009}[%n@%m]%F{013}\UE0B2%K{013}%F{000}%~%F{013}%K{009}\UE0B0%F{000}%#%F{009}%k\UE0B0%f '
+fi
 function zle-line-init zle-keymap-select {
-  VIM_PROMPT=$'%S%F{012}[%n@%m]\UE0B2%F{015}%s%~%S%F{012}\UE0B0%#%s\UE0B0%f '
+  VIM_PROMPT=$'%F{000}%K{012}[%n@%m]%F{013}\UE0B2%K{013}%F{000}%~%F{013}%K{012}\UE0B0%F{000}%#%F{012}%k\UE0B0%f '
   PS1="${${KEYMAP/vicmd/$VIM_PROMPT}/main/$MYPROMPT}"
   zle reset-prompt
 }