From bf0a976d4ac365726ff567724ffe2a6c349e70e9 Mon Sep 17 00:00:00 2001
From: Matthew Ess <mat@mat.services>
Date: Sun, 10 Jan 2021 23:19:57 -0500
Subject: [PATCH] Centralize some stuff

---
 hm-configs/fish.nix | 31 -------------------------------
 users/mat-hm.nix    | 10 ++++++++++
 2 files changed, 10 insertions(+), 31 deletions(-)

diff --git a/hm-configs/fish.nix b/hm-configs/fish.nix
index ddce51d..77ef9e8 100644
--- a/hm-configs/fish.nix
+++ b/hm-configs/fish.nix
@@ -2,28 +2,6 @@
   enable = true;
   package = pkgs.fish;
   interactiveShellInit = ''
-    echo 'ヽ(´ᗜ｀)ノ welcome ヽ(´ᗜ｀)ノ'
-    if not functions -q fisher
-      set -q XDG_CONFIG_HOME; or set XDG_CONFIG_HOME ~/.config
-      curl https://git.io/fisher --create-dirs -sLo $XDG_CONFIG_HOME/fish/functions/fisher.fish
-      fish -c fisher
-    end
-    fish_vi_key_bindings
-    set VIRTUAL_ENV_DISABLE_PROMPT true
-
-    alias cat=bat
-    alias br=broot
-    alias tree=br
-    alias ack=rg
-    alias ag=rg
-    alias grep=rg
-
-    alias sys="sudo systemctl"
-
-    alias rebuild="sudo nixos-rebuild switch"
-    alias rebuildd="sudo nixos-rebuild switch; and systemctl restart display-manager"
-    alias upgrade="sudo rm -rf /root/.cache/nix/tarballs; and sudo nix-channel --update; and sudo nixos-rebuild switch --upgrade"
-
     alias clip="xclip -selection c"
 
     alias cxuse="sudo cachix use -d ~/dotfiles.nix"
@@ -59,14 +37,5 @@
     alias wifi="nmcli r w off; nmcli r w on"
 
     alias nixops=~/dev/nixops/result/bin/nixops
-
-    bind \cr 'fzy_select_history (commandline -b)'
-    bind -M insert \cr 'fzy_select_history (commandline -b)'
-
-    bind \cf 'fzy_select_directory'
-    bind -M insert \cf 'fzy_select_directory'
-
-    bind -M insert ! __history_previous_command
-    bind -M insert '$' __history_previous_command_arguments
   '';
 }
diff --git a/users/mat-hm.nix b/users/mat-hm.nix
index ce14ae9..4c9b97e 100644
--- a/users/mat-hm.nix
+++ b/users/mat-hm.nix
@@ -57,6 +57,16 @@ in {
           alias rebuild="sudo nixos-rebuild switch"
           alias rebuildd="sudo nixos-rebuild switch; and systemctl restart display-manager"
           alias upgrade="sudo rm -rf /root/.cache/nix/tarballs; and sudo nix-channel --update; and sudo nixos-rebuild switch --upgrade"
+
+
+          bind \cr 'fzy_select_history (commandline -b)'
+          bind -M insert \cr 'fzy_select_history (commandline -b)'
+
+          bind \cf 'fzy_select_directory'
+          bind -M insert \cf 'fzy_select_directory'
+
+          bind -M insert ! __history_previous_command
+          bind -M insert '$' __history_previous_command_arguments
         '';
       };