push

modules/hosts/box/box.nix

@@ -21,14 +21,13 @@
       openssh
       gitea
 
-
-      (den.provides.cloudflared-tunnel "tvtun"   3001)
-      (den.provides.cloudflared-tunnel "search"  8888)
-      (den.provides.cloudflared-tunnel "files"   3210)
-      (den.provides.cloudflared-tunnel "tube"    3030)
-      (den.provides.cloudflared-tunnel "monitor" 61208)
-      (den.provides.cloudflared-tunnel "reddit"  8975)
-      (den.provides.cloudflared-tunnel "git"     3000)
+      (tunnel 3001 "tvtun")
+      (tunnel 8888 "search")
+      (tunnel 3210 "files")
+      (tunnel 3030 "tube")
+      (tunnel 8975 "reddit")
+      (tunnel 3002 "git")
+      (tunnel 61208 "monitor")
     ];
 
     nixos = {

modules/hosts/laptop/laptop.nix

@@ -1,28 +1,28 @@
 
 { den, ... }: {
   den.aspects.laptop = {
-    includes = [
+    includes = with den.aspects; [
       den.default
-      <amdgpu>
-      <cosmic>
-      <firefox>
-      <audio>
+      den.aspects.amdgpu
+      cosmic
+      firefox
+      audio
 
       den.provides.home-manager
-      <stylix>
-      <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 = {
@@ -32,6 +32,8 @@
         HandleLidSwitch = "ignore";
         HandleLidSwitchDocked = "ignore";
       };
+
+      users.users.bug.extraGroups = [ "networkmanager" "wheel" "audio" "video" "libvirtd" "ydotool" "dialout" ];
     };
   };
 }