From f3137e3a322d8285cf6199e788f4e41079a4869c Mon Sep 17 00:00:00 2001
From: Matthew Ess <mat@mat.services>
Date: Mon, 11 Jan 2021 00:46:25 -0500
Subject: [PATCH] Some cleanup

---
 cachix/hie-nix.nix      | 7 -------
 cachix/matthewess.nix   | 8 --------
 cachix/mothbot.nix      | 7 -------
 hm-configs/fish.nix     | 9 +++------
 users/mat-hm-laptop.nix | 5 ++++-
 users/mat-hm.nix        | 1 -
 6 files changed, 7 insertions(+), 30 deletions(-)
 delete mode 100644 cachix/hie-nix.nix
 delete mode 100644 cachix/matthewess.nix
 delete mode 100644 cachix/mothbot.nix

diff --git a/cachix/hie-nix.nix b/cachix/hie-nix.nix
deleted file mode 100644
index 10b79d6..0000000
--- a/cachix/hie-nix.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  nix = {
-    binaryCaches = [ "https://hie-nix.cachix.org" ];
-    binaryCachePublicKeys =
-      [ "hie-nix.cachix.org-1:EjBSHzF6VmDnzqlldGXbi0RM3HdjfTU3yDRi9Pd0jTY=" ];
-  };
-}
diff --git a/cachix/matthewess.nix b/cachix/matthewess.nix
deleted file mode 100644
index 4626555..0000000
--- a/cachix/matthewess.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  nix = {
-    binaryCaches = [ "https://matthewess.cachix.org" ];
-    binaryCachePublicKeys = [
-      "matthewess.cachix.org-1:dlcWfdyp8KTqlWXYIupL2+GM3hkWAojTl+WOBqGt/X0="
-    ];
-  };
-}
diff --git a/cachix/mothbot.nix b/cachix/mothbot.nix
deleted file mode 100644
index ba3fe02..0000000
--- a/cachix/mothbot.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  nix = {
-    binaryCaches = [ "https://mothbot.cachix.org" ];
-    binaryCachePublicKeys =
-      [ "mothbot.cachix.org-1:+frc2gaYS3tGHaHCeuwlWkBSR6xwskmCfvIX3YjMcV8=" ];
-  };
-}
diff --git a/hm-configs/fish.nix b/hm-configs/fish.nix
index 77ef9e8..31a4c70 100644
--- a/hm-configs/fish.nix
+++ b/hm-configs/fish.nix
@@ -8,12 +8,9 @@
     alias cxpsh="nix-shell --command exit; nix-store -qR --include-outputs (nix-instantiate shell.nix) | cachix push"
     alias cxpush=cxpsh
 
-    function config -a file
-      if test -z "$file"
-        set file configuration
-      end
-      vim ~/dotfiles.nix/$file.nix +'cd %:p:h'
-    end
+    alias code=codium
+    alias config="code ~/dotfiles.nix"
+    alias home="vim ~/dotfiles.nix/users/mat-hm.nix +'cd %:p:h'"
 
     alias vims="vim -S Session.vim"
 
diff --git a/users/mat-hm-laptop.nix b/users/mat-hm-laptop.nix
index 8c53ad6..c76c8f0 100644
--- a/users/mat-hm-laptop.nix
+++ b/users/mat-hm-laptop.nix
@@ -76,7 +76,10 @@ in {
         enable = true;
         matchBlocks = {
           "pi".hostname = "192.168.1.165";
-          "gagarin".hostname = "192.168.1.246";
+          "gagarin" = {
+            hostname = "192.168.1.246";
+            forwardAgent = true;
+          };
           "mir".hostname = "138.197.58.58";
           "soviet".hostname = "soviet.circumlunar.space";
         };
diff --git a/users/mat-hm.nix b/users/mat-hm.nix
index 90bb026..a7bf64c 100644
--- a/users/mat-hm.nix
+++ b/users/mat-hm.nix
@@ -59,7 +59,6 @@ in {
           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)'