1 files changed, 58 insertions, 58 deletions

diff --git a/common/commandline.nix b/common/commandline.nix
index 36fae26..73dbb51 100644
--- a/common/commandline.nix
+++ b/common/commandline.nix
@@ -1,3 +1,5 @@
+inputs:
+
 { config, pkgs, lib, ... }:
 
 with import ../lib/theme.nix { inherit lib; };
@@ -8,11 +10,11 @@ let
 in
 {
   imports = [
-    ./commandline/dircolors.nix
-    ./commandline/git.nix
-    ./commandline/htop.nix
-    ./commandline/tmux.nix
-    ./commandline/zsh.nix
+    (import ./commandline/dircolors.nix inputs)
+    (import ./commandline/git.nix inputs)
+    (import ./commandline/htop.nix inputs)
+    (import ./commandline/tmux.nix inputs)
+    (import ./commandline/zsh.nix inputs)
   ];
 
   environment.shellAliases = {
@@ -24,8 +26,6 @@ in
   programs.bash = {
     enableCompletion = true;
     interactiveShellInit = ''
-      eval "$(${pkgs.starship}/bin/starship init bash)"
-
       PATH="${pkgs.pazi}/bin:$PATH"
       eval "$(pazi init bash)"
     '';
@@ -42,67 +42,67 @@ in
   };
 
   security.sudo.extraConfig =
-  let
-    lectureFile = builtins.toFile "sudoers.lecture" ''
-    
-         ${dominantEscapeCode}"Bee" careful    __
-           ${dominantEscapeCode}with sudo!    // \
-                         \\_/ //
-       '''-.._.-'''-.._.. -(||)(')
-                         ''''
+    let
+      lectureFile = builtins.toFile "sudoers.lecture" ''
+        
+             ${dominantEscapeCode}"Bee" careful    __
+               ${dominantEscapeCode}with sudo!    // \
+                             \\_/ //
+           '''-.._.-'''-.._.. -(||)(')
+                             ''''
 
-    '';
-  in
+      '';
+    in
     ''
-    Defaults lecture = always
-    Defaults lecture_file = "${lectureFile}"
+      Defaults lecture = always
+      Defaults lecture_file = "${lectureFile}"
     '';
 
-    home-manager.users.minijackson = { ... }:
-    {
-      # TODO
-      xdg.configFile."starship.toml".text = ''
-        [directory]
-        fish_style_pwd_dir_length = 2
-        style = "bold blue"
-
-        [git_branch]
-        symbol = "branch "
+  home-manager.users.minijackson = { ... }: {
+    programs.bash.enable = true;
 
-        [git_status]
-        ahead = "^"
-        behind = "v"
-        deleted = "x"
-
-        [jobs]
-        symbol = "+ "
-
-        [package]
-        symbol = "version "
-        style = "bold green"
-        disabled = true
-
-        [rust]
-        symbol = "rust "
-        style = "bold dimmed yellow"
+    programs.bat = {
+      enable = true;
+      config = {
+        theme = "TwoDark";
+      };
+    };
 
-        [nix_shell]
-        style = "bold blue"
+    programs.pazi.enable = true;
 
-        [character]
-        symbol = ">"
-      '';
+    programs.starship = {
+      enable = true;
+      enableZshIntegration = false;
 
-      programs.bat = {
-        enable = true;
-        config = {
-          theme = "TwoDark";
+      settings = {
+        character.symbol = ">";
+        directory = {
+          fish_style_pwd_dir_length = 2;
+          style = "bold blue";
+        };
+        git_branch.symbol = "branch ";
+        git_status = {
+          ahead = "^";
+          behind = "v";
+          deleted = "x";
+        };
+        jobs.symbol = "+ ";
+        nix_shell.style = "bold blue";
+        package = {
+          disabled = true;
+          style = "bold green";
+          symbol = "version ";
+        };
+        rust = {
+          style = "bold dimmed yellow";
+          symbol = "rust ";
         };
       };
     };
+  };
 
-    home-manager.users.root = { ... }:
-    {
-      programs.bat = config.home-manager.users.minijackson.programs.bat;
-    };
+  home-manager.users.root = { ... }: {
+    programs.bash.enable = true;
+    programs.bat = lib.mkDefault config.home-manager.users.minijackson.programs.bat;
+  };
 }