small refactor of desktop file, add mullvad-vpn

home-manager/desktop/default.nix

@@ -186,6 +186,7 @@
       nextcloud-client
       # nitrokey-app
       # protonvpn-gui
+      mullvad-vpn
       virtualbox
       #watchmate
       qbittorrent

nixos/desktop/default.nix

@@ -28,14 +28,67 @@
       allowUnfree = true;
     };
   };
-  services.udev.extraRules = ''
+  services = {
-    KERNEL=="hidraw*", ATTRS{idVendor}=="057e", MODE="0660", TAG+="uaccess"
+    udev.extraRules = ''
-    KERNEL=="hidraw*", KERNELS=="*057e:*", MODE="0660", TAG+="uaccess"
+      KERNEL=="hidraw*", ATTRS{idVendor}=="057e", MODE="0660", TAG+="uaccess"
-    KERNEL=="hidraw*", ATTRS{idVendor}=="2dc8", MODE="0660", TAG+="uaccess"
+      KERNEL=="hidraw*", KERNELS=="*057e:*", MODE="0660", TAG+="uaccess"
-    KERNEL=="hidraw*", KERNELS=="*2DC8:*", MODE="0660", TAG+="uaccess"
+      KERNEL=="hidraw*", ATTRS{idVendor}=="2dc8", MODE="0660", TAG+="uaccess"
-    KERNEL=="hidraw*", ATTRS{idProduct}=="6012", ATTRS{idVendor}=="2dc8", MODE="0660", TAG+="uaccess"
+      KERNEL=="hidraw*", KERNELS=="*2DC8:*", MODE="0660", TAG+="uaccess"
-    KERNEL=="hidraw*", KERNELS=="*2DC8:6012*", MODE="0660", TAG+="uaccess"
+      KERNEL=="hidraw*", ATTRS{idProduct}=="6012", ATTRS{idVendor}=="2dc8", MODE="0660", TAG+="uaccess"
-  '';
+      KERNEL=="hidraw*", KERNELS=="*2DC8:6012*", MODE="0660", TAG+="uaccess"
+    '';
+
+    # Enable the X11 windowing system.
+    xserver.enable = true;
+
+    # Enable the KDE Plasma Desktop Environment.
+    # displayManager.sddm = {
+    #   enable = true;
+    #   wayland.enable = true;
+    # };
+    desktopManager.plasma6.notoPackage = pkgs.atkinson-hyperlegible;
+
+    # Enable flatpak support
+    flatpak.enable = true;
+    packagekit.enable = true;
+
+    mullvad-vpn.enable = true;
+
+    # Configure keymap in X11
+    xserver.xkb = {
+      layout = "us";
+      variant = "";
+      options = "terminate:ctrl_alt_bksp,compose:caps_toggle";
+    };
+
+    # Enable CUPS to print documents.
+    printing.enable = true;
+
+    # Enable fwupd daemon and user space client
+    fwupd.enable = true;
+    pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+      jack.enable = true;
+      wireplumber.enable = true;
+    };
+
+    avahi = {
+      nssmdns4 = true;
+      enable = true;
+      ipv4 = true;
+      ipv6 = true;
+      publish = {
+        enable = true;
+        addresses = true;
+        workstation = true;
+      };
+    };
+
+    pulseaudio.enable = false;
+  };
 
   environment.systemPackages = with pkgs;
     [
@@ -164,54 +217,6 @@
 
   # Set your time zone.
   time.timeZone = "Europe/Amsterdam";
-  services = {
-    # Enable the X11 windowing system.
-    xserver.enable = true;
-
-    # Enable the KDE Plasma Desktop Environment.
-    # displayManager.sddm = {
-    #   enable = true;
-    #   wayland.enable = true;
-    # };
-    desktopManager.plasma6.notoPackage = pkgs.atkinson-hyperlegible;
-
-    # Enable flatpak support
-    flatpak.enable = true;
-    packagekit.enable = true;
-
-    # Configure keymap in X11
-    xserver.xkb = {
-      layout = "us";
-      variant = "";
-      options = "terminate:ctrl_alt_bksp,compose:caps_toggle";
-    };
-
-    # Enable CUPS to print documents.
-    printing.enable = true;
-
-    # Enable fwupd daemon and user space client
-    fwupd.enable = true;
-    pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-      jack.enable = true;
-      wireplumber.enable = true;
-    };
-
-    avahi = {
-      nssmdns4 = true;
-      enable = true;
-      ipv4 = true;
-      ipv6 = true;
-      publish = {
-        enable = true;
-        addresses = true;
-        workstation = true;
-      };
-    };
-  };
   hardware = {
     graphics.enable32Bit = true;
 
@@ -219,8 +224,6 @@
     bluetooth.enable = true;
   };
   security.rtkit.enable = true;
-
-  services.pulseaudio.enable = false;
   virtualisation.podman = {
     enable = true;
     dockerCompat = true;