cleanup

3 files changed, 74 insertions, 38 deletions

diff --git a/modules/basic-tools/default.nix b/modules/basic-tools/default.nix
index 1d4f2a4..9408778 100644
--- a/modules/basic-tools/default.nix
+++ b/modules/basic-tools/default.nix
@@ -6,6 +6,8 @@
     ./multiplexers.nix
     ./nix.nix
     ./nix-ld.nix
+    ./zsh.nix
+    ./fish.nix
   ];
 
   environment.systemPackages =
@@ -68,47 +70,11 @@
     // editorconf;
 
   environment.shellAliases = {
-    ls = "ls --color=auto";
-    l = "ls -l";
-    la = "ls -la";
-    ll = "ls -lah";
-    lt = "ls --tree";
     vim = "nvim";
     grep = "grep --color=auto";
-    e = "$EDITOR";
-    v = "$EDITOR";
-  };
-
-  users.defaultUserShell = pkgs.zsh;
-  programs.zsh = {
-    enable = true;
-    enableCompletion = true;
-    syntaxHighlighting.enable = true;
-    interactiveShellInit = ''
-      bindkey -e
-      export HISTFILE="$HOME/.zsh_history"
-      export HISTSIZE=10000000
-      export SAVEHIST=10000000
-      setopt HIST_IGNORE_ALL_DUPS
-      # allow comments
-      setopt interactivecomments
-    '';
-    promptInit = ''
-      source ${pkgs.liquidprompt}/share/zsh/plugins/liquidprompt/liquidprompt
-    '';
-  };
-
-  environment.etc.liquidpromptrc = {
-    text = ''
-      LP_ENABLE_SSH_COLORS=1
-      LP_ENABLE_TITLE=1
-      LP_ENABLE_SCREEN_TITLE=1
-      LP_ENABLE_TEMP=0
-      LP_ENABLE_SVN=0
-      LP_BATTERY_THRESHOLD=15
-      LP_SSH_COLORS=1
-    '';
   };
+  users.defaultUserShell = (if config.networking.hostName == "toaster" then pkgs.fish else pkgs.zsh);
+  users.users.root.shell = pkgs.zsh; # keep root shell posix compatible
 
   programs.iftop.enable = true;
   programs.mosh.enable = true;
diff --git a/modules/basic-tools/fish.nix b/modules/basic-tools/fish.nix
new file mode 100644
index 0000000..b948149
--- /dev/null
+++ b/modules/basic-tools/fish.nix
@@ -0,0 +1,26 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    lsd
+    fzf
+    grc
+    fishPlugins.done
+    fishPlugins.fzf-fish
+    fishPlugins.tide
+    fishPlugins.grc
+  ];
+
+  programs.fish = {
+    enable = true;
+    interactiveShellInit = ''
+      set fish_greeting
+    '';
+    shellAliases = {
+      ls = "lsd --icon=never";
+      l = "ls -l";
+      ll = "ls -la";
+      vim = "nvim";
+      grep = "grep --color=auto";
+    };
+  };
+}
diff --git a/modules/basic-tools/zsh.nix b/modules/basic-tools/zsh.nix
new file mode 100644
index 0000000..c474267
--- /dev/null
+++ b/modules/basic-tools/zsh.nix
@@ -0,0 +1,44 @@
+{ pkgs, ... }:
+{
+  environment.shellAliases = {
+    ls = "ls --color=auto";
+    l = "ls -l";
+    la = "ls -la";
+    ll = "ls -lah";
+    lt = "ls --tree";
+    vim = "nvim";
+    grep = "grep --color=auto";
+    e = "$EDITOR";
+    v = "$EDITOR";
+  };
+
+  programs.zsh = {
+    enable = true;
+    enableCompletion = true;
+    syntaxHighlighting.enable = true;
+    interactiveShellInit = ''
+      bindkey -e
+      export HISTFILE="$HOME/.zsh_history"
+      export HISTSIZE=10000000
+      export SAVEHIST=10000000
+      setopt HIST_IGNORE_ALL_DUPS
+      # allow comments
+      setopt interactivecomments
+    '';
+    promptInit = ''
+      source ${pkgs.liquidprompt}/share/zsh/plugins/liquidprompt/liquidprompt
+    '';
+  };
+
+  environment.etc.liquidpromptrc = {
+    text = ''
+      LP_ENABLE_SSH_COLORS=1
+      LP_ENABLE_TITLE=1
+      LP_ENABLE_SCREEN_TITLE=1
+      LP_ENABLE_TEMP=0
+      LP_ENABLE_SVN=0
+      LP_BATTERY_THRESHOLD=15
+      LP_SSH_COLORS=1
+    '';
+  };
+}