From aec799281c36a6a014d521d5d4409d328a3249e8 Mon Sep 17 00:00:00 2001
From: Henro Veijer <info@data-pro.nu>
Date: Wed, 25 Feb 2026 21:33:02 +0100
Subject: [PATCH] Corrected path to kitty.conf

---
 henrovnix_ok/README.org             |  2 +-
 henrovnix_ok/home/default.nix       | 53 +++++++++++++++--------------
 henrovnix_ok/home/dev/emacs/init.el |  2 +-
 henrovnix_ok/home/dev/kitty.nix     |  2 +-
 henrovnix_ok/home/dev/shells.nix    | 10 ++----
 henrovnix_ok/home/dev/zsh.nix       | 11 +-----
 6 files changed, 33 insertions(+), 47 deletions(-)

diff --git a/henrovnix_ok/README.org b/henrovnix_ok/README.org
index 2b949d31a..b4dd61011 100755
--- a/henrovnix_ok/README.org
+++ b/henrovnix_ok/README.org
@@ -2185,7 +2185,7 @@ Kitty gets installed and configured
 #+begin_src nix :tangle home/dev/kitty.nix :noweb tangle :mkdirp yes.
 { config, pkgs, lib, flakeRoot, ... }:
 let
-  repoKittyConf = flakeRoot + "/assets/conf/dev/kitty.conf";
+  repoKittyConf = flakeRoot + "/assets/conf/dev/terminal/kitty.conf";
 in
 {
   xdg.enable = true;
diff --git a/henrovnix_ok/home/default.nix b/henrovnix_ok/home/default.nix
index d3ad8686d..1c547ca12 100644
--- a/henrovnix_ok/home/default.nix
+++ b/henrovnix_ok/home/default.nix
@@ -1,28 +1,29 @@
-{ pkgs, user, ... }:
-{
-  imports = [
-    ./apps/ai.nix
-    #./apps/default-apps.nix
-    ./apps/theme.nix
-    ./desktop/hypridle.nix
-    ./desktop/hyprland.nix
-    ./desktop/hyprexpo.nix
-    ./desktop/hyprlock.nix
-    ./desktop/hyprscrolling.nix
-    ./desktop/hyprshell.nix
-    ./desktop/wallpaper.nix
-    ./desktop/waybar.nix
-    ./desktop/walker.nix
-    ./dev/dev.nix
-    ./dev/shells.nix
-    ./dev/starship.nix
-    ./dev/zsh.nix
-    ./dev/emacs
-  ];
+{ pkgs, user, ... } :
+  {
+    imports = [
+      ./apps/ai.nix
+      #./apps/default-apps.nix
+      ./apps/theme.nix
+      ./desktop/hypridle.nix
+      ./desktop/hyprland.nix
+      ./desktop/hyprexpo.nix
+      ./desktop/hyprlock.nix
+      ./desktop/hyprscrolling.nix
+      ./desktop/hyprshell.nix
+      ./desktop/wallpaper.nix
+      ./desktop/waybar.nix
+      ./desktop/walker.nix
+      ./dev/dev.nix
+      ./dev/shells.nix
+      ./dev/starship.nix
+      ./dev/emacs
+    ];
 
-  home.username = "${user.username}";
-  home.homeDirectory = pkgs.lib.mkDefault "/home/${user.username}";
-  home.stateVersion = user.stateVersion;
+    home.username = "${user.username}";
+    home.homeDirectory = pkgs.lib.mkDefault "/home/${user.username}";
+    home.stateVersion = user.stateVersion;
 
-  programs.home-manager.enable = true;
-}
+    
+
+    programs.home-manager.enable =  true;
+  }
diff --git a/henrovnix_ok/home/dev/emacs/init.el b/henrovnix_ok/home/dev/emacs/init.el
index 802e27ad3..573695006 100644
--- a/henrovnix_ok/home/dev/emacs/init.el
+++ b/henrovnix_ok/home/dev/emacs/init.el
@@ -124,7 +124,7 @@
 (use-package nerd-icons
   :custom
   ;; disable bright icon colors
-  (nerd-icons-color-icons nil))
+  (nerd-icons-color-icons nil))hells.nix
 
 (use-package doom-modeline
   :custom
diff --git a/henrovnix_ok/home/dev/kitty.nix b/henrovnix_ok/home/dev/kitty.nix
index c5b9fa071..21627398a 100644
--- a/henrovnix_ok/home/dev/kitty.nix
+++ b/henrovnix_ok/home/dev/kitty.nix
@@ -1,6 +1,6 @@
 { config, pkgs, lib, flakeRoot, ... }:
 let
-  repoKittyConf = flakeRoot + "/assets/conf/dev/kitty.conf";
+  repoKittyConf = flakeRoot + "/assets/conf/dev/terminal/kitty.conf";
 in
 {
   xdg.enable = true;
diff --git a/henrovnix_ok/home/dev/shells.nix b/henrovnix_ok/home/dev/shells.nix
index 3ecd85581..b3db0331c 100644
--- a/henrovnix_ok/home/dev/shells.nix
+++ b/henrovnix_ok/home/dev/shells.nix
@@ -1,7 +1,7 @@
 # shells.nix — Home-Manager module
 #
 # Reads:
-#   ${flakeRoot}/assets/conf/dev/terminal/enabled_shells.conf
+#   ${flakeRoot}/assets/conf/shells.nixdev/terminal/enabled_shells.conf
 #   ${flakeRoot}/assets/conf/dev/terminal/aliases.conf
 #
 # For each enabled shell in [enabled_shells]:
@@ -89,7 +89,6 @@ let
   zshSeed = ''
     # Created once from: ${toString aliasesFile}
     # Edit freely; Home Manager will not overwrite this file.
-    #
     ${secText "bash_zsh"}
     ${secText "zsh_specific"}
     '';
@@ -125,10 +124,8 @@ let
     # Created once from: ${toString aliasesFile}
     # Edit freely; Home Manager will not overwrite this file.
     status is-interactive; or exit
-
     # Translated from [bash_zsh]:
     ${fishTranslated}
-
     # From [fish_specific]:
     ${secText "fish_specific"}
       '';
@@ -169,7 +166,6 @@ in
 # Create/remove alias files based on enabled shells
 home.activation.shellAliasesFiles = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
   set -euo pipefail
-
   # bash -------------------------------------------------------
   if ${if shellEnabled "bash" then "true" else "false"}; then
     cat > "${bashAliasesPath}" <<'EOF'
@@ -178,16 +174,14 @@ EOF
   else
     rm -f "${bashAliasesPath}"
   fi
-
   # zsh -------------------------------------------------------
-  if ${if shellEnabled "zsh" then "true" else "false"}; then
+ if ${if shellEnabled "zsh" then "true" else "false"}; then
     cat > "${zshAliasesPath}" <<'EOF'
 ${zshSeed}
 EOF
   else
     rm -f "${zshAliasesPath}"
   fi
-
   # fish -------------------------------------------------------
   if ${if shellEnabled "fish" then "true" else "false"}; then
     mkdir -p "$(dirname "${fishAliasesPath}")"
diff --git a/henrovnix_ok/home/dev/zsh.nix b/henrovnix_ok/home/dev/zsh.nix
index 599a13469..bbfd86cf6 100644
--- a/henrovnix_ok/home/dev/zsh.nix
+++ b/henrovnix_ok/home/dev/zsh.nix
@@ -1,19 +1,11 @@
-{
-  config,
-  pkgs,
-  lib,
-  flakeRoot,
-  ...
-}:
+{  config,  pkgs,  lib, flakeRoot,  ... }:
 {
   programs.zsh = {
     enable = true;
     enableCompletion = true;
     autocd = true;
-
     # Optional but recommended: keep zsh config in one dir (relative to $HOME)
     dotDir = ".config/zsh";
-
     oh-my-zsh = {
       enable = true;
       theme = "";
@@ -28,7 +20,6 @@
         "kubectl"
       ];
     };
-
     autosuggestion.enable = true;
     syntaxHighlighting.enable = true;
   };