push

modules/core/theme/catppuccin.nix

@@ -4,7 +4,7 @@
 in {
   den.aspects.catppuccin = {
     nixos = {
-      imports = [ inputs.nix-flatpak.nixosModules.nix-flatpak ];
+      imports = [ inputs.catppuccin.nixosModules.catppuccin ];
 
       catppuccin = {
         enable = true;
@@ -17,7 +17,7 @@ in {
     };
 
     homeManager = {
-      imports = [ inputs.catppuccin.nixosModules.catppuccin ];
+      imports = [ inputs.catppuccin.homeModules.catppuccin ];
 
       catppuccin = {
         enable = true;

modules/hosts.nix

@@ -9,7 +9,13 @@ in {
     nix.users.bug = bug;
     laptop.users.bug = bug;
     box.users.bug = bug;
+    box.users.levi = {
+      isNormalUser = true;
+      description = "levi";
+      group = "levi";
+    };
   };
 
   den.homes.x86_64-linux.bug = { aspect = "bug"; };
+  den.homes.x86_64-linux.levi = { aspect = "levi"; };
 }

modules/hosts/box/box.nix

@@ -3,7 +3,7 @@
   den.aspects.box = {
     includes = with den.aspects; [
       den.default
-      # den.provides.home-manager
+      den.provides.home-manager
       syncthing
       fish
 
@@ -33,14 +33,6 @@
 
     nixos = {
       networking.hostName = "box";
-
-      users.users.levi = {
-        isNormalUser = true;
-        description = "levi";
-        extraGroups = [];
-
-        hashedPasswordFile = "/home/bug/users/levi.passwd";
-      };
     };
   };
 }

modules/users/levi.nix

@@ -0,0 +1,10 @@
+{ den, ... }: {
+  den.aspects.levi = {
+    includes = [
+      den.provides.primary-user
+      (den.provides.user-shell "fish")
+    ];
+
+    user.hashedPasswordFile = "/home/bug/users/levi.passwd";
+  };
+}