fix things

This commit is contained in:
zackartz 2024-05-23 21:24:09 +00:00
parent 042ee74dbd
commit 846c63df67
No known key found for this signature in database
GPG key ID: 5B53E53A9A514DBA
7 changed files with 19 additions and 11 deletions

View file

@ -94,6 +94,8 @@
inherit inputs;
src = ./.;
overlays = [inputs.neovim-nightly-overlay.overlay];
snowfall = {
namespace = "custom";
};

View file

@ -86,6 +86,8 @@
pkgs.dwl
pkgs.killall
pkgs.custom.rebuild
pkgs.custom.powermenu
pkgs.parsec-bin
pkgs.filezilla

View file

@ -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 = {

View file

@ -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
'';
};
}

View file

@ -28,6 +28,7 @@
download-dir = "/home/zack/dl";
};
};
services.gnome.gnome-keyring.enable = true;
# Bootloader.
boot.loader.systemd-boot.enable = lib.mkForce false;