11 files changed, 15 insertions, 43 deletions
diff --git a/user/emacs/raycast-script.applescript b/user/emacs/raycast-script.applescript
index 7fd64fbb..0d9a0bd8 100755
--- a/user/emacs/raycast-script.applescript
+++ b/user/emacs/raycast-script.applescript
@@ -6,7 +6,7 @@
 # @raycast.mode silent
 
 # Optional parameters:
-# @raycast.icon https://www.gnu.org/software/emacs/images/emacs.png
+# @raycast.icon /Users/alan/.config/emacs/emacs.icns
 # @raycast.packageName Emacs
 
 do shell script "$SHELL -c \"open -a ~/.local/state/nix/profile/Applications/Emacs.app\""
diff --git a/user/mba.nix b/user/marvin.nix
index 890cda69..b76bdd74 100644
--- a/user/mba.nix
+++ b/user/marvin.nix
@@ -13,8 +13,6 @@
     ./settings/nixpkgs.nix
     ./settings/ssh.nix
     ./settings/user-interface.nix
-    <private>
-    <private/ssh.nix>
   ];
 
   home.username = "alan";
diff --git a/user/prefect.nix b/user/prefect.nix
index 0a957d64..a15128bf 100644
--- a/user/prefect.nix
+++ b/user/prefect.nix
@@ -19,8 +19,6 @@
     ./settings/ssh.nix
     ./settings/user-interface.nix
     ./settings/xresources.nix
-    <private>
-    <private/ssh.nix>
   ];
 
   home.username = "alan";
diff --git a/user/server.nix b/user/server.nix
index 9b3db3fc..235e6908 100644
--- a/user/server.nix
+++ b/user/server.nix
@@ -9,7 +9,6 @@
     ./settings/nix.nix
     ./settings/nixos.nix
     ./settings/development/base.nix
-    <private>
   ];
   home = {
     username = "alan";
diff --git a/user/settings/base.nix b/user/settings/base.nix
index 5c5d6012..97ad7d14 100644
--- a/user/settings/base.nix
+++ b/user/settings/base.nix
@@ -1,4 +1,4 @@
-args@{ config
+{ config
 , lib
 , pkgs
 , ...
@@ -6,10 +6,7 @@ args@{ config
   imports = [
     ./neovim.nix
     ./shell.nix
-    (import <nix-index-database/home-manager-module.nix>
-      (args // { databases = import <nix-index-database/packages.nix>; }))
   ];
-
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
   manual = {
@@ -94,7 +91,6 @@ args@{ config
       tree
       remake
       abduco
-      dvtm
       walk
       nuspell
     ] ++ (with pkgs.hunspellDicts; [
diff --git a/user/settings/darwin.nix b/user/settings/darwin.nix
index e894bebd..f445e5cb 100644
--- a/user/settings/darwin.nix
+++ b/user/settings/darwin.nix
@@ -109,8 +109,8 @@
   };
 
   home.shellAliases = {
-    rb = "darwin-rebuild";
-    rbs = "darwin-rebuild switch";
+    rb = "nh os";
+    rbs = "nh os switch";
 
     dig = "dig +noall +answer";
 
@@ -118,19 +118,7 @@
   };
 
   programs.ssh.extraConfig = ''
-    IdentityAgent "~/.strongbox/agent.sock"
-  '';
-
-  home.activation.linkStrongboxSSHAgentSocket = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
-    if [[ ! -d ~/.strongbox ]]
-    then
-      $DRY_RUN_CMD mkdir ~/.strongbox
-    fi
-    if [[ ! -S ~/.strongbox/agent.sock ]]
-    then
-      $DRY_RUN_CMD ln -s $VERBOSE_ARG \
-        ~/Library/Group\ Containers/group.strongbox.mac.mcguill/agent.sock ~/.strongbox/agent.sock
-    fi
+    IdentityAgent ~/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh
   '';
 
   # Use GPG from  GPGTools
diff --git a/user/settings/kitty.nix b/user/settings/kitty.nix
index c1de50d8..8a06a820 100644
--- a/user/settings/kitty.nix
+++ b/user/settings/kitty.nix
@@ -18,6 +18,7 @@
     };
     settings = {
       macos_option_as_alt = "left";
+      cursor_blink_interval = 0;
     };
     extraConfig = ''
       include ~/.config/kitty/theme.conf
diff --git a/user/settings/nix.nix b/user/settings/nix.nix
index 66c00daf..87db3d56 100644
--- a/user/settings/nix.nix
+++ b/user/settings/nix.nix
@@ -12,15 +12,11 @@ in
     enable = true;
     # needed for "standalone" home-manager, conflicts with module
     package = lib.mkDefault pkgs.nix;
-    settings = {
-      use-xdg-base-directories = true;
-    };
   };
 
   home.packages = with pkgs; [
     cached-nix-shell
     nil
-    npins
     nix-prefetch-scripts
     nix-init
     nix-update
@@ -33,7 +29,7 @@ in
   ];
   xdg.configFile."nix-init/config.toml".source = toml.generate "config.toml" {
     maintainers = [ "alanpearce" ];
-    nixpkgs = "<nixpkgs>";
+    nixpkgs = "builtins.getFlake \"nixpkgs\"";
   };
   programs.emacs.extraPackages = epkgs: (with epkgs; [
     nix-mode
diff --git a/user/settings/nixos.nix b/user/settings/nixos.nix
index 85ea7f72..c6b50263 100644
--- a/user/settings/nixos.nix
+++ b/user/settings/nixos.nix
@@ -5,9 +5,9 @@
   ];
 
   home.shellAliases = {
-    srb = "nixos-rebuild";
-    rbs = "nixos-rebuild switch --fast";
-    rbb = "nixos-rebuild boot --fast";
+    srb = "nh os";
+    rbs = "nh os switch";
+    rbb = "nh os boot";
     rbr = "nixos-rebuild switch --rollback";
   };
 }
diff --git a/user/settings/shell.nix b/user/settings/shell.nix
index fe2b4690..0b232d0e 100644
--- a/user/settings/shell.nix
+++ b/user/settings/shell.nix
@@ -117,8 +117,8 @@ in
       grup = "git rup";
 
       ho = "home-manager";
-      hob = "home-manager build";
-      hos = "home-manager switch -b hm_bak_$(date +%Y%m%d%H%M)";
+      hob = "nh home build";
+      hos = "nh home switch -b hm_bak_$(date +%Y%m%d%H%M)";
       hon = "home-manager news";
       hoh = "home-manager help";
       hop = "home-manager packages";
@@ -129,7 +129,7 @@ in
       lw1 = "lorri watch --once";
       lwo = "lorri watch --once";
 
-      nsh = "nix-shell";
+      nsh = "nix shell";
       nb = "nix build";
       nl = "nix log"; # shadows `coreutils.nl`, but I've never used that yet
       nr = "nix run";
diff --git a/user/settings/user-interface.nix b/user/settings/user-interface.nix
index 29de4439..3574fda7 100644
--- a/user/settings/user-interface.nix
+++ b/user/settings/user-interface.nix
@@ -26,19 +26,15 @@ in
   };
   home.packages = with pkgs;
     [
-      hack-font
-      ibm-plex
       inter
       input-fonts
-      jetbrains-mono
-      meslo-lg
-      recursive
       # see https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/data/fonts/nerdfonts/shas.nix
       (nerdfonts.override {
         fonts = [
           "JetBrainsMono"
           "IBMPlexMono"
-          "iA-Writer"
+          "ZedMono"
+          "Recursive"
           "NerdFontsSymbolsOnly"
         ];
       })