move more modules

flake.nix

@@ -129,6 +129,11 @@
                 "nix-command"
                 "flakes"
               ];
+
+              documentation = {
+                info.enable = false; # info pages and the info command
+                doc.enable = false; # documentation distributed in packages' /share/doc
+              };
             }
 
             ./nixosConfigurations/${device}
@@ -140,7 +145,6 @@
             self.nixosModules.tailscale
             self.nixosModules.allowed-unfree-list
             self.nixosModules.extra-caches
-            ./modules/nixpkgs.nix
 
             zerforschen-plus.nixosModules.default
           ]

home/vinzenz/configuration.nix

@@ -56,6 +56,8 @@
     icu
 
     nextcloud-client
+
+    lutris
   ];
 
   home.file = {

modules/amd-graphics.nix

@@ -1,22 +0,0 @@
-{ pkgs, config, ... }:
-{
-  config = {
-    boot.kernelModules = [ "amdgpu" ];
-    services.xserver.videoDrivers = [ "amdgpu" ];
-
-    hardware = {
-      graphics.enable = true;
-      amdgpu = {
-        opencl.enable = true;
-        amdvlk = {
-          # TODO: this creates black borders around GNOME apps
-          # enable = true;
-          # support32Bit.enable = config.hardware.graphics.enable32Bit;
-        };
-        overdrive.enable = true;
-      };
-    };
-
-    environment.systemPackages = with pkgs; [ nvtopPackages.amd ];
-  };
-}

modules/gaming.nix

@@ -19,12 +19,7 @@
       mangohud
       vulkan-tools
       glxinfo
-      lutris
     ];
 
-    networking.firewall.allowedUDPPorts = [
-      # Factorio
-      34197
-    ];
   };
 }

modules/nixpkgs.nix

@@ -1,9 +0,0 @@
-{
-  documentation = {
-    enable = true; # documentation of packages
-    nixos.enable = false; # nixos documentation
-    man.enable = true; # manual pages and the man command
-    info.enable = false; # info pages and the info command
-    doc.enable = false; # documentation distributed in packages' /share/doc
-  };
-}

nixosConfigurations/vinzenz-lpt2/hardware.nix

@@ -1,6 +1,6 @@
-{ lib, ... }:
+{ lib, vinzenzNixosModules, ... }:
 {
-  imports = [ ../../modules/intel-graphics.nix ];
+  imports = [ vinzenzNixosModules.intel-graphics ];
   config = {
     # intel cpu
     boot.kernelModules = [

nixosConfigurations/vinzenz-pc2/configuration.nix

@@ -1,36 +1,34 @@
 { pkgs, ... }:
 {
-  imports = [
+  nix.settings.extra-platforms = [
-    ./hardware.nix
+    "aarch64-linux"
-    ./vscode-server.nix
+    "i686-linux"
-    ./hass.nix
   ];
-  config = {
-    nix.settings.extra-platforms = [
-      "aarch64-linux"
-      "i686-linux"
-    ];
 
-    services.xserver.xkb = {
+  services.xserver.xkb = {
-      # Configure keymap in X11
+    # Configure keymap in X11
-      layout = "de";
+    layout = "de";
-      variant = "";
+    variant = "";
-    };
-
-    # Configure console keymap
-    console.keyMap = "de";
-
-    users.users.vinzenz.openssh.authorizedKeys.keys = [
-      ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINrY6tcgnoC/xbgL7vxSjddEY9MBxRXe9n2cAHt88/TT home roaming''
-      ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH''
-      ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDNpLDmctyqGpow/ElQvdhY4BLBPS/sigDJ1QEcC7wC vinzenz-lpt2-roaming''
-    ];
-
-    users.users.ronja.openssh.authorizedKeys.keys = [
-      ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIALWKm+d6KL6Vl3grPOcGouiNTkvdhXuWJmcrdEBY2nw ssh-host-key''
-      ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEgN6J8KyVyQqBAz+y3drXDmIsxOPkdPB+ISgpIP9Eld Generated By Termius''
-    ];
-
-    environment.systemPackages = with pkgs; [ lact ];
   };
+
+  # Configure console keymap
+  console.keyMap = "de";
+
+  users.users.vinzenz.openssh.authorizedKeys.keys = [
+    ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINrY6tcgnoC/xbgL7vxSjddEY9MBxRXe9n2cAHt88/TT home roaming''
+    ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH''
+    ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDNpLDmctyqGpow/ElQvdhY4BLBPS/sigDJ1QEcC7wC vinzenz-lpt2-roaming''
+  ];
+
+  users.users.ronja.openssh.authorizedKeys.keys = [
+    ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIALWKm+d6KL6Vl3grPOcGouiNTkvdhXuWJmcrdEBY2nw ssh-host-key''
+    ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEgN6J8KyVyQqBAz+y3drXDmIsxOPkdPB+ISgpIP9Eld Generated By Termius''
+  ];
+
+  environment.systemPackages = with pkgs; [ lact ];
+
+  networking.firewall.allowedUDPPorts = [
+    # Factorio
+    34197
+  ];
 }

nixosConfigurations/vinzenz-pc2/default.nix

@@ -3,6 +3,8 @@
   imports = [
     ./configuration.nix
     ./hardware.nix
+    ./vscode-server.nix
+    ./hass.nix
 
     ../../modules/gnome.nix
     ../../modules/gaming.nix

nixosConfigurations/vinzenz-pc2/hardware.nix

@@ -1,6 +1,6 @@
-{ ... }:
+{ vinzenzNixosModules, ... }:
 {
-  imports = [ ../../modules/amd-graphics.nix ];
+  imports = [ vinzenzNixosModules.amd-graphics ];
   config = {
     # amd cpu
     boot.kernelModules = [ "kvm-amd" ];

nixosConfigurations/vinzenz-pc2/vscode-server.nix

@@ -15,16 +15,12 @@
     ];
   };
 
-  networking = {
+  networking.firewall.allowedTCPPorts = [
-    firewall = {
+    8542
-      allowedTCPPorts = [
+    8543
-        8542
+    8544
-        8543
+    80
-        8544
+    1313
-        80
+    5201
-        1313
+  ];
-        5201
-      ];
-    };
-  };
 }

nixosModules/amd-graphics.nix

@@ -0,0 +1,20 @@
+{ pkgs, ... }:
+{
+  boot.kernelModules = [ "amdgpu" ];
+  services.xserver.videoDrivers = [ "amdgpu" ];
+
+  hardware = {
+    graphics.enable = true;
+    amdgpu = {
+      opencl.enable = true;
+      amdvlk = {
+        # TODO: this creates black borders around GNOME apps
+        # enable = true;
+        # support32Bit.enable = config.hardware.graphics.enable32Bit;
+      };
+      overdrive.enable = true;
+    };
+  };
+
+  environment.systemPackages = with pkgs; [ nvtopPackages.amd ];
+}