From 4842d9c8fc00b5d114cd0553419cd659050c08d5 Mon Sep 17 00:00:00 2001
From: mat ess <mat@mat.services>
Date: Sat, 5 Feb 2022 16:53:35 -0500
Subject: [PATCH] Tiny fixes, add mullvadvpn

---
 darwin/homebrew.nix |  3 ++-
 flake.nix           | 21 ++++++++++-----------
 home/default.nix    |  9 ++-------
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/darwin/homebrew.nix b/darwin/homebrew.nix
index 2b2ab98..eb7feda 100644
--- a/darwin/homebrew.nix
+++ b/darwin/homebrew.nix
@@ -58,6 +58,7 @@ in
     "knockknock"
     "lagrange"
     "lulu"
+    "mullvadvpn"
     "rectangle"
     "signal"
     "steam"
@@ -70,5 +71,5 @@ in
 
   # For cli packages that aren't currently available for macOS in `nixpkgs`.Packages should be
   # installed in `../home/default.nix` whenever possible.
-  homebrew.brews = [ "unison-language" ];
+  homebrew.brews = [ "fzf" "unison-language" ];
 }
diff --git a/flake.nix b/flake.nix
index 74ad010..2ce066b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,17 +26,16 @@
       # Configuration for `nixpkgs`
       nixpkgsConfig = {
         config = { allowUnfree = true; };
-        # overlays = attrValues self.overlays;
-        overlays = attrValues self.overlays ++ singleton (
-          # Sub in x86 version of packages that don't build on Apple Silicon yet
-          final: prev: (optionalAttrs (prev.stdenv.system == "aarch64-darwin") {
-            inherit (final.pkgs-x86)
-              # idris2
-              # nix-index
-              # purescript;
-              niv;
-          })
-        );
+        overlays = attrValues self.overlays;
+        # overlays = attrValues self.overlays ++ singleton (
+        #   # Sub in x86 version of packages that don't build on Apple Silicon yet
+        #   final: prev: (optionalAttrs (prev.stdenv.system == "aarch64-darwin") {
+        #     inherit (final.pkgs-x86)
+        #       idris2
+        #       nix-index
+        #       purescript;
+        #   })
+        # );
       };
 
       # Shared home-manager configs
diff --git a/home/default.nix b/home/default.nix
index ec114df..6696996 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -17,7 +17,7 @@
     # fancy shell history
     # https://rycee.gitlab.io/home-manager/options.html#opt-programs.atuin.enable
     atuin = {
-      enable = true;
+      enable = false;
       settings = { };
     };
     # a nicer cat
@@ -58,11 +58,6 @@
         };
       };
       interactiveShellInit = ''
-        # Init atuin
-        atuin init fish | source
-        bind -M insert -k up _atuin_search
-        bind -M insert \eOA _atuin_search
-        bind -M insert \e\[A _atuin_search
         # Set `bat` colors based on value of `$term_backdround` when shell starts up.
         set-bat-colors
       '';
@@ -83,7 +78,7 @@
     fd # fancy version of `find`
     htop # fancy version of `top`
     hyperfine # benchmarking tool
-    mosh # wrapper for `ssh` that better and not dropping connections
+    mosh # wrapper for `ssh` that better at not dropping connections
     pijul # alternative to `git`
     procs # fancy version of `ps`
     ripgrep # better version of `grep`