formatting

modules/apps/kitty.nix

@@ -67,7 +67,4 @@ let
       };
     };
   };
-in
+in { home-manager.users.moritz = { ... }: (base); }
-{
-  home-manager.users.moritz = { ... }: (base);
-}

modules/apps/zathura.nix

@@ -20,7 +20,4 @@ let
       };
     };
   };
-in
+in { home-manager.users.moritz = { ... }: (base); }
-{
-  home-manager.users.moritz = { ... }: (base);
-}

modules/desktop/polybar/default.nix

@@ -4,19 +4,15 @@ let
   base = {
     services.polybar = {
       enable = true;
-      package = pkgs.polybar.override {
+      package = pkgs.polybar.override { pulseSupport = true; };
-        pulseSupport = true;
+      script = ''
-      };
+        for m in $(polybar --list-monitors | ${pkgs.coreutils}/bin/cut -d":" -f1); do
-      script = ''for m in $(polybar --list-monitors | ${pkgs.coreutils}/bin/cut -d":" -f1); do
+                           MONITOR=$m polybar --reload bottom &
-                   MONITOR=$m polybar --reload bottom &
+                         done
-                 done
+                       '';
-               '';
       config = ./config.ini;
-      extraConfig = builtins.readFile ./modules.ini +
+      extraConfig = builtins.readFile ./modules.ini
-        builtins.readFile ./colors.ini;
+        + builtins.readFile ./colors.ini;
     };
   };
-in
+in { home-manager.users.moritz = { ... }: (base); }
-{
-  home-manager.users.moritz = { ... }: (base);
-}

modules/services/default.nix

@@ -1,17 +1,9 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports = [
+  imports = [ ./dunst ./diskstation ./emacs ./agenix.nix ./picom.nix ];
-    ./dunst
-    ./diskstation
-    ./emacs
-    ./agenix.nix
-    ./picom.nix
-  ];
 
-  home-manager.users.moritz.services = {
+  home-manager.users.moritz.services = { kdeconnect.enable = true; };
-    kdeconnect.enable = true;
-  };
 
   services = {
     printing.enable = true;

modules/services/dunst/default.nix

@@ -4,13 +4,8 @@ let
   base = {
     xdg = {
       enable = true;
-      configFile."dunt/dunstrc" = {
+      configFile."dunt/dunstrc" = { source = ./dunstrc; };
-        source = ./dunstrc;
-      };
     };
     services.dunst.enable = true;
   };
-in
+in { home-manager.users.moritz = { ... }: (base); }
-{
-  home-manager.users.moritz = { ... }: (base);
-}

overlays/default.nix

@@ -1,14 +1,10 @@
 { inputs }:
 
 final: prev: {
-  picom = prev.picom.overrideAttrs (old: {
+  picom = prev.picom.overrideAttrs (old: { src = inputs.picom; });
-    src = inputs.picom;
-  });
   unstable = import inputs.unstable {
     system = prev.system;
     config.allowUnfree = true;
   };
-  nur = import inputs.nur {
+  nur = import inputs.nur { system = prev.system; };
-    system = prev.system;
-  };
 }