diff options
| author | scouckel <james.krinsky@gmail.com> | 2026-01-25 11:42:17 -0600 |
|---|---|---|
| committer | scouckel <james.krinsky@gmail.com> | 2026-01-25 11:42:17 -0600 |
| commit | 8f3848f4d41f9184657048ddecbe052b22d26874 (patch) | |
| tree | 690b7e7a345eb41eade0fd118e7bd821ac4c15a5 /modules | |
| parent | c1e1db1d3dcbc0437d3e740c9a63cd9838754cec (diff) | |
big changes
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/home-manager/default.nix | 2 | ||||
| -rw-r--r-- | modules/nixos/default.nix | 12 | ||||
| -rw-r--r-- | modules/nixos/nas.nix | 17 | ||||
| -rw-r--r-- | modules/nixos/xdg-portal.nix | 5 |
4 files changed, 28 insertions, 8 deletions
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 24cbba7..c872ab6 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -59,7 +59,7 @@ enable = true; defaultApplications = { - "application/pdf" = "userapp-kitty vi-DARLE3.desktop"; + "application/pdf" = "zen-twilight.desktop"; "application/javascript" = "userapp-kitty vi-DARLE3.desktop"; "application/toml" = "userapp-kitty vi-DARLE3.desktop"; "application/vnd.microsoft.portable-executable" = "wine-desktop"; diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index ec1e0a9..9babfdb 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -33,13 +33,17 @@ programs.localsend.enable = true; - services.nordvpn.enable = true; - fonts.packages = with pkgs; [ nerd-fonts.jetbrains-mono jetbrains-mono ]; + fonts.fontconfig.defaultFonts = { + monospace = [ + "JetBrainsMono Nerd Font" + ]; + }; + programs.nh = { enable = true; clean.enable = true; @@ -67,4 +71,8 @@ programs.partition-manager.enable = true; services.udisks2.enable = true; + + services.mullvad-vpn.enable = true; + services.mullvad-vpn.package = pkgs.mullvad-vpn; + services.mullvad-vpn.enableExcludeWrapper = true; } diff --git a/modules/nixos/nas.nix b/modules/nixos/nas.nix index 46bcb13..6201160 100644 --- a/modules/nixos/nas.nix +++ b/modules/nixos/nas.nix @@ -7,6 +7,9 @@ config = lib.mkIf config.client.nas.enable { services.tailscale.enable = true; + services.tailscale.useRoutingFeatures = "client"; + services.tailscale.openFirewall = true; + services.tailscale.extraUpFlags = [ "--accept-dns=false" ]; networking.nftables.enable = true; networking.firewall = { enable = true; @@ -14,6 +17,20 @@ allowedUDPPorts = [ config.services.tailscale.port ]; }; + networking.nftables = { + tables = { + mullvad_tailscale = { + content = '' + chain output { + type route hook output priority 0; policy accept; + ip daddr 100.64.0.0/10 ct mark set 0x00000f41 meta mark set 0x6d6f6c65; + } + ''; + family = "inet"; + }; + }; + }; + systemd.services.tailscaled.serviceConfig.Environment = [ "TS_DEBUG_FIREWALL_MODE=nftables" ]; diff --git a/modules/nixos/xdg-portal.nix b/modules/nixos/xdg-portal.nix index 7883eec..51035a4 100644 --- a/modules/nixos/xdg-portal.nix +++ b/modules/nixos/xdg-portal.nix @@ -5,11 +5,6 @@ enable = true; config.common.default = "*"; - # config = { - # common = { - # default = [ "hyprland" ]; - # }; - # }; extraPortals = with pkgs; [ xdg-desktop-portal-hyprland |