Commit 882d90c

HPCesia <me@hpcesia.com>
2026-03-22 15:54:34
refactor: den aspects - hosts
den
1 parent ab1e51f
Changed files (16)
modules
hosts
kevin
hardware
cpu-intel.nix
gpu-nvidia.nix
misc.nix
screen.nix
touchpad.nix
boot.nix
default.nix
filesystem.nix
networking.nix
state-version.nix
pardofelis
networking
default.nix
boot.nix
default.nix
filesystem.nix
state-version.nix
users
hpcesia
default.nix
modules/hosts/kevin/hardware/cpu-intel.nix
@@ -1,5 +1,5 @@
 {inputs, ...}: {
-  flake.modules.nixos."hosts/kevin" = _: {
+  den.aspects.kevin.nixos = {
     imports = with inputs.nixos-hardware.nixosModules; [
       common-cpu-intel
     ];
modules/hosts/kevin/hardware/gpu-nvidia.nix
@@ -1,5 +1,5 @@
 {
-  flake.modules.nixos."hosts/kevin" = {config, ...}: {
+  den.aspects.kevin.nixos = {config, ...}: {
     hardware.nvidia = {
       package = config.boot.kernelPackages.nvidiaPackages.stable;
       open = true;
modules/hosts/kevin/hardware/misc.nix
@@ -1,5 +1,5 @@
 {inputs, ...}: {
-  flake.modules.nixos."hosts/kevin" = {pkgs, ...}: {
+  den.aspects.kevin.nixos = {pkgs, ...}: {
     imports = with inputs.nixos-hardware.nixosModules; [
       common-pc-laptop
       common-pc-laptop-ssd
modules/hosts/kevin/hardware/screen.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: {
-  flake.modules.nixos."hosts/kevin" = _: {
+  den.aspects.kevin.nixos = {
     imports = with inputs.nixos-hardware.nixosModules; [
       common-hidpi
     ];
@@ -13,7 +13,7 @@
     services.kmscon.extraConfig = "font-size=20";
   };
 
-  flake.modules.homeManager."hosts/kevin" = {osConfig, ...}: let
+  den.aspects.kevin.provides.to-users.homeManager = {osConfig, ...}: let
     hasNiri = osConfig.programs.niri.enable;
   in
     lib.optionalAttrs hasNiri {
modules/hosts/kevin/hardware/touchpad.nix
@@ -1,9 +1,9 @@
 {lib, ...}: {
-  flake.modules.nixos."hosts/kevin" = _: {
+  den.aspects.kevin.nixos = {
     services.libinput.enable = true;
   };
 
-  flake.modules.homeManager."hosts/kevin" = {osConfig, ...}: let
+  den.aspects.kevin.provides.to-users.homeManager = {osConfig, ...}: let
     hasPlasma = osConfig.services.desktopManager.plasma6.enable;
   in
     lib.optionalAttrs hasPlasma {
modules/hosts/kevin/boot.nix
@@ -1,7 +1,7 @@
 {inputs, ...}: {
   flake-file.inputs.distro-grub-themes.url = "github:AdisonCavani/distro-grub-themes";
 
-  flake.modules.nixos."hosts/kevin" = {pkgs, ...}: {
+  den.aspects.kevin.nixos = {pkgs, ...}: {
     stylix.targets.plymouth.enable = false;
     stylix.targets.grub.enable = false;
modules/hosts/kevin/default.nix
@@ -38,19 +38,14 @@ in {
     <desktop/dm/sddm>
   ];
 
-  den.aspects.kevin.nixos = {
-    imports = [
-      config.flake.modules.nixos."hosts/kevin"
-    ];
-  };
-
   flake.meta.host.hosts.kevin = {
     system = "x86_64-linux";
     hostPubKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOO9CyAqGo/WbJkncrt1a9jxS1E+hd550SC4A08I/l0/ root@kevin";
     isDesktop = true;
     isLaptop = true;
   };
-  flake.modules.nixos."hosts/kevin" = _: {
+
+  den.aspects.kevin.nixos = {
     imports =
       (with config.flake.modules.nixos; [
         desktop
@@ -66,12 +61,10 @@ in {
       ++ [
         {
           home-manager.users.hpcesia = {
-            imports =
-              (with config.flake.modules.homeManager; [
-                desktop
-                dev
-              ])
-              ++ [config.flake.modules.homeManager."hosts/kevin"];
+            imports = with config.flake.modules.homeManager; [
+              desktop
+              dev
+            ];
           };
         }
       ];
modules/hosts/kevin/filesystem.nix
@@ -1,5 +1,5 @@
 {
-  flake.modules.nixos."hosts/kevin" = _: {
+  den.aspects.kevin.nixos = {
     swapDevices = [
       {
         device = "/dev/disk/by-uuid/3fb5330a-ccff-4483-a8d0-3ea733356ad3";
modules/hosts/kevin/networking.nix
@@ -1,5 +1,5 @@
 {lib, ...}: {
-  flake.modules.nixos."hosts/kevin" = {config, ...}: {
+  den.aspects.kevin.nixos = {config, ...}: {
     networking = {
       networkmanager.enable = true;
       interfaces."wlp0s20f3" = {};
modules/hosts/kevin/state-version.nix
@@ -1,8 +1,8 @@
 {
-  flake.modules = let
+  den.aspects.kevin = let
     stateVersion = "25.11";
   in {
-    nixos."hosts/kevin" = _: {
+    nixos = {
       # DO NOT FIDDLE WITH THIS VALUE !!!
       # This value determines the NixOS release from which the default
       # settings for stateful data, like file locations and database versions
@@ -13,17 +13,5 @@
       # and release notes, SERIOUSLY.
       system.stateVersion = stateVersion; # Did you read the comment?
     };
-
-    homeManager."hosts/kevin" = _: {
-      # This value determines the Home Manager release that your
-      # configuration is compatible with. This helps avoid breakage
-      # when a new Home Manager release introduces backwards
-      # incompatible changes.
-      #
-      # You can update Home Manager without changing this value. See
-      # the Home Manager release notes for a list of state version
-      # changes in each release.
-      home.stateVersion = stateVersion;
-    };
   };
 }
modules/hosts/pardofelis/networking/default.nix
@@ -1,5 +1,5 @@
 {
-  flake.modules.nixos."hosts/pardofelis" = {config, ...}: let
+  den.aspects.pardofelis.nixos = {config, ...}: let
     iface = "eth0";
   in {
     networking = {
modules/hosts/pardofelis/boot.nix
@@ -1,5 +1,5 @@
 {lib, ...}: {
-  flake.modules.nixos."hosts/pardofelis" = _: {
+  den.aspects.pardofelis.nixos = {
     boot.kernelParams = [
       "audit=0"
       "net.ifnames=0"
modules/hosts/pardofelis/default.nix
@@ -27,12 +27,6 @@
       };
   };
 
-  den.aspects.pardofelis.nixos = {
-    imports = [
-      config.flake.modules.nixos."hosts/pardofelis"
-    ];
-  };
-
   flake.meta.host.hosts.pardofelis = {
     system = "x86_64-linux";
     hostPubKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEuT/WkeA7btTeATmWJ2O9f/A6FI0Gl/1KjPGfHbWD5C root@pardofelis";
@@ -40,7 +34,8 @@
     sshPorts = [23930];
     isServer = true;
   };
-  flake.modules.nixos."hosts/pardofelis" = _: {
+
+  den.aspects.pardofelis.nixos = {
     imports = (
       map
       (n: config.flake.modules.nixos."${config.flake.meta.service.prefix}${n}")
modules/hosts/pardofelis/filesystem.nix
@@ -1,5 +1,5 @@
 {inputs, ...}: {
-  flake.modules.nixos."hosts/pardofelis" = _: {
+  den.aspects.pardofelis.nixos = {
     imports = [inputs.disko.nixosModules.default];
 
     disko.devices = {
modules/hosts/pardofelis/state-version.nix
@@ -1,8 +1,8 @@
 {
-  flake.modules = let
+  den.aspects.pardofelis = let
     stateVersion = "25.11";
   in {
-    nixos."hosts/pardofelis" = _: {
+    nixos = {
       # DO NOT FIDDLE WITH THIS VALUE !!!
       # This value determines the NixOS release from which the default
       # settings for stateful data, like file locations and database versions
modules/users/hpcesia/default.nix
@@ -47,4 +47,16 @@ in {
 
     vaultix.secrets.user-hpcesia-hashed-password.file = ./hashed-password.age;
   };
+
+  den.aspects.hpcesia.homeManager = {
+    # This value determines the Home Manager release that your
+    # configuration is compatible with. This helps avoid breakage
+    # when a new Home Manager release introduces backwards
+    # incompatible changes.
+    #
+    # You can update Home Manager without changing this value. See
+    # the Home Manager release notes for a list of state version
+    # changes in each release.
+    home.stateVersion = "25.11";
+  };
 }