From 33dba4a0fe3b3c18c0eb92185fcd683c78b5f8d7 Mon Sep 17 00:00:00 2001
From: notgne2 <gen2@gen2.space>
Date: Sun, 6 Nov 2022 17:42:23 -0700
Subject: [PATCH] switch back from fish to zsh

---
 common.nix                     |  3 ++-
 flake.nix                      |  4 ----
 home-manager/common.nix        | 17 ++---------------
 home-manager/users/chekkie.nix |  6 ------
 home-manager/users/notgne2.nix | 10 ----------
 users/notgne2.nix              |  1 -
 6 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/common.nix b/common.nix
index 794424c..89dfb5e 100644
--- a/common.nix
+++ b/common.nix
@@ -105,7 +105,8 @@
     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.fish;
+    users.defaultUserShell = lib.mkOverride 900 pkgs.zsh;
   };
 }
diff --git a/flake.nix b/flake.nix
index 772c55b..c127eba 100644
--- a/flake.nix
+++ b/flake.nix
@@ -34,10 +34,6 @@
       url = "github:glacambre/firenvim";
       flake = false;
     };
-    done = {
-      url = "github:franciscolourenco/done";
-      flake = false;
-    };
     schemer2 = {
       url = "github:thefryscorer/schemer2";
       flake = false;
diff --git a/home-manager/common.nix b/home-manager/common.nix
index 443f0ab..4456d90 100644
--- a/home-manager/common.nix
+++ b/home-manager/common.nix
@@ -8,6 +8,7 @@ inputs: {
 
   programs.direnv = {
     enable = lib.mkDefault true;
+    enableZshIntegration = true;
     nix-direnv.enable = lib.mkDefault true;
     stdlib = ''
       : ''${XDG_CACHE_HOME:=$HOME/.cache}
@@ -52,7 +53,6 @@ inputs: {
     ripgrep
     lsd
 
-    # for fish-done
     libnotify
     notify-desktop
   ];
@@ -64,7 +64,7 @@ inputs: {
     };
   };
 
-  programs.fish = {
+  programs.zsh = {
     enable = true;
     shellAliases = {
       ls = "lsd";
@@ -73,19 +73,6 @@ inputs: {
       lla = "ls -la";
       lt = "ls --tree";
     };
-    plugins = [
-      {
-        name = "done";
-        src = inputs.done;
-      }
-    ];
-    interactiveShellInit = ''
-      set -U __done_min_cmd_duration 4000
-
-      set -U fish_key_bindings fish_default_key_bindings
-
-      eval (${pkgs.direnv}/bin/direnv hook fish)
-    '';
   };
 
   programs.firefox = {
diff --git a/home-manager/users/chekkie.nix b/home-manager/users/chekkie.nix
index 44b0c4e..af332ba 100644
--- a/home-manager/users/chekkie.nix
+++ b/home-manager/users/chekkie.nix
@@ -32,10 +32,4 @@
       right_meters = ["RightCPUs" "Blank" "CPU"];
     };
   };
-
-  programs.fish.shellAliases = {
-    node = "node --experimental-repl-await";
-    ls = "lsd";
-    bp = "npm version patch && npm publish && git push";
-  };
 }
diff --git a/home-manager/users/notgne2.nix b/home-manager/users/notgne2.nix
index 5122514..2d1f0cc 100644
--- a/home-manager/users/notgne2.nix
+++ b/home-manager/users/notgne2.nix
@@ -9,11 +9,6 @@ inputs: {
     url = "https://raw.githubusercontent.com/eprints/eprints3.4/master/lib/mime.types";
     sha256 = "0cdhq71wk5h3zcfrz8dyqc3vrjyikwjqsla855v036r54lch0kn2";
   };
-
-  sc = pkgs.writeScript "sc.sh" ''
-    #!${pkgs.zsh}/bin/zsh
-    git commit -am "$*"
-  '';
 in {
   programs.home-manager.enable = true;
 
@@ -248,11 +243,6 @@ in {
     FZF_DEFAULT_COMMAND = "${pkgs.fd}/bin/fd --type f";
   };
 
-  programs.fish.shellAliases = {
-    bp = "npm version patch && npm publish && git push";
-    sc = "${sc}";
-  };
-
   xdg.configFile."nvim-qt/nvim-qt.conf".text = ''
     ext_tabline=false
     ext_popupmenu=false
diff --git a/users/notgne2.nix b/users/notgne2.nix
index 2118f0a..72abe2e 100644
--- a/users/notgne2.nix
+++ b/users/notgne2.nix
@@ -8,7 +8,6 @@
 
   users.users.notgne2 = {
     isNormalUser = true;
-    shell = pkgs.fish;
     home = "/home/notgne2";
     description = "notgne2";