hosts/aarch64-darwin/lookingglass/default.nix

@@ -21,7 +21,6 @@ rec {
     nmasur.settings = {
       username = nmasur.settings.username;
       fullName = nmasur.settings.fullName;
-      host = "lookingglass";
     };
     nmasur.profiles = {
       common.enable = true;

hosts/aarch64-linux/flame/default.nix

@@ -23,7 +23,6 @@ rec {
     nmasur.settings = {
       username = nmasur.settings.username;
       fullName = nmasur.settings.fullName;
-      host = networking.hostName;
     };
     nmasur.profiles = {
       common.enable = true;

hosts/x86_64-linux/arrow/default.nix

@@ -19,7 +19,6 @@ rec {
     nmasur.settings = {
       username = nmasur.settings.username;
       fullName = nmasur.settings.fullName;
-      host = networking.hostName;
     };
     nmasur.profiles = {
       common.enable = true;

hosts/x86_64-linux/hydra/default.nix

@@ -19,7 +19,6 @@ rec {
     nmasur.settings = {
       username = nmasur.settings.username;
       fullName = nmasur.settings.fullName;
-      host = networking.hostName;
     };
     nmasur.profiles = {
       common.enable = true;

hosts/x86_64-linux/staff/default.nix

@@ -23,7 +23,6 @@ rec {
     nmasur.settings = {
       username = nmasur.settings.username;
       fullName = nmasur.settings.fullName;
-      host = networking.hostName;
     };
     nmasur.profiles = {
       common.enable = true;

hosts/x86_64-linux/swan/default.nix

@@ -21,7 +21,6 @@ rec {
     nmasur.settings = {
       username = nmasur.settings.username;
       fullName = nmasur.settings.fullName;
-      host = networking.hostName;
     };
     nmasur.profiles = {
       common.enable = true;

hosts/x86_64-linux/tempest/default.nix

@@ -23,7 +23,6 @@ rec {
     nmasur.settings = {
       username = nmasur.settings.username;
       fullName = nmasur.settings.fullName;
-      host = networking.hostName;
     };
     nmasur.profiles = {
       common.enable = true;

platforms/home-manager/modules/nmasur/presets/programs/atuin.nix

@@ -15,7 +15,6 @@ in
   config = lib.mkIf cfg.enable {
     programs.atuin = {
       enable = true;
-      daemon.enable = true;
       flags = [
         "--disable-up-arrow"
         "--disable-ctrl-r"
@@ -34,7 +33,6 @@ in
         secrets_filter = true;
         enter_accept = false;
         keymap_mode = "vim-normal";
-        records = true; # Sync v2
       };
     };
 

platforms/home-manager/modules/nmasur/presets/programs/nixpkgs-darwin.nix

@@ -21,12 +21,6 @@ in
 
   config = lib.mkIf (cfg.enable) {
 
-    # These are useful for triggering from zellij (rather than running directly in the shell)
-    nmasur.presets.programs.nixpkgs.commands.rebuildNixos = pkgs.writeShellScriptBin "rebuild-darwin" ''
-      git -C ${config.nmasur.presets.programs.dotfiles.path} add --intent-to-add --all
-      darwin-rebuild switch --flake "${config.nmasur.presets.programs.dotfiles.path}#${config.nmasur.settings.host}"
-    '';
-
     programs.fish = {
       shellAbbrs = lib.mkIf config.nmasur.presets.programs.dotfiles.enable {
         nr = {

platforms/home-manager/modules/nmasur/presets/programs/nixpkgs.nix

@@ -11,34 +11,10 @@ in
 
 {
 
-  options.nmasur.presets.programs.nixpkgs = {
-    enable = lib.mkEnableOption "Nixpkgs presets";
-    commands = {
-      # These are useful for triggering from zellij (rather than running directly in the shell)
-      rebuildHome = lib.mkOption {
-        type = lib.types.package;
-        default = pkgs.writeShellScriptBin "rebuild-home" ''
-          git -C ${config.nmasur.presets.programs.dotfiles.path} add --intent-to-add --all
-          ${lib.getExe pkgs.home-manager} switch --flake "${config.nmasur.presets.programs.dotfiles.path}#${config.nmasur.settings.host}"
-        '';
-      };
-      rebuildNixos = lib.mkOption {
-        type = lib.types.package;
-        default = pkgs.writeShellScriptBin "rebuild-nixos" ''
-          git -C ${config.nmasur.presets.programs.dotfiles.path} add --intent-to-add --all
-          doas nixos-rebuild switch --flake ${config.nmasur.presets.programs.dotfiles.path}
-        '';
-      };
-    };
-  };
+  options.nmasur.presets.programs.nixpkgs.enable = lib.mkEnableOption "Nixpkgs presets";
 
   config = lib.mkIf cfg.enable {
 
-    home.packages = [
-      cfg.commands.rebuildHome
-      cfg.commands.rebuildNixos
-    ];
-
     programs.fish = {
       shellAbbrs = {
         n = "nix";

platforms/home-manager/modules/nmasur/presets/programs/zellij.nix

@@ -34,12 +34,6 @@ in
               zellij pipe --plugin file:$(which zellij-switch.wasm) -- "--cwd $TARGET_DIR --layout default --session $(basename $TARGET_DIR)"
             '';
         };
-        gh-run = {
-          body = # fish
-            ''
-              zellij action new-pane --start-suspended -- gh run watch
-            '';
-        };
       };
     };
 
@@ -121,34 +115,6 @@ in
                 close_on_exit = true;
               };
             };
-            "bind \"Alt Shift h\"" = {
-              Run = {
-                _args = [
-                  (lib.getExe config.nmasur.presets.programs.nixpkgs.commands.rebuildHome)
-                ];
-                # close_on_exit = false;
-              };
-            };
-            "bind \"Alt Shift r\"" = {
-              Run = {
-                _args = [
-                  (lib.getExe config.nmasur.presets.programs.nixpkgs.commands.rebuildNixos)
-                ];
-                # close_on_exit = false;
-              };
-            };
-            "bind \"Alt Shift w\"" = {
-              Run = {
-                _args = [
-                  (lib.getExe pkgs.gh)
-                  "run"
-                  "watch"
-                ];
-                # direction = "Right";
-                # close_on_exit = false;
-                # start_suspended = true;
-              };
-            };
             "bind \"Super Shift ]\"" = {
               GoToNextTab = { };
             };

platforms/home-manager/modules/nmasur/presets/services/hammerspoon/default.nix

@@ -18,9 +18,8 @@ in
     xdg.configFile."hammerspoon/init.lua".source = ./init.lua;
     xdg.configFile."hammerspoon/Spoons/ControlEscape.spoon".source = ./Spoons/ControlEscape.spoon;
     xdg.configFile."hammerspoon/Spoons/DismissAlerts.spoon".source = ./Spoons/DismissAlerts.spoon;
-    xdg.configFile."hammerspoon/Spoons/Launcher.spoon/init.lua".source =
-      pkgs.replaceVars ./Spoons/Launcher.spoon/init.lua
-        {
+    xdg.configFile."hammerspoon/Spoons/Launcher.spoon/init.lua".source = pkgs.substituteAll {
+      src = ./Spoons/Launcher.spoon/init.lua;
       discord = "${pkgs.discord}/Applications/Discord.app";
       firefox = "${pkgs.firefox-unwrapped}/Applications/Firefox.app";
       ghostty = "${config.programs.ghostty.package}/Applications/Ghostty.app";

platforms/home-manager/modules/nmasur/settings.nix

@@ -10,10 +10,6 @@
       type = lib.types.str;
       description = "Human readable name of the user";
     };
-    host = lib.mkOption {
-      type = lib.types.str;
-      description = "Name of the host of this deployment";
-    };
     hostnames = lib.mkOption {
       type = lib.types.attrsOf lib.types.str;
       description = "Map of service names to FQDNs";