Refactor, test out fish on wonderland

1 files changed, 4 insertions, 61 deletions

diff --git a/share/home/zsh.nix b/share/home/zsh.nix
index 4a52f5c..cbc8428 100644
--- a/share/home/zsh.nix
+++ b/share/home/zsh.nix
@@ -1,4 +1,6 @@
-{ pkgs, ... }: {
+{ ... }: {
+  imports = [ ./shellenv.nix ];
+
   programs.zsh = {
     enable = true;
     enableAutosuggestions = true;
@@ -7,65 +9,6 @@
     enableVteIntegration = true;
     autocd = true;
     dotDir = ".config/zsh";
-
-    shellAliases = {
-      battery-status = ''
-        upower -i $(upower -e | grep BAT) | grep -E "state|to full|percentage"
-      '';
-      ip = ''ip --color=auto'';
-      ltg = "ls --git --tree";
-      ltgi = "ltg --git-ignore";
-      sl = "sl -awFc5";
-      tempdir = "cd $(mktemp -d)";
-    };
-  };
-  home.packages = with pkgs; [ sl ];
-
-  programs.eza = {
-    enable = true;
-    enableAliases = true;
-    icons = true;
-    extraOptions = [ "--header" "--group-directories-first" "--long" ];
   };
-
-  programs.starship = {
-    enable = true;
-    enableZshIntegration = true;
-
-    #    settings = let
-    #      lightblue-bg = "bg:#769ff0";
-    #      lightblue-fg = "fg:#e3e5e5";
-    #      lightblue = "${lightblue-fg} ${lightblue-bg}";
-    #    in {
-    #      format = lib.concatStrings [
-    #        "[░▒▓](#a3aed2)"
-    #        "[$username @ $hostname](${lightblue})"
-    #        "$directory"
-    #        "$rust"
-    #        "$package"
-    #        "\n"
-    #        "> "
-    #      ];
-    #
-    #      hostname = {
-    #        ssh_only = false;
-    #        format = "[$hostname]($style)";
-    #        trim_at = ""; # disable trimming
-    #        style = lightblue;
-    #      };
-    #
-    #      username = {
-    #        show_always = true;
-    #        format = "[$user]($style)";
-    #        style_user = lightblue;
-    #        style_root = "${lightblue-bg} fg:red bold";
-    #      };
-    #
-    #      directory = {
-    #        format = "[ $path ]($style)";
-    #        truncation_length = 3;
-    #        truncation_symbol = "…/";
-    #      };
-    #    }; # end of settings
-  }; # end of programs.starship
+  programs.starship.enableZshIntegration = true;
 }