From 206b9b60508755388fd1514a1f9ceeb90deff4e8 Mon Sep 17 00:00:00 2001
From: Laurent Gueret <alistreaza@MacBook-Air-de-Laurent.local>
Date: Wed, 11 Feb 2026 13:27:09 +0100
Subject: [PATCH] Second fix on new structure

---
 hosts/darwin/home/alistreaza.nix           | 1 +
 hosts/darwin/system/os.nix                 | 3 +++
 hosts/nixos/home/alistreaza.nix            | 1 +
 hosts/nixos/system/os.nix                  | 7 +------
 modules/{system => home}/common/neovim.nix | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename modules/{system => home}/common/neovim.nix (76%)

diff --git a/hosts/darwin/home/alistreaza.nix b/hosts/darwin/home/alistreaza.nix
index 7c88bb0..bd34abb 100644
--- a/hosts/darwin/home/alistreaza.nix
+++ b/hosts/darwin/home/alistreaza.nix
@@ -14,6 +14,7 @@
     # Apps
     home.shell.zsh = true;
     home.shell.git = true;
+    home.shell.neovim = true;
 
     # Homebrew apps
     home.homebrew.iterm = true;
diff --git a/hosts/darwin/system/os.nix b/hosts/darwin/system/os.nix
index bb0b19f..bc7fd62 100644
--- a/hosts/darwin/system/os.nix
+++ b/hosts/darwin/system/os.nix
@@ -1,4 +1,7 @@
 { ... }:
 {
   nixpkgs.hostPlatform = "aarch64-darwin";
+
+  # System version
+  system.stateVersion = "25.11";
 }
diff --git a/hosts/nixos/home/alistreaza.nix b/hosts/nixos/home/alistreaza.nix
index f3d7cf5..c34e34d 100644
--- a/hosts/nixos/home/alistreaza.nix
+++ b/hosts/nixos/home/alistreaza.nix
@@ -14,6 +14,7 @@
     # Apps
     home.shell.zsh = true;
     home.shell.git = true;
+    home.shell.neovim = true;
 
     # Code editor
     home.ide.zed.enable = true;
diff --git a/hosts/nixos/system/os.nix b/hosts/nixos/system/os.nix
index f9fde28..8aa196c 100755
--- a/hosts/nixos/system/os.nix
+++ b/hosts/nixos/system/os.nix
@@ -18,11 +18,6 @@
   # System configurations
   os.keyboard.apple.enable = true;
 
-  # Shell configurations
-  os.shell.zsh.enable = true;
-  os.shell.git.enable = true;
-  os.shell.nh.enable = true;
-
   # Gnome configurations
   os.gnome.shell.enable = true;
   os.gnome.apps.enable = true;
@@ -32,7 +27,7 @@
   os.virtualisation.podman.enable = true;
 
   # Dev
-  os.shell.dev.enable = true;
+  os.shell.nh.enable = true;
   os.shell.devenv.enable = true;
 
   # Ssh
diff --git a/modules/system/common/neovim.nix b/modules/home/common/neovim.nix
similarity index 76%
rename from modules/system/common/neovim.nix
rename to modules/home/common/neovim.nix
index 90d69a4..93652ea 100644
--- a/modules/system/common/neovim.nix
+++ b/modules/home/common/neovim.nix
@@ -1,10 +1,10 @@
 { lib, config, ... }:
 with lib;
 let
-  cfg = config.os.shell.neovim;
+  cfg = config.home.shell.neovim;
 in
 {
-  options.os.shell.neovim = {
+  options.home.shell.neovim = {
     enable = mkEnableOption "System neovim service";
   };
   config = mkIf cfg.enable {