[macbook] Leaner brew list.

home-modules/explicit-configs/nvim/lua/keymappings.lua

@@ -6,6 +6,7 @@ local handlers = lsp.handlers
 -- Space as leader.
 vim.api.nvim_set_keymap('n', '<Space>', '<NOP>', {noremap = true, silent = true})
 vim.g.mapleader = ' '
+vim.g.maplocalleader = ' '
 
 -- Exit insert mode with ,h.
 vim.api.nvim_set_keymap('i', ',m', '<ESC>', {noremap = true, silent = true})
@@ -65,8 +66,9 @@ vim.api.nvim_set_keymap('n', '<Leader>bs', '<cmd>Telescope buffers<cr>',{})
 -- Code actions.
 vim.api.nvim_set_keymap('n', '<Leader>ca', "<Cmd>lua vim.lsp.buf.code_action()<CR>",{silent = true, noremap = true})
 vim.api.nvim_set_keymap('x', '<Leader>ca', "<Cmd>lua vim.lsp.buf.range_code_action()<CR>",{silent = true, noremap = true})
--- Flutter commands.
+-- Search and replace.
-vim.api.nvim_set_keymap('n', '<Leader>fl', "<cmd>lua require('telescope').extensions.flutter.commands()<cr>",{silent = true, noremap = true})
+vim.api.nvim_set_keymap('n', '<Leader>sr', ':GrugFar<cr>', {noremap = true, silent = true})
+vim.api.nvim_set_keymap('n', '<Leader>rsr', ':GrugFarWithin<cr>', {noremap = true, silent = true})
 
 
 -- Hover doc popup

home-modules/explicit-configs/nvim/lua/plugins.lua

@@ -75,6 +75,7 @@ return require('packer').startup(function(use)
     }
     use { "junegunn/fzf" }
     use { "junegunn/fzf.vim" }
+    use { "MagicDuck/grug-far.nvim" }
 
 
     -- Diagnostics

home-modules/secretive.nix

@@ -1,9 +1,10 @@
 { user, ... } : {
   programs.ssh = {
     enable = true;
-    extraConfig = ''
+    matchBlocks = {
-Host *
+      "*" = {
-  IdentityAgent ${user.homeDirectory}/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh
+        identityAgent = "${user.homeDirectory}/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh";
-    '';
+      };
+    };
   };
 }

hosts/common/keys/id_secretive.pub

@@ -1 +1 @@
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCLJj/fefApUkXp79YPPk1O2L6CW6kqISXSWWmR8+MX0wk3lQv1NUp1p87sE57i6aUcYMuba0U9y+ppQq603uOc= code@secretive.Mariano’s-MacBook-Pro-(2).local
+ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBLNJvauvfuOq5DUO0pnObq/8De1dW1ZM757sMGVvwLUHm48si4coYozbDISIe58Puc9uMkihvHSjNlZh0vMHoo= git@secretive.Mariano’s-MacBook-Pro-(2).local

hosts/macbook/configuration.nix

@@ -38,17 +38,19 @@
       no_quarantine = true;
     };
 
+    taps = [
+      "agavra/tap"
+    ];
     brews = [
-      "raylib"
       "watchman"
       "vite"
       "pipx"
       "codex"
       "python@3.11"
       "glow"
-      "act"
       "chromaprint"
       "libiconv"
+      "agavra/tap/tuicr"
     ];
     casks = [
       "ghostty"
@@ -68,7 +70,7 @@
       "discord"
       "claude-code"
       "calibre"
-      "rsyncui"
+      "trilium-notes"
     ];
   };
 

hosts/macbook/home.nix

@@ -84,10 +84,28 @@ in {
   };
 
   programs.ssh = {
+    enableDefaultConfig = false;
     matchBlocks = {
-      media = {
+      "*" = {
+        forwardAgent = false;
+        addKeysToAgent = "no";
+        compression = false;
+        serverAliveInterval = 0;
+        serverAliveCountMax = 3;
+        hashKnownHosts = false;
+        userKnownHostsFile = "~/.ssh/known_hosts";
+        controlMaster = "no";
+        controlPath = "~/.ssh/master-%r@%n:%p";
+        controlPersist = "no";
+      };
+      homeserver = {
         user = "jmug";
-        hostname = "192.168.8.241";
+        hostname = "100.122.244.59";
+        forwardAgent = true;
+      };
+      devbox = {
+        user = "jmug";
+        hostname = "100.102.140.44";
         forwardAgent = true;
       };
       handmade = {
@@ -95,6 +113,11 @@ in {
         hostname = "82.180.160.149";
         forwardAgent = true;
       };
+      "racknerd" = {
+        user = "jmug";
+        hostname = "155.94.155.137";
+        addKeysToAgent = "yes";
+      };
     };
   };
 

hosts/nixbox/configuration.nix

@@ -241,11 +241,9 @@ in
   services.gvfs.enable = true;
   services.udisks2.enable = true;
 
-  # Enable the OpenSSH daemon.
   # Enable the OpenSSH daemon.
   services.openssh = {
     enable = true;
-    # ports = [ 69 ];
     settings = {
       PasswordAuthentication = false;
       PermitRootLogin = "no";

hosts/nixbox/home.nix

@@ -84,6 +84,7 @@ in {
       pkgs-unstable.opencode
       pkgs-unstable.claude-code
       pkgs-unstable.openssl
+      pkgs-unstable.dig
       # zig
       fastfetch
       fzf
@@ -117,12 +118,10 @@ in {
 
   programs.zsh = {
     shellAliases = {
-      # TODO BEGIN Interpolate the name of the host here.
+      flakeconf = "nvim ${homeDirectory}/nixos/flake.nix";
-      # flakeconf = "sudo nvim /etc/nixos/flake.nix";
+      nosconf = "nvim ${homeDirectory}/nixos/hosts/nixbox/configuration.nix";
-      # nosconf = "sudo nvim /etc/nixos/hosts/devbox/configuration.nix";
+      homeconf = "nvim ${homeDirectory}/nixos/hosts/nixbox/home.nix";
-      # homeconf = "sudo nvim /etc/nixos/hosts/devbox/home.nix";
+      nvconf = "sudo nvim ${homeDirectory}/nixos/home-modules/explicit-configs/nvim/init.lua";
-      # nvconf = "sudo nvim /etc/nixos/home-modules/explicit-configs/nvim/init.lua";
-      # TODO END Interpolate the name of the host here.
       rshellconf = "source ~/.zshrc";
       # TODO: Interpolate the name of the host here.
       nrsw = "sudo nixos-rebuild switch --flake ${homeDirectory}/nixos#nixbox";
@@ -146,42 +145,48 @@ in {
   services.ssh-agent.enable = true;
   programs.ssh = {
     enable = true;
-    addKeysToAgent = "confirm";
+    enableDefaultConfig = false;
     matchBlocks = {
-      "git" = {
+      "*" = {
+        forwardAgent = false;
+        addKeysToAgent = "no";
+        compression = false;
+        serverAliveInterval = 0;
+        serverAliveCountMax = 3;
+        hashKnownHosts = false;
+        userKnownHostsFile = "~/.ssh/known_hosts";
+        controlMaster = "no";
+        controlPath = "~/.ssh/master-%r@%n:%p";
+        controlPersist = "no";
+        identityFile = [
+          "/home/jmug/.ssh/id_yubikey" # Auto updated symlik that matches all yubikeys.
+          "/home/jmug/.ssh/id_jmug" # Fallback key with passphrase.
+        ];
+      };
+      git = {
         host = "github.com";
         user = "git";
-        identityFile = [
+        addKeysToAgent = "yes";
-          "/home/jmug/.ssh/id_yubikey" # Auto updated symlik that matches all yubikeys.
-          "/home/jmug/.ssh/id_jmug" # Fallback key with passphrase.
-        ];
       };
-      "forgejo" = {
+      forgejo = {
         host = "code.jmug.me";
         user = "forgejo";
-        identityFile = [
+        addKeysToAgent = "yes";
-          "/home/jmug/.ssh/id_yubikey" # Auto updated symlik that matches all yubikeys.
-          "/home/jmug/.ssh/id_jmug" # Fallback key with passphrase.
-        ];
       };
-      "tailscale-jmug" = {
+      homeserver = {
         user = "jmug";
         hostname = "100.122.244.59";
-        identityFile = [
+        forwardAgent = true;
-          "/home/jmug/.ssh/id_yubikey" # Auto updated symlik that matches all yubikeys.
+      };
-          "/home/jmug/.ssh/id_jmug" # Fallback key with passphrase.
+      racknerd = {
-        ];
+        user = "jmug";
+        hostname = "155.94.155.137";
+      };
+      handmade = {
+        user = "jmug";
+        hostname = "82.180.160.149";
       };
     };
-    # matchBlocks = {
-    #   ws = {
-    #     user = "aym";
-    #     hostname = "73.118.150.68";
-    #     port = 69;
-    #     forwardAgent = true;
-    #     identityFile = "/home/jmug/.ssh/id_ed25519";
-    #   };
-    # };
   };
 
   # Let Home Manager install and manage itself.