format

modules/apps/art.nix

@@ -40,7 +40,9 @@ in
     apps.art.enable = lib.mkEnableOption "digital art and creative applications";
     dev.gameDev.enable = lib.mkEnableOption "game development tools and engines";
   };
-  config.users.users = let
+  config.users.users =
+    let
       packages = artPackages ++ gameDevPackages;
-  in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
+    in
+    inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
 }

modules/apps/gaming.nix

@@ -50,7 +50,8 @@ in
       #   environmentFile = config.sops.secrets.switch-presence.path;
       # };
     };
-    users.users = let
+    users.users =
+      let
         packages = builtins.attrValues {
           inherit retroarchWithCores;
           inherit (pkgs)
@@ -69,6 +70,7 @@ in
             prismlauncher # minecraft launcher with jdk overlays
             ;
         };
-    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
+      in
+      inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
   };
 }

modules/apps/internet.nix

@@ -30,11 +30,12 @@ in
 {
   options.my.apps.internet.enable = lib.mkEnableOption "internet browsers and communication apps";
   config = lib.mkIf config.my.apps.internet.enable {
-    home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.apps (user: {
+    home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.apps (_user: {
       programs.librewolf = import ./librewolf.nix;
     });
     programs.geary.enable = true;
-    users.users = let
+    users.users =
+      let
         packages = builtins.attrValues {
           # inherit (inputs.zen-browser.packages.x86_64-linux) twilight;
           inherit krisp-patcher;
@@ -52,6 +53,7 @@ in
             fractal # matrix client
             ;
         };
-    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
+      in
+      inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
   };
 }

modules/apps/misc.nix

@@ -8,7 +8,8 @@
 {
   options.my.apps.misc.enable = lib.mkEnableOption "miscellaneous desktop applications";
   config = lib.mkIf config.my.apps.misc.enable {
-    users.users = let
+    users.users =
+      let
         packages = builtins.attrValues {
           inherit (pkgs)
             blanket # background noise
@@ -17,6 +18,7 @@
             gnome-obfuscate # censor private information
             ;
         };
-    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
+      in
+      inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
   };
 }

modules/apps/multimedia.nix

@@ -8,7 +8,8 @@
 {
   options.my.apps.multimedia.enable = lib.mkEnableOption "multimedia applications and media players";
   config = lib.mkIf config.my.apps.multimedia.enable {
-    users.users = let
+    users.users =
+      let
         packages = builtins.attrValues {
           inherit (pkgs)
             curtail # image compressor
@@ -19,6 +20,7 @@
             tagger # tag music files
             ;
         };
-    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
+      in
+      inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
   };
 }

modules/apps/music.nix

@@ -8,7 +8,8 @@
 {
   options.my.apps.piano.enable = lib.mkEnableOption "piano learning and music theory apps";
   config = lib.mkIf config.my.apps.piano.enable {
-    users.users = let
+    users.users =
+      let
         packages = builtins.attrValues {
           inherit (pkgs)
             neothesia
@@ -16,6 +17,7 @@
             timidity
             ;
         };
-    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
+      in
+      inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
   };
 }

modules/apps/office.nix

@@ -9,7 +9,8 @@
   options.my.apps.office.enable = lib.mkEnableOption "office applications and productivity tools";
   config = lib.mkIf config.my.apps.office.enable {
     environment.variables.CALIBRE_USE_SYSTEM_THEME = "1";
-    users.users = let
+    users.users =
+      let
         packages = builtins.attrValues {
           inherit (pkgs)
             jre17_minimal # for libreoffice extensions
@@ -20,6 +21,7 @@
             # planify # let's pretend I will organize my tasks
             ;
         };
-    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
+      in
+      inputs.self.lib.mkUserPackages lib config.my.toggleUsers.apps packages;
   };
 }

modules/dev/emacs.nix

@@ -8,7 +8,7 @@
 {
   options.my.emacs.enable = lib.mkEnableOption "Doom Emacs configuration";
   config = lib.mkIf config.my.emacs.enable {
-    home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.dev (user: {
+    home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.dev (_user: {
       xdg.dataFile = {
         "doom/templates/events.org".source = ../../dotfiles/doom/templates/events.org;
         "doom/templates/default.org".source = ../../dotfiles/doom/templates/default.org;
@@ -22,7 +22,8 @@
             e = "edit";
           };
     });
-    users.users = let
+    users.users =
+      let
         packages = builtins.attrValues {
           inherit (pkgs.xorg) xwininfo;
           inherit (pkgs)
@@ -46,7 +47,8 @@
             prettier # multi-language linter
             ;
         };
-    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.dev packages;
+      in
+      inputs.self.lib.mkUserPackages lib config.my.toggleUsers.dev packages;
     services.emacs = {
       enable = true;
       defaultEditor = true;
@@ -57,7 +59,8 @@
         extraPackages =
           epkgs:
           let
-            inherit (config.home-manager.users.${inputs.self.lib.getFirstUser config.my.toggleUsers.dev}.programs.emacs)
+            inherit
+              (config.home-manager.users.${inputs.self.lib.getFirstUser config.my.toggleUsers.dev}.programs.emacs)
               extraPackages
               extraConfig
               ;

modules/dev/javascript.nix

@@ -31,7 +31,7 @@ in
       users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
     })
     {
-      home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.dev (user: {
+      home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.dev (_user: {
         xdg.configFile = {
           "npm/npmrc".source = ../../dotfiles/npmrc;
           "configstore/update-notifier-npm-check.json".text = builtins.toJSON {

modules/dev/nix.nix

@@ -34,10 +34,8 @@ in
   };
   config = lib.mkIf config.my.dev.nix.enable {
     users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
-    home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.dev (user: {
+    home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.dev (_user: {
-      programs.${shellType}.shellAliases =
+      programs.${shellType}.shellAliases = inputs.self.lib.mergeAliases inputs.self.lib.commonAliases {
-        inputs.self.lib.mergeAliases inputs.self.lib.commonAliases
-          {
         nixformat = ''
           deadnix -e && \
           nix run nixpkgs#nixfmt-tree && \

modules/dev/python.nix

@@ -50,7 +50,7 @@ in
       users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
     })
     {
-      home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.dev (user: {
+      home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.dev (_user: {
         xdg.configFile."python/pythonrc".source = ../../dotfiles/pythonrc;
       });
       environment.variables.PYTHONSTARTUP = "\${XDG_CONFIG_HOME}/python/pythonrc";

modules/factories/mkscript.nix

@@ -37,11 +37,14 @@
     description = "Configuration for multiple scripts.";
   };
   config = lib.mkIf (lib.any (s: s.enable) (lib.attrValues config.my.scripts)) {
-    users.users = let
+    users.users =
-      packages = config.my.scripts
+      let
+        packages =
+          config.my.scripts
           |> lib.mapAttrsToList (_name: script: lib.optional (script.enable && script.install) script.package)
           |> lib.flatten;
-    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.scripts packages;
+      in
+      inputs.self.lib.mkUserPackages lib config.my.toggleUsers.scripts packages;
     systemd.user.services =
       config.my.scripts
       |> lib.mapAttrs' (

modules/modules.nix

@@ -118,8 +118,14 @@ in
         apps = "jawz";
         dev = "bearded_dragonn";
         shell = "jawz";
-        gaming = [ "jawz" "bearded_dragonn" ];
+        gaming = [
-        stylix = [ "jawz" "bearded_dragonn" ];
+          "jawz"
+          "bearded_dragonn"
+        ];
+        stylix = [
+          "jawz"
+          "bearded_dragonn"
+        ];
       };
     };
   };

modules/services/printing.nix

@@ -14,9 +14,11 @@ in
 {
   options.my.services.printing.enable = lib.mkEnableOption "printing services and drivers";
   config = lib.mkIf config.my.services.printing.enable {
-    users.users = let
+    users.users =
+      let
         packages = [ pkgs.simple-scan ];
-    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.services packages;
+      in
+      inputs.self.lib.mkUserPackages lib config.my.toggleUsers.services packages;
     services.printing = {
       enable = true;
       drivers = printingDrivers;

modules/shell/config.nix

@@ -15,9 +15,11 @@
     description = "The shell to use system-wide (bash or zsh)";
   };
   config = {
-    users.users = lib.mkMerge (map (user: {
+    users.users = lib.mkMerge (
+      map (user: {
         ${user}.shell = pkgs.${config.my.shell.type};
-    }) (inputs.self.lib.normalizeUsers config.my.toggleUsers.shell));
+      }) (inputs.self.lib.normalizeUsers config.my.toggleUsers.shell)
+    );
     programs.zsh.enable = config.my.shell.type == "zsh";
   };
 }

modules/shell/exercism.nix

@@ -8,13 +8,15 @@
 {
   options.my.shell.exercism.enable = lib.mkEnableOption "Exercism coding practice platform";
   config = lib.mkIf config.my.shell.exercism.enable {
-    users.users = let
+    users.users =
+      let
         packages = builtins.attrValues {
           inherit (pkgs)
             exercism # learn to code
             bats # testing system, required by Exercism
             ;
         };
-    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.shell packages;
+      in
+      inputs.self.lib.mkUserPackages lib config.my.toggleUsers.shell packages;
   };
 }

modules/shell/multimedia.nix

@@ -8,10 +8,12 @@
 {
   options.my.shell.multimedia.enable = lib.mkEnableOption "multimedia CLI tools and codecs";
   config = lib.mkIf config.my.shell.multimedia.enable {
-    sops.secrets."gallery-dl/secrets" = let
+    sops.secrets."gallery-dl/secrets" =
+      let
         # Use first user for secret ownership
         user = inputs.self.lib.getFirstUser config.my.toggleUsers.shell;
-    in {
+      in
+      {
         sopsFile = ../../secrets/gallery.yaml;
         owner = user;
         mode = "0400";
@@ -42,7 +44,8 @@
         };
       };
     });
-    users.users = let
+    users.users =
+      let
         packages = builtins.attrValues {
           inherit (pkgs)
             ffmpeg # not ffmpreg, the coolest video conversion tool!
@@ -50,6 +53,7 @@
             ffpb # make ffmpeg encoding... a bit fun
             ;
         };
-    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.shell packages;
+      in
+      inputs.self.lib.mkUserPackages lib config.my.toggleUsers.shell packages;
   };
 }

modules/shell/tools.nix

@@ -96,7 +96,8 @@ in
         vimAlias = true;
       };
     };
-    users.users = let
+    users.users =
+      let
         packages = builtins.attrValues {
           inherit (pkgs)
             ripgrep # modern grep
@@ -112,7 +113,8 @@ in
             rmlint # amazing dupe finder that integrates well with BTRFS
             ;
         };
-    in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.shell packages;
+      in
+      inputs.self.lib.mkUserPackages lib config.my.toggleUsers.shell packages;
     environment.variables = {
       HISTFILE = "\${XDG_STATE_HOME}/bash/history";
       LESSHISTFILE = "-";

parts/core.nix

@@ -214,22 +214,29 @@ in
       };
       getSshKeys = keyNames: keyNames |> map (name: inputs.self.lib.sshKeys.${name});
       # Helper functions for multi-user toggle support
-      normalizeUsers = users:
+      normalizeUsers = users: if builtins.isString users then [ users ] else users;
-        if builtins.isString users then [ users ] else users;
+      mkUserPackages =
-      mkUserPackages = lib: users: packages:
+        lib: users: packages:
-        lib.mkMerge (map (user: {
+        lib.mkMerge (
+          map (user: {
             ${user}.packages = packages;
-        }) (inputs.self.lib.normalizeUsers users));
+          }) (inputs.self.lib.normalizeUsers users)
-      mkUserAttrs = lib: users: attrs:
+        );
-        lib.mkMerge (map (user: {
+      mkUserAttrs =
+        lib: users: attrs:
+        lib.mkMerge (
+          map (user: {
             ${user} = attrs;
-        }) (inputs.self.lib.normalizeUsers users));
+          }) (inputs.self.lib.normalizeUsers users)
-      mkHomeManagerUsers = lib: users: fn:
+        );
-        lib.mkMerge (map (user: {
+      mkHomeManagerUsers =
+        lib: users: fn:
+        lib.mkMerge (
+          map (user: {
             ${user} = fn user;
-        }) (inputs.self.lib.normalizeUsers users));
+          }) (inputs.self.lib.normalizeUsers users)
-      getFirstUser = users:
+        );
-        if builtins.isString users then users else (builtins.head users);
+      getFirstUser = users: if builtins.isString users then users else (builtins.head users);
     };
   };
 }