From 1e5c9aec5c6b38f5876e76164dfb7db7c04776a6 Mon Sep 17 00:00:00 2001
From: Sam Willcocks <sam@wlcx.cc>
Date: Mon, 10 Jan 2022 15:57:17 +0000
Subject: [PATCH] Remove mac-specific ssh agent, tweak aliases

---
 home.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/home.nix b/home.nix
index 6e9de09..42acb44 100644
--- a/home.nix
+++ b/home.nix
@@ -3,21 +3,21 @@
 let mypkgs = (import ./modules/pkgs.nix { inherit pkgs; });
 in {
   home.packages = mypkgs.all;
+  home.sessionVariables = {
+    "EDITOR" = "nvim";
+  };
   programs = {
     home-manager.enable = true;
 
     # Shell and env-y stuff
     zsh = {
       enable = true;
-      envExtra = ''
-        export SSH_AUTH_SOCK=/Users/sam.willcocks/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh
-      '';
       shellAliases = {
         g = "git";
         cat = "bat";
         vim = "nvim";
         hmswitch = ''home-manager switch --flake ".#$(hostname -s)"'';
-        nrswitch = "nixos-rebuild switch --flake '.#'";
+        nrswitch = "sudo nixos-rebuild switch --flake '.#'";
       };
 
       plugins = [{
@@ -68,8 +68,12 @@ in {
         co = "checkout";
         d = "diff";
         dc = "diff --cached";
-        r = "rebase --autostash";
-        ri = "rebase --autostash --interactive";
+        l = "log";
+        lp = "log --patch";
+        r = "rebase";
+        rc = "rebase --continue";
+        ra = "rebase --autostash";
+        rai = "rebase --autostash --interactive";
         st = "status";
 
         gone = ''