push

modules/hosts/box/box.nix

@@ -2,6 +2,7 @@
 { den, ... }: {
   den.aspects.box = {
     includes = with den.aspects; [
+      den.default
       den.provides.home-manager
       syncthing
       fish
@@ -10,14 +11,15 @@
       searxng
       copyparty
       glances
-      #invidious
+      # invidious
       mailserver
-      matrix
+      #matrix
       redlib
-      sish
+      #sish
       vscode-server
       dns
       openssh
+      gitea
     ];
 
     nixos = {

modules/hosts/defaults.nix

@@ -1,6 +1,6 @@
 {
   den.default = {
-    nixos = { pkgs, ... }: {
+    nixos = { pkgs, lib, ... }: {
       imports = [
         /etc/nixos/hardware-configuration.nix
       ];
@@ -33,7 +33,7 @@
       };
 
       boot = {
-        kernelPackages = pkgs.linuxPackages_zen;
+        #kernelPackages = lib.mkForce pkgs.linuxPackages_zen;
 
         initrd.checkJournalingFS = false;
 

modules/hosts/laptop/laptop.nix

@@ -1,28 +1,28 @@
 
 { den, ... }: {
   den.aspects.laptop = {
-    includes = with den.aspects; [
-      amdgpu
-      cosmic
-      firefox
-      audio
+    includes = [
+      den.default
+      <amdgpu>
+      <cosmic>
+      <firefox>
+      <audio>
 
       den.provides.home-manager
-      stylix
-      #nvidia
-      syncthing
-      swap
-      cloudflare-warp
-      packages
-      development
-      cad
-      mpd
-      virtualisation
-      flatpak
-      fish
-      dns
-      openssh
-      beets
+      <stylix>
+      <syncthing>
+      <swap>
+      <cloudflare-warp>
+      <packages>
+      <development>
+      <cad>
+      <mpd>
+      <virtualisation>
+      <flatpak>
+      <fish>
+      <dns>
+      <openssh>
+      <beets>
     ];
 
     nixos = {

modules/hosts/nix/nix.nix

@@ -2,6 +2,7 @@
 {
   den.aspects.nix = {
     includes = with den.aspects; [
+      den.default
       #amdgpu
       cosmic
       firefox
@@ -15,7 +16,7 @@
       #cloudflare-warp
       packages
       development
-      cad
+      #cad
       mpd
       virtualisation
       flatpak