flake.lock

@@ -2,16 +2,19 @@
   "nodes": {
     "devshell": {
       "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1764011051,
+        "lastModified": 1713532798,
-        "narHash": "sha256-M7SZyPZiqZUR/EiiBJnmyUbOi5oE/03tCeFrTiUZchI=",
+        "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "17ed8d9744ebe70424659b0ef74ad6d41fc87071",
+        "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40",
         "type": "github"
       },
       "original": {
@@ -25,11 +28,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1731533236,
+        "lastModified": 1710146030,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -45,43 +48,43 @@
         ]
       },
       "locked": {
-        "lastModified": 1764866045,
+        "lastModified": 1756245065,
-        "narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=",
+        "narHash": "sha256-aAZNbGcWrVRZgWgkQbkabSGcDVRDMgON4BipMy69gvI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab",
+        "rev": "54b2879ce622d44415e727905925e21b8f833a98",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-25.11",
+        "ref": "release-25.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1764831616,
+        "lastModified": 1756494058,
-        "narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=",
+        "narHash": "sha256-Yxg5zKIM450FAq7ihT6wkbuJ+Fl3KjbSpPjwFhSgMGc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4",
+        "rev": "2788026c663a210beeb81e85f93ca5e86243fb3c",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-25.11",
+        "ref": "release-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1764951420,
+        "lastModified": 1713995654,
-        "narHash": "sha256-oLJXP0fb5hyUvHGKAWdtjhl1/4ivxXy3HsuMMTTxrd8=",
+        "narHash": "sha256-S+4C0H9w7H9tSv1RviD/otsTmf1ECuxJMJ/j1t9gjPE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0b784f7c32b9bbab8a599ccc6b4acc58f42d6f4f",
+        "rev": "ce6da85c2dc9e659bef799c2ed053771e1bb8ee3",
         "type": "github"
       },
       "original": {

flake.nix

@@ -2,28 +2,21 @@
   description = "Samw's home environment, as managed by nix/home-manager.";
   inputs = {
     # Nixpkgs
-    nixpkgs = {
+    nixpkgs = {url = "github:nixos/nixpkgs/release-25.05";};
-      # N.B. we use the nixos-x branch as this is updated *after* successful hydra builds
+    nixpkgs-unstable = {url = "github:nixos/nixpkgs";};
-      # rather than release-x. See https://wiki.nixos.org/wiki/Channel_branches
-      url = "github:nixos/nixpkgs/nixos-25.11";
-    };
-    nixpkgs-unstable = {
-      url = "github:nixos/nixpkgs";
-    };
     # Other modules
     home-manager = {
-      url = "github:nix-community/home-manager/release-25.11";
+      url = "github:nix-community/home-manager/release-25.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     flake-utils.url = "github:numtide/flake-utils";
     devshell = {
       url = "github:numtide/devshell";
+      inputs.flake-utils.follows = "flake-utils";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
-  outputs =
+  outputs = inputs: let
-    inputs:
-    let
     overlays = [
       # Add our own local packages
       (final: prev: {
@@ -35,44 +28,31 @@
         ssh-tpm-agent = (import inputs.nixpkgs-unstable { system = prev.system; }).ssh-tpm-agent;
       })
     ];
-    in
+  in (rec {
-    (
-      rec {
       profiles = import ./home/profiles.nix;
       lib = {
-          mkHome =
+        mkHome = {
-            {
           profiles,
           system,
           username ? "samw",
         }:
           inputs.home-manager.lib.homeManagerConfiguration {
-              pkgs = (
+            pkgs = (import inputs.nixpkgs { 
-                import inputs.nixpkgs {
               inherit system;
               config.allowUnfree = true;  # Yes I know it's bad for me
-                }
+            });
-              );
             modules = [
-                {
+              { home = { 
-                  home = {
               inherit username;
               homeDirectory =
-                      if (inputs.nixpkgs.lib.systems.elaborate system).isDarwin then
+                if (inputs.nixpkgs.lib.systems.elaborate system).isDarwin
-                        "/Users/${username}"
+                then "/Users/${username}"
-                      else
+                else "/home/${username}";
-                        "/home/${username}";
               stateVersion = "21.11";
-                  };
+            };}] ++ profiles ++ [
-                }
-              ]
-              ++ profiles
-              ++ [
               {nixpkgs.overlays = overlays;}
               # See comment in home/default.nix.
-                (
+              ({ pkgs, ... }: {
-                  { pkgs, ... }:
-                  {
                 nix = {
                   enable = true;
                   package = pkgs.nix;
@@ -83,14 +63,8 @@
                   # level, so less duplication overall and no more fetching that 30MB src
                   # every time you run nix shell.
                   registry.nixpkgs.flake = inputs.nixpkgs;
-                      registry.nixpkgs-unstable.to = {
-                        owner = "nixos";
-                        repo = "nixpkgs";
-                        type = "github";
                 };
-                    };
+              })
-                  }
-                )
             ];
             extraSpecialArgs = {inherit system;};
           };
@@ -100,59 +74,34 @@
       homeConfigurations = {
         zinc = lib.mkHome {
           system = "aarch64-darwin";
-            profiles = with profiles; [
+          profiles = with profiles; [default dev dev-gui sensitive mac];
-              default
-              dev
-              dev-gui
-              sensitive
-              mac
-            ];
         };
         luroy = lib.mkHome {
           system = "x86_64-linux";
-            profiles = with profiles; [
+          profiles = with profiles; [default dev];
-              default
-              dev
-            ];
-          };
-          phosphorus = lib.mkHome {
-            system = "aarch64-darwin";
-            profiles = with profiles; [
-              default
-              dev
-              sensitive
-              mac
-            ];
         };
       };
     }
     # Per-system things
-      // (inputs.flake-utils.lib.eachDefaultSystem (
+    // (inputs.flake-utils.lib.eachDefaultSystem (system: let
-        system:
-        let
       pkgs = import inputs.nixpkgs {
         inherit system;
         overlays = overlays ++ [inputs.devshell.overlays.default];
       };
       platform = pkgs.lib.systems.elaborate system;
-        in
+    in {
-        {
       # Flake interface to my local packages.
       # - `callPackage` puts some junk in mypkgs (`override` and
       #   `overrideDerivation`) so we filter out anything that isn't a derivation
       # - We also filter out any packages that aren't supported on the current
       #   platform.
-          packages =
+      packages = with pkgs.lib; (filterAttrs (_: v: (isDerivation v && meta.availableOn platform v)) pkgs.mypkgs);
-            with pkgs.lib;
+      formatter = pkgs.alejandra;
-            (filterAttrs (_: v: (isDerivation v && meta.availableOn platform v)) pkgs.mypkgs);
-          formatter = pkgs.nixfmt-tree;
       # A devshell with useful utils
       devShells.default = pkgs.devshell.mkShell {
         packages = [
           inputs.home-manager.packages.${system}.default
         ];
       };
-        }
+    })));
-      ))
-    );
 }

home/aws.nix

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

home/default.nix

@@ -1,11 +1,9 @@
 {
   pkgs,
   ...
-}:
+}: let
-let
   packages = pkgs.callPackage ./packages.nix {};
-in
+in {
-{
   home.packages = packages.all;
   home.sessionVariables = {
     EDITOR = "vim"; # is overriden to nvim in vim.nix if needed 
@@ -57,6 +55,9 @@ in
         # Don't honk at me constantly
         unsetopt beep
       '';
+      envExtra = ''
+        export FZF_DEFAULT_COMMAND='${pkgs.fd}/bin/fd --type f --strip-cwd-prefix'
+      '';
       syntaxHighlighting.enable = true;
       plugins = [
         {
@@ -76,32 +77,25 @@ in
       enable = true;
       settings = {
         add_newline = false;
-        direnv.disabled = false;
+        format = "$username$hostname$shlvl$directory$git_branch$git_commit$git_state$git_metrics$git_status$hg_branch$docker_context$golang$kotlin$nodejs$python$rust$terraform$nix_shell$memory_usage$aws$gcloud$openstack$azure$env_var$crystal$custom$sudo$cmd_duration$line_break$jobs$status$shell$character";
-        format = "$all";
         username.format = "[$user]($style) ";
         hostname.format = "[$hostname]($style) ";
-        directory = {
+        directory = {truncation_length = -1;};
-          truncation_length = -1;
-        };
         git_branch.format = "[$symbol$branch]($style) ";
-        python.symbol = "py ";
+        python.format = "[py \${pyenv_prefix}(\${version} )(\\($virtualenv\\) )]($style)";
-        nodejs.symbol = "js ";
+        nodejs.format = "[js ($version )]($style)";
-        nix_shell.symbol = "nix ";
+        nix_shell.format = "[nix $state( \\($name\\))]($style) ";
-        rust.symbol = "rs ";
-        direnv.symbol = "de ";
       };
     };
 
     direnv = {
       enable = true;
       nix-direnv.enable = true;
-      config.global.warn_timeout = "30s";
     };
 
     fzf = {
       enable = true;
-      defaultCommand = "${pkgs.fd}/bin/fd --type f";
+      defaultCommand = "${pkgs.ripgrep}/bin/rg --files";
-      fileWidgetCommand = "${pkgs.fd}/bin/fd --type f";
     };
 
     ssh = {

home/docker.nix

@@ -1,7 +1 @@
-{ pkgs, ... }:
+{pkgs, ...}: {home.packages = with pkgs; [docker colima];}
-{
-  home.packages = with pkgs; [
-    docker
-    colima
-  ];
-}

home/git.nix

@@ -1,24 +1,18 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
+  home.packages = with pkgs; [ git-open tea ];
-  home.packages = with pkgs; [
-    git-open
-    tea
-  ];
-  programs.delta = {
-    # Better diffs
-    enable = true;
-    enableGitIntegration = true;
-    options = {
-      line-numbers = true;
-    };
-  };
   programs.git = {
     enable = true;
     lfs.enable = true;
-    settings = {
+    userName = "Sam Willcocks";
-      user.name = "Sam Willcocks";
+    userEmail = "sam@wlcx.cc";
-      user.email = "sam@wlcx.cc";
+
-      alias = {
+    delta = {
+      # Better diffs
+      enable = true;
+      options = {line-numbers = true;};
+    };
+
+    aliases = {
       a = "add";
       ap = "add -p";
       br = "branch";
@@ -42,18 +36,13 @@
       sw = "switch";
       swc = "switch --create";
 
-        gone = ''! git fetch -p && git for-each-ref --format '%(refname:short) %(upstream:track)' │ awk '$2 == "[gone]" {print $1}' | xargs -r git branch -D'';
+      gone = ''
+        ! git fetch -p && git for-each-ref --format '%(refname:short) %(upstream:track)' │ awk '$2 == "[gone]" {print $1}' | xargs -r git branch -D'';
     };
+    extraConfig = {
       branch.sort = "-committerdate";
       push.default = "current";
       init.defaultBranch = "main";
-      merge = {
-        conflictStyle = "diff3";
-        mergiraf = {
-          name = "mergiraf";
-          driver = "${pkgs.mergiraf}/bin/mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L";
-        };
-      };
     };
     includes = [
       # Always include local gitconfig if it's there

home/gpg.nix

@@ -1,5 +1,4 @@
-{ pkgs, lib, ... }:
+{pkgs, lib, ...}: {
-{
   programs.gpg = {
     enable = true;
     mutableKeys = false;

home/helix.nix

@@ -1,32 +0,0 @@
-{ ... }:
-{
-  programs.helix = {
-    enable = true;
-    settings = {
-      theme = "monokai_pro";
-      editor."soft-wrap".enable = true;
-    };
-    languages = {
-      language-server.basedpyright = {
-        command = "basedpyright-langserver";
-        args = [ "--stdio" ];
-      };
-      language = [
-        {
-          name = "python";
-          roots = [
-            "pyproject.toml"
-            "setup.py"
-            "poetry.lock"
-            ".git"
-          ];
-          language-servers = [
-            {
-              name = "basedpyright";
-            }
-          ];
-        }
-      ];
-    };
-  };
-}

home/macs.nix

@@ -2,20 +2,14 @@
   pkgs,
   lib,
   ...
-}:
+}: {
-{
   # Mac specific packages.
   # TODO: have this in a central packages place rather than here
-  home.packages = with pkgs; [
+  home.packages = with pkgs; [pngpaste mypkgs.qrclip];
-    pngpaste
-    mypkgs.qrclip
-  ];
   # Use secretive for SSH agent
   programs.ssh.matchBlocks.all = lib.mkIf pkgs.stdenv.isDarwin {
     host = "*";
-    extraOptions."IdentityAgent" =
+    extraOptions."IdentityAgent" = "~/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh";
-      "~/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh";
   };
-  programs.zsh.sessionVariables.SSH_AUTH_SOCK = "$HOME/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh";
   programs.zsh.initExtra = "eval $(/opt/homebrew/bin/brew shellenv)";
 }

home/packages.nix

@@ -1,6 +1,5 @@
 {pkgs}:
-with pkgs;
+with pkgs; rec {
-rec {
   # The stuff you want installed everywhere. The necessities.
   base = [
     bat # cat replacement, aliased to cat in home-manager
@@ -13,28 +12,13 @@ rec {
     unzip
     vim
     wget
-    helix
   ];
 
   # Networking shit
-  net = [
+  net = [dig iperf3 nmap socat tcpdump whois];
-    dig
-    iperf3
-    mtr
-    nmap
-    socat
-    tcpdump
-  ];
 
   # development tools
-  dev = [
+  dev = [jq nixfmt gh glab hexyl helix];
-    jq
-    nixfmt-rfc-style
-    gh
-    glab
-    hexyl
-    attic-client
-  ];
 
   all = base ++ net ++ dev;
 }

home/passwords.nix

@@ -1,11 +1,8 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   home.packages = with pkgs; [yubikey-manager];
   programs.password-store = {
     enable = true;
-    settings = {
+    settings = {PASSWORD_STORE_DIR = "$HOME/.password-store";};
-      PASSWORD_STORE_DIR = "$HOME/.password-store";
-    };
     package = pkgs.pass.withExtensions (exts: [exts.pass-otp]);
   };
   programs.zsh.shellAliases = {

home/profiles.nix

@@ -2,28 +2,17 @@
   # The basics that you'll want everywhere
   default = ./default.nix;
   # A machine for development
-  dev =
+  dev = {...}: {
-    { ... }:
+    imports = [./git.nix ./vim.nix ./vim-dev];
-    {
-      imports = [
-        ./git.nix
-        ./vim.nix
-        ./vim-dev
-        ./helix.nix
-      ];
   };
   # A machine for dev with a GUI
   # TODO: detect this automatically somehow?
-  dev-gui =
+  dev-gui = {...}: {
-    { ... }:
-    {
     imports = [./vscode.nix];
   };
   tpmssh = ./tpmssh.nix;
   # Sensitive stuff
-  sensitive =
+  sensitive = {...}: {
-    { ... }:
-    {
     imports = [
       ./passwords.nix
       ./gpg.nix
@@ -36,13 +25,5 @@
   # A machine you want to do aws stuff on
   aws = ./aws.nix;
   # A server
-  server =
+  server = {...}: {imports = [./default.nix ./git.nix ./vim.nix];};
-    { ... }:
-    {
-      imports = [
-        ./default.nix
-        ./git.nix
-        ./vim.nix
-      ];
-    };
 }

home/tpmssh.nix

@@ -1,6 +1,5 @@
 # Enable tpm-ssh-agent in a systemd user service
-{ pkgs, config, ... }:
+{pkgs, config, ...}: {
-{
   home.packages = [ pkgs.ssh-tpm-agent ];
   home.sessionVariables = {
     SSH_AUTH_SOCK = "$(${pkgs.ssh-tpm-agent}/bin/ssh-tpm-agent --print-socket)";
@@ -23,18 +22,11 @@
       Environment = ''
         SSH_AUTH_SOCK="%t/ssh-tpm-agent.sock"
       '';
-      ExecStart = "${
+      ExecStart = "${pkgs.writeShellScriptBin "start-ssh-tpm-agent" (if config.services.gpg-agent.enableSshSupport then ''
-        pkgs.writeShellScriptBin "start-ssh-tpm-agent" (
-          if config.services.gpg-agent.enableSshSupport then
-            ''
         ${pkgs.ssh-tpm-agent}/bin/ssh-tpm-agent -A $(${config.programs.gpg.package}/bin/gpgconf --list-dirs agent-ssh-socket)
-            ''
+      '' else ''
-          else
-            ''
         ${pkgs.ssh-tpm-agent}/bin/ssh-tpm-agent
-            ''
+      '')}/bin/start-ssh-tpm-agent";
-        )
-      }/bin/start-ssh-tpm-agent";
       PassEnvironment = "SSH_AGENT_PID";
       SuccessExitStatus = 2;
       Type = "simple";

home/vim-dev/default.nix

@@ -3,14 +3,9 @@
   lib,
   system,
   ...
-}:
+}: {
-{
+  home.packages = with pkgs; [nil];
-  home.packages = with pkgs; [
+  programs.neovim.plugins = with pkgs.vimPlugins;
-    nil
-    nixd
-  ];
-  programs.neovim.plugins =
-    with pkgs.vimPlugins;
     [
       # More fancy shit
       nvim-treesitter

home/vim-dev/dev.lua

@@ -54,10 +54,6 @@ require'lspconfig'.nil_ls.setup{
   on_attach = on_attach,
   capabilities = capabilities,
 }
-require'lspconfig'.nixd.setup{
-  on_attach = on_attach,
-  capabilities = capabilities,
-}
 require'lspconfig'.rust_analyzer.setup{
   on_attach = on_attach,
   capabilities = capabilities,
@@ -75,13 +71,6 @@ require'lspconfig'.rust_analyzer.setup{
       description = 'Open documentation for the symbol under the cursor in default browser',
     },
   },
-  settings = {
-    ["rust-analyzer"] = {
-      procMacro = {
-        enable = false,
-      },
-    },
-  },
 }
 require'lspconfig'.dhall_lsp_server.setup{
   on_attach = on_attach,

home/vim.nix

@@ -4,8 +4,7 @@
   pkgs,
   lib,
   ...
-}:
+}: {
-{
   home.sessionVariables.EDITOR = lib.mkForce "nvim";
   home.packages = with pkgs; [ripgrep];
   programs.neovim = {
@@ -27,7 +26,7 @@
       vim-gitgutter
       # More stuff idk
       emmet-vim
-      vim-sleuth # guess whitespace settings from file
+      vim-sleuth # guess whitespace settings from file
     ];
     extraConfig = ''
       lua <<EOF

home/vscode.nix

@@ -1,22 +1,19 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   programs.vscode = {
     enable = true;
     package = pkgs.vscodium;
     mutableExtensionsDir = false;
-    profiles.default.extensions = with pkgs.vscode-extensions; [
+    extensions = with pkgs.vscode-extensions; [
-      rust-lang.rust-analyzer
+      matklad.rust-analyzer
       jdinhlife.gruvbox
       jnoortheen.nix-ide
       editorconfig.editorconfig
     ];
-    profiles.default.userSettings = {
+    userSettings = {
       "update.mode" = "none";
       "window.autoDetectColorScheme" = true;
       "workbench.preferredDarkColorTheme" = "Gruvbox Dark Hard";
-      "workbench.preferredLightColorTheme" = "Gruvbox Light Hard";
       "files.trimTrailingWhitespace" = true;
-      "emmet.includeLanguages"."django-html" = "html";
       # Don't try to write to the nix-managed .ssh/config
       "remote.SSH.configFile" = "~/.ssh/config.local";
       "editor.rulers" = [ 90 ];

pkgs/default.nix

@@ -1,5 +1,4 @@
 # TODO: auto import everything
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   qrclip = pkgs.callPackage ./qrclip {};
 }

pkgs/qrclip/default.nix

@@ -2,14 +2,11 @@
   pkgs,
   lib,
   stdenv,
-}:
+}: let
-let
   zbar = pkgs.zbar.override {enableVideo = false;};
 in
   (pkgs.writeShellScriptBin "qrclip" ''
     set -eo pipefail
     ${pkgs.pngpaste}/bin/pngpaste - | ${zbar}/bin/zbarimg --raw -q1 -
   '')
-// {
+  // {meta.platforms = lib.platforms.darwin;}
-  meta.platforms = lib.platforms.darwin;
-}