feat: add wallpaper as module, add optionals

profiles/common/home/packages.nix

@@ -60,20 +60,6 @@
     qmk
     qmk-udev-rules
 
-    # games
-    lutris
-    wine
-    libudev-zero
-    dwarfs
-    fuse-overlayfs
-    # steam
-    # steam-run
-    patchelf
-    gamescope
-    vulkan-tools
-    moonlight-qt
-    ns-usbloader
-
     # firefox related
     tridactyl-native
 

profiles/common/home/stylix.nix

@@ -46,6 +46,7 @@
       };
     };
 
+    image = config.swarselsystems.wallpaper;
     targets = {
       emacs.enable = false;
       waybar.enable = false;

profiles/common/nixos/stylix.nix

@@ -1,4 +1,4 @@
-{ pkgs, home-manager, ... }:
+{ inputs, pkgs, home-manager, config, ... }:
 {
   stylix = {
 
@@ -47,11 +47,14 @@
     };
 
     targets.grub.enable = false; # the styling makes grub more ugly
+    image = config.swarselsystems.wallpaper;
   };
   home-manager.users.swarsel = {
-    stylix.targets = {
-      emacs.enable = false;
-      waybar.enable = false;
+    stylix = {
+      targets = {
+        emacs.enable = false;
+        waybar.enable = false;
+      };
     };
   };
 }

profiles/fourside/default.nix

@@ -3,12 +3,17 @@
 
   imports = [
     inputs.nixos-hardware.nixosModules.lenovo-thinkpad-p14s-amd-gen2
+
     ./hardware-configuration.nix
     ./nixos.nix
+
+    ../optional/nixos/steam.nix
+    ../optional/nixos/virtualbox.nix
+
     inputs.home-manager.nixosModules.home-manager
     {
       home-manager.users.swarsel.imports = outputs.mixedModules ++ [
-        ./home.nix
+        ../optional/home/gaming.nix
       ] ++ (builtins.attrValues outputs.homeManagerModules);
     }
   ] ++ (builtins.attrValues outputs.nixosModules);
@@ -24,6 +29,11 @@
   #  ------   -----
   # | DP-4 | |eDP-1|
   #  ------   -----
+
+  swarselsystems = {
+    wallpaper = ../../wallpaper/lenovowp.png;
+  };
+
   home-manager.users.swarsel.swarselsystems = {
     isLaptop = true;
     isNixos = true;

profiles/fourside/nixos.nix

@@ -34,18 +34,7 @@
     };
   };
 
-  virtualisation.virtualbox = {
-    host = {
-      enable = true;
-      enableExtensionPack = true;
-    };
-    # leaving this here for future notice. setting guest.enable = true will make 'restarting sysinit-reactivation.target' take till timeout on nixos-rebuild switch
-    guest = {
-      enable = false;
-    };
-  };
 
-  stylix.image = ../../wallpaper/lenovowp.png;
 
   hardware = {
     graphics = {
@@ -64,12 +53,6 @@
     };
   };
 
-  programs.steam = {
-    enable = true;
-    extraCompatPackages = [
-      pkgs.proton-ge-bin
-    ];
-  };
 
   # Configure keymap in X11 (only used for login)
 
@@ -90,13 +73,6 @@
 
 
   environment.systemPackages = with pkgs; [
-    # gog games installing
-    heroic
-    # minecraft
-    temurin-bin-17
-    (prismlauncher.override {
-      glfw = pkgs.glfw-wayland-minecraft;
-    })
   ];
 
   system.stateVersion = "23.05";

profiles/optional/home/gaming.nix

@@ -0,0 +1,27 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    lutris
+    wine
+    libudev-zero
+    dwarfs
+    fuse-overlayfs
+    # steam
+    # steam-run
+    patchelf
+    gamescope
+    vulkan-tools
+    moonlight-qt
+    ns-usbloader
+
+    # gog games installing
+    heroic
+
+    # minecraft
+    temurin-bin-17
+    (prismlauncher.override {
+      glfw = pkgs.glfw-wayland-minecraft;
+    })
+  ];
+}

profiles/optional/nixos/steam.nix

@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+{
+
+  programs.steam = {
+    enable = true;
+    extraCompatPackages = [
+      pkgs.proton-ge-bin
+    ];
+  };
+}

profiles/optional/nixos/virtualbox.nix

@@ -0,0 +1,13 @@
+{ ... }:
+{
+  virtualisation.virtualbox = {
+    host = {
+      enable = true;
+      enableExtensionPack = true;
+    };
+    # leaving this here for future notice. setting guest.enable = true will make 'restarting sysinit-reactivation.target' take till timeout on nixos-rebuild switch
+    guest = {
+      enable = false;
+    };
+  };
+}