Regenerated

Droidnix/README.org

@@ -1217,35 +1217,44 @@ This sets up the zsh in the terminal
 { lib, pkgs, config, ... }:
 
 let
-  username = config.defaultUser or "henrov";
+  username    = config.users.users.defaultUser or "henrov";
+  homeDir     = "/home/${username}";
   programName = "zsh";
   programAssets = ../../../assets/system/conf/${programName};
   zshInitFile  = "${programAssets}/zsh.conf";
+
+  # Helper to fetch an external plugin from GitHub
+  fetchPlugin = { owner, repo, rev, sha256 }: pkgs.fetchFromGitHub {
+    inherit owner repo rev sha256;
+  };
 in
 {
-  # System-wide package
+  # Ensure zsh is installed system-wide
   environment.systemPackages = [ pkgs.zsh ];
 
-  # Home Manager user settings
-  _module.args.hmUsers = {
-    ${username} = {
-      # Enable Zsh + Oh-My-Zsh
-      programs.zsh = {
-        enable = true;
-        ohMyZsh.enable = true;
-        ohMyZsh.theme = "catppuccin-mocha";
-        ohMyZsh.plugins = [
-          "git"
-          "docker"
-          "direnv"
-          "zsh-autosuggestions"
-          "zsh-completions"
-          "zsh-history-substring-search"
-        ];
+  # Home Manager configuration for the default user
+  home.username = username;
+  home.homeDirectory = homeDir;
 
-        # Inject contents of zsh.conf
-        shellInit = builtins.readFile zshInitFile;
-      };
+  programs.zsh = {
+    enable = true;
+
+    ohMyZsh = {
+      enable = true;
+      theme = "catppuccin-mocha";
+
+      # Standard built-in plugins
+      plugins = [
+        "git"
+        "docker"
+        "direnv"
+        "zsh-autosuggestions"
+        "zsh-completions"
+        "zsh-history-substring-search"
+      ];
+
+      # Inject custom Zsh configuration
+      shellInit = builtins.readFile zshInitFile;
     };
   };
 }