configuration/Tone.nix

@@ -11,10 +11,6 @@
     etc."ppp/options".text = ''
       ipcp-accept-remote
     '';
-    systemPackages = with pkgs; [openfortivpn];
-  };
-  services = {
-    samba.enable = true;
-    hardware.bolt.enable = true;
+    systemPackages = with pkgs; [openfortivpn samba];
   };
 }

configuration/default.nix

@@ -102,7 +102,6 @@
       useStockConfig = true;
     };
   };
-  security.rtkit.enable = true;
   virtualisation.podman.enable = true;
   time.timeZone = "Europe/London";
   i18n.defaultLocale = "en_GB.UTF-8";

configuration/desktop.nix

@@ -7,7 +7,10 @@
   imports = [./default.nix];
   nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland";
   system.autoUpgrade.operation = "boot";
-  hardware.bluetooth.enable = true;
+  hardware = {
+    pulseaudio.enable = true;
+    bluetooth.enable = true;
+  };
   environment = {
     plasma6 =
       lib.mkIf config.services.desktopManager.plasma6.enable
@@ -30,14 +33,6 @@
   services = {
     flatpak.enable = true;
     printing.enable = true;
-    pipewire = {
-      enable = true;
-      pulse.enable = true;
-      alsa = {
-        enable = true;
-        support32Bit = true;
-      };
-    };
     xserver = {
       enable = true;
       xkb = {