diff --git a/flake.nix b/flake.nix
index 7907215..a8ce297 100644
--- a/flake.nix
+++ b/flake.nix
@@ -45,6 +45,7 @@
 
     outputs = { self, nixpkgs, home-manager, ... } @ inputs: {
 
+
         nixosConfigurations = {
         
             homebox = nixpkgs.lib.nixosSystem {
@@ -177,5 +178,7 @@
                 };
             };
         };
+        
+        iso = self.nixosConfigurations.iso.config.system.build.images.iso;
     };
 }
diff --git a/system-config/configuration/iso/default.nix b/system-config/configuration/iso/default.nix
index ebfbfdf..24b3732 100644
--- a/system-config/configuration/iso/default.nix
+++ b/system-config/configuration/iso/default.nix
@@ -2,14 +2,8 @@
 
     imports = with inputs; [
         
-        disko.nixosModules.default
-
-        (import ./disko.nix { device = "/dev/mmcblk0"; })
-
         (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix")
         
-        sops-nix.nixosModules.sops
-
         home-manager.nixosModules.default
 
     ];
@@ -25,14 +19,21 @@
             };
         };
 
+        users.users."nathan" = {
+            hashedPassword = "$y$j9T$F0pn6l4C45lz4a0FTZLqE0$Fc48Ptbmz/3MJCk/Jsaqop4ff.bY3J3GcjhmJx5R7k6";
+            packages = with pkgs; [ 
+                git 
+                inputs.disko.packages.${pkgs.system}.disko 
+                inputs.disko.packages.${pkgs.system}.disko-install 
+            ];
+        };
+
         sysconfig = {
-            remoteBuildClient = true;
-            host = "live";
+            host = "iso";
             graphical = true;
             users = {
                 nathan = {
                     extraGroups = [ "wheel" "networkmanager" ];
-                    hashedPasswordFile = config.sops.secrets."nathan/pass".path;
                     shell = pkgs.zsh;
                     home-manager = {
                         enable = true;
@@ -46,10 +47,9 @@
                                 wal.enable = true;
                                 mpd.enable = true;
                                 hyprpanel.enable = true;
-                                calcurse.enable = true;
                                 rofi.enable = true;
                                 firefox.enable = true;
-                                git.enable = true;
+                                git.enable = false;
                                 nh.enable = true;
                             };
                         } 
diff --git a/system-config/configuration/laptop/default.nix b/system-config/configuration/laptop/default.nix
index bdbb036..503419a 100644
--- a/system-config/configuration/laptop/default.nix
+++ b/system-config/configuration/laptop/default.nix
@@ -12,6 +12,11 @@
 
     config = {
 
+        services.desktopManager.cosmic = {
+            enable = true;
+            xwayland.enable = true;
+        };
+
         nixpkgs.config = {
             allowUnfree = true;
         };