Merge branch 'master' into cla

8 files changed, 28 insertions, 26 deletions

diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc
index d0152f7..628ed00 100644
--- a/gtk-2.0/gtkrc
+++ b/gtk-2.0/gtkrc
@@ -1,9 +1,10 @@
 # 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-Red-Darkest"
+include "/home/zachir/.gtkrc-2.0.mine"
+gtk-theme-name="Flat-Remix-GTK-Green-Darkest-Solid"
 gtk-icon-theme-name="Cosmic"
-gtk-font-name="Noto Sans,  10"
+gtk-font-name="Cantarell 11"
 gtk-cursor-theme-name="BreezeX-Black"
 gtk-cursor-theme-size=32
 gtk-toolbar-style=3
diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini
index c597fa3..28ef3a0 100644
--- a/gtk-3.0/settings.ini
+++ b/gtk-3.0/settings.ini
@@ -1,7 +1,7 @@
 [Settings]
-gtk-theme-name=Flat-Remix-GTK-Red-Darkest
+gtk-theme-name=Flat-Remix-GTK-Green-Darkest-Solid
 gtk-icon-theme-name=Cosmic
-gtk-font-name=Noto Sans,  10
+gtk-font-name=Cantarell 11
 gtk-cursor-theme-name=BreezeX-Black
 gtk-cursor-theme-size=32
 gtk-toolbar-style=3
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 3db087f..4916286 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -1,6 +1,5 @@
 # See https://wiki.hyprland.org/Configuring/Monitors/
 #{{{ Monitor config
-monitor = eDP-1, 1920x1080@60, 0x0, 1
 monitor = , preferred, auto, 1
 monitor = HDMI-A-1, 1920x1080@75, 1920x0, 1
 monitor = DP-1, 1920x1080@60, 0x0, 1
@@ -45,6 +44,7 @@ env = XCURSOR_SIZE,32
 debug {
   enable_stdout_logs = false
   disable_logs = true
+  full_cm_proto = true
 }
 # }}}
 
@@ -110,7 +110,7 @@ misc {
     swallow_regex = ^(kitty)$
     swallow_exception_regex = ^(wev|.*ueberzug|n?vi?m? .*)$
     vfr = true
-    vrr = 1
+    vrr = 3
 }
 #}}}
 
@@ -188,6 +188,7 @@ gestures {
 plugin {
   hyprsplit {
     num_workspaces = 9
+    persistent_workspaces = true
   }
 }
 #}}}
diff --git a/tofi/colors b/tofi/colors
index 5dcbb04..047c875 100644
--- a/tofi/colors
+++ b/tofi/colors
@@ -1,10 +1,10 @@
 background-color = #000000
-outline-color = #ec0101
-border-color = #ec0101
+outline-color = #198844
+border-color = #198844
 text-color = #ffffff
-prompt-color = #ec0101
+prompt-color = #198844
 prompt-background = #000000
-placeholder-color = #ec0101
+placeholder-color = #198844
 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 = #6e3c85
-selection-background = #ec0101
+selection-match-color = #39c1ed
+selection-background = #198844
 
diff --git a/tofi/themes/colors b/tofi/themes/colors
index 5dcbb04..047c875 100644
--- a/tofi/themes/colors
+++ b/tofi/themes/colors
@@ -1,10 +1,10 @@
 background-color = #000000
-outline-color = #ec0101
-border-color = #ec0101
+outline-color = #198844
+border-color = #198844
 text-color = #ffffff
-prompt-color = #ec0101
+prompt-color = #198844
 prompt-background = #000000
-placeholder-color = #ec0101
+placeholder-color = #198844
 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 = #6e3c85
-selection-background = #ec0101
+selection-match-color = #39c1ed
+selection-background = #198844
 
diff --git a/waybar/style.css b/waybar/style.css
index f8cc3c9..3016776 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -125,7 +125,7 @@ window#waybar.hidden {
 }
 
 #battery.charging, #battery.plugged {
-    color: #EC0101;
+    color: #198844;
     background-color: #1b1d1c;
 }
 
@@ -156,7 +156,7 @@ label:focus {
 }
 
 #memory {
-    background-color: #EC0101;
+    background-color: #198844;
     color: #ffffff;
 }
 
@@ -181,7 +181,7 @@ label:focus {
 }
 
 #wireplumber {
-    background-color: #EC0101;
+    background-color: #198844;
     color: #ffffff;
 }
 
@@ -283,13 +283,13 @@ label:focus {
 
 #tray > .passive {
     -gtk-icon-effect: dim;
-    background-color: #EC0101;
+    background-color: #198844;
     color: #ffffff;
 }
 
 #tray > .needs-attention {
     -gtk-icon-effect: highlight;
-    background-color: #EC0101;
+    background-color: #198844;
     color: #ffffff;
 }
 
diff --git a/xsettingsd/xsettingsd.conf b/xsettingsd/xsettingsd.conf
index 622b06f..c4ab3db 100644
--- a/xsettingsd/xsettingsd.conf
+++ b/xsettingsd/xsettingsd.conf
@@ -1,4 +1,4 @@
-Net/ThemeName "Flat-Remix-GTK-Red-Darkest"
+Net/ThemeName "Flat-Remix-GTK-Green-Darkest-Solid"
 Net/IconThemeName "Cosmic"
 Gtk/CursorThemeName "BreezeX-Black"
 Net/EnableEventSounds 1
diff --git a/zsh/zshrc b/zsh/zshrc
index dffdc65..f748913 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -47,10 +47,10 @@ bindkey "${key[PageDown]}" history-substring-search-down
 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 '
+  MYPROMPT=$'%F{000}%K{002}[%n@%m]%F{006}\UE0B2%K{006}%F{000}%~%F{006}%K{002}\UE0B0%F{000}%#%F{002}%k\UE0B0%f '
 fi
 function zle-line-init zle-keymap-select {
-  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 '
+  VIM_PROMPT=$'%F{000}%K{012}[%n@%m]%F{006}\UE0B2%K{006}%F{000}%~%F{006}%K{012}\UE0B0%F{000}%#%F{012}%k\UE0B0%f '
   PS1="${${KEYMAP/vicmd/$VIM_PROMPT}/main/$MYPROMPT}"
   zle reset-prompt
 }