hosts-by-platform/aarch64-linux/flame/default.nix

@@ -17,6 +17,7 @@ rec {
     base.enable = true;
     server.enable = true;
     communications.enable = true;
+    power-user.enable = true;
   };
 
   home-manager.users."noah" = {

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

@@ -40,6 +40,9 @@ in
           description = "Evaluate a bash-like environment variables file";
           body = ''set -gx (cat $argv | tr "=" " " | string split ' ')'';
         };
+        fish_user_key_bindings = {
+          body = builtins.readFile ./functions/fish_user_key_bindings.fish;
+        };
         ip = {
           body = lib.getExe pkgs.nmasur.ip-check;
         };

platforms/home-manager/modules/nmasur/presets/programs/fzf/default.nix

@@ -51,11 +51,11 @@ in
         };
         recent = {
           description = "Open a recent file in Vim";
-          body = builtins.readFile ./fish/recent.fish;
+          body = builtins.readFile ./edit/recent.fish;
         };
         search-and-edit = {
           description = "Search and open the relevant file in Vim";
-          body = builtins.readFile ./fish/search-and-edit.fish;
+          body = builtins.readFile ./edit/search-and-edit.fish;
         };
       };
       shellAbbrs = {

platforms/home-manager/modules/nmasur/presets/programs/git/default.nix

@@ -16,12 +16,10 @@ in
     name = lib.mkOption {
       type = lib.types.str;
       description = "Name to use for git commits";
-      default = config.nmasur.settings.fullName;
     };
     email = lib.mkOption {
       type = lib.types.str;
       description = "Email to use for git commits";
-      default = "7386960+nmasur@users.noreply.github.com";
     };
   };
 

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

@@ -28,13 +28,12 @@ in
 
     home.packages = [ cfg.package ];
 
-    #nmasur.presets.programs.neovim.package = lib.mkDefault pkgs.nmasur-neovim.override {
-    #  colors = cfg.colors;
-    #  github = cfg.github.enable;
-    #  terraform = cfg.terraform.enable;
-    #  kubernetes = cfg.kubernetes.enable;
-    #};
-    nmasur.presets.programs.neovim.package = pkgs.nmasur.neovim;
+    nmasur.presets.programs.neovim.package = lib.mkDefault pkgs.nmasur-neovim.override {
+      colors = cfg.colors;
+      github = cfg.github.enable;
+      terraform = cfg.terraform.enable;
+      kubernetes = cfg.kubernetes.enable;
+    };
 
     # Use Neovim as the editor for git commit messages
     programs.git.extraConfig.core.editor = "${lib.getExe cfg.package}";
@@ -61,7 +60,7 @@ in
 
     # Create a desktop option for launching Neovim from a file manager
     # (Requires launching the terminal and then executing Neovim)
-    xdg.desktopEntries.nvim = lib.mkIf (pkgs.stdenv.isLinux && config.nmasur.presets.services.i3.enable) {
+    xdg.desktopEntries.nvim = lib.mkIf (pkgs.stdenv.isLinux) {
       name = "Neovim wrapper";
       exec = "${lib.getExe config.nmasur.presets.services.i3.terminal} nvim %F"; # TODO: change to generic
       mimeType = [

platforms/home-manager/modules/nmasur/profiles/common.nix

@@ -28,11 +28,9 @@ in
 
     nmasur.presets = {
       programs = {
-        bat.enable = lib.mkDefault true;
-        fd.enable = lib.mkDefault true;
-        ripgrep.enable = lib.mkDefault true;
-        starship.enable = lib.mkDefault true;
-        nixpkgs.enable = lib.mkDefault true;
+        bat.enable = true;
+        ripgrep.enable = true;
+        fd.enable = true;
       };
       services = {
         loadkey.enable = lib.mkDefault true;

platforms/home-manager/modules/nmasur/profiles/linux-base.nix

@@ -1,5 +1,6 @@
 {
   config,
+  pkgs,
   lib,
   ...
 }:
@@ -34,9 +35,14 @@ in
       };
     };
 
-    nmasur.presets.programs = {
-      doas.enable = lib.mkDefault true;
+    programs.fish = {
+      shellAliases = {
+        # Move files to XDG trash on the commandline
+        trash = lib.mkDefault "${pkgs.trash-cli}/bin/trash-put";
+      };
+      shellAbbrs = {
+        t = lib.mkDefault "trash";
+      };
     };
-
   };
 }

platforms/home-manager/modules/nmasur/profiles/linux-gui.nix

@@ -1,6 +1,5 @@
 {
   config,
-  pkgs,
   lib,
   ...
 }:
@@ -44,15 +43,5 @@ in
       };
     };
 
-    programs.fish = {
-      shellAliases = {
-        # Move files to XDG trash on the commandline
-        trash = lib.mkDefault "${pkgs.trash-cli}/bin/trash-put";
-      };
-      shellAbbrs = {
-        t = lib.mkDefault "trash";
-      };
-    };
-
   };
 }

platforms/home-manager/modules/nmasur/profiles/power-user.nix

@@ -52,14 +52,10 @@ in
     nmasur.presets.programs = {
       atuin.enable = lib.mkDefault true;
       bat.enable = lib.mkDefault true;
-      direnv.enable = lib.mkDefault true;
       dotfiles.enable = lib.mkDefault true;
       fd.enable = lib.mkDefault true;
-      fish.enable = lib.mkDefault true;
-      fzf.enable = lib.mkDefault true;
-      nixpkgs.enable = lib.mkDefault true;
-      prettyping.enable = lib.mkDefault true;
       ripgrep.enable = lib.mkDefault true;
+      prettyping.enable = lib.mkDefault true;
       weather.enable = lib.mkDefault true;
       yt-dlp.enable = lib.mkDefault true;
       zoxide.enable = lib.mkDefault true;

platforms/nixos/modules/nmasur/presets/services/caddy.nix

@@ -83,7 +83,6 @@ in
         );
       in
       {
-        enable = true;
         adapter = "''"; # Required to enable JSON
         configFile = pkgs.writeText "Caddyfile" (
           builtins.toJSON {

platforms/nixos/modules/nmasur/presets/services/cloudflare.nix

@@ -67,8 +67,8 @@ in
 
     # Tell Caddy to use Cloudflare DNS for ACME challenge validation
     services.caddy.package = pkgs.caddy.withPlugins {
-      plugins = [ "github.com/caddy-dns/cloudflare@v0.0.0-20250228175314-1fb64108d4de" ];
-      hash = "sha256-3nvVGW+ZHLxQxc1VCc/oTzCLZPBKgw4mhn+O3IoyiSs=";
+      plugins = [ "github.com/caddy-dns/cloudflare@master" ];
+      hash = "sha256-C7JOGd4sXsRZL561oP84V2/pTg7szEgF4OFOw35yS1s=";
     };
     nmasur.presets.services.caddy.tlsPolicies = [
       {

platforms/nixos/modules/nmasur/presets/services/minecraft-server.nix

@@ -23,7 +23,6 @@ in
     allowUnfreePackages = [ "minecraft-server" ];
 
     services.minecraft-server = {
-      enable = true;
       eula = true;
       declarative = true;
       whitelist = { };

platforms/nixos/modules/nmasur/presets/services/n8n.nix

@@ -17,7 +17,6 @@ in
     allowUnfreePackages = [ "n8n" ];
 
     services.n8n = {
-      enable = true;
       webhookUrl = "https://${hostnames.n8n}";
       settings = {
         listen_address = "127.0.0.1";

platforms/nixos/modules/nmasur/presets/services/thelounge.nix

@@ -10,7 +10,6 @@ in
   config = lib.mkIf cfg.enable {
 
     services.thelounge = {
-      enable = true;
       public = false;
       port = 9000;
       extraConfig = {