feat(flake.lock): update flake inputs and locked versions for nixvim and flake-parts

flake.lock

@@ -175,6 +175,27 @@
       }
     },
     "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1787559586,
+        "narHash": "sha256-onL0VLf9vPllmT0H/OlURIU5r5t5WIEl7t4tVNKT0Nw=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "9d0d87172c374f89da73c1cfe6d81ae62feac1f1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_3": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
       },
@@ -220,11 +241,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1787680808,
-        "narHash": "sha256-9168tNt0NZdtlx5RM5huEuc9NCWMLACJA9O4UK/l2Zc=",
+        "lastModified": 1787797243,
+        "narHash": "sha256-8+Q7NOB7RPajRjA4pbCDLzqH+MTjnG9x6LUPLfL2joA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6840c9a8f50722944eb106ce8bb237c138584f2a",
+        "rev": "99c9ec63390f1d8c14d95d9e8b17cc29cfbd4e11",
         "type": "github"
       },
       "original": {
@@ -242,11 +263,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1787704590,
-        "narHash": "sha256-WxaT4eXm7WynrXjyi8XZHVD8y7bEE086AFa0zTtxy6A=",
+        "lastModified": 1788012048,
+        "narHash": "sha256-Ja0btchPlXVw5XVEIe5N8DhNZJE8LKiBG1x0jZcNjTU=",
         "owner": "numtide",
         "repo": "llm-agents.nix",
-        "rev": "4c7c50e9c7aab5a1fbc8d4e26d196a76fde00fc3",
+        "rev": "952d31f9337df4799f22aa067d1075822d024ecc",
         "type": "github"
       },
       "original": {
@@ -276,11 +297,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1787708809,
-        "narHash": "sha256-g8nkh08udC9gGpHnSb10+yjaw7Ie3bxCz2VmDy1XjRM=",
+        "lastModified": 1787985973,
+        "narHash": "sha256-6YafqgJETEUfhFaKx3zvinjq1WDz8fy/PnEVtw7YmaU=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "60132c95fbfebfc9db33217b4eca3b921ff98d38",
+        "rev": "fdeb8646a1f9e5f0db80dd05e9db54ab7687378e",
         "type": "github"
       },
       "original": {
@@ -354,11 +375,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1787498568,
-        "narHash": "sha256-9i/VTdusq/+NM/tz+J1Re+ojkMB8MBf0QshnYfzHz30=",
+        "lastModified": 1787736819,
+        "narHash": "sha256-cV5xEJJK3BvhU8rEd4mC9UsmDi5qscv/kzGPhBRC5WA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "56c02bc00adcf003215cc4bd996d6efaf4cff188",
+        "rev": "9fbb54b33e91ee4ca368e35a78e0613c720600b3",
         "type": "github"
       },
       "original": {
@@ -368,6 +389,42 @@
         "type": "github"
       }
     },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1787631388,
+        "narHash": "sha256-vMiXptXarfSdJb1Gkc+FYVOAibuBRj7qxGa8z68q1Uw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ac6b2166e7a9375683b8e98f860f273222337b16",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixvim": {
+      "inputs": {
+        "flake-parts": "flake-parts_2",
+        "nixpkgs": "nixpkgs_5",
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1787862710,
+        "narHash": "sha256-dL1Tv7LekaTWUJxHRckjbupWczDdc3QOgRuVCM+WAvQ=",
+        "owner": "nix-community",
+        "repo": "nixvim",
+        "rev": "8c096abcf376137527c134da4ee210332b08ccc0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixvim",
+        "type": "github"
+      }
+    },
     "ny": {
       "flake": false,
       "locked": {
@@ -412,6 +469,7 @@
         "nix-flatpak": "nix-flatpak",
         "nix-vscode-extensions": "nix-vscode-extensions",
         "nixpkgs": "nixpkgs_4",
+        "nixvim": "nixvim",
         "plasma-manager": "plasma-manager",
         "sidra": "sidra",
         "vscode-server": "vscode-server"
@@ -508,11 +566,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1786706192,
-        "narHash": "sha256-NViIxuTn4VA6w5JPpzamwkCnFUmhFc4CFMemIKsC/B8=",
+        "lastModified": 1787786351,
+        "narHash": "sha256-IdcF4NFQORtS2FJ7aXYDod204+WQS8ymmdqiqbUMlMY=",
         "owner": "wimpysworld",
         "repo": "sidra",
-        "rev": "8ace425cda0f462acc7a00ada1e71f87aa30c2cf",
+        "rev": "126a06eb4d3ba1c19ada5ca1a8c4869b37db574a",
         "type": "github"
       },
       "original": {
@@ -551,6 +609,23 @@
         "type": "github"
       }
     },
+    "systems_3": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1774449309,
+        "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "c29398b59d2048c4ab79345812849c9bd15e9150",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "ref": "future-26.11",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
@@ -574,7 +649,7 @@
     },
     "vscode-server": {
       "inputs": {
-        "flake-parts": "flake-parts_2"
+        "flake-parts": "flake-parts_3"
       },
       "locked": {
         "lastModified": 1784312229,

flake.nix

@@ -21,6 +21,7 @@
       url = "github:gmodena/nix-flatpak/?ref=latest";
     };
     vscode-server.url = "github:nix-community/nixos-vscode-server";
+    nixvim.url = "github:nix-community/nixvim";
     llm-agents.url = "github:numtide/llm-agents.nix";
     nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions";
     agenix = {
@@ -53,6 +54,7 @@
             home-manager.extraSpecialArgs = { inherit inputs; };
             home-manager.sharedModules = [
               plasma-manager.homeModules.plasma-manager
+              inputs.nixvim.homeModules.nixvim
             ];
             home-manager.users.emmatherock = { osConfig, ... }: {
               imports = [ ./home/emmatherock/core.nix ] ++ osConfig.myHomeProfile.extraPrograms;
@@ -74,6 +76,9 @@
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.extraSpecialArgs = { inherit inputs; };
+            home-manager.sharedModules = [
+              inputs.nixvim.homeModules.nixvim
+            ];
             home-manager.users.emmatherock = { osConfig, ... }: {
               imports = [ ./home/emmatherock/core.nix ] ++ osConfig.myHomeProfile.extraPrograms;
             };

home/emmatherock/agents.nix

@@ -5,7 +5,8 @@ let
 in
 {
   home.packages = with agents; [
-    antigravity-cli
+    gemini-cli
+    codex
     claude-code
   ];
 }

home/emmatherock/core.nix

@@ -1,3 +1,4 @@
+{ pkgs, ... }:
 {
   imports = [
     ./git.nix
@@ -13,6 +14,9 @@
     enable = true;
     nix-direnv.enable = true;
   };
+  home.packages = with pkgs; [
+    fastfetch
+  ];
 
   home.stateVersion = "25.11";
 }

home/emmatherock/neovim.nix

@@ -0,0 +1,203 @@
+# Declarative Neovim config via nixvim. Goal: a real, lean IDE — not a
+# feature-for-feature VSCode clone. Every plugin here earns its place.
+
+{ pkgs, ... }:
+
+{
+  programs.nixvim = {
+    enable = true;
+    defaultEditor = true;
+    vimAlias = true; # `vim` -> nvim, handy when SSH'd into the VPS/homelab
+
+    colorschemes.catppuccin = {
+      enable = true;
+      settings.flavour = "mocha";
+    };
+
+    globals.mapleader = " ";
+
+    opts = {
+      number = true;
+      relativenumber = true;
+      shiftwidth = 2;
+      tabstop = 2;
+      expandtab = true;
+      termguicolors = true;
+      signcolumn = "yes";
+      scrolloff = 8;
+    };
+
+    # --- File explorer ---
+    plugins.neo-tree = {
+      enable = true;
+      settings.window.width = 30;
+    };
+
+    # --- Fuzzy finder: files, grep, buffers, LSP symbols ---
+    plugins.telescope = {
+      enable = true;
+      extensions.fzf-native.enable = true;
+    };
+
+    # --- Treesitter: syntax highlighting/parsing for your stack ---
+    plugins.treesitter = {
+      enable = true;
+      settings.ensure_installed = [
+        "nix" "bash" "lua" "markdown" "json" "yaml"
+        "rust" "go" "gomod" "c" "cpp" "c_sharp" "python"
+        "javascript" "typescript" "tsx" "vue" "html" "css"
+      ];
+    };
+
+    # --- LSP: one server per language/toolchain you use ---
+    plugins.lsp = {
+      enable = true;
+      servers = {
+        nixd.enable = true;
+        bashls.enable = true;
+        rust_analyzer = {
+          enable = true;
+          installCargo = true;
+          installRustc = true;
+        };
+        gopls.enable = true;
+        clangd.enable = true; # C / C++
+        csharp_ls.enable = true;
+        pyright.enable = true;
+        ts_ls.enable = true; # JS/TS, React
+        volar.enable = true; # Vue
+        html.enable = true;
+        cssls.enable = true;
+        tailwindcss.enable = true;
+        jsonls.enable = true;
+      };
+      keymaps.lspBuf = {
+        "gd" = "definition";
+        "gr" = "references";
+        "K" = "hover";
+        "<leader>rn" = "rename";
+        "<leader>ca" = "code_action";
+      };
+    };
+
+    # --- Autocompletion ---
+    plugins.cmp = {
+      enable = true;
+      settings.sources = [
+        { name = "nvim_lsp"; }
+        { name = "path"; }
+        { name = "buffer"; }
+      ];
+    };
+    plugins.cmp-nvim-lsp.enable = true;
+    plugins.cmp-path.enable = true;
+    plugins.cmp-buffer.enable = true;
+
+    # --- Format on save ---
+    plugins.conform-nvim = {
+      enable = true;
+      settings = {
+        format_on_save = {
+          lsp_fallback = true;
+          timeout_ms = 500;
+        };
+        formatters_by_ft = {
+          rust = [ "rustfmt" ];
+          go = [ "gofmt" ];
+          c = [ "clang-format" ];
+          cpp = [ "clang-format" ];
+          python = [ "black" ];
+          javascript = [ "prettier" ];
+          typescript = [ "prettier" ];
+          javascriptreact = [ "prettier" ];
+          typescriptreact = [ "prettier" ];
+          vue = [ "prettier" ];
+          nix = [ "nixpkgs-fmt" ];
+        };
+      };
+    };
+
+    # --- Git: gutter signs, hunk stage/reset, blame ---
+    plugins.gitsigns.enable = true;
+
+    # --- Statusline ---
+    plugins.lualine.enable = true;
+
+    # --- Discoverable keybindings while you're still learning ---
+    plugins.which-key.enable = true;
+
+    # --- AI agent: CodeCompanion, curated natively in nixvim ---
+    # Configured to reuse your existing `claude`/`gemini` CLI auth via ACP
+    # adapters instead of a separate Anthropic Console 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
+    #     `_acp` suffix) and live 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
+    #     `gemini` CLI's own login — no key needed, closest thing to "just
+    #     use my existing session".
+    #   - 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
+    #     ~/.config/codecompanion/claude-oauth-token (chmod 600, outside the
+    #     nix store). It's read at runtime via the `cmd:` prefix below rather
+    #     than embedded in this file.
+    plugins.codecompanion = {
+      enable = true;
+      settings = {
+        interactions.chat.adapter = "claude_code"; # switch to "gemini_cli" per-chat
+        adapters.acp = {
+          claude_code.__raw = ''
+            function()
+              return require("codecompanion.adapters").extend("claude_code", {
+                env = {
+                  CLAUDE_CODE_OAUTH_TOKEN = "cmd:cat ~/.config/codecompanion/claude-oauth-token",
+                },
+              })
+            end
+          '';
+          gemini_cli.__raw = ''
+            function()
+              return require("codecompanion.adapters").extend("gemini_cli", {
+                defaults = {
+                  auth_method = "oauth-personal",
+                },
+              })
+            end
+          '';
+        };
+      };
+    };
+
+    # --- Editor-level tooling only: formatters conform.nvim shells out to.
+    #     Language toolchains themselves (cargo, go, dotnet-sdk, nodejs,
+    #     a compiler, a python interpreter) come from your per-project
+    #     nix-shell / flake devShell, not from here — launch nvim from
+    #     inside that shell (`nix develop`, or nix-shell + direnv) so LSP
+    #     servers resolve the right toolchain via PATH.
+    extraPackages = with pkgs; [
+      python3Packages.black
+      prettier
+      nixpkgs-fmt
+    ];
+
+    keymaps = [
+      { mode = "n"; key = "<leader>e"; action = "<cmd>Neotree toggle<CR>"; }
+      { mode = "n"; key = "<leader>ff"; action = "<cmd>Telescope find_files<CR>"; }
+      { mode = "n"; key = "<leader>fg"; action = "<cmd>Telescope live_grep<CR>"; }
+      { mode = "n"; key = "<leader>fb"; action = "<cmd>Telescope buffers<CR>"; }
+
+      # CodeCompanion
+      { 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
+    ];
+  };
+}

home/emmatherock/packages.nix

@@ -3,9 +3,6 @@
   programs.btop.package = pkgs.btop.override { cudaSupport = false; rocmSupport = true; };
 
   home.packages = with pkgs; [
-    # --- Base y Terminal ---
-    vim
-    fastfetch
     nvtopPackages.full
   ];
 }

hosts/miku-homelab/default.nix

@@ -27,6 +27,7 @@
     ../../home/emmatherock/deskflow.nix
     ../../home/emmatherock/gaming.nix
     ../../home/emmatherock/media.nix
+    ../../home/emmatherock/neovim.nix
     ../../home/emmatherock/packages.nix
     ../../home/emmatherock/plasma.nix
     ../../home/emmatherock/vscode.nix

hosts/vps/default.nix

@@ -11,8 +11,9 @@
 
   age.secrets.vps-wg.file = ../../secrets/vps-wg.age;
 
-    myHomeProfile.extraPrograms = [
+  myHomeProfile.extraPrograms = [
     ../../home/emmatherock/agents.nix
+    ../../home/emmatherock/neovim.nix
   ];
 
   myNetworking = {