From 2dd43366bf0a7054f0b8a71f77aa614dcb706d31 Mon Sep 17 00:00:00 2001
From: Dustin Swan <dustin@dustinswan.com>
Date: Fri, 12 Apr 2019 15:17:07 -0400
Subject: [PATCH] Switching back to zsh for now. home-manager and nixos make it
 too hard

---
 Xresources |  2 +-
 home.nix   | 26 +++++++++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/Xresources b/Xresources
index aaa5534..b19899b 100644
--- a/Xresources
+++ b/Xresources
@@ -9,7 +9,7 @@ rofi.color-normal: #00000000, #ffffff, #22000000, #88ffffff, #000000
 rofi.color-active: #44000000, #ffffff, #66000000, #44000000, #ffffff
 rofi.hide-scrollbar: true
 rofi.combi-modi: window,run,ssh
-rofi.run-command: fish -c '{cmd}'
+! rofi.run-command: fish -c '{cmd}'
 
 ! urxvt
 urxvt*internalBorder: 12
diff --git a/home.nix b/home.nix
index 182fd45..f19e37e 100644
--- a/home.nix
+++ b/home.nix
@@ -117,9 +117,24 @@
   programs.htop.enable = true;
   programs.jq.enable = true;
   programs.vscode.enable = true;
-  programs.fish = {
+  # programs.fish = {
+  #   enable = true;
+  #   shellAliases = {
+  #     l = "ls -la";
+  #     ta = "tmux attach -d";
+  #     e = "emacsclient -a \"\" -t -nw";
+  #     weather = "curl http://wttr.in";
+  #     er = "rm -rf logs; unzip -o";
+  #   };
+  # };
+  programs.zsh = {
     enable = true;
-    # interactiveShellInit = builtins.readFile ~/dotfiles/config.fish;
+    enableAutosuggestions = true;
+    oh-my-zsh = {
+      enable = true;
+      plugins = [ "git" "sudo" ];
+      theme = "refined";
+    };
     shellAliases = {
       l = "ls -la";
       ta = "tmux attach -d";
@@ -129,7 +144,10 @@
     };
   };
   programs.firefox.enable = true;
-  programs.fzf.enable = true;
+  programs.fzf = {
+    enable = true;
+    enableZshIntegration = true;
+  };
   programs.feh.enable = true;
   programs.git = {
     enable = true;
@@ -149,9 +167,11 @@
   };
   programs.keychain = {
     enable = true;
+    enableZshIntegration = true;
     inheritType = "any";
     agents = ["gpg" "ssh"];
     keys = ["id_rsa" "2B3A6377"];
+    # extraFlags = "--quiet";
   };
   programs.rofi = {
     enable = true;