refactor: format all the code with nixpkgs-fmt

.envrc

@@ -2,6 +2,7 @@ if ! has nix_direnv_version || ! nix_direnv_version 2.2.1; then
   source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.1/direnvrc" "sha256-zelF0vLbEl5uaqrfIzbgNzJWGmLzCmYAkInj/LNxvKs="
 fi
 
+watch_file devenv.nix
 watch_file flake.nix
 watch_file flake.lock
 if ! use flake . --no-pure-eval

devenv.nix

@@ -0,0 +1,8 @@
+{
+  git-hooks.hooks = {
+    deadnix.enable = true;
+    nixpkgs-fmt.enable = true;
+  };
+
+  scripts.update.exec = "nix flake update";
+}

flake.nix

@@ -17,60 +17,55 @@
     nixvim.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = { self, ... }@inputs:
-    rec {
+  outputs = { self, ... } @ inputs: rec {
+    lib = import ./lib {
+      inherit inputs;
+      inherit (self) outputs;
+    };
 
-      lib = import ./lib {
-        inherit inputs;
-        inherit (self) outputs;
+    homeConfigurations = {
+      "thomas@meili" = lib.mkHome {
+        system = "aarch64-darwin";
+        modules = [ ./home/meili.nix ];
       };
 
-      homeConfigurations = {
-        "thomas@meili" = lib.mkHome {
-          system = "aarch64-darwin";
-          modules = [ ./home/meili.nix ];
-        };
-
-        "thomas@modgud" = lib.mkHome {
-          system = "x86_64-linux";
-          modules = [ ./home/modgud.nix ];
-        };
+      "thomas@modgud" = lib.mkHome {
+        system = "x86_64-linux";
+        modules = [ ./home/modgud.nix ];
       };
+    };
 
-      nixosConfigurations = {
-        # modgud = lib.mkSystem {
-        #   system = "x86_64-linux";
-        #   modules = [ ./hosts/modgud ];
-        # };
+    nixosConfigurations = {
+      # modgud = lib.mkSystem {
+      #   system = "x86_64-linux";
+      #   modules = [ ./hosts/modgud ];
+      # };
 
-        # odin = lib.mkSystem {
-        #   system = "x86_64-linux";
-        #   modules = [ ./hosts/odin ];
-        # };
-      };
+      # odin = lib.mkSystem {
+      #   system = "x86_64-linux";
+      #   modules = [ ./hosts/odin ];
+      # };
+    };
 
-      darwinConfigurations = {
-        meili = lib.mkDarwin {
-          system = "aarch64-darwin";
-          modules = [ ./hosts/meili ];
-        };
+    darwinConfigurations = {
+      meili = lib.mkDarwin {
+        system = "aarch64-darwin";
+        modules = [ ./hosts/meili ];
       };
+    };
 
-      devShells = lib.mkDevenvShell {
-        git-hooks.hooks = {
-          deadnix.enable = true;
-          nixpkgs-fmt.enable = true;
-        };
-
-        scripts.update.exec = "nix flake update";
-      };
+    devShells = lib.mkDevenvShell {
+      default = import ./devenv.nix;
+    };
 
-      modules = import ./modules;
-      overlays = import ./overlays { inherit inputs; };
+    modules = import ./modules;
+    overlays = import ./overlays { inherit inputs; };
 
-      packages = lib.eachSystem (import ./packages) // lib.eachSystem (system: {
+    packages =
+      lib.eachSystem (import ./packages)
+      // lib.eachSystem (system: {
         devenv-up = self.devShells.${system}.default.config.procfileScript;
         devenv-test = self.devShells.${system}.default.config.test;
       });
-    };
+  };
 }

home/features/cli/aider-chat.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
-{
+{ pkgs, ... }: {
   home.packages = with pkgs; [
     aider-chat
   ];

home/features/cli/bat.nix

@@ -1,5 +1,4 @@
 { pkgs, ... }:
-
 let
   catppuccin-src = pkgs.fetchFromGitHub {
     owner = "catppuccin";
@@ -8,7 +7,6 @@ let
     sha256 = "sha256-6fWoCH90IGumAMc4buLRWL0N61op+AuMNN9CAR9/OdI=";
   };
 in
-
 {
   programs.bat = {
     enable = true;

home/features/cli/fish.nix

@@ -1,5 +1,7 @@
-{ lib, pkgs, ... }:
-{
+{ lib
+, pkgs
+, ...
+}: {
   programs.fish = {
     enable = true;
     shellAliases = import ./shell-aliases.nix;
@@ -15,5 +17,6 @@
       repo = "fish";
       rev = "cc8e4d8";
       sha256 = "sha256-udiU2TOh0lYL7K7ylbt+BGlSDgCjMpy75vQ98C1kFcc=";
-    } + "/themes/Catppuccin Frappe.theme");
+    }
+  + "/themes/Catppuccin Frappe.theme");
 }

home/features/cli/fzf.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
-{
+{ pkgs, ... }: {
   home.packages = with pkgs; [ fd ];
 
   programs.fzf = rec {

home/features/cli/git.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
-{
+{ pkgs, ... }: {
   home.packages = [
     pkgs.git
     pkgs.git-crypt
@@ -13,18 +12,20 @@
     userName = "Thomas Stachl";
     userEmail = "[email protected]";
 
-    includes = [{
-      condition = "gitdir/i:~/workspace/aesir/**";
-      contents = {
-        core.sshCommand = "ssh -i ~/.ssh/id_aesirdev";
-        user = {
-          email = "[email protected]";
-          name = "Æsir Dev";
-          signingKey = "58145313C9636027";
+    includes = [
+      {
+        condition = "gitdir/i:~/workspace/aesir/**";
+        contents = {
+          core.sshCommand = "ssh -i ~/.ssh/id_aesirdev";
+          user = {
+            email = "[email protected]";
+            name = "Æsir Dev";
+            signingKey = "58145313C9636027";
+          };
+          commit.gpgSign = true;
         };
-        commit.gpgSign = true;
-      };
-    }];
+      }
+    ];
 
     signing = {
       key = "ED5EAAA8E895B23A";
@@ -154,12 +155,11 @@
     };
   };
 }
-
 # [filter "lfs"]
 # 	clean = git-lfs clean -- %f
 # 	smudge = git-lfs smudge -- %f
 # 	process = git-lfs filter-process
 # 	required = true
-
 # TODO: Proton Drive
 # ln -s ~/Library/CloudStorage/[email protected]/Photos ~/Photos
+

home/features/cli/nostr.nix

@@ -1,4 +1,3 @@
-{ pkgs, ... }:
-{
+{ pkgs, ... }: {
   home.packages = [ pkgs.unstable.nak ];
 }

home/features/cli/nushell.nix

@@ -1,5 +1,4 @@
-{ config, ... }:
-{
+{ config, ... }: {
   home.sessionVariables.SHELL = "${config.programs.nushell.package}/bin/nu";
   programs.nushell = {
     enable = true;

home/features/cli/pass.nix

@@ -1,5 +1,4 @@
-{ config, ... }:
-{
+{ config, ... }: {
   programs.password-store.enable = true;
 
   programs.fish.shellInit = ''

home/features/cli/ssh.nix

@@ -1,4 +1,7 @@
-{ config, lib, ... }:
+{ config
+, lib
+, ...
+}:
 let
   configHome = "${config.xdg.configHome}/gnupg";
 in

home/features/cli/tmux.nix

@@ -1,5 +1,7 @@
-{ pkgs, config, ... }:
-{
+{ pkgs
+, config
+, ...
+}: {
   # - WARNING Neither Tc nor RGB capability set. True colors are disabled. |'termguicolors'| won't work properly.
   #   - ADVICE:
   #     - Put this in your ~/.tmux.conf and replace XXX by your $TERM outside of tmux:

home/features/core.nix

@@ -2,8 +2,7 @@
 , outputs
 , lib
 , ...
-}:
-{
+}: {
   imports = [
     # INFO: this is shared between home-manager, nixos, and darwin
     outputs.modules.global.nix-config
@@ -16,7 +15,10 @@
     enableNixpkgsReleaseCheck = false;
 
     username = "thomas";
-    homeDirectory = if pkgs.stdenv.isDarwin then "/Users/thomas" else "/home/thomas";
+    homeDirectory =
+      if pkgs.stdenv.isDarwin
+      then "/Users/thomas"
+      else "/home/thomas";
 
     packages = with pkgs; [
       cachix

home/features/desktop/aerospace.nix

@@ -1,5 +1,8 @@
-{ pkgs, config, lib, ... }:
-
+{ pkgs
+, config
+, lib
+, ...
+}:
 let
   cfg = config.programs.aerospace;
   aerospace = "${pkgs.lib.meta.getExe cfg.package}";
@@ -34,7 +37,6 @@ let
 
   aerospace-focus = "${pkgs.lib.meta.getExe aerospace-focus-pkg}";
 in
-
 {
   home.packages = [ aerospace-focus-pkg ];
 

home/features/desktop/alacritty.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
-{
+{ pkgs, ... }: {
   programs.alacritty = {
     enable = true;
 

home/features/desktop/fonts.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
-{
+{ pkgs, ... }: {
   fonts.fontconfig.enable = true;
 
   home.packages = with pkgs; [

home/features/desktop/ghostty.nix

@@ -3,7 +3,6 @@
 , lib
 , ...
 }:
-
 let
   ghosttyCatppuccinSrc = pkgs.fetchFromGitHub {
     owner = "catppuccin";
@@ -12,7 +11,6 @@ let
     sha256 = "sha256-RlgTeBkjEvZpkZbhIss3KxQcvt0goy4WU+w9d2XCOnw=";
   };
 in
-
 {
   xdg.configFile = {
     "ghostty/themes/catppuccin-frappe.conf".text =

home/features/desktop/yubikey.nix

@@ -1,8 +1,8 @@
-{ lib, pkgs, ... }:
-
-with lib;
-
-let
+{ lib
+, pkgs
+, ...
+}:
+with lib; let
   inherit (pkgs.stdenv.hostPlatform) isLinux;
 in
 {

home/features/desktop/zen-browser.nix

@@ -1,5 +1,4 @@
-{ outputs, ... }:
-{
+{ outputs, ... }: {
   imports = [
     outputs.modules.home-manager.zen-browser
   ];

home/features/nvim/default.nix

@@ -1,11 +1,15 @@
-{ inputs, lib, pkgs, ... }:
+{ inputs
+, lib
+, pkgs
+, ...
+}:
 let
   # Define `recursiveUpdateMany` if not present
   recursiveUpdateMany = sets: lib.fold lib.attrsets.recursiveUpdate { } sets;
 
   # Merge all plugin configurations directly from imports
   nixvim = recursiveUpdateMany [
-    ({
+    {
       enable = true;
       defaultEditor = true;
       vimdiffAlias = true;
@@ -31,7 +35,7 @@ let
         })
         vim.cmd.colorscheme("nord")
       '';
-    })
+    }
 
     (import ./keymaps.nix)
     (import ./options.nix)

home/features/nvim/plugins/lint.nix

@@ -4,10 +4,10 @@
     elixir = [ "credo" ];
   };
 }
-
 # vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, {
 #   group = lint_augroup,
 #   callback = function()
 #     lint.try_lint()
 #   end,
 # })
+

home/features/nvim/plugins/treesitter.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
-{
+{ pkgs, ... }: {
   plugins.treesitter = {
     grammarPackages = pkgs.vimPlugins.nvim-treesitter.passthru.allGrammars;
 

hosts/common/default.nix

@@ -1,5 +1,7 @@
-{ pkgs, outputs, ... }:
-{
+{ pkgs
+, outputs
+, ...
+}: {
   imports = [
     outputs.modules.global
 

hosts/common/home-manager.nix

@@ -1,10 +1,12 @@
-{ inputs, outputs, ... }:
+{ inputs
+, outputs
+, ...
+}:
 let
   home-manager-module =
-    if builtins.runCommand "uname" ''{ outFile = "/dev/stdout"; }'' == "Darwin" then
-      inputs.home-manager.darwinModules.home-manager
-    else
-      inputs.home-manager.nixosModules.home-manager;
+    if builtins.runCommand "uname" ''{ outFile = "/dev/stdout"; }'' == "Darwin"
+    then inputs.home-manager.darwinModules.home-manager
+    else inputs.home-manager.nixosModules.home-manager;
 in
 {
   imports = [ home-manager-module ];

hosts/common/nix.nix

@@ -3,8 +3,7 @@
 , config
 , outputs
 , ...
-}:
-{
+}: {
   nix = {
     settings = {
       substituters = [

hosts/meili/default.nix

@@ -1,10 +1,11 @@
-{ outputs, ... }:
-{
-  imports = [
-    outputs.modules.global.nix-config
-    ./system.nix
-    ./software.nix
-  ] ++ (builtins.attrValues outputs.modules.darwin);
+{ outputs, ... }: {
+  imports =
+    [
+      outputs.modules.global.nix-config
+      ./system.nix
+      ./software.nix
+    ]
+    ++ (builtins.attrValues outputs.modules.darwin);
 
   # NOTE: might be valuable to put this in it's own file
   # nix.linux-builder = {

hosts/meili/software.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
-{
+{ pkgs, ... }: {
   # TODO:
   #   - Proton Mail Bridge
   #   - Proton Drive set up home folders

hosts/modgud/default.nix

@@ -1,5 +1,4 @@
-{ outputs, ... }:
-{
+{ outputs, ... }: {
   imports = [
     ./hardware.nix
 

hosts/modgud/disk.nix

@@ -1,5 +1,7 @@
-{ lib, inputs, ... }:
-{
+{ lib
+, inputs
+, ...
+}: {
   imports = [
     inputs.disko.nixosModules.disko
   ];

hosts/modgud/hardware.nix

@@ -1,5 +1,7 @@
-{ lib, modulesPath, ... }:
-{
+{ lib
+, modulesPath
+, ...
+}: {
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
     (modulesPath + "/profiles/qemu-guest.nix")

lib/default.nix

@@ -1,24 +1,29 @@
-{ inputs, outputs }:
+{ inputs
+, outputs
+,
+}:
+
 let
+  inherit (inputs) darwin devenv home-manager nixpkgs;
+  inherit (nixpkgs) lib;
   # Helper to determine if a system is Darwin
   isDarwin = system: builtins.elem "darwin" (builtins.split "-" system);
 
   # Helper to get the appropriate nixpkgs for a system
-  getPkgsForSystem =
-    system:
-    if isDarwin system then
-      inputs.nixpkgs-darwin.legacyPackages.${system}
-    else
-      inputs.nixpkgs.legacyPackages.${system};
+  getPkgsForSystem = system:
+    if isDarwin system
+    then inputs.nixpkgs-darwin.legacyPackages.${system}
+    else inputs.nixpkgs.legacyPackages.${system};
 in
+
 rec {
   mkSystem =
     { system
-    , nixpkgs ? inputs.nixpkgs
+    , nixpkgs ? nixpkgs
     , modules ? [ ]
     ,
     }:
-    inputs.nixpkgs.lib.nixosSystem {
+    lib.nixosSystem {
       inherit system modules nixpkgs;
       specialArgs = { inherit inputs outputs; };
     };
@@ -28,7 +33,7 @@ rec {
     , modules ? [ ]
     ,
     }:
-    inputs.darwin.lib.darwinSystem {
+    darwin.lib.darwinSystem {
       inherit system modules;
       specialArgs = { inherit inputs outputs; };
     };
@@ -38,33 +43,34 @@ rec {
     , modules ? [ ]
     ,
     }:
-    inputs.home-manager.lib.homeManagerConfiguration {
+    home-manager.lib.homeManagerConfiguration {
       inherit modules;
       pkgs = getPkgsForSystem system;
       extraSpecialArgs = { inherit inputs outputs; };
     };
 
-  mkDevenvShell =
-    config:
+  mkDevenvShell = config:
     eachSystemWithPkgs (
       { pkgs }:
-      {
-        default = inputs.devenv.lib.mkShell {
-          inherit inputs pkgs;
-          modules = [ config ];
-        };
-      }
+      lib.mapAttrs
+        (
+          _name: module:
+            devenv.lib.mkShell {
+              inherit inputs pkgs;
+              modules = [ module ];
+            }
+        )
+        config
     );
 
-  eachSystem = inputs.nixpkgs.lib.genAttrs [
+  eachSystem = lib.genAttrs [
     "x86_64-linux"
     "x86_64-darwin"
     "aarch64-linux"
     "aarch64-darwin"
   ];
 
-  eachSystemWithPkgs =
-    f:
+  eachSystemWithPkgs = f:
     eachSystem (
       system:
       f {
@@ -72,8 +78,7 @@ rec {
       }
     );
 
-  print =
-    text:
+  print = text:
     let
       json = builtins.toJSON text;
     in

modules/darwin/networking/remote-login.nix

@@ -1,32 +1,25 @@
-{ config, lib, ... }:
-
-with lib;
-
-let
-
+{ config
+, lib
+, ...
+}:
+with lib; let
   cfg = config.networking;
 
   remoteLogin = optionalString (cfg.remote-login) ''
     systemsetup -setremotelogin on
   '';
-
 in
-
 {
   options = {
-
     networking.remote-login = mkEnableOption "remote login";
-
   };
 
   config = {
-
     system.activationScripts.networking.text = mkIf cfg.remote-login (mkAfter ''
       # enable remote login
       echo "enabling remote login..." >&2
 
       ${remoteLogin}
     '');
-
   };
 }

modules/darwin/security/pam-reattach.nix

@@ -3,14 +3,10 @@
 , pkgs
 , ...
 }:
-
-with lib;
-
-let
+with lib; let
   cfg = config.security.pam;
 
-  mkPamReattachScript =
-    isEnabled:
+  mkPamReattachScript = isEnabled:
     let
       file = "/etc/pam.d/sudo";
       option = "security.pam.reattach";
@@ -18,49 +14,49 @@ let
     in
     ''
       ${
-        if isEnabled then
-          ''
-            # If enable and in file, remove and re-add in case the store path has
-            # changed
-            if grep '${option}' ${file} > /dev/null; then
-              ${sed} -i '/${option}/d' ${file}
-            fi
+        if isEnabled
+        then ''
+          # If enable and in file, remove and re-add in case the store path has
+          # changed
+          if grep '${option}' ${file} > /dev/null; then
+            ${sed} -i '/${option}/d' ${file}
+          fi
 
-            ${sed} -i '2i\
-            auth       optional       ${pkgs.pam-reattach}/lib/pam/pam_reattach.so ignore_ssh # nix-darwin: ${option}
-            ' ${file}
-          ''
-        else
-          ''
-            # Disable pam_reattach, if added by nix-darwin
-            if grep '${option}' ${file} > /dev/null; then
-              ${sed} -i '/${option}/d' ${file}
-            fi
-          ''
+          ${sed} -i '2i\
+          auth       optional       ${pkgs.pam-reattach}/lib/pam/pam_reattach.so ignore_ssh # nix-darwin: ${option}
+          ' ${file}
+        ''
+        else ''
+          # Disable pam_reattach, if added by nix-darwin
+          if grep '${option}' ${file} > /dev/null; then
+            ${sed} -i '/${option}/d' ${file}
+          fi
+        ''
       }
     '';
 in
-
 {
   options = {
-    security.pam.enablePamReattach = mkEnableOption "" // {
-      description = lib.mdDoc ''
-        Enable pam_reattach sudo authentication with Touch ID in tmux/screen.
+    security.pam.enablePamReattach =
+      mkEnableOption ""
+      // {
+        description = lib.mdDoc ''
+          Enable pam_reattach sudo authentication with Touch ID in tmux/screen.
 
-        When enabled, this option adds the following line to
-        {file}`/etc/pam.d/sudo`:
+          When enabled, this option adds the following line to
+          {file}`/etc/pam.d/sudo`:
 
-        ```
-        auth       optional     pam_reattach.so ignore_ssh
-        ```
+          ```
+          auth       optional     pam_reattach.so ignore_ssh
+          ```
 
-        ::: {.note}
-        macOS resets this file when doing a system update. As such,
-        pam_reattach won't work after a system update
-        until the nix-darwin configuration is reapplied.
-        :::
-      '';
-    };
+          ::: {.note}
+          macOS resets this file when doing a system update. As such,
+          pam_reattach won't work after a system update
+          until the nix-darwin configuration is reapplied.
+          :::
+        '';
+      };
   };
 
   config = {

modules/darwin/system/rosetta.nix

@@ -1,11 +1,10 @@
-{ config, lib, ... }:
-
-with lib;
-
-let
+{ config
+, lib
+, ...
+}:
+with lib; let
   cfg = config.system.rosetta;
 in
-
 {
   options = {
     system.rosetta.enable = mkOption {

modules/global/nix-config.nix

@@ -3,8 +3,7 @@
 , config
 , outputs
 , ...
-}:
-{
+}: {
   nix = {
     package = pkgs.nix;
 

overlays/default.nix

@@ -1,5 +1,4 @@
-{ inputs, ... }:
-rec {
+{ inputs, ... }: rec {
   # This one brings our custom packages from the 'pkgs' directory
   additions = final: _prev: import ../packages { pkgs = final; };
 
@@ -17,9 +16,11 @@ rec {
       old: inputs.nixpkgs.lib.recursiveUpdate old { meta.broken = false; }
     );
 
-    tmuxPlugins = prev.tmuxPlugins // {
-      tmux-select-pane-no-wrap = prev.tmux-select-pane-no-wrap;
-    };
+    tmuxPlugins =
+      prev.tmuxPlugins
+      // {
+        tmux-select-pane-no-wrap = prev.tmux-select-pane-no-wrap;
+      };
   };
 
   # When applied, the unstable nixpkgs set (declared in the flake inputs) will

packages/default.nix

@@ -1,7 +1,4 @@
-{ pkgs ? (import <nixpkgs>) { }
-,
-}:
-{
+{ pkgs ? (import <nixpkgs>) { } }: {
   hello = pkgs.callPackage ./hello.nix { };
   photo-cli = pkgs.callPackage ./photo-cli.nix { };
   tmux-select-pane-no-wrap = pkgs.callPackage ./tmux-select-pane-no-wrap.nix { };

packages/photo-cli.nix

@@ -1,5 +1,7 @@
-{ buildDotnetGlobalTool, lib, ... }:
-
+{ buildDotnetGlobalTool
+, lib
+, ...
+}:
 buildDotnetGlobalTool {
   pname = "photo-cli";
   version = "0.3.3";

packages/tmux-select-pane-no-wrap.nix

@@ -1,4 +1,7 @@
-{ fetchFromGitHub, tmuxPlugins }:
+{ fetchFromGitHub
+, tmuxPlugins
+,
+}:
 tmuxPlugins.mkTmuxPlugin rec {
   pluginName = "tmux-select-pane-no-wrap";
   version = "00add78";