From 87e552f1c563e422dce93ac3f47f191fe06e0ed7 Mon Sep 17 00:00:00 2001
From: mat ess <mat@mat.services>
Date: Sun, 17 Jul 2022 12:37:52 -0400
Subject: [PATCH] Cleanup, add Wireguard

---
 .gitignore          |  1 +
 darwin/homebrew.nix |  1 +
 home/default.nix    | 15 ---------------
 home/shells.nix     | 34 +++++++++++++++++++---------------
 4 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8e1f17d..6a854f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 result
+result-*
 *.secret.*
 .nvimlog
\ No newline at end of file
diff --git a/darwin/homebrew.nix b/darwin/homebrew.nix
index 89a3916..55bfe7b 100644
--- a/darwin/homebrew.nix
+++ b/darwin/homebrew.nix
@@ -45,6 +45,7 @@ in
     Bitwarden = 1352778147;
     Spark = 1176895641;
     # UTM = 1538878817;
+    Wireguard = 1451685025;
     Xcode = 497799835;
   };
 
diff --git a/home/default.nix b/home/default.nix
index f54ab93..2e4bb28 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -31,20 +31,6 @@
       enable = true;
       nix-direnv.enable = true;
     };
-    # Firefox
-    # https://rycee.gitlab.io/home-manager/options.html#opt-programs.firefox.enable
-    # firefox = {
-    #   enable = true;
-    #   package = pkgs.firefox;
-    # };
-    # Htop
-    # https://rycee.gitlab.io/home-manager/options.html#opt-programs.htop.enable
-    htop = {
-      enable = true;
-      settings = {
-        show_program_path = true;
-      };
-    };
     # See `./shells.nix` for more on how this is used.
     fish = {
       functions = {
@@ -78,7 +64,6 @@
     du-dust # fancy version of `du`
     exa # fancy version of `ls`
     fd # fancy version of `find`
-    htop # fancy version of `top`
     # httpie # fancy version of `curl`
     hyperfine # benchmarking tool
     mosh # wrapper for `ssh` that better at not dropping connections
diff --git a/home/shells.nix b/home/shells.nix
index c0d1de9..dcdb077 100644
--- a/home/shells.nix
+++ b/home/shells.nix
@@ -130,6 +130,19 @@
       '';
       onVariable = "term_background";
     };
+
+    init-shell-colors.body = ''
+      set -g fish_color_quote        cyan      # color of commands
+      set -g fish_color_redirection  brmagenta # color of IO redirections
+      set -g fish_color_end          blue      # color of process separators like ';' and '&'
+      set -g fish_color_error        red       # color of potential errors
+      set -g fish_color_match        --reverse # color of highlighted matching parenthesis
+      set -g fish_color_search_match --background=yellow
+      set -g fish_color_selection    --reverse # color of selected text (vi mode)
+      set -g fish_color_operator     green     # color of parameter expansion operators like '*' and '~'
+      set -g fish_color_escape       red       # color of character escapes like '\n' and and '\x70'
+      set -g fish_color_cancel       red       # color of the '^C' indicator on a canceled command
+    '';
   };
   # }}}
 
@@ -141,16 +154,11 @@
       nixConfigDir = "${config.home.homeDirectory}/dotfiles.nix";
     in
     with pkgs; {
-      # My additions
-      code = "codium";
-
-      # OG
       # Nix related
       drb = "pushd ${nixConfigDir}/; darwin-rebuild build --flake ${nixConfigDir}/; popd";
       drs = "pushd ${nixConfigDir}/; darwin-rebuild switch --flake ${nixConfigDir}/; popd";
       drc = "codium ${nixConfigDir}";
       drv = "vim ${nixConfigDir}";
-      cdr = "cd ${nixConfigDir}";
       flakeup = "nix flake update ${nixConfigDir}/";
       nb = "nix build";
       nd = "nix develop";
@@ -171,6 +179,11 @@
       ps = "${procs}/bin/procs";
       tb = "toggle-background";
       sb = "set-background-to-macOS";
+      code = "codium";
+      http = "xh";
+      https = "xhs";
+      top = "btm";
+      htop = "btm";
     };
 
   # Configuration that should be above `loginShellInit` and `interactiveShellInit`.
@@ -190,16 +203,7 @@
     # they are triggered when the relevent event happens or variable changes.
     set-shell-colors
     # Set Fish colors that aren't dependent the `$term_background`.
-    set -g fish_color_quote        cyan      # color of commands
-    set -g fish_color_redirection  brmagenta # color of IO redirections
-    set -g fish_color_end          blue      # color of process separators like ';' and '&'
-    set -g fish_color_error        red       # color of potential errors
-    set -g fish_color_match        --reverse # color of highlighted matching parenthesis
-    set -g fish_color_search_match --background=yellow
-    set -g fish_color_selection    --reverse # color of selected text (vi mode)
-    set -g fish_color_operator     green     # color of parameter expansion operators like '*' and '~'
-    set -g fish_color_escape       red       # color of character escapes like '\n' and and '\x70'
-    set -g fish_color_cancel       red       # color of the '^C' indicator on a canceled command
+    init-shell-colors
   '';
   # }}}