cleanup a bit

flake.nix

@@ -59,14 +59,12 @@
     nixosConfigurations."kop-pc" = nixpkgs-unstable.lib.nixosSystem {
         inherit system;
         specialArgs = {
-          vars = import ./systems/userdata-default.nix // import ./systems/pc/userdata.nix;
           pkgsVersion = nixpkgs-unstable;
           inherit inputs outputs;
         };
         modules = [
           ./modules
           ./users/kopatz
-          ./modules/collections/desktop.nix
           ./systems/pc/configuration.nix
          ({ config, pkgs, ... }: { nixpkgs.overlays = with outputs.overlays; [additions modifications unstable-packages nur.overlay]; })
           agenix.nixosModules.default

modules/collections/desktop.nix

@@ -1,53 +1 @@
-{pkgs, config, ...}:
-{
-  imports = [
-    #../fh/scanning.nix
-    ../flatpak.nix
-    ../gpg.nix
-    ../kernel.nix # use latest kernel
-    ../services/syncthing.nix
-    ../support/ntfs.nix
-  ];
 
-  custom = {
-    tmpfs.enable = true;
-    wireshark.enable = true;
-    virt-manager.enable = true;
-    nftables.enable = true;
-    cli-tools.enable = true;
-    nix = {
-      index.enable = true;
-      ld.enable = true;
-      settings.enable = true;
-    };
-    static-ip = {
-      enable = true;
-      interface = "enp42s0";
-      ip = "192.168.0.11";
-      dns = "192.168.0.10";
-    };
-    misc = {
-      docker.enable = true;
-    };
-    hardware = {
-      vfio.enable = true;
-      nvidia.enable = true;
-      firmware.enable = true;
-      ssd.enable = true;
-      wooting.enable = true;
-    };
-    graphical = {
-      audio.enable = true;
-      code.enable = true;
-      emulators.enable = true;
-      gamemode.enable = true;
-      games.enable = true;
-      ime.enable = true;
-      noise-supression.enable = true;
-      obs.enable = true;
-      openrgb.enable = true;
-      plasma.enable = true;
-      shared.enable = true;
-    };
-  };
-}

systems/pc/configuration.nix

@@ -8,8 +8,55 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
+      ../../modules/flatpak.nix
+      ../../modules/gpg.nix
+      ../../modules/kernel.nix # use latest kernel
+      ../../modules/services/syncthing.nix
+      ../../modules/support/ntfs.nix
     ];
 
+  custom = {
+    tmpfs.enable = true;
+    wireshark.enable = true;
+    virt-manager.enable = true;
+    nftables.enable = true;
+    cli-tools.enable = true;
+    nix = {
+      index.enable = true;
+      ld.enable = true;
+      settings.enable = true;
+    };
+    static-ip = {
+      enable = true;
+      interface = "enp42s0";
+      ip = "192.168.0.11";
+      dns = "192.168.0.10";
+    };
+    misc = {
+      docker.enable = true;
+    };
+    hardware = {
+      vfio.enable = true;
+      nvidia.enable = true;
+      firmware.enable = true;
+      ssd.enable = true;
+      wooting.enable = true;
+    };
+    graphical = {
+      audio.enable = true;
+      code.enable = true;
+      emulators.enable = true;
+      gamemode.enable = true;
+      games.enable = true;
+      ime.enable = true;
+      noise-supression.enable = true;
+      obs.enable = true;
+      openrgb.enable = true;
+      plasma.enable = true;
+      shared.enable = true;
+    };
+  };
+
   mainUser.layout = "de";
   mainUser.variant = "us";
   age.identityPaths = [ /home/kopatz/.ssh/id_rsa ];

systems/pc/userdata.nix

@@ -1,10 +0,0 @@
-
-{
-  interface = "enp42s0";
-  ipv4 = "192.168.0.11";
-  dns = "192.168.0.6";
-# IOMMU Group 16 2b:00.0 VGA compatible controller [0300]: NVIDIA Corporation GA102 [GeForce RTX 3090] [10de:2204] (rev a1)
-# IOMMU Group 16 2b:00.1 Audio device [0403]: NVIDIA Corporation GA102 High Definition Audio Controller [10de:1aef] (rev a1)
-  gpu_vga = "10de:2204";
-  gpu_audio = "10de:1aef";
-}