diff --git a/flake-parts/nixos/hosts.nix b/flake-parts/nixos/hosts.nix
index f43f216..2941936 100644
--- a/flake-parts/nixos/hosts.nix
+++ b/flake-parts/nixos/hosts.nix
@@ -28,6 +28,14 @@
       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;
+    };
+
     darwinModules.base = {...}: {
       imports = [
         ../../nixos/profiles/common.nix
diff --git a/home-manager/profiles/willem/darwin/base.nix b/home-manager/profiles/willem/darwin/base.nix
index 8d2820d..613eeed 100644
--- a/home-manager/profiles/willem/darwin/base.nix
+++ b/home-manager/profiles/willem/darwin/base.nix
@@ -38,6 +38,12 @@
       gptk-steam(){ wine-gptk "${config.home.homeDirectory}/.gptk_wineprefix/drive_c/Program\ Files\ \(x86\)/Steam/steam.exe"; }
     '';
 
+  programs.emacs.extraPackages = epkgs:
+    with epkgs; [
+      swift-mode
+      company-sourcekit
+    ];
+
   home.packages = with pkgs;
     [
       colima
diff --git a/home-manager/profiles/willem/programs/emacs/default.nix b/home-manager/profiles/willem/programs/emacs/default.nix
index 1a4d0d1..c8dc3e8 100644
--- a/home-manager/profiles/willem/programs/emacs/default.nix
+++ b/home-manager/profiles/willem/programs/emacs/default.nix
@@ -28,7 +28,6 @@
         all-the-icons
         all-the-icons-dired
         company-mode
-        company-sourcekit
         counsel
         dash
         editorconfig
@@ -51,7 +50,6 @@
         s
         separedit
         solarized-theme
-        swift-mode
         swiper
         yasnippet
       ])
diff --git a/nixos/hosts/winbox.nix b/nixos/hosts/winbox.nix
index a8ab3b7..03e703e 100644
--- a/nixos/hosts/winbox.nix
+++ b/nixos/hosts/winbox.nix
@@ -28,7 +28,7 @@
     fsType = "ext4";
   };
 
-  fileSystems."/boot/efi" = {
+  fileSystems."/boot" = {
     device = "/dev/disk/by-uuid/4FEE-904E";
     fsType = "vfat";
   };