flake.nix

@@ -19,14 +19,10 @@
   outputs = inputs: let
     overlays = [
       # Add our own local packages
-      (final: prev: {
+      (final: prev: rec {
         # Make my local packages available as pkgs.mypkgs.<foo>
         mypkgs = prev.callPackage ./pkgs {};
       })
-      # more up to date ssh-tpm-agent. Can probably ditch this post-24.05
-      (final: prev: {
-        ssh-tpm-agent = (import inputs.nixpkgs-unstable { system = prev.system; }).ssh-tpm-agent;
-      })
     ];
   in (rec {
       profiles = import ./home/profiles.nix;
@@ -72,6 +68,11 @@
 
       # Standalone home-manager configurations
       homeConfigurations = {
+        boron = lib.mkHome {
+          system = "aarch64-darwin";
+          profiles = with profiles; [default dev dev-gui sensitive mac docker aws];
+          username = "samuel.willcocks";
+        };
         zinc = lib.mkHome {
           system = "aarch64-darwin";
           profiles = with profiles; [default dev dev-gui sensitive mac];

home/default.nix

@@ -6,8 +6,9 @@
 in {
   home.packages = packages.all;
   home.sessionVariables = {
-    EDITOR = "vim"; # is overriden to nvim in vim.nix if needed 
+    "PATH" = "$HOME/.local/bin:$PATH";
-    WORDCHARS = "\${WORDCHARS//[\\/.=]/}"; # ctrl-w on paths without make angery
+    "EDITOR" = "vim";
+    "WORDCHARS" = "\${WORDCHARS//[\\/.=]/}"; # ctrl-w on paths without make angery
   };
   /*
   # For some reason this doesn't play nice when using home manager config from inside

home/profiles.nix

@@ -10,7 +10,6 @@
   dev-gui = {...}: {
     imports = [./vscode.nix];
   };
-  tpmssh = ./tpmssh.nix;
   # Sensitive stuff
   sensitive = {...}: {
     imports = [

home/tpmssh.nix

@@ -1,35 +0,0 @@
-# Enable tpm-ssh-agent in a systemd user service
-{pkgs, config, lib, ...}: {
-  home.packages = [ pkgs.ssh-tpm-agent ];
-  home.sessionVariables = {
-    SSH_AUTH_SOCK = let
-      maybeProxy = lib.strings.optionalString config.services.gpg-agent.enableSshSupport " -A $(${config.programs.gpg.package}/bin/gpgconf --list-dirs agent-ssh-socket)";
-      cmd = "${pkgs.ssh-tpm-agent}/bin/ssh-tpm-agent --print-socket${maybeProxy}";
-    in "$(${cmd})";
-    TESTIFICLES = "hello";
-  };
-  systemd.user.sockets.ssh-tpm-agent = {
-    Unit.WantedBy = [ "sockets.target" ];
-    Socket = {
-      ListenStream = "%t/ssh-tpm-agent.sock";
-      SocketMode = "0600";
-      Service = "ssh-tpm-agent.service";
-    };
-  };
-
-  systemd.user.services.ssh-tpm-agent = {
-    Unit = {
-      Requires = [ "ssh-tpm-agent.socket" ];
-      ConditionEnvironment = "!SSH_AGENT_PID";
-    };
-    Service = {
-      Environment = ''
-        SSH_AUTH_SOCK="%t/ssh-tpm-agent.sock"
-      '';
-      ExecStart = "${pkgs.ssh-tpm-agent}";
-      PassEnvironment = "SSH_AGENT_PID";
-      SuccessExitStatus = 2;
-      Type = "simple";
-    };
-  };
-}

home/vim.nix

@@ -5,7 +5,7 @@
   lib,
   ...
 }: {
-  home.sessionVariables.EDITOR = lib.mkForce "nvim";
+  home.sessionVariables = lib.mkForce {"EDITOR" = "nvim";};
   home.packages = with pkgs; [ripgrep];
   programs.neovim = {
     enable = true;