gruvbox

9 files changed, 84 insertions, 33 deletions

diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf
index 9891d79..7a6d290 100644
--- a/.config/fontconfig/fonts.conf
+++ b/.config/fontconfig/fonts.conf
@@ -4,28 +4,28 @@
 	<alias>
 		<family>serif</family>
 		<prefer>
-			<family>Ubuntu</family>
+			<family>LiterationSerif Nerd Font Propo</family>
 			<family>Noto Color Emoji</family>
 		</prefer>
 	</alias>
 	<alias>
 		<family>sans-serif</family>
 		<prefer>
-	    <family>Ubuntu</family>
+	    <family>LiterationSans Nerd Font</family>
       <family>Noto Color Emoji</family>
 		</prefer>
 	</alias>
 	<alias>
 		<family>sans</family>
 		<prefer>
-			<family>Ubuntu</family>
+			<family>LiterationSans Nerd Font</family>
 			<family>Noto Color Emoji</family>
 		</prefer>
 	</alias>
 	<alias>
 		<family>monospace</family>
 		<prefer>
-			<family>Ubuntu Mono</family>
+			<family>LiterationMono Nerd Font Mono</family>
 		</prefer>
 	</alias>
 </fontconfig>
diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index 8d9c0b7..a94499a 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -42,7 +42,7 @@ general {
 }
 
 decoration {
-    rounding = 10
+    rounding = 0
 
     active_opacity = 1.0
     inactive_opacity = 1.0
@@ -94,7 +94,7 @@ input {
     kb_layout = us,ru
     kb_variant =
     kb_model =
-    kb_options = grp:ctrl_shift_toggle
+    kb_options = grp:win_space_toggle
     kb_rules =
 
     force_no_accel = 1
diff --git a/.config/kitty/gruvbox.conf b/.config/kitty/gruvbox.conf
new file mode 100644
index 0000000..369da8d
--- /dev/null
+++ b/.config/kitty/gruvbox.conf
@@ -0,0 +1,49 @@
+# gruvbox dark by morhetz, https://github.com/morhetz/gruvbox
+# This work is licensed under the terms of the MIT license.
+# For a copy, see https://opensource.org/licenses/MIT.
+
+background  #282828
+foreground  #ebdbb2
+
+cursor                #928374
+
+selection_foreground  #928374
+selection_background  #3c3836
+
+color0  #282828
+color8  #928374
+
+# red
+color1                #cc241d
+# light red
+color9                #fb4934
+
+# green
+color2                #98971a
+# light green
+color10               #b8bb26
+
+# yellow
+color3                #d79921
+# light yellow
+color11               #fabd2d
+
+# blue
+color4                #458588
+# light blue
+color12               #83a598
+
+# magenta
+color5                #b16286
+# light magenta
+color13               #d3869b
+
+# cyan
+color6                #689d6a
+# lighy cyan
+color14               #8ec07c
+
+# light gray
+color7                #a89984
+# dark gray
+color15               #928374
diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index d1b523d..5cd0f7b 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -1,11 +1,14 @@
-include catppuccin.conf 
+include gruvbox.conf 
 font_size 16.0
-font_family LiterationMono Nerd Font Mono
+font_family monospace 
 bold_font auto
 italic_font auto
 bold_italic_font auto
 
-window_padding_width 10
-background_opacity 0.7
+cursor_shape block 
+shell_integration no-cursor
 
+window_padding_width 10
+background_opacity 0.9
 confirm_os_window_close 0
+
diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi
index f517c83..501865b 100644
--- a/.config/rofi/config.rasi
+++ b/.config/rofi/config.rasi
@@ -1,6 +1,6 @@
 configuration{
     modi: "run,drun,window";
-    icon-theme: "Oranchelo";
+    icon-theme: "Gruvbox-Icons";
     show-icons: true;
     terminal: "kitty";
     drun-display-format: "{icon} {name}";
@@ -14,4 +14,4 @@ configuration{
     sidebar-mode: true;
 }
 
-@theme "catppuccin"
+@theme "gruvbox"
diff --git a/.config/rofi/catppuccin.rasi b/.config/rofi/gruvbox.rasi
index b377af1..3285ac0 100644
--- a/.config/rofi/catppuccin.rasi
+++ b/.config/rofi/gruvbox.rasi
@@ -1,12 +1,12 @@
 * {
-    bg-col:  #1e1e2e;
-    bg-col-light: #1e1e2e;
-    border-col: #1e1e2e;
-    selected-col: #1e1e2e;
-    blue: #89b4fa;
-    fg-col: #cdd6f4;
-    fg-col2: #f38ba8;
-    grey: #6c7086;
+    bg-col:  #282828;
+    bg-col-light: #282828;
+    border-col: #ebdbb2;
+    selected-col: #282828;
+    blue: #458588;
+    fg-col: #ebdbb2;
+    fg-col2: #fb4934;
+    grey: #a89984;
 
     width: 600;
     font: "LiterationMono Nerd Font 12";
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index ac53d24..e6048ff 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -8,8 +8,8 @@
 }
 
 #waybar {
-    color: #cdd6f4;
-    background: #1e1e2e; 
+    color: #EBDBB2;
+    background: #282828; 
 }
 
 tooltip {
@@ -21,16 +21,16 @@ tooltip {
 }
 
 #workspaces button {
-    color: #6c7086;
+    color: #a89984;
 }
 
 #workspaces button.active {
-    color: #cdd6f4;
-    background: #1e1e2e;
+    color: #EBDBB2;
+    background: #282828;
 }
 
 #window {
-    color: #cdd6f4;
+    color: #EBDBB2;
     margin-left: 15px;
 }
 
diff --git a/dependencies.txt b/dependencies.txt
index 35af87e..f6405da 100644
--- a/dependencies.txt
+++ b/dependencies.txt
@@ -11,7 +11,6 @@ wireplumber
 
 # fonts
 ttf-liberation-mono-nerd
-ttf-ubuntu-font-family
 noto-fonts-emoji
 fontconfig
 
diff --git a/rice.sh b/rice.sh
index 0d4c915..cf09d75 100755
--- a/rice.sh
+++ b/rice.sh
@@ -23,14 +23,14 @@ doas -u $PERMUSER mkdir -p /home/$PERMUSER/.local/share/themes
 doas -u $PERMUSER mkdir -p /home/$PERMUSER/.local/share/icons
 
 cd $WORKDIRECTORY
-doas -u $PERMUSER curl -LO "https://github.com/catppuccin/gtk/releases/download/v1.0.3/catppuccin-mocha-yellow-standard+default.zip"
-doas -u $PERMUSER unzip catppuccin-mocha-yellow-standard+default.zip
-doas -u $PERMUSER mv catppuccin-mocha-yellow-standard+default catppuccin-yellow
-doas -u $PERMUSER cp -r catppuccin-yellow /home/$PERMUSER/.local/share/themes
+doas -u $PERMUSER git clone https://github.com/awnrt/gruvbox-gtk-theme 
+doas -u $PERMUSER cp -r gruvbox-gtk-theme/Gruvbox-Dark /home/$PERMUSER/.local/share/themes
+doas -u $PERMUSER cp -r gruvbox-gtk-theme/Gruvbox-Icons /home/$PERMUSER/.local/share/icons
 
-doas -u $PERMUSER dbus-launch gsettings set org.gnome.desktop.interface gtk-theme "catppuccin-yellow"
+doas -u $PERMUSER dbus-launch gsettings set org.gnome.desktop.interface gtk-theme "Gruvbox-Dark"
+doas -u $PERMUSER dbus-launch gsettings set org.gnome.desktop.interface icon-theme "Gruvbox-Icons"
 doas -u $PERMUSER dbus-launch gsettings set org.gnome.desktop.wm.preferences button-layout 'appmenu'
-doas -u $PERMUSER dbus-launch gsettings set org.gnome.desktop.interface font-name "Ubuntu 11"
+doas -u $PERMUSER dbus-launch gsettings set org.gnome.desktop.interface font-name "LiterationSans Nerd Font 11"
 
 cd $WORKDIRECTORY
 doas -u $PERMUSER git clone https://github.com/zdharma-continuum/fast-syntax-highlighting