convert staubfinger to functions

flake.nix

@@ -72,10 +72,11 @@
             }
           ];
         };
-        staubfinger = nixpkgs.lib.nixosSystem {
-          inherit system pkgs;
-          modules = [
-            ./systems/staubfinger/configuration.nix
+        staubfinger = mkComputer
+          ./systems/staubfinger/configuration.nix
+          ./modules/desktop.nix
+          ./hardware/bluetooth
+          [
             nixos-hardware.nixosModules.common-pc-laptop
             nixos-hardware.nixosModules.common-pc-laptop-ssd
             home-manager.nixosModules.home-manager
@@ -88,7 +89,6 @@
                 };
             }
           ];
-        };
         nixos-vm = nixpkgs.lib.nixosSystem {
           inherit system pkgs;
           modules = [

systems/staubfinger/configuration.nix

@@ -1,17 +1,11 @@
 { ... }:
-
 {
   imports =
     [
-      # Include the results of the hardware scan.
-      ../../modules/desktop.nix
-      ../../hardware/bluetooth
       ./hardware-configuration.nix
     ];
 
-  networking.hostName = "staubfinger"; # Define your hostname.
-
+  networking.hostName = "staubfinger";
   virtualisation.virtualbox.host.enable = true;
-
 }
 

systems/staubfinger/hardware-configuration.nix

@@ -1,5 +1,4 @@
 { ... }:
-
 {
   boot.initrd.availableKernelModules = [
     "aesni_intel"
@@ -15,18 +14,16 @@
   boot.kernelParams = [
     "acpi_osi="
   ];
-
   boot.initrd.luks.devices."cryptlvm".device = "/dev/sda2";
+
   fileSystems."/" = {
     device = "/dev/disk/by-label/nixos";
     fsType = "ext4";
   };
-
   fileSystems."/boot" = {
     device = "/dev/disk/by-label/BOOT";
     fsType = "vfat";
   };
-
   swapDevices = [
     { device = "/dev/disk/by-label/swap"; }
   ];