From ad98720b108f1790d81bb6ad9aade665b43965f2 Mon Sep 17 00:00:00 2001
From: sid <sid@sid.ovh>
Date: Thu, 21 May 2026 12:27:07 +0200
Subject: [PATCH] add hm host ee. refactor other hm hosts

---
 flake.nix                               |  1 +
 users/sid/home/default.nix              |  1 -
 users/sid/home/home.nix                 |  3 +-
 users/sid/home/hosts/16ach6/default.nix |  2 ++
 users/sid/home/hosts/ee/default.nix     | 40 +++++++++++++++++++++++++
 users/sid/home/hosts/nuc8/default.nix   |  2 ++
 users/sid/home/hosts/pc/default.nix     |  2 +-
 users/sid/home/hosts/rv2/default.nix    |  2 ++
 users/sid/home/hyprland/default.nix     |  3 ++
 users/sid/home/hyprland/nixvim.nix      | 40 +++++++++++++++++++++++++
 users/sid/home/nixvim.nix               | 34 +--------------------
 11 files changed, 93 insertions(+), 37 deletions(-)
 create mode 100644 users/sid/home/hosts/ee/default.nix
 create mode 100644 users/sid/home/hyprland/nixvim.nix

diff --git a/flake.nix b/flake.nix
index f49450d..89220d9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -115,6 +115,7 @@
 
       homeConfigurations = {
         "sid@16ach6" = mkHomeConfiguration "x86_64-linux" [ ./users/sid/home/hosts/16ach6 ];
+        "sid@ee" = mkHomeConfiguration "x86_64-linux" [ ./users/sid/home/hosts/ee ];
         "sid@nuc8" = mkHomeConfiguration "x86_64-linux" [ ./users/sid/home/hosts/nuc8 ];
         "sid@pc" = mkHomeConfiguration "x86_64-linux" [ ./users/sid/home/hosts/pc ];
         "sid@rv2" = mkHomeConfiguration "x86_64-linux" [ ./users/sid/home/hosts/rv2 ];
diff --git a/users/sid/home/default.nix b/users/sid/home/default.nix
index 02734cf..8b8ec93 100644
--- a/users/sid/home/default.nix
+++ b/users/sid/home/default.nix
@@ -9,7 +9,6 @@
     ./git.nix
     ./home.nix
     ./nixvim.nix
-    ./secrets
 
     inputs.synix.homeModules.common
 
diff --git a/users/sid/home/home.nix b/users/sid/home/home.nix
index b4a48ee..9ba7fc2 100644
--- a/users/sid/home/home.nix
+++ b/users/sid/home/home.nix
@@ -4,9 +4,8 @@
 
     shellAliases = {
       gpr = "git remote prune origin";
+      gt = "git tag";
       search-store = "find /nix/store -maxdepth 1 -type d | rg -i";
     };
-
-    stateVersion = "24.11";
   };
 }
diff --git a/users/sid/home/hosts/16ach6/default.nix b/users/sid/home/hosts/16ach6/default.nix
index be25e15..fc65553 100644
--- a/users/sid/home/hosts/16ach6/default.nix
+++ b/users/sid/home/hosts/16ach6/default.nix
@@ -45,4 +45,6 @@
   };
 
   services.spotifyd.settings.device_name = "16ach6";
+
+  home.stateVersion = "24.11";
 }
diff --git a/users/sid/home/hosts/ee/default.nix b/users/sid/home/hosts/ee/default.nix
new file mode 100644
index 0000000..f49e33f
--- /dev/null
+++ b/users/sid/home/hosts/ee/default.nix
@@ -0,0 +1,40 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  inherit (lib) getExe;
+in
+{
+  programs.opencode = {
+    enable = true;
+    enableMcpIntegration = config.programs.mcp.enable;
+    settings = {
+      model = "openrouter/moonshotai/kimi-k2.6";
+      autoshare = false;
+      autoupdate = false;
+    };
+  };
+
+  programs.mcp = {
+    enable = true;
+    servers = {
+      fetcher = {
+        command = getExe pkgs.synix.fetcher-mcp;
+      };
+      nixos = {
+        command = getExe pkgs.nix;
+        args = [
+          "run"
+          "github:utensils/mcp-nixos"
+          "--"
+        ];
+      };
+    };
+  };
+
+  home.stateVersion = "25.11";
+}
diff --git a/users/sid/home/hosts/nuc8/default.nix b/users/sid/home/hosts/nuc8/default.nix
index 869b5ee..7561f29 100644
--- a/users/sid/home/hosts/nuc8/default.nix
+++ b/users/sid/home/hosts/nuc8/default.nix
@@ -37,4 +37,6 @@
   };
 
   services.spotifyd.settings.device_name = "nuc8";
+
+  home.stateVersion = "24.11";
 }
diff --git a/users/sid/home/hosts/pc/default.nix b/users/sid/home/hosts/pc/default.nix
index 31665ca..32f702d 100644
--- a/users/sid/home/hosts/pc/default.nix
+++ b/users/sid/home/hosts/pc/default.nix
@@ -10,5 +10,5 @@
 
   programs.waybar.settings.mainBar.output = "DP-3";
 
-  home.stateVersion = lib.mkForce "25.11";
+  home.stateVersion = "25.11";
 }
diff --git a/users/sid/home/hosts/rv2/default.nix b/users/sid/home/hosts/rv2/default.nix
index db10093..3915bed 100644
--- a/users/sid/home/hosts/rv2/default.nix
+++ b/users/sid/home/hosts/rv2/default.nix
@@ -31,4 +31,6 @@
       mountPoint = "/home/sid";
     };
   };
+
+  home.stateVersion = "24.11";
 }
diff --git a/users/sid/home/hyprland/default.nix b/users/sid/home/hyprland/default.nix
index b90521f..066d99b 100644
--- a/users/sid/home/hyprland/default.nix
+++ b/users/sid/home/hyprland/default.nix
@@ -14,6 +14,7 @@
     ./gpg.nix
     ./hyprland.nix
     ./newsboat.nix
+    ./nixvim.nix
     ./obs-studio.nix
     ./opencode.nix
     ./packages.nix
@@ -30,6 +31,8 @@
     ./xdg.nix
     ./yazi.nix
 
+    ../secrets
+
     inputs.synix.homeModules.virtualisation
   ];
 }
diff --git a/users/sid/home/hyprland/nixvim.nix b/users/sid/home/hyprland/nixvim.nix
new file mode 100644
index 0000000..d81e500
--- /dev/null
+++ b/users/sid/home/hyprland/nixvim.nix
@@ -0,0 +1,40 @@
+{ config, ... }:
+
+{
+  programs.nixvim = {
+    plugins = {
+      avante = {
+        enable = true;
+        settings = {
+          auto_suggestions_provider = null;
+          diff = {
+            autojump = true;
+            debug = false;
+            list_opener = "copen";
+          };
+          highlights = {
+            diff = {
+              current = "DiffText";
+              incoming = "DiffAdd";
+            };
+          };
+          hints = {
+            enabled = true;
+          };
+          selector = {
+            provider = "telescope";
+          };
+          provider = "openrouter";
+          providers = {
+            openrouter = {
+              __inherited_from = "openai";
+              endpoint = "https://openrouter.ai/api/v1";
+              api_key_name = "cmd:cat ${config.sops.secrets.openrouter-api-key.path}";
+              model = "google/gemini-3-flash-preview";
+            };
+          };
+        };
+      };
+    };
+  };
+}
diff --git a/users/sid/home/nixvim.nix b/users/sid/home/nixvim.nix
index bdc92e5..9a84a39 100644
--- a/users/sid/home/nixvim.nix
+++ b/users/sid/home/nixvim.nix
@@ -1,4 +1,4 @@
-{ inputs, config, ... }:
+{ inputs, ... }:
 
 {
   imports = [
@@ -10,38 +10,6 @@
     plugins = {
       csvview.enable = true;
       direnv.enable = true;
-      avante = {
-        enable = true;
-        settings = {
-          auto_suggestions_provider = null;
-          diff = {
-            autojump = true;
-            debug = false;
-            list_opener = "copen";
-          };
-          highlights = {
-            diff = {
-              current = "DiffText";
-              incoming = "DiffAdd";
-            };
-          };
-          hints = {
-            enabled = true;
-          };
-          selector = {
-            provider = "telescope";
-          };
-          provider = "openrouter";
-          providers = {
-            openrouter = {
-              __inherited_from = "openai";
-              endpoint = "https://openrouter.ai/api/v1";
-              api_key_name = "cmd:cat ${config.sops.secrets.openrouter-api-key.path}";
-              model = "google/gemini-3-flash-preview";
-            };
-          };
-        };
-      };
       render-markdown = {
         enable = true;
         settings = {