cleanup

home/default.nix

@@ -1,7 +1,32 @@
 { system, pkgs, home-manager, modules, nid, ... }:
 let
-  ivand-programs = with modules.home.programs; [ nvim zsh tmux git chromium firefox kitty lf obs-studio sway swaylock browserpass bottom gpg comma nushell waybar tealdeer pueue ];
+  ivand-programs = with modules.home.programs; [
-  ivand-packages = with modules.home.packages; [ dev essential media ];
+    nvim
+    zsh
+    tmux
+    git
+    chromium
+    firefox
+    kitty
+    lf
+    obs-studio
+    sway
+    swaylock
+    browserpass
+    bottom
+    gpg
+    comma
+    nushell
+    waybar
+    tealdeer
+    pueue
+    starship
+  ];
+  ivand-packages = with modules.home.packages; [
+    dev
+    essential
+    media
+  ];
 in
 {
   ivand = home-manager.lib.homeManagerConfiguration {

modules/home/programs/default.nix

@@ -15,6 +15,7 @@
   nushell = import ./nushell;
   obs-studio = import ./obs-studio { inherit pkgs; };
   pueue = import ./pueue;
+  starship = import ./starship;
   sway = import ./sway { inherit pkgs; };
   swaylock = import ./swaylock;
   tealdeer = import ./tealdeer;

modules/home/programs/nushell/default.nix

@@ -1,6 +1,5 @@
 {
-  programs = {
+  programs.nushell = {
-    nushell = {
     enable = true;
     environmentVariables = {
       config = ''{
@@ -33,9 +32,4 @@
       }
     '';
   };
-    starship = {
-      enable = true;
-      enableNushellIntegration = true;
-    };
-  };
 }

modules/home/programs/starship/default.nix

@@ -0,0 +1,12 @@
+{
+  programs.starship = {
+    enable = true;
+    enableNushellIntegration = true;
+    enableZshIntegration = true;
+    settings = {
+      sudo = {
+        disabled = false;
+      };
+    };
+  };
+}

modules/home/programs/zsh/default.nix

@@ -31,20 +31,5 @@
     history = {
       expireDuplicatesFirst = true;
     };
-    plugins = [
-      {
-        name = "zsh-powerlevel10k";
-        src = "${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k";
-        file = "powerlevel10k.zsh-theme";
-      }
-      {
-        name = "zsh-nix-shell";
-        file = "nix-shell.plugin.zsh";
-        src = "${pkgs.zsh-nix-shell}/share/zsh-nix-shell";
-      }
-    ];
-    initExtra = ''
-      source "$HOME/.p10k.zsh"
-    '';
   };
 }