diff --git a/nixos.nix b/nixos.nix
index 85fd5e5f..acf39e49 100644
--- a/nixos.nix
+++ b/nixos.nix
@@ -9,6 +9,17 @@
     ./private/profile/nixos
   ];
 
+  options = {
+    deploy.profile.kat = lib.mkEnableOption "uhh meow" // { default = true; };
+    deploy.profile.gui = lib.mkEnableOption "graphical system" // {
+      default = true;
+    };
+    deploy.profile.sway = lib.mkEnableOption "sway wm" // { default = true; };
+    deploy.profile.laptop = lib.mkEnableOption "lappytop" // {
+      default = true;
+    };
+  };
+
   options.home-manager.users = lib.mkOption {
     type = lib.types.attrsOf (lib.types.submoduleWith {
       modules = [ ];
@@ -22,12 +33,28 @@
 
   config = {
     home-manager = {
+
       useUserPackages = true;
       useGlobalPkgs = true;
 
       users = {
         kat = {
           imports = [ ./home.nix (import (./hosts + "/${hostName}/home")) ];
+
+          options = {
+            deploy.profile.kat = lib.mkEnableOption "uhh meow" // {
+              default = true;
+            };
+            deploy.profile.gui = lib.mkEnableOption "graphical system" // {
+              default = true;
+            };
+            deploy.profile.sway = lib.mkEnableOption "sway wm" // {
+              default = true;
+            };
+            deploy.profile.laptop = lib.mkEnableOption "lappytop" // {
+              default = true;
+            };
+          };
         };
       };
     };
diff --git a/profiles/gui/home.nix b/profiles/gui/home.nix
index 442d5a07..36abc3ac 100644
--- a/profiles/gui/home.nix
+++ b/profiles/gui/home.nix
@@ -2,10 +2,4 @@
 
 {
   imports = [ ./home ];
-
-  options = {
-    deploy.profile.gui = lib.mkEnableOption "graphical system" // {
-      default = true;
-    };
-  };
 }
diff --git a/profiles/gui/nixos.nix b/profiles/gui/nixos.nix
index 5c36ca3c..47eb0b4d 100644
--- a/profiles/gui/nixos.nix
+++ b/profiles/gui/nixos.nix
@@ -3,11 +3,5 @@
 {
   imports = [ ./nixos ];
 
-  options = {
-    deploy.profile.gui = lib.mkEnableOption "graphical system" // {
-      default = true;
-    };
-  };
-
-  config = { home-manager.users.kat = { imports = [ ./home.nix ]; }; };
+  home-manager.users.kat = { imports = [ ./home.nix ]; };
 }
diff --git a/profiles/kat/home.nix b/profiles/kat/home.nix
index dd8b62e4..36abc3ac 100644
--- a/profiles/kat/home.nix
+++ b/profiles/kat/home.nix
@@ -2,13 +2,4 @@
 
 {
   imports = [ ./home ];
-
-  #home-manager.useGlobalPkgs = true;
-  #home-manager.users.kat = {
-  #  imports = [ ../../../modules/home ];
-  #};
-
-  options = {
-    deploy.profile.kat = lib.mkEnableOption "uhh meow" // { default = true; };
-  };
 }
diff --git a/profiles/kat/nixos.nix b/profiles/kat/nixos.nix
index 5e3f914b..df30b751 100644
--- a/profiles/kat/nixos.nix
+++ b/profiles/kat/nixos.nix
@@ -1,24 +1,17 @@
 { config, pkgs, lib, ... }:
 
 {
-  config = {
-    home-manager.users.kat = { imports = [ ./home.nix ]; };
+  home-manager.users.kat = { imports = [ ./home.nix ]; };
 
-    users.users.kat = {
-      uid = 1000;
-      isNormalUser = true;
-      openssh.authorizedKeys.keys = [
-        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCocjQqiDIvzq+Qu3jkf7FXw5piwtvZ1Mihw9cVjdVcsra3U2c9WYtYrA3rS50N3p00oUqQm9z1KUrvHzdE+03ZCrvaGdrtYVsaeoCuuvw7qxTQRbItTAEsfRcZLQ5c1v/57HNYNEsjVrt8VukMPRXWgl+lmzh37dd9w45cCY1QPi+JXQQ/4i9Vc3aWSe4X6PHOEMSBHxepnxm5VNHm4PObGcVbjBf0OkunMeztd1YYA9sEPyEK3b8IHxDl34e5t6NDLCIDz0N/UgzCxSxoz+YJ0feQuZtud/YLkuQcMxW2dSGvnJ0nYy7SA5DkW1oqcy6CGDndHl5StOlJ1IF9aGh0gGkx5SRrV7HOGvapR60RphKrR5zQbFFka99kvSQgOZqSB3CGDEQGHv8dXKXIFlzX78jjWDOBT67vA/M9BK9FS2iNnBF5x6shJ9SU5IK4ySxq8qvN7Us8emkN3pyO8yqgsSOzzJT1JmWUAx0tZWG/BwKcFBHfceAPQl6pwxx28TM3BTBRYdzPJLTkAy48y6iXW6UYdfAPlShy79IYjQtEThTuIiEzdzgYdros0x3PDniuAP0KOKMgbikr0gRa6zahPjf0qqBnHeLB6nHAfaVzI0aNbhOg2bdOueE1FX0x48sjKqjOpjlIfq4WeZp9REr2YHEsoLFOBfgId5P3BPtpBQ== cardno:000612078454"
-      ];
-      shell = pkgs.zsh;
-      extraGroups = [ "wheel" "video" ];
-      hashedPassword =
-        "$6$i28yOXoo$/WokLdKds5ZHtJHcuyGrH2WaDQQk/2Pj0xRGLgS8UcmY2oMv3fw2j/85PRpsJJwCB2GBRYRK5LlvdTleHd3mB.";
-    };
+  users.users.kat = {
+    uid = 1000;
+    isNormalUser = true;
+    openssh.authorizedKeys.keys = [
+      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCocjQqiDIvzq+Qu3jkf7FXw5piwtvZ1Mihw9cVjdVcsra3U2c9WYtYrA3rS50N3p00oUqQm9z1KUrvHzdE+03ZCrvaGdrtYVsaeoCuuvw7qxTQRbItTAEsfRcZLQ5c1v/57HNYNEsjVrt8VukMPRXWgl+lmzh37dd9w45cCY1QPi+JXQQ/4i9Vc3aWSe4X6PHOEMSBHxepnxm5VNHm4PObGcVbjBf0OkunMeztd1YYA9sEPyEK3b8IHxDl34e5t6NDLCIDz0N/UgzCxSxoz+YJ0feQuZtud/YLkuQcMxW2dSGvnJ0nYy7SA5DkW1oqcy6CGDndHl5StOlJ1IF9aGh0gGkx5SRrV7HOGvapR60RphKrR5zQbFFka99kvSQgOZqSB3CGDEQGHv8dXKXIFlzX78jjWDOBT67vA/M9BK9FS2iNnBF5x6shJ9SU5IK4ySxq8qvN7Us8emkN3pyO8yqgsSOzzJT1JmWUAx0tZWG/BwKcFBHfceAPQl6pwxx28TM3BTBRYdzPJLTkAy48y6iXW6UYdfAPlShy79IYjQtEThTuIiEzdzgYdros0x3PDniuAP0KOKMgbikr0gRa6zahPjf0qqBnHeLB6nHAfaVzI0aNbhOg2bdOueE1FX0x48sjKqjOpjlIfq4WeZp9REr2YHEsoLFOBfgId5P3BPtpBQ== cardno:000612078454"
+    ];
+    shell = pkgs.zsh;
+    extraGroups = [ "wheel" "video" ];
+    hashedPassword =
+      "$6$i28yOXoo$/WokLdKds5ZHtJHcuyGrH2WaDQQk/2Pj0xRGLgS8UcmY2oMv3fw2j/85PRpsJJwCB2GBRYRK5LlvdTleHd3mB.";
   };
-
-  options = {
-    deploy.profile.kat = lib.mkEnableOption "uhh meow" // { default = true; };
-  };
-
 }
diff --git a/profiles/laptop/home.nix b/profiles/laptop/home.nix
index 821d98aa..e5d01b95 100644
--- a/profiles/laptop/home.nix
+++ b/profiles/laptop/home.nix
@@ -1,9 +1,3 @@
 { lib, ... }:
 
-{
-  options = {
-    deploy.profile.laptop = lib.mkEnableOption "lappytop" // {
-      default = true;
-    };
-  };
-}
+{ }
diff --git a/profiles/laptop/nixos.nix b/profiles/laptop/nixos.nix
index ae430a9e..d1d9cbc5 100644
--- a/profiles/laptop/nixos.nix
+++ b/profiles/laptop/nixos.nix
@@ -2,12 +2,4 @@
 
 {
   imports = [ ./nixos ];
-
-  options = {
-    deploy.profile.laptop = lib.mkEnableOption "lappytop" // {
-      default = true;
-    };
-  };
-
-  config = { home-manager.users.kat = { imports = [ ./home.nix ]; }; };
 }
diff --git a/profiles/sway/home.nix b/profiles/sway/home.nix
index e9fb7086..36abc3ac 100644
--- a/profiles/sway/home.nix
+++ b/profiles/sway/home.nix
@@ -2,8 +2,4 @@
 
 {
   imports = [ ./home ];
-
-  options = {
-    deploy.profile.sway = lib.mkEnableOption "sway wm" // { default = true; };
-  };
 }
diff --git a/profiles/sway/nixos.nix b/profiles/sway/nixos.nix
index bac2279d..06581ae7 100644
--- a/profiles/sway/nixos.nix
+++ b/profiles/sway/nixos.nix
@@ -3,9 +3,5 @@
 {
   imports = [ ./nixos ];
 
-  options = {
-    deploy.profile.sway = lib.mkEnableOption "sway wm" // { default = true; };
-  };
-
-  config = { home-manager.users.kat = { imports = [ ./home.nix ]; }; };
+  home-manager.users.kat = { imports = [ ./home.nix ]; };
 }