diff --git a/modules/apps/kitty.nix b/modules/apps/kitty.nix index c039099..1cb6d75 100644 --- a/modules/apps/kitty.nix +++ b/modules/apps/kitty.nix @@ -67,7 +67,4 @@ let }; }; }; -in -{ - home-manager.users.moritz = { ... }: (base); -} +in { home-manager.users.moritz = { ... }: (base); } diff --git a/modules/apps/zathura.nix b/modules/apps/zathura.nix index 1e6ee31..2ee1bee 100644 --- a/modules/apps/zathura.nix +++ b/modules/apps/zathura.nix @@ -20,7 +20,4 @@ let }; }; }; -in -{ - home-manager.users.moritz = { ... }: (base); -} +in { home-manager.users.moritz = { ... }: (base); } diff --git a/modules/desktop/polybar/default.nix b/modules/desktop/polybar/default.nix index 81b1912..37ced76 100644 --- a/modules/desktop/polybar/default.nix +++ b/modules/desktop/polybar/default.nix @@ -4,19 +4,15 @@ let base = { services.polybar = { enable = true; - package = pkgs.polybar.override { - pulseSupport = true; - }; - script = ''for m in $(polybar --list-monitors | ${pkgs.coreutils}/bin/cut -d":" -f1); do - MONITOR=$m polybar --reload bottom & - done - ''; + package = pkgs.polybar.override { pulseSupport = true; }; + script = '' + for m in $(polybar --list-monitors | ${pkgs.coreutils}/bin/cut -d":" -f1); do + MONITOR=$m polybar --reload bottom & + done + ''; config = ./config.ini; - extraConfig = builtins.readFile ./modules.ini + - builtins.readFile ./colors.ini; + extraConfig = builtins.readFile ./modules.ini + + builtins.readFile ./colors.ini; }; }; -in -{ - home-manager.users.moritz = { ... }: (base); -} +in { home-manager.users.moritz = { ... }: (base); } diff --git a/modules/services/default.nix b/modules/services/default.nix index ebd46ef..d933374 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -1,17 +1,9 @@ { config, lib, pkgs, ... }: { - imports = [ - ./dunst - ./diskstation - ./emacs - ./agenix.nix - ./picom.nix - ]; + imports = [ ./dunst ./diskstation ./emacs ./agenix.nix ./picom.nix ]; - home-manager.users.moritz.services = { - kdeconnect.enable = true; - }; + home-manager.users.moritz.services = { kdeconnect.enable = true; }; services = { printing.enable = true; diff --git a/modules/services/dunst/default.nix b/modules/services/dunst/default.nix index 0340f7c..789f958 100644 --- a/modules/services/dunst/default.nix +++ b/modules/services/dunst/default.nix @@ -4,13 +4,8 @@ let base = { xdg = { enable = true; - configFile."dunt/dunstrc" = { - source = ./dunstrc; - }; + configFile."dunt/dunstrc" = { source = ./dunstrc; }; }; services.dunst.enable = true; }; -in -{ - home-manager.users.moritz = { ... }: (base); -} +in { home-manager.users.moritz = { ... }: (base); } diff --git a/overlays/default.nix b/overlays/default.nix index 641651b..9b0d4a4 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,14 +1,10 @@ { inputs }: final: prev: { - picom = prev.picom.overrideAttrs (old: { - src = inputs.picom; - }); + picom = prev.picom.overrideAttrs (old: { src = inputs.picom; }); unstable = import inputs.unstable { system = prev.system; config.allowUnfree = true; }; - nur = import inputs.nur { - system = prev.system; - }; + nur = import inputs.nur { system = prev.system; }; }