Regenerated

Droidnix/README.org

@@ -1183,30 +1183,16 @@ in
 ** =generated/moduled/terminals/starship.nix=
 This file sets up starship prompt
 #+BEGIN_SRC nix :tangle generated/modules/terminals/starship.nix :noweb tangle :mkdirp yes :eval never-html
-{ lib, config, pkgs, ... }:
+{ config, pkgs, lib, flakeRoot, ... }:
 
-let
-  username = config.defaultUser or "henrov";
-
-  # Paths
-  starshipAssets = ../../../assets/system/conf/starship.toml;
-in
 {
-  # Install Starship system-wide
-  environment.systemPackages = [
-    pkgs.starship
-  ];
+  xdg.enable = true;
 
-  # Home Manager user settings
-  _module.args.hmUsers = {
-    ${username} = {
-      home.packages = [
-        pkgs.starship
-      ];
-
-      # Copy the config into ~/.config
-      home.file.".config/starship.toml".source = starshipAssets;
-    };
+  programs.starship = {
+    enable = true;
+    enableZshIntegration  = true;
+    enableBashIntegration = true;
+    enableFishIntegration = true;
   };
 }
 #+END_SRC
@@ -1214,27 +1200,33 @@ in
 ** =generated/modules/terminals/zsh.nix=
 This sets up the zsh in the terminal
 #+BEGIN_SRC nix :tangle generated/modules/terminals/zsh.nix :noweb tangle :mkdirp yes :eval never-html
-{ lib, pkgs, config, ... }:
+{ config, pkgs, lib, ... }:
 
 {
-  ################################################
-  # System-wide installation of Zsh + Oh-My-Zsh
-  ################################################
-  environment.systemPackages = [
-    pkgs.zsh
-    pkgs.oh-my-zsh
-  ];
+  programs.zsh = {
+    enable = true;
+    enableCompletion = true;
+    autocd = true;
+    dotDir = "${config.xdg.configHome}/zsh";
 
-  ################################################
-  # Make Zsh the default shell for all users
-  ################################################
-  users.defaultUserShell = pkgs.zsh;
+    ohMyZsh = {
+      enable = true;
+      theme = "";
+      plugins = [
+        "git"
+        "sudo"
+        "extract"
+        "colored-man-pages"
+        "command-not-found"
+        "history"
+        "docker"
+        "kubectl"
+      ];
+    };
 
-  ################################################
-  # Disable Home Manager shell check warnings
-  ################################################
-  users.users.henrov.ignoreShellProgramCheck = true;
-  users.users.root.ignoreShellProgramCheck = true;
+    autosuggestion.enable = true;
+    syntaxHighlighting.enable = true;
+  };
 }
 #+END_SRC