From 294c6a4571a1f96d7346363243e6ff3ec354a0aa Mon Sep 17 00:00:00 2001
From: Dave Gallant <davegallant@gmail.com>
Date: Fri, 10 Sep 2021 23:08:36 -0400
Subject: [PATCH] Add amass and gitfast

---
 common/packages.nix                  | 1 +
 flake.nix                            | 5 ++---
 home/default.nix                     | 9 +++++++--
 home/nvim/lua/init.lua               | 1 -
 modules/overlays/vpngate/default.nix | 6 +++---
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/common/packages.nix b/common/packages.nix
index 64c5b3b..4aa9f62 100644
--- a/common/packages.nix
+++ b/common/packages.nix
@@ -160,6 +160,7 @@ in
         srv
 
         # security
+        amass
         yar
         yubikey-manager
 
diff --git a/flake.nix b/flake.nix
index 2412adb..3cd1b20 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,13 +11,12 @@
 
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
+    neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
+
     darwin = {
       url = "github:lnl7/nix-darwin";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
-
-
   };
 
   outputs = { self, darwin, home-manager, nixpkgs, nixos-hardware, ... }@inputs: {
diff --git a/home/default.nix b/home/default.nix
index 7c39d22..0cda8d7 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -59,6 +59,7 @@ in
           "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
         "ms" = "merge --squash";
         "po" = "push origin";
+        "pf" = "push -f";
         "por" = "push origin HEAD:refs/for/$1";
         "st" = "status";
         "wip" =
@@ -110,7 +111,7 @@ in
       localVariables = {
         CASE_SENSITIVE = "true";
         DISABLE_UNTRACKED_FILES_DIRTY = "true";
-        RPROMPT = "";
+        RPROMPT = ""; # override because macOS defaults to filepath
         ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE = "fg=#838383,underline";
         ZSH_DISABLE_COMPFIX = "true";
       };
@@ -147,7 +148,11 @@ in
 
       "oh-my-zsh" = {
         enable = true;
-        plugins = [ "last-working-dir" "tmux" ];
+        plugins = [
+          "gitfast"
+          "last-working-dir"
+          "tmux"
+        ];
       };
 
     };
diff --git a/home/nvim/lua/init.lua b/home/nvim/lua/init.lua
index b874046..7101173 100644
--- a/home/nvim/lua/init.lua
+++ b/home/nvim/lua/init.lua
@@ -39,7 +39,6 @@ vim.opt.switchbuf     = 'usetab'                -- try to reuse windows/tabs whe
 vim.opt.synmaxcol     = 200                     -- don't bother syntax highlighting long lines
 vim.opt.tabstop       = 2                       -- spaces per tab
 vim.opt.termguicolors = true                    -- use guifg/guibg instead of ctermfg/ctermbg in terminal
-vim.opt.textwidth     = 80                      -- automatically hard wrap at 80 columns
 
 vim.opt.shell         = 'bash'                  -- shell to use for `!`, `:!`, `system()` etc.
 vim.opt.shiftround    = false                   -- don't always indent by multiple of shiftwidth
diff --git a/modules/overlays/vpngate/default.nix b/modules/overlays/vpngate/default.nix
index 3c73803..55f53e9 100644
--- a/modules/overlays/vpngate/default.nix
+++ b/modules/overlays/vpngate/default.nix
@@ -3,15 +3,15 @@
 buildGoModule rec {
 
   pname = "vpngate";
-  version = "v0.1.0";
+  version = "v0.1.1";
 
-  vendorSha256 = "sha256-HOGPzCMh7nVKfpzKkAyaSDeRyowj9VuizCA7CLFWp78=";
+  vendorSha256 = "sha256-EAtZA7epMWEcDMP3F/9Fh06GUze70cidmaE4b/e3Sic=";
 
   src = fetchFromGitHub {
     owner = "davegallant";
     repo = "vpngate";
     rev = version;
-    sha256 = "sha256-kToXqICQHWgXVLc3fN2bAxHAQWS3Dq3jdpi3CBXkP90=";
+    sha256 = "sha256-+/yICgCbaofLWk7YIzVKjt0rOVycsecLeoppKOEiUoY=";
   };
 
   meta = with lib; {