boxes/mlg/default.nix

@@ -2,7 +2,7 @@
 
 {
   imports = [
-#    ./hardware-configuration.nix
+    ./hardware-configuration.nix
     ./nvidia.nix
     ../../modules/bootstrap.nix
     ../../modules/common.nix

boxes/virtbox/home.nix

@@ -1,9 +0,0 @@
-{ lib, inputs, config, pkgs, home, ... }:
-
-{
-  imports = [
-    ../../home/x11.nix
-  ];
-
-  home.stateVersion = "23.11";
-}

boxes/x230t/default.nix

@@ -1,18 +0,0 @@
-{ lib, config, pkgs, ...}:
-
-{
-  imports = [
-    ./hardware-configuration.nix
-    ../../modules/bootstrap.nix
-    ../../modules/common.nix
-    ../../modules/x11.nix
-    ../../modules/tlp.nix
-  ];
-
-  boot.loader.grub.enable = true;
-  boot.loader.grub.device = "/dev/sda";
-
-  networking.hostName = "x230t";
-
-  system.stateVersion = "23.11";
-}

boxes/x230t/hardware-configuration.nix

@@ -1,33 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/99d9f4ba-5781-4f2d-aa15-f1f911658913";
-      fsType = "ext4";
-    };
-
-  swapDevices = [ ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp0s25.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}

boxes/x230t/home.nix

@@ -1,10 +0,0 @@
-{ lib, inputs, config, pkgs, home, ... }:
-
-{
-  imports = [
-    ../../home/x11.nix
-    ../../home/chromium
-  ];
-
-  home.stateVersion = "23.11";
-}

builds/flake.nix

@@ -10,6 +10,9 @@
         lib.fold lib.recursiveUpdate { } (
           map f [
             "x86_64-linux"
+            "x86_64-darwin"
+            "aarch64-linux"
+            "aarch64-darwin"
           ]
         );
       mkPackages = pkgs: {

builds/utils.nix

@@ -4,7 +4,6 @@
 , bash
 , feh
 , jq
-, fzy
 , figlet
 , curl
 , xrandr
@@ -18,7 +17,7 @@ stdenv.mkDerivation rec {
   src = ./utils;
 
   nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ bash feh xrandr jq curl fzy ];
+  buildInputs = [ bash feh xrandr jq curl ];
 
   buildPhase = "";
 

flake.lock

@@ -91,12 +91,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-PYg0MoGsZWtACHUwF/teZJ96wUhDs3rHgTe2A0sMQ/A=",
+        "narHash": "sha256-xCQE9SSKWjmoYOaIkzdlGULeGbEF9Gau5TPgYJxalmw=",
-        "path": "/nix/store/lnr366wiqiliymnv4j8h8j01m7mvcb5w-source/builds",
+        "path": "/nix/store/ngxkaia0jmb6bfn1i5blvqaggxb8sy3f-source/builds",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/lnr366wiqiliymnv4j8h8j01m7mvcb5w-source/builds",
+        "path": "/nix/store/ngxkaia0jmb6bfn1i5blvqaggxb8sy3f-source/builds",
         "type": "path"
       }
     }

flake.nix

@@ -24,13 +24,13 @@
         specialArgs = { inherit inputs; };
         modules = [
           ./boxes/virtbox
-        ];
+          home-manager.nixosModules.home-manager
-      };
+          {
-      x230t = nixpkgs.lib.nixosSystem {
+            home-manager.useGlobalPkgs = true;
-        system = "x86_64-linux";
+            home-manager.useUserPackages = true;
-        specialArgs = { inherit inputs; };
+            home-manager.extraSpecialArgs = { inherit inputs; };
-        modules = [
+            home-manager.users.usr = import ./boxes/virtbox/home.nix;
-          ./boxes/x230t
+          }
         ];
       };
       mainsail = nixpkgs.lib.nixosSystem {
@@ -38,31 +38,15 @@
         specialArgs = { inherit inputs; };
         modules = [
           ./boxes/mainsail
+          home-manager.nixosModules.home-manager
+          {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            home-manager.extraSpecialArgs = { inherit inputs; };
+            home-manager.users.usr = import ./boxes/mainsail/home.nix;
+          }
         ];
       };
     };
-    homeConfigurations = {
-      "usr@x230t" = home-manager.lib.homeManagerConfiguration {
-        pkgs = nixpkgs.legacyPackages.x86_64-linux;
-	extraSpecialArgs = { inherit inputs; };
-	modules = [
-	  ./boxes/x230t/home.nix
-	];
-      };
-      "usr@mainsail" = home-manager.lib.homeManagerConfiguration {
-        pkgs = nixpkgs.legacyPackages.x86_64-linux;
-	extraSpecialArgs = { inherit inputs; };
-	modules = [
-	  ./boxes/x230t/home.nix
-	];
-      };
-      "usr@virtbox" = home-manager.lib.homeManagerConfiguration {
-        pkgs = nixpkgs.legacyPackages.x86_64-linux;
-	extraSpecialArgs = { inherit inputs; };
-	modules = [
-	  ./boxes/x230t/home.nix
-	];
-      };
-    };
   };
 }

home/chromium/default.nix

@@ -1,12 +0,0 @@
-{ lib, inputs, config, pkgs, home, ... }:
-
-{
-  home.packages = with pkgs; [
-    ungoogled-chromium
-  ];
-
-  programs.chromium = {
-    enable = true;
-    package = pkgs.ungoogled-chromium;
-  };
-}

modules/bootstrap.nix

@@ -1,6 +1,10 @@
 { config, pkgs, ... }:
 
 {
+  imports = [
+    ./hardware-configuration.nix
+  ];
+
   environment.systemPackages = with pkgs; [
     git
     neovim

modules/tlp.nix

@@ -1,5 +0,0 @@
-{ lib, config, pkgs, inputs, ...}:
-
-{
-  services.tlp.enable = true;
-}