From 846c63df67072e2d8a5dc439069d9112bb76e329 Mon Sep 17 00:00:00 2001
From: zackartz <zackmyers@lavabit.com>
Date: Thu, 23 May 2024 21:24:09 +0000
Subject: [PATCH] fix things

---
 flake.nix                                     |  2 ++
 homes/x86_64-linux/zack@earth/default.nix     |  2 ++
 modules/home/shells/zsh/default.nix           |  1 +
 modules/nixos/services/vpn/default.nix        | 24 ++++++++++---------
 .../powermenu.nix => powermenu/default.nix}   |  0
 .../{sys/rebuild.nix => rebuild/default.nix}  |  0
 systems/x86_64-linux/earth/default.nix        |  1 +
 7 files changed, 19 insertions(+), 11 deletions(-)
 rename packages/{sys/powermenu.nix => powermenu/default.nix} (100%)
 rename packages/{sys/rebuild.nix => rebuild/default.nix} (100%)

diff --git a/flake.nix b/flake.nix
index 3ae5b66..c276e9a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -94,6 +94,8 @@
       inherit inputs;
       src = ./.;
 
+      overlays = [inputs.neovim-nightly-overlay.overlay];
+
       snowfall = {
         namespace = "custom";
       };
diff --git a/homes/x86_64-linux/zack@earth/default.nix b/homes/x86_64-linux/zack@earth/default.nix
index 9b0b7ac..41f4023 100644
--- a/homes/x86_64-linux/zack@earth/default.nix
+++ b/homes/x86_64-linux/zack@earth/default.nix
@@ -86,6 +86,8 @@
     pkgs.dwl
 
     pkgs.killall
+    pkgs.custom.rebuild
+    pkgs.custom.powermenu
 
     pkgs.parsec-bin
     pkgs.filezilla
diff --git a/modules/home/shells/zsh/default.nix b/modules/home/shells/zsh/default.nix
index 8bb6ace..50e37ed 100644
--- a/modules/home/shells/zsh/default.nix
+++ b/modules/home/shells/zsh/default.nix
@@ -24,6 +24,7 @@ in {
         LC_ALL = "en_US.UTF-8";
         ZSH_AUTOSUGGEST_USE_ASYNC = "true";
         SSH_AUTH_SOCK = "/run/user/1000/keyring/ssh";
+        FLAKE = "/home/zack/nixos";
       };
       enableAutosuggestions = true;
       history = {
diff --git a/modules/nixos/services/vpn/default.nix b/modules/nixos/services/vpn/default.nix
index 0721276..66ce233 100644
--- a/modules/nixos/services/vpn/default.nix
+++ b/modules/nixos/services/vpn/default.nix
@@ -9,11 +9,13 @@ with lib.custom; let
   cfg = config.services.vpn;
 in {
   options.services.vpn = with types; {
-    enable = mkBoolOpt false "Enable MiniDLNA service";
+    enable = mkBoolOpt false "Enable VPN service(s)";
+
+    enableMullvad = mkBoolOpt false "Enable Mullvad VPN Daemon";
   };
 
   config = mkIf cfg.enable {
-    services.mullvad-vpn.enable = true;
+    services.mullvad-vpn.enable = cfg.enableMullvad;
     services.openvpn.servers = {
       work = {
         config = ''config /home/zack/Downloads/zachary_myers.ovpn'';
@@ -21,14 +23,14 @@ in {
       };
     };
 
-    # disable autoconnect for now
-    # systemd.services."mullvad-daemon".postStart = let
-    #   mullvad = config.services.mullvad-vpn.package;
-    # in ''
-    #   while ! ${mullvad}/bin/mullvad status >/dev/null; do sleep 1; done
-    #   ${mullvad}/bin/mullvad auto-connect set on
-    #   ${mullvad}/bin/mullvad tunnel set ipv6 on
-    #   ${mullvad}/bin/mullvad connect
-    # '';
+    systemd.services."mullvad-daemon".postStart = let
+      mullvad = config.services.mullvad-vpn.package;
+    in
+      mkIf cfg.enableMullvad ''
+        while ! ${mullvad}/bin/mullvad status >/dev/null; do sleep 1; done
+        ${mullvad}/bin/mullvad auto-connect set on
+        ${mullvad}/bin/mullvad tunnel set ipv6 on
+        ${mullvad}/bin/mullvad connect
+      '';
   };
 }
diff --git a/packages/sys/powermenu.nix b/packages/powermenu/default.nix
similarity index 100%
rename from packages/sys/powermenu.nix
rename to packages/powermenu/default.nix
diff --git a/packages/sys/rebuild.nix b/packages/rebuild/default.nix
similarity index 100%
rename from packages/sys/rebuild.nix
rename to packages/rebuild/default.nix
diff --git a/systems/x86_64-linux/earth/default.nix b/systems/x86_64-linux/earth/default.nix
index 9f892e4..a4effeb 100644
--- a/systems/x86_64-linux/earth/default.nix
+++ b/systems/x86_64-linux/earth/default.nix
@@ -28,6 +28,7 @@
       download-dir = "/home/zack/dl";
     };
   };
+  services.gnome.gnome-keyring.enable = true;
 
   # Bootloader.
   boot.loader.systemd-boot.enable = lib.mkForce false;