nixpkgs-format all files

flake.nix

@@ -14,7 +14,8 @@
 
     emacs-overlay.url = "github:nix-community/emacs-overlay";
 
-    home-manager = { url = "github:nix-community/home-manager"; };
+    home-manager.url = "github:nix-community/home-manager";
+
     picom = {
       url = "github:jonaburg/picom";
       flake = false;

modules/apps/kitty.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
-let
+{
-  base = {
+  home-manager.users.moritz = {
     programs.kitty = {
       enable = true;
       settings = {
@@ -67,4 +67,4 @@ let
       };
     };
   };
-in { home-manager.users.moritz = { ... }: (base); }
+}

modules/apps/rofi/default.nix

@@ -1,7 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let
+{
-  base = (home: {
+  home-manager.users.moritz = {
+
     programs.rofi = {
       enable = true;
       package = pkgs.rofi.override { plugins = with pkgs; [ rofi-calc ]; };
@@ -15,5 +16,5 @@ let
         dmenu_command = rofi
       '';
     };
-  });
+  };
-in { home-manager.users.moritz = { ... }: (base "/home/moritz/"); }
+}

modules/apps/zathura.nix

@@ -1,7 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let
+{
-  base = {
+  home-manager.users.moritz = {
+
     programs.zathura = {
       enable = true;
       options = {
@@ -51,4 +52,4 @@ let
       };
     };
   };
-in { home-manager.users.moritz = { ... }: (base); }
+}

modules/cachix.nix

@@ -1,4 +1,3 @@
-
 # WARN: this file will get overwritten by $ cachix use <name>
 { pkgs, lib, ... }:
 
@@ -7,7 +6,8 @@ let
   toImport = name: value: folder + ("/" + name);
   filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key;
   imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
-in {
+in
+{
   inherit imports;
-  nix.binaryCaches = ["https://cache.nixos.org/"];
+  nix.binaryCaches = [ "https://cache.nixos.org/" ];
 }

modules/cachix/nix-community.nix

@@ -1,4 +1,3 @@
-
 {
   nix = {
     binaryCaches = [

modules/cli/git.nix

@@ -1,7 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let
+{
-  base = (home: {
+  home-manager.users.moritz = {
+
     programs.git = {
       enable = true;
       userName = "MoritzBoehme";
@@ -9,5 +10,5 @@ let
       extraConfig = { init.defaultBranch = "main"; };
       delta.enable = true;
     };
-  });
+  };
-in { home-manager.users.moritz = { ... }: (base "/home/moritz"); }
+}

modules/cli/zsh.nix

@@ -36,7 +36,8 @@ let
       };
     };
   });
-in {
+in
+{
   environment.pathsToLink = [ "/share/zsh" ];
   home-manager.users.moritz = { ... }: (base "/home/moritz");
 }

modules/containers/media.nix

@@ -5,7 +5,8 @@ let
   puid = "1000";
   pgid = "100";
   timeZone = "Europe/Berlin";
-in {
+in
+{
   home-manager.users.moritz = {
     home.packages = with pkgs; [ docker-compose ];
     home.file = {

modules/desktop/polybar/default.nix

@@ -1,7 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let
+{
-  base = {
+  home-manager.users.moritz = {
+
     services.polybar = {
       enable = true;
       package = pkgs.polybar.override { pulseSupport = true; };
@@ -9,10 +10,10 @@ let
         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;
     };
   };
-in { home-manager.users.moritz = { ... }: (base); }
+}

modules/editors/emacs.nix

@@ -3,7 +3,8 @@
 let
   emacs = with pkgs;
     ((emacsPackagesNgGen emacsGcc).emacsWithPackages (epkgs: [ epkgs.vterm ]));
-in {
+in
+{
   fonts.fonts = [ pkgs.emacs-all-the-icons-fonts ];
 
   home-manager.users.moritz = {

modules/services/diskstation/default.nix

@@ -25,14 +25,16 @@
   fileSystems."/media/media" = {
     device = "//192.168.0.2/media";
     fsType = "cifs";
-    options = let
+    options =
-      # this line prevents hanging on network split
+      let
-      automount_opts =
+        # this line prevents hanging on network split
-        "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
+        automount_opts =
+          "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
 
-    in [
+      in
-      "${automount_opts},credentials=/run/secrets/smbMedia,uid=1000,gid=100"
+      [
-    ];
+        "${automount_opts},credentials=/run/secrets/smbMedia,uid=1000,gid=100"
+      ];
   };
 
   # fileSystems."/media/diskstation" = {

modules/services/kdeconnect.nix

@@ -4,7 +4,8 @@ let
     from = 1714;
     to = 1764;
   };
-in {
+in
+{
   home-manager.users.moritz.services = { kdeconnect.enable = true; };
   networking.firewall = {
     allowedTCPPortRanges = [ ports ];

modules/services/picom.nix

@@ -1,7 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let
+{
-  base = {
+  home-manager.users.moritz = {
+
     services.picom = {
       enable = true;
       inactiveOpacity = "0.90";
@@ -48,4 +49,4 @@ let
       '';
     };
   };
-in { home-manager.users.moritz = { ... }: (base); }
+}

secrets/secrets.nix

@@ -8,7 +8,8 @@ let
   nixos-desktop =
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKl8gMhwSf1NsP5gp14xbbyjqQLZzcHLb/XKRMoHdXgI";
   hosts = [ nixos-laptop nixos-desktop ];
-in {
+in
+{
   "nordvpn.age".publicKeys = users ++ hosts;
   "davfs.age".publicKeys = users ++ hosts;
   "smbMoritz.age".publicKeys = users ++ hosts;