cleanup

users/moritz/home.nix

@@ -8,14 +8,14 @@
   home.username = "moritz";
   home.homeDirectory = "/home/moritz";
 
-  programs.git = {
+  programs = {
+    git = {
       enable = true;
       userName = "MoritzBoehme";
       userEmail = "mr.x@moritzboeh.me";
     };
 
-  # Zathura
-  programs.zathura = {
+    zathura = {
       enable = true;
       options = {
         recolor = true;
@@ -33,8 +33,7 @@
       };
     };
 
-  # Zsh
-  programs.zsh = {
+    zsh = {
       enable = true;
 
       shellGlobalAliases = {
@@ -64,49 +63,76 @@
                 ];
     };
 
-  xdg = {
-    enable = true;
-    configFile = {
-      "sxhkd/sxhkdrc".source = ~/.dotfiles/config/sxhkd/sxhkdrc;
-      "bspwm/bspwmrc".source = ~/.dotfiles/config/bspwm/bspwmrc;
-    };
-  };
-
-  # Kitty
-  programs.kitty = { 
+    kitty = {
       enable = true;
       settings = {
         scrollback_lines = 10000;
         enable_audio_bell = false;
         cursor_shape = "underline";
       };
-    extraConfig = builtins.readFile ~/.dotfiles/config/kitty/dracula.conf;
+      extraConfig = builtins.readFile ~/.config/kitty/dracula.conf;
       font = {
         name = "FiraCode Nerd Font";
         size = 10;
       };
     };
 
-  programs.exa.enable = true;
-  programs.bat.enable = true;
+    exa.enable = true;
+    bat.enable = true;
 
-  programs.starship = {
+    starship = {
       enable = true;
       enableZshIntegration = true;
     };
 
-  services.polybar = {
+    rofi = {
+      enable = true;
+      theme = ~/.config/rofi/dracula_old.rasi;
+    };
+
+    emacs.enable = true;
+  };
+  
+  xdg = {
+    enable = true;
+    configFile = {
+      "sxhkd/sxhkdrc" = {
+        source = ~/.dotfiles/config/sxhkd/sxhkdrc;
+        onChange = "pkill -USR1 -x sxhkd";
+      };
+      "bspwm/bspwmrc" = {
+        source = ~/.dotfiles/config/bspwm/bspwmrc;
+        onChange = "bspc wm -r";
+      };
+      "doom" = {
+        source = ~/.dotfiles/config/doom;
+        recursive = true;
+        onChange = builtins.readFile ~/.dotfiles/config/doom/reload.sh;
+      };
+      "kitty" = {
+        source = ~/.dotfiles/config/kitty;
+        recursive = true;
+      };
+      "rofi" = {
+        source = ~/.dotfiles/config/rofi;
+        recursive = true;
+      };
+    };
+  };
+
+  services = {
+    polybar = {
       enable = true;
       script = ''for m in $(polybar --list-monitors | ${pkgs.coreutils}/bin/cut -d":" -f1); do
                    MONITOR=$m polybar --reload bottom &
-done
-'';
+                 done
+               '';
       config = ~/.dotfiles/config/polybar/config.ini;
       extraConfig = builtins.readFile ~/.dotfiles/config/polybar/modules.ini +
                     builtins.readFile ~/.dotfiles/config/polybar/colors.ini;
     };
 
-  services.picom = {
+    picom = {
       enable = true;
       inactiveOpacity = "0.95";
       opacityRule = [
@@ -117,19 +143,9 @@ done
       inactiveDim = "0.1";
     };
 
-  programs.rofi = {
-    enable = true;
+    emacs.enable = true;
   };
 
-  programs.emacs.enable = true;
-
-  services.emacs.enable = true;
-
-  home.file.".doom.d" = {
-    source = ~/.dotfiles/config/doom;
-    recursive = true;
-    onChange = builtins.readFile ~/.dotfiles/config/doom/reload.sh;
-  };
 
   home.packages = with pkgs; [
     neofetch