push

flake.lock

@@ -68,10 +68,28 @@
         "type": "github"
       }
     },
+    "catppuccin": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1772153824,
+        "narHash": "sha256-T65qXmlcD9qFpPTi+mOXsn4dIkO2N8Ls67nqmuzepv0=",
+        "owner": "catppuccin",
+        "repo": "nix",
+        "rev": "4b0f5b7bf7b3eeb484d49524f3c9791864ab9362",
+        "type": "github"
+      },
+      "original": {
+        "owner": "catppuccin",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
     "copyparty": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
         "lastModified": 1771834427,
@@ -291,6 +309,22 @@
       }
     },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1771848320,
+        "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "2fc6539b481e1d2569f25f8799236694180c0993",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1748162331,
         "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=",
@@ -305,7 +339,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1771207753,
         "narHash": "sha256-b9uG8yN50DRQ6A7JdZBfzq718ryYrlmGgqkRm9OOwCE=",
@@ -348,6 +382,7 @@
     },
     "root": {
       "inputs": {
+        "catppuccin": "catppuccin",
         "copyparty": "copyparty",
         "den": "den",
         "flake-aspects": "flake-aspects",
@@ -356,7 +391,7 @@
         "home-manager": "home-manager",
         "import-tree": "import-tree",
         "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "nixpkgs-lib": [
           "nixpkgs"
         ],

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";
+  };
+}