chore(nixvim): preserve branch-specific setup

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

.codex/config.toml

@@ -0,0 +1,5 @@
+## Me
+
+[mcp_servers.nixos]
+command = "nix"
+args = ["run", "github:utensils/mcp-nixos", "--"]

TODO.md

@@ -1,3 +1 @@
-- Evaluate Plasma Manager when Plasma 6.7 support improves
 - Review system-wide package list periodically
-- Add additional hosts

flake.lock

@@ -96,15 +96,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1784665499,
+        "lastModified": 1788011267,
-        "narHash": "sha256-9BMxlTxCCDAeoNLtb1a/st7udtTIJep+wpUzquA29VU=",
+        "narHash": "sha256-mEq2kU+ljompTToZ44Afvm7d/rHJ5iMBl0tjZuyShJs=",
-        "owner": "nix-community",
+        "owner": "Mic92",
         "repo": "bun2nix",
-        "rev": "0f2a1f0b6f42cebe3b149bf62d38754c5e0e9729",
+        "rev": "5765b0614591f75ee8ba5596e81ae85c167d1071",
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
+        "owner": "Mic92",
+        "ref": "fix-structured-attrs-hook",
         "repo": "bun2nix",
         "type": "github"
       }
@@ -161,11 +162,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1787559586,
+        "lastModified": 1788450739,
-        "narHash": "sha256-onL0VLf9vPllmT0H/OlURIU5r5t5WIEl7t4tVNKT0Nw=",
+        "narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "9d0d87172c374f89da73c1cfe6d81ae62feac1f1",
+        "rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993",
         "type": "github"
       },
       "original": {
@@ -241,11 +242,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1787797243,
+        "lastModified": 1788458226,
-        "narHash": "sha256-8+Q7NOB7RPajRjA4pbCDLzqH+MTjnG9x6LUPLfL2joA=",
+        "narHash": "sha256-UZTAlg8iKVEmyEXakzKmukrzFIKrXezYsRy9vajDrGw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "99c9ec63390f1d8c14d95d9e8b17cc29cfbd4e11",
+        "rev": "aa308770461dcf22c333a5e8a31c8bddbde5bee9",
         "type": "github"
       },
       "original": {
@@ -263,11 +264,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1788012048,
+        "lastModified": 1788481344,
-        "narHash": "sha256-Ja0btchPlXVw5XVEIe5N8DhNZJE8LKiBG1x0jZcNjTU=",
+        "narHash": "sha256-3jEfPEkegrp3ps+VuNT0i+kI4hhfDKoSICoUzZrXDOE=",
         "owner": "numtide",
         "repo": "llm-agents.nix",
-        "rev": "952d31f9337df4799f22aa067d1075822d024ecc",
+        "rev": "496d8f2d508dcd4673a1480cd58b3e9bf3400c15",
         "type": "github"
       },
       "original": {
@@ -297,11 +298,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1787985973,
+        "lastModified": 1788408011,
-        "narHash": "sha256-6YafqgJETEUfhFaKx3zvinjq1WDz8fy/PnEVtw7YmaU=",
+        "narHash": "sha256-VErLyHIT3U4x64a2G6J6wplB4yDPIpMXlhUpBjUMNEE=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "fdeb8646a1f9e5f0db80dd05e9db54ab7687378e",
+        "rev": "f848614222a7ef023998450a6f6773e10f8adf83",
         "type": "github"
       },
       "original": {
@@ -343,11 +344,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1787424095,
+        "lastModified": 1788372231,
-        "narHash": "sha256-dWLO5AHhKaw6rdWCtTes8hnntT1r0/J5yhQGm0f0ZgU=",
+        "narHash": "sha256-7aqErvrAEz/5OcPA5p3M+tVOqeYc4oJXkNIPXfCqxAw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "174eb786fb68e3a13e4e535a3deea479a0c07a6a",
+        "rev": "9387b3fcc0c23c86661636da63faabad4235a0a6",
         "type": "github"
       },
       "original": {
@@ -375,11 +376,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1787736819,
+        "lastModified": 1788316716,
-        "narHash": "sha256-cV5xEJJK3BvhU8rEd4mC9UsmDi5qscv/kzGPhBRC5WA=",
+        "narHash": "sha256-bc7rSpXIdn9QWGNqfWcPZWOhEVF8NoeAZkWq0XWnf/k=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9fbb54b33e91ee4ca368e35a78e0613c720600b3",
+        "rev": "3ed67ec0a4d3c7ab4ae1f04f8ee8df07bfa506a2",
         "type": "github"
       },
       "original": {
@@ -389,20 +390,34 @@
         "type": "github"
       }
     },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1789844176,
+        "narHash": "sha256-COQmpo4lFIzMgUjr3ntDpjH0NwrCnf7N0uhR+6WPGP8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "79b35bf0bda5cd110f856aa5b5b2c5ba4460dbf5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixvim": {
       "inputs": {
         "flake-parts": "flake-parts_2",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_5",
-          "nixpkgs"
-        ],
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1787862710,
+        "lastModified": 1788190018,
-        "narHash": "sha256-dL1Tv7LekaTWUJxHRckjbupWczDdc3QOgRuVCM+WAvQ=",
+        "narHash": "sha256-59BAfH0txPAZrPBF4QJqwvUWppD+ICrcjA1LZAmPnrQ=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "8c096abcf376137527c134da4ee210332b08ccc0",
+        "rev": "41844750e55f17b1385d5b09ca7ade5f11f49506",
         "type": "github"
       },
       "original": {
@@ -552,11 +567,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1787786351,
+        "lastModified": 1788475513,
-        "narHash": "sha256-IdcF4NFQORtS2FJ7aXYDod204+WQS8ymmdqiqbUMlMY=",
+        "narHash": "sha256-JRZ3eQpeeExv3mR1icbZAjToe7MPm8XleJML0UsrAHg=",
         "owner": "wimpysworld",
         "repo": "sidra",
-        "rev": "126a06eb4d3ba1c19ada5ca1a8c4869b37db574a",
+        "rev": "257dce10bd6805633d99e5cdae6897d014619dcc",
         "type": "github"
       },
       "original": {

flake.nix

@@ -21,10 +21,7 @@
       url = "github:gmodena/nix-flatpak/?ref=latest";
     };
     vscode-server.url = "github:nix-community/nixos-vscode-server";
-    nixvim = {
+    nixvim.url = "github:nix-community/nixvim";
-      url = "github:nix-community/nixvim";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     llm-agents.url = "github:numtide/llm-agents.nix";
     nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions";
     agenix = {

home/emmatherock/agents.nix

@@ -5,10 +5,9 @@ let
 in
 {
   home.packages = with agents; [
-    gemini-cli
     codex
     codex-acp
     claude-code
     claude-agent-acp
   ];
-}
+}

home/emmatherock/neovim.nix

@@ -16,6 +16,24 @@
 
     globals.mapleader = " ";
 
+    # --- System clipboard over OSC 52, so "+y / "+p work over SSH
+    #     (Termius -> VPS/homelab) without a local clipboard provider.
+    #     Requires Neovim 0.10+ for vim.ui.clipboard.osc52; confirmed
+    #     present (Neovim 0.12.5 on the pinned nixpkgs as of 2026-09).
+    extraConfigLua = ''
+      vim.g.clipboard = {
+        name = "OSC 52",
+        copy = {
+          ["+"] = require("vim.ui.clipboard.osc52").copy("+"),
+          ["*"] = require("vim.ui.clipboard.osc52").copy("*"),
+        },
+        paste = {
+          ["+"] = require("vim.ui.clipboard.osc52").paste("+"),
+          ["*"] = require("vim.ui.clipboard.osc52").paste("*"),
+        },
+      }
+    '';
+
     opts = {
       number = true;
       relativenumber = true;
@@ -45,7 +63,7 @@
       settings.ensure_installed = [
         "nix" "bash" "lua" "markdown" "json" "yaml"
         "rust" "go" "gomod" "c" "cpp" "c_sharp" "python"
-        "javascript" "typescript" "tsx" "vue" "html" "css"
+        "javascript" "typescript" "tsx" "vue" "html" "css" "dockerfile"
       ];
     };
 
@@ -70,6 +88,8 @@
         cssls.enable = true;
         tailwindcss.enable = true;
         jsonls.enable = true;
+        dockerls.enable = true;
+        docker_compose_language_service.enable = true;
       };
       keymaps.lspBuf = {
         "gd" = "definition";
@@ -85,14 +105,55 @@
       enable = true;
       settings.sources = [
         { name = "nvim_lsp"; }
+        { name = "luasnip"; }
         { name = "path"; }
         { name = "buffer"; }
       ];
+      settings.snippet.expand = ''
+        function(args)
+          require("luasnip").lsp_expand(args.body)
+        end
+      '';
+      settings.mapping = {
+        "<Tab>" = ''
+          cmp.mapping(function(fallback)
+            if cmp.visible() then
+              cmp.select_next_item()
+            elseif require("luasnip").expand_or_jumpable() then
+              require("luasnip").expand_or_jump()
+            else
+              fallback()
+            end
+          end, { "i", "s" })
+        '';
+        "<S-Tab>" = ''
+          cmp.mapping(function(fallback)
+            if cmp.visible() then
+              cmp.select_prev_item()
+            elseif require("luasnip").jumpable(-1) then
+              require("luasnip").jump(-1)
+            else
+              fallback()
+            end
+          end, { "i", "s" })
+        '';
+      };
     };
     plugins.cmp-nvim-lsp.enable = true;
+    plugins.cmp_luasnip.enable = true;
     plugins.cmp-path.enable = true;
     plugins.cmp-buffer.enable = true;
 
+    # --- Snippets ---
+    plugins.luasnip = {
+      enable = true;
+      fromVscode = [ { paths = "${pkgs.vimPlugins.friendly-snippets}"; } ];
+    };
+
+    # --- Pairs and surrounding text ---
+    plugins.nvim-autopairs.enable = true;
+    plugins.nvim-surround.enable = true;
+
     # --- Format on save ---
     plugins.conform-nvim = {
       enable = true;
@@ -120,6 +181,9 @@
     # --- Git: gutter signs, hunk stage/reset, blame ---
     plugins.gitsigns.enable = true;
 
+    # --- Git: interactive status/commit/diff/blame ---
+    plugins.fugitive.enable = true;
+
     # --- Statusline ---
     plugins.lualine.enable = true;
 
@@ -127,22 +191,23 @@
     plugins.which-key.enable = true;
 
     # --- AI agent: CodeCompanion, curated natively in nixvim ---
-    # Configured to reuse your existing `claude`/`gemini` CLI auth via ACP
+    # Configured to reuse your existing `claude`/`codex` CLI auth via ACP
-    # adapters instead of a separate Anthropic Console API key.
+    # adapters instead of a separate Anthropic Console/OpenAI API key.
     #
     # Verified against https://codecompanion.olimorris.dev/configuration/adapters-acp
     # (CodeCompanion >= v18.0.0, which is what's pinned by nixvim's nixpkgs as of
     # 2026-08). Two things changed from an older/assumed layout:
     #   - the default-adapter key is `interactions.chat.adapter`, not
     #     `strategies.chat.adapter` (renamed in v18.0.0);
-    #   - the built-in adapter names are `claude_code` and `gemini_cli` (no
+    #   - the built-in adapter name is `claude_code` (no `_acp` suffix) and
-    #     `_acp` suffix) and live under `adapters.acp.<name>`.
+    #     lives under `adapters.acp.<name>`.
     #
     # Neither adapter has a true zero-config mode that silently piggybacks on
     # an already-logged-in CLI session:
-    #   - gemini_cli: `defaults.auth_method = "oauth-personal"` reuses the
+    #   - codex: extends the built-in `codex` preset. `defaults.auth_method`
-    #     `gemini` CLI's own login — no key needed, closest thing to "just
+    #     accepts "api-key" | "chat-gpt" (confirmed against the docs above,
-    #     use my existing session".
+    #     not "chatgpt"/"openai-api-key"/"codex-api-key"). "chat-gpt" reuses
+    #     your ChatGPT/Codex CLI login instead of an OPENAI_API_KEY.
     #   - claude_code: there's no oauth-personal equivalent. Run
     #     `claude setup-token` once (ties to your Pro/Max subscription rather
     #     than a Console API key) and save the result to
@@ -152,8 +217,10 @@
     plugins.codecompanion = {
       enable = true;
       settings = {
-        interactions.chat.adapter = "claude_code"; # switch to "gemini_cli" per-chat
+        interactions.chat.adapter = "claude_code"; # switch to "codex" per-chat
+        interactions.inline.adapter = "claude_code";
         adapters.acp = {
+          opts.show_presets = false;
           claude_code.__raw = ''
             function()
               return require("codecompanion.adapters").extend("claude_code", {
@@ -163,16 +230,17 @@
               })
             end
           '';
-          gemini_cli.__raw = ''
+          codex.__raw = ''
             function()
-              return require("codecompanion.adapters").extend("gemini_cli", {
+              return require("codecompanion.adapters").extend("codex", {
                 defaults = {
-                  auth_method = "oauth-personal",
+                  auth_method = "chat-gpt",
                 },
               })
             end
           '';
         };
+        adapters.http.opts.show_presets = false;
           display.chat.window = {
           layout = "vertical";
           position = "right";
@@ -206,6 +274,13 @@
       { mode = [ "n" "v" ]; key = "<leader>ac"; action = "<cmd>CodeCompanionChat Toggle<CR>"; }
       { mode = "v"; key = "<leader>aa"; action = "<cmd>CodeCompanionChat Add<CR>"; }
       { mode = "n"; key = "<leader>ai"; action = "<cmd>CodeCompanion<CR>"; } # inline assistant
+
+      # Fugitive
+      { mode = "n"; key = "<leader>gs"; action = "<cmd>Git<CR>"; } # status
+      { mode = "n"; key = "<leader>gc"; action = "<cmd>Git commit<CR>"; } # interactive commit
+      { mode = "n"; key = "<leader>gp"; action = "<cmd>Git push<CR>"; }
+      { mode = "n"; key = "<leader>gl"; action = "<cmd>Git pull<CR>"; }
+      { mode = "n"; key = "<leader>gd"; action = "<cmd>Gvdiffsplit<CR>"; } # diff current file
     ];
   };
 }

hosts/miku-homelab/default.nix

@@ -5,6 +5,7 @@
     ./hardware-configuration.nix
     ../../modules/profiles/desktop.nix
     ../../modules/profiles/server.nix
+    ../../modules/services/ollama.nix
     ../../modules/services/samba.nix
     ../../modules/system/home-profile.nix
     ../../modules/system/nix-ld.nix
@@ -27,7 +28,7 @@
     ../../home/emmatherock/deskflow.nix
     ../../home/emmatherock/gaming.nix
     ../../home/emmatherock/media.nix
-    ../../home/emmatherock/neovim.nix
+    #../../home/emmatherock/neovim.nix
     ../../home/emmatherock/packages.nix
     ../../home/emmatherock/plasma.nix
     ../../home/emmatherock/vscode.nix
@@ -157,5 +158,12 @@
     experimental-features = [ "nix-command" "flakes" ];
   };
 
+  zramSwap = {
+    enable = true;
+    algorithm = "zstd";
+    memoryPercent = 50;
+    priority = 100;
+  };
+
   system.stateVersion = "25.11";
 }

hosts/vps/default.nix

@@ -42,6 +42,10 @@
           publicKey = "bqxDHQNxOSFpTo3We9ujC2WljtaRBgiNEewW+Rlu10k=";
           allowedIPs = [ "10.20.0.2/32" ];
         }
+        {
+          publicKey = "6aw0w7v9uFGvLn/eSdf7z/ljvzz4kviYlSOSj0LKp1E=";
+          allowedIPs = [ "10.20.0.3/32" ];
+        }
       ];
     };
   };
@@ -71,6 +75,12 @@
   boot.loader.systemd-boot.configurationLimit = 10;
   boot.loader.efi.canTouchEfiVariables = true;
 
+  # Required for this host to act as a Tailscale/Headscale exit node.
+  boot.kernel.sysctl = {
+    "net.ipv4.ip_forward" = 1;
+    "net.ipv6.conf.all.forwarding" = 1;
+  };
+
   time.timeZone = "America/Argentina/Buenos_Aires";
   i18n.defaultLocale = "en_US.UTF-8";
 

modules/services/ollama.nix

@@ -0,0 +1,35 @@
+{ pkgs, ... }:
+
+{
+  services.ollama = {
+    enable = true;
+    # `services.ollama.acceleration` does not exist (that option only lives on
+    # services.tabby); GPU backend selection for ollama is done by package choice.
+    package = pkgs.ollama-rocm;
+
+    # Same "don't expose services directly" pattern as the rest of the homelab:
+    # bind to localhost only. If this needs to be reachable from other devices
+    # later, put it behind Traefik + Headscale like the other services instead
+    # of opening it up directly.
+    host = "127.0.0.1";
+    port = 11434;
+
+    environmentVariables = {
+      # Ollama is on-demand by design: it loads a model into VRAM on the first
+      # request and unloads it after this much idle time. 5m is already the
+      # ollama default, set explicitly so it's not an implicit behavior.
+      OLLAMA_KEEP_ALIVE = "5m";
+    };
+
+    # RDNA4 (gfx1200/gfx1201, incl. the RX 9060 XT) has official ROCm support
+    # since ROCm 6.4.4. Verified on this host (2026-08-30) with rocmPackages.clr
+    # 7.2.3: `rocminfo` correctly reports "Name: gfx1200" and `rocm-smi
+    # --showmeminfo vram` reports the full 16GiB, so the "detected with 0 VRAM,
+    # falls back to CPU" issue does not reproduce here and rocmOverrideGfx is
+    # not needed. If a future nixpkgs bump regresses this, re-check with:
+    #   nix shell nixpkgs#rocmPackages.rocminfo -c rocminfo | grep -i gfx
+    #   nix shell nixpkgs#rocmPackages.rocm-smi -c rocm-smi --showmeminfo vram
+    # and only then set rocmOverrideGfx = "12.0.0"; (gfx1200) if VRAM reports 0.
+    # rocmOverrideGfx = "12.0.0";
+  };
+}