From 4434fa89222fd7576295e867f308f993eda9ae84 Mon Sep 17 00:00:00 2001
From: notgne2 <gen2@gen2.space>
Date: Fri, 11 Nov 2022 16:09:41 -0700
Subject: [PATCH] switch to elvish shell

---
 common.nix                       |  2 -
 flake.nix                        |  1 +
 home-manager/common.nix          | 16 ++-----
 home-manager/modules/default.nix |  1 +
 home-manager/modules/elvish.nix  | 82 ++++++++++++++++++++++++++++++++
 5 files changed, 87 insertions(+), 15 deletions(-)
 create mode 100644 home-manager/modules/elvish.nix

diff --git a/common.nix b/common.nix
index 89dfb5e..d9fd532 100644
--- a/common.nix
+++ b/common.nix
@@ -105,8 +105,6 @@
     networking.firewall.allowPing = true;
     networking.firewall.allowedTCPPorts = lib.mkDefault [22];
 
-    programs.zsh.enable = lib.mkDefault true;
     programs.fish.enable = lib.mkDefault true;
-    users.defaultUserShell = lib.mkOverride 900 pkgs.zsh;
   };
 }
diff --git a/flake.nix b/flake.nix
index c127eba..650442f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -85,6 +85,7 @@
       kermit = import ./home-manager/modules/kermit.nix;
       de2u = import ./home-manager/modules/de2u.nix inputs;
       de3u = import ./home-manager/modules/de3u.nix inputs;
+      elvish = import ./home-manager/modules/elvish.nix inputs;
       all = import ./home-manager/modules/default.nix inputs;
     };
 
diff --git a/home-manager/common.nix b/home-manager/common.nix
index 9a9449a..1f7f021 100644
--- a/home-manager/common.nix
+++ b/home-manager/common.nix
@@ -59,26 +59,16 @@ inputs: {
 
   programs.starship = {
     enable = true;
-    settings = {
-      line_break.disabled = true;
-    };
   };
 
   programs.zoxide = {
     enable = true;
   };
 
-  programs.zsh = {
+  programs.elvish = {
     enable = true;
-    enableAutosuggestions = true;
-    enableSyntaxHighlighting = true;
-    shellAliases = {
-      ls = "lsd";
-      l = "ls -l";
-      la = "ls -a";
-      lla = "ls -la";
-      lt = "ls --tree";
-    };
+    starship = true;
+    zoxide = true;
   };
 
   programs.firefox = {
diff --git a/home-manager/modules/default.nix b/home-manager/modules/default.nix
index aa18ea4..09f5ba0 100644
--- a/home-manager/modules/default.nix
+++ b/home-manager/modules/default.nix
@@ -15,5 +15,6 @@ inputs: {
     ./kermit.nix
     (import ./de2u.nix inputs)
     (import ./de3u.nix inputs)
+    ./elvish.nix
   ];
 }
diff --git a/home-manager/modules/elvish.nix b/home-manager/modules/elvish.nix
new file mode 100644
index 0000000..2726ec3
--- /dev/null
+++ b/home-manager/modules/elvish.nix
@@ -0,0 +1,82 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
+  cfg = config.programs.elvish;
+in {
+  options.programs.elvish = {
+    enable = mkEnableOption "Elvish, a friendly interactive shell and an expressive programming";
+
+    defaultFromBash = mkOption {
+      type = types.bool;
+      default = cfg.enable;
+      description = ''
+        Launch automatically when an interactive Bash shell is started
+      '';
+    };
+
+    zoxide = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Enable zoxide smart directory switcher
+      '';
+    };
+
+    starship = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Use the starship prompt
+      '';
+    };
+
+    package = mkOption {
+      type = types.package;
+      default = pkgs.elvish;
+      defaultText = literalExpression "pkgs.elvish";
+      description = ''
+        The elvish package to install. May be used to change the version.
+      '';
+    };
+
+    initExtra = mkOption {
+      type = types.lines;
+      default = "";
+      description = ''
+        Elvish code called during interactive elvish shell
+        initialisation.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [cfg.package];
+
+    # programs.man.generateCaches = mkDefault true;
+
+    xdg.configFile."elvish/rc.elv".text = cfg.initExtra;
+
+    programs.bash.enable = mkIf cfg.defaultFromBash true;
+    programs.bash.initExtra = mkIf cfg.defaultFromBash "exec elvish";
+
+    programs.starship.enable = mkIf cfg.starship true;
+    programs.zoxide.enable = mkIf cfg.zoxide true;
+
+    programs.starship.enableBashIntegration = mkIf cfg.defaultFromBash false;
+
+    programs.elvish.initExtra = mkMerge [
+      (mkIf cfg.starship ''
+        if (and (not-eq $E:TERM "dumb") (or (not (has-env "INSIDE_EMACS")) (eq $E:INSIDE_EMACS "vterm"))) {
+          eval (${config.home.profileDirectory}/bin/starship init elvish)
+        }
+      '')
+      (mkIf cfg.zoxide ''
+        eval (${config.programs.zoxide.package}/bin/zoxide init elvish | slurp)
+      '')
+    ];
+  };
+}