diff --git a/hosts/nixos/yveltal/configuration.nix b/hosts/nixos/yveltal/configuration.nix index ffae220..b398174 100644 --- a/hosts/nixos/yveltal/configuration.nix +++ b/hosts/nixos/yveltal/configuration.nix @@ -19,7 +19,7 @@ ssh.enable = true; sops.enable = true; yubikey.enable = true; - tailscale.enable = true; + tailscale.enable = false; syncthing.enable = true; }; diff --git a/modules/system/tailscale/default.nix b/modules/system/tailscale/default.nix index 8110453..2c5f024 100644 --- a/modules/system/tailscale/default.nix +++ b/modules/system/tailscale/default.nix @@ -15,7 +15,7 @@ in { services.tailscale = { enable = true; useRoutingFeatures = "both"; - authKeyFile = authkey_file; + #authKeyFile = authkey_file; extraUpFlags = [ "--accept-routes=true" # true is equilivant to useRoutingFeatures = "client" (breaks shit) "--accept-dns=true" # explicitly allow resolved diff --git a/users/blake/dots/default.nix b/users/blake/dots/default.nix index 93f09f4..4294a34 100644 --- a/users/blake/dots/default.nix +++ b/users/blake/dots/default.nix @@ -6,6 +6,7 @@ }: { imports = [ ./librewolf + ./firefox ./kitty ./dunst ./waybar diff --git a/users/blake/dots/firefox/default.nix b/users/blake/dots/firefox/default.nix new file mode 100644 index 0000000..6059c73 --- /dev/null +++ b/users/blake/dots/firefox/default.nix @@ -0,0 +1,20 @@ +{ + pkgs, + lib, + config, + ... +}: let + program = "firefox"; + cfg = config.dots.${program}; + #sec = sops.secrets; +in { + options.dots.${program} = { + enable = lib.mkEnableOption "enables ${program}"; + }; + + config = lib.mkIf cfg.enable { + programs.${program} = { + enable = true; + }; + }; +} diff --git a/users/blake/dots/librewolf/default.nix b/users/blake/dots/librewolf/default.nix index 68a8501..8ea5a76 100644 --- a/users/blake/dots/librewolf/default.nix +++ b/users/blake/dots/librewolf/default.nix @@ -13,7 +13,6 @@ in { }; config = lib.mkIf cfg.enable { - # just using the normal lfrc programs.${program} = { enable = true; }; diff --git a/users/blake/hosts/yveltal.nix b/users/blake/hosts/yveltal.nix index 403b4dd..5684480 100644 --- a/users/blake/hosts/yveltal.nix +++ b/users/blake/hosts/yveltal.nix @@ -15,6 +15,7 @@ lf.enable = true; kitty.enable = true; librewolf.enable = true; + firefox.enable = true; waybar.enable = true; dunst.enable = true; hypr.enable = true;