diff --git a/etc/nixos/compose.nix b/etc/nixos/compose.nix
index c085bae..aa9d4f9 100644
--- a/etc/nixos/compose.nix
+++ b/etc/nixos/compose.nix
@@ -1,17 +1,15 @@
-{ config, lib, inputs, pkgs, settings, ... }: let
+{ home-manager, config, lib, inputs, pkgs, settings, ... }: let
   unstable = import inputs.nixpkgs-unstable { inherit (pkgs) system; };
 in {
   imports = [ ./hardware-configuration.nix ];
 
-  boot.readOnlyNixStore = true;
-  boot.initrd.compressor = "zstd";
   boot = {
     readOnlyNixStore = true;
     initrd.compressor = "zstd";
     loader.systemd-boot.enable = true;
     loader.systemd-boot.editor = false;
     loader.systemd-boot.configurationLimit = 25;
-    loader.canTouchEfiVariables = true;
+    loader.efi.canTouchEfiVariables = true;
     kernelParams = [
       "nvidia_drm"
       "nvidia_modeset"
@@ -41,18 +39,13 @@ in {
 
   security = {
     sudo.enable = false;
-    security.doas = {
+    doas = {
       enable = true;
       extraRules = [{ users = [ "coast" ]; keepEnv = true; persist = true; }];
     };
   };
 
-  home-manager.nixosModules.home-manager {
-    home-manager.useGlobalPkgs = true;
-    home-manager.useUserPackages = true;
-    home-manager.users.coast = import ./home.nix;
-    home-manager.backupFileExtension = "home-backup";
-  };
+
 
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 }
diff --git a/etc/nixos/create.nix b/etc/nixos/create.nix
index 5f6d556..108cd73 100644
--- a/etc/nixos/create.nix
+++ b/etc/nixos/create.nix
@@ -1,14 +1,11 @@
 { config, pkgs, ... }: {
 
-  xdg.portal.enable = true;
-  xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-wlr ];
   services = {
     xserver = {
       enable = true;
       videoDrivers = ["nvidia"];
       windowManager.qtile.enable = true;
     };
-    flatpak.enable = true;
 
     displayManager.ly.enable = true;
     blueman.enable = true;
diff --git a/etc/nixos/flake.nix b/etc/nixos/flake.nix
index 75b1763..58f968c 100644
--- a/etc/nixos/flake.nix
+++ b/etc/nixos/flake.nix
@@ -15,8 +15,13 @@
         inherit system;
         modules = [
           ./compose.nix
-          ./create.nix
-          {
+          ./create.nix  home-manager.nixosModules.home-manager {
+              home-manager.useGlobalPkgs = true;
+              home-manager.useUserPackages = true;
+              home-manager.users.coast = import ./home.nix;
+              home-manager.backupFileExtension = "home-backup";
+              }
+              {
               environment.systemPackages = with pkgs; [
               (lib.hiPrio pkgs-unstable.uutils-coreutils-noprefix)
               (pkgs.runCommand "vim-wrapper" { } '' mkdir -p $out/bin; ln -s ${pkgs.neovim}/bin/nvim $out/bin/vim '')