rearrange imports

hardware/fcs-tristan-nixbook.nix

@@ -1,10 +1,12 @@
-{user}: {
+{
   config,
   lib,
   pkgs,
   modulesPath,
   ...
-}: {
+}: let
+  user = config.user;
+in {
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];

hardware/g920.nix

@@ -1,13 +1,6 @@
-{
-  pkgs,
-  user,
-}: {
-  home-manager.users.${user}.imports = [
-    {
-      home.packages = with pkgs; [
-        oversteer
-      ];
-    }
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    oversteer
   ];
 
   environment.etc.logitechG920 = {

hardware/vm.nix

@@ -1,18 +1,11 @@
-{user}: {
-  modulesPath,
-  lib,
-  config,
-  ...
-}: {
-  imports = [
-  ];
-
+{config, ...}: let
+  user = config.user;
+in {
   system.stateVersion = "24.05";
 
   home-manager.users.${user}.imports = [
     {
       home.stateVersion = "24.05";
     }
-    ../home/programs/sway.nix
   ];
 }

hardware/zenix.nix

@@ -1,14 +1,16 @@
-{user}: {
+{
   config,
   lib,
   pkgs,
   modulesPath,
   ...
-}: {
+}: let
+  user = config.user;
+in {
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
     ./ddc.nix
-    (import ./g920.nix {inherit user pkgs;})
+    ./g920.nix
   ];
 
   boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
@@ -79,12 +81,6 @@
 
   system.stateVersion = "22.11"; # do not change
 
-  virtualisation = {
-    podman = {
-      enable = true;
-    };
-  };
-
   home-manager.users.${user}.imports = [
     {
       home.stateVersion = "22.05";