From 0f4f700ef1e379d10f0c3f1e2635ae8553cf073c Mon Sep 17 00:00:00 2001
From: willemml <willem@leit.so>
Date: Wed, 8 Nov 2023 15:52:41 -0800
Subject: [PATCH] Fixes home-manager stateVersion definition

---
 flake-parts/nixos/hosts.nix           | 11 +----------
 home-manager/profiles/willem/base.nix |  1 +
 nixos/hosts/winbox.nix                |  3 +++
 nixos/modules/vm.nix                  |  2 --
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/flake-parts/nixos/hosts.nix b/flake-parts/nixos/hosts.nix
index 887834c..f43f216 100644
--- a/flake-parts/nixos/hosts.nix
+++ b/flake-parts/nixos/hosts.nix
@@ -28,14 +28,6 @@
       home-manager.users.willem = self.homeManagerModules.user-willem-linux;
     };
 
-    nixosModules.willem-hyprland = {...}: {
-      imports = [
-        inputs.home-manager.nixosModules.home-manager
-        self.nixosModules.homeManagerIntegration
-      ];
-      home-manager.users.willem = self.homeManagerModules.user-willem-linux // self.homeManagerModules.hyprland;
-    };
-
     darwinModules.base = {...}: {
       imports = [
         ../../nixos/profiles/common.nix
@@ -51,10 +43,9 @@
       system = "x86_64-linux";
       modules = [
         self.nixosModules.base
-        self.nixosModules.willem-hyprland
+        self.nixosModules.willem-home
         ../../nixos/hosts/winbox.nix
       ];
-      home-manager.users.willem.home.stateVersion = "23.05";
 
       specialArgs = {inherit inputs;};
     };
diff --git a/home-manager/profiles/willem/base.nix b/home-manager/profiles/willem/base.nix
index e3d7372..bafc58b 100644
--- a/home-manager/profiles/willem/base.nix
+++ b/home-manager/profiles/willem/base.nix
@@ -7,6 +7,7 @@
   emacsCommand = "emacsclient -c -nw";
 in rec {
   home = {
+    stateVersion = "23.05";
     keyboard = {
       layout = "us";
       variant = "colemak";
diff --git a/nixos/hosts/winbox.nix b/nixos/hosts/winbox.nix
index fc76cd9..a8ab3b7 100644
--- a/nixos/hosts/winbox.nix
+++ b/nixos/hosts/winbox.nix
@@ -14,6 +14,9 @@
   boot.kernelModules = ["amdgpu"];
   boot.extraModulePackages = [];
 
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
   hardware.opengl.driSupport = true;
 
   hardware.opengl.extraPackages = with pkgs; [
diff --git a/nixos/modules/vm.nix b/nixos/modules/vm.nix
index 984467d..db41eb1 100644
--- a/nixos/modules/vm.nix
+++ b/nixos/modules/vm.nix
@@ -7,8 +7,6 @@
     "${modulesPath}/virtualisation/qemu-vm.nix"
   ];
 
-  system.stateVersion = lib.mkDefault "23.05";
-
   console.keyMap = lib.mkDefault "colemak";
 
   security.sudo.wheelNeedsPassword = false;