4 files changed, 122 insertions, 0 deletions
diff --git a/modules/nixosModules/desktop/default.nix b/modules/nixosModules/desktop/default.nix
index 4aa338c..411c361 100644
--- a/modules/nixosModules/desktop/default.nix
+++ b/modules/nixosModules/desktop/default.nix
@@ -2,14 +2,37 @@
   flake.nixosModules.desktop = {pkgs, ...}: {
     imports = [
       self.nixosModules.gaming
+      self.nixosModules.mullvad
       self.nixosModules.pipewire
       self.nixosModules.printing
+      self.nixosModules.tailscaleDesktop
       self.nixosModules.thunar
     ];
 
     hardware.bluetooth.enable = true;
     environment.systemPackages = [ 
       self.packages.${pkgs.stdenv.hostPlatform.system}.zen-browser
+
+      pkgs.bitwarden-desktop
+      pkgs.brave
+      pkgs.discord
+      pkgs.feishin
+      pkgs.ffmpeg-full
+      pkgs.gimp3
+      pkgs.libreoffice
+      pkgs.mpv
+      pkgs.obsidian
+      pkgs.qbittorrent
+      pkgs.thunderbird
+      pkgs.ungoogled-chromium
+      pkgs.vlc
+      pkgs.winetricks
+      pkgs.wineWow64Packages.stable
     ];
+
+    programs.nix-ld.enable = true;
+
+    services.upower.enable = true;
+    services.playerctld.enable = true;
   };
 }
diff --git a/modules/nixosModules/desktop/mullvad.nix b/modules/nixosModules/desktop/mullvad.nix
new file mode 100644
index 0000000..9f2892c
--- /dev/null
+++ b/modules/nixosModules/desktop/mullvad.nix
@@ -0,0 +1,22 @@
+{lib, ...}: {
+  flake.nixosModules.mullvad = { pkgs, ... }: {
+    services.mullvad-vpn = {
+      enable = true;
+      package = pkgs.mullvad-vpn;
+      enableExcludeWrapper = true;
+    };
+
+    # allow tailscale traffic through
+    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/nixosModules/desktop/pipewire.nix b/modules/nixosModules/desktop/pipewire.nix
index 46e3926..bf05dbd 100644
--- a/modules/nixosModules/desktop/pipewire.nix
+++ b/modules/nixosModules/desktop/pipewire.nix
@@ -8,5 +8,7 @@
       pulse.enable = true;
       socketActivation = true;
     };
+
+    environment.systemPackages = [ pkgs.pwvucontrol ];
   };
 }
diff --git a/modules/nixosModules/desktop/tailscale.nix b/modules/nixosModules/desktop/tailscale.nix
new file mode 100644
index 0000000..f2ab9fc
--- /dev/null
+++ b/modules/nixosModules/desktop/tailscale.nix
@@ -0,0 +1,75 @@
+{ lib, ... }: {
+  flake.nixosModules.tailscaleDesktop = { config, ... }: {
+    services.tailscale = {
+      enable = true;
+      useRoutingFeatures = "client";
+      openFirewall = true;
+    };
+    
+    networking.firewall = {
+      enable = lib.mkDefault true;
+      trustedInterfaces = [ "tailscale0" ];
+      allowedUDPPorts = [ config.services.tailscale.port ];
+    };
+  };
+
+  flake.nixosModules.nasClient = { pkgs, ... }: {
+    boot.supportedFilesystems = [ "nfs" ];
+
+    environment.systemPackages = with pkgs; [ nfs-utils ];
+
+    fileSystems."/mnt/data" = {
+      device = "100.64.0.2:/tank/data";
+      fsType = "nfs4";
+
+      options = [
+        "x-systemd.automount"
+        "noauto"
+        "nofail"
+        "_netdev"
+
+        "hard"
+        "noatime"
+
+        "x-systemd.mount-timeout=10"
+        "x-systemd.idle-timeout=600"
+      ];
+    };
+
+    fileSystems."/mnt/backups" = {
+      device = "100.64.0.2:/tank/backups";
+      fsType = "nfs4";
+
+      options = [
+        "x-systemd.automount"
+        "noauto"
+        "nofail"
+        "_netdev"
+
+        "hard"
+        "noatime"
+
+        "x-systemd.mount-timeout=10"
+        "x-systemd.idle-timeout=600"
+      ];
+    };
+
+    fileSystems."/mnt/media" = {
+      device = "100.64.0.2:/tank/media";
+      fsType = "nfs4";
+
+      options = [
+        "x-systemd.automount"
+        "noauto"
+        "nofail"
+        "_netdev"
+
+        "hard"
+        "noatime"
+
+        "x-systemd.mount-timeout=10"
+        "x-systemd.idle-timeout=600"
+      ];
+    };
+  };
+}