From cdb9cc59558315434d45e882ec903bd64254f4e6 Mon Sep 17 00:00:00 2001
From: Laurent Gueret <alistreaza@MacBook-Air-de-Laurent.local>
Date: Wed, 11 Feb 2026 13:31:12 +0100
Subject: [PATCH] Fix on system flake

---
 hosts/darwin/home/alistreaza.nix           | 6 +++---
 hosts/nixos/home/alistreaza.nix            | 4 +++-
 hosts/nixos/system/os.nix                  | 4 ----
 modules/{system => home}/common/devenv.nix | 4 ++--
 modules/{system => home}/common/nh.nix     | 4 ++--
 5 files changed, 10 insertions(+), 12 deletions(-)
 rename modules/{system => home}/common/devenv.nix (76%)
 rename modules/{system => home}/common/nh.nix (81%)

diff --git a/hosts/darwin/home/alistreaza.nix b/hosts/darwin/home/alistreaza.nix
index bd34abb..7b9d943 100644
--- a/hosts/darwin/home/alistreaza.nix
+++ b/hosts/darwin/home/alistreaza.nix
@@ -11,21 +11,21 @@
       homeDirectory = /Users/alistreaza;
     };
 
-    # Apps
+    # Shell apps
     home.shell.zsh = true;
     home.shell.git = true;
     home.shell.neovim = true;
+    home.shell.nh.enable = true;
+    home.shell.devenv.enable = true;
 
     # Homebrew apps
     home.homebrew.iterm = true;
     home.homebrew.zed = true;
     home.homebrew.jetbrain = true;
-
     home.homebrew.iina = true;
     home.homebrew.zen = true;
     home.homebrew.obsidian = true;
     home.homebrew.microsoft = true;
-
     home.homebrew.keka = true;
 
     # No Home Application Folders
diff --git a/hosts/nixos/home/alistreaza.nix b/hosts/nixos/home/alistreaza.nix
index c34e34d..b9de6b3 100644
--- a/hosts/nixos/home/alistreaza.nix
+++ b/hosts/nixos/home/alistreaza.nix
@@ -11,10 +11,12 @@
       homeDirectory = "/home/alistreaza";
     };
 
-    # Apps
+    # Shell apps
     home.shell.zsh = true;
     home.shell.git = true;
     home.shell.neovim = true;
+    home.shell.nh.enable = true;
+    home.shell.devenv.enable = true;
 
     # Code editor
     home.ide.zed.enable = true;
diff --git a/hosts/nixos/system/os.nix b/hosts/nixos/system/os.nix
index 8aa196c..b205f90 100755
--- a/hosts/nixos/system/os.nix
+++ b/hosts/nixos/system/os.nix
@@ -26,10 +26,6 @@
   os.virtualisation.cuda.enable = true;
   os.virtualisation.podman.enable = true;
 
-  # Dev
-  os.shell.nh.enable = true;
-  os.shell.devenv.enable = true;
-
   # Ssh
   programs.ssh.enableAskPassword = false; # No-window git push fix
 
diff --git a/modules/system/common/devenv.nix b/modules/home/common/devenv.nix
similarity index 76%
rename from modules/system/common/devenv.nix
rename to modules/home/common/devenv.nix
index b744727..cc99581 100644
--- a/modules/system/common/devenv.nix
+++ b/modules/home/common/devenv.nix
@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.os.shell.devenv;
+  cfg = config.home.shell.devenv;
 in
 {
-  options.os.shell.devenv = {
+  options.home.shell.devenv = {
     enable = mkEnableOption "System devenv service";
   };
   config = mkIf cfg.enable {
diff --git a/modules/system/common/nh.nix b/modules/home/common/nh.nix
similarity index 81%
rename from modules/system/common/nh.nix
rename to modules/home/common/nh.nix
index d0c0883..ce2ca27 100644
--- a/modules/system/common/nh.nix
+++ b/modules/home/common/nh.nix
@@ -1,10 +1,10 @@
 { lib, config, ... }:
 with lib;
 let
-  cfg = config.os.shell.nh;
+  cfg = config.home.shell.nh;
 in
 {
-  options.os.shell.nh = {
+  options.home.shell.nh = {
     enable = mkEnableOption "System nh service";
   };
   config = mkIf cfg.enable {