From e4b15a3b1abb4551f0771cfa5480750dc14bff56 Mon Sep 17 00:00:00 2001
From: Gabriel <faktenlord@gmail.com>
Date: Fri, 2 Sep 2022 18:21:58 +0200
Subject: [PATCH] themes n stuff

---
 modules/desktop.nix | 43 +++++++++++++++++++++++++++++++++++++------
 modules/zsh.nix     |  5 +----
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/modules/desktop.nix b/modules/desktop.nix
index 3915592..df0dcee 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -83,14 +83,14 @@ in with lib; {
         # custom scripts
         window-screenshot desktop-ctl em-record em-play em-play-loop
         pa_applet
-        brightnessctl
+        brightnessctl gruvbox-dark-icons-gtk
+        gruvbox-dark-gtk
       ];
       # i3 {{{
       xsession = {
         enable = true;
         windowManager.i3 = {
           enable = true;
-          package = pkgs.i3-gaps;
           config = {
             bars = [];
             terminal = "kitty";
@@ -106,8 +106,8 @@ in with lib; {
                 { command = "sleep 4 && setxkbmap -layout us -variant altgr-intl"; always = true; }
                 { command = "feh --bg-scale ${../other/wallpaper.jpg}"; always = true; notification = false; }
                 { command = "picom --experimental-backend"; }
-                { command = "nm-applet"; }
-                { command = "pa-applet"; }
+                { command = "pkill nm-applet; nm-applet"; always = true; }
+                { command = "pkill pa-applet; pa-applet"; always = true; } 
               ];
             # }}}
             # Assigns {{{
@@ -198,9 +198,11 @@ in with lib; {
               size = 9.0;
             };
             gaps = {
+              top = 24;
               inner = 15;
               outer = 0;
               smartGaps = false;
+              smartBorders = "no_gaps";
             };
             colors = {
               background = "#1d2021";
@@ -274,7 +276,7 @@ in with lib; {
         services.polybar = {
           enable = true;
 
-          script = "pkill polybar; polybar & disown";
+          script = "pkill polybar; polybar &";
           settings = {
             colors = {
               background = "#282828";
@@ -307,7 +309,7 @@ in with lib; {
               cursor-scroll = "ns-resize";
               enable-ipc = true;
               wm-restack = "i3";
-              override-redirect = false;
+              override-redirect = true;
             };
 
             "module/xworkspaces" = {
@@ -392,6 +394,35 @@ in with lib; {
           };
         };
       # }}}
+      # gtk {{{
+      gtk = {
+        enable = true;
+        cursorTheme = {
+          package = pkgs.phinger-cursors;
+          name = "phinger-cursors";
+          size = 20;
+        };
+        font = { 
+          package = pkgs.montserrat;
+          name = "Montserrat";
+          size = 11;
+        };
+        iconTheme = {
+          package = pkgs.gruvbox-dark-icons-gtk;
+          name = "gruvbox-dark-icons";
+        };
+        theme = {
+          package = pkgs.gruvbox-dark-gtk;
+          name = "gruvbox-dark";
+        };
+      };
+      # }}}
+      # Qt {{{
+      qt = {
+        enable = true;
+        platformTheme = "gtk";
+      };
+      # }}}
     };
   };
 }
diff --git a/modules/zsh.nix b/modules/zsh.nix
index 041d8c3..3fed847 100644
--- a/modules/zsh.nix
+++ b/modules/zsh.nix
@@ -17,10 +17,6 @@ in with lib; {
         autocd = true;
         defaultKeymap = "viins";
         dotDir = ".config/zsh";
-        dirHashes = {
-          repos = "$HOME/Documents/repos";
-          nixc = "$HOME/nix-configs";
-        };
         history = {
           extended = true;
           save = 100000;
@@ -37,6 +33,7 @@ in with lib; {
           upg = "paru -Syu --skipreview --noconfirm && flatpak upgrade && rustup upgrade";
 
           grepo = "cd $HOME/Documents/repos && ls";
+          gnix = "cd $HOME/nix-configs";
 
           slol = "while true;do \\clear;sl --help | lolcat;done;";