push

README.md

@@ -13,7 +13,7 @@ modules are automatically discovered via [import-tree](https://github.com/vic/im
 ```
 modules/
 ├── core/          # System fundamentals (desktop, audio, graphics, network, theme)
-├── hosts/         # Per-machine includes (nix, laptop, box)
+├── hosts/         # Per-machine includes (nix, styx, box)
 ├── infra/         # Infrastructure (syncthing, cloudflared tunnels)
 ├── services/      # Self-hosted services (searxng, gitea, copyparty, ...)
 ├── software/      # User software (firefox, nixcord, beets, ...)
@@ -27,7 +27,7 @@ modules/
 | Host | Role | GPU | Switch Command |
 |------|------|-----|----------------|
 | `nix` | desktop | nvidia | `nh os switch ~/nix --impure -H nix` |
-| `laptop` | laptop | amd | `nh os switch ~/nix --impure -H laptop` |
+| `styx` | laptop | amd | `nh os switch ~/nix --impure -H styx` |
 | `box` | homeserver | — | `nh os switch ~/nix --impure -H box` |
 
 ---

flake.nix

@@ -35,5 +35,10 @@
       url = "github:different-name/catppuccin-userstyles-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    # nix-citizen.url = "github:LovingMelody/nix-citizen";
+
+    # nix-gaming.url = "github:fufexan/nix-gaming";
+    # nix-citizen.inputs.nix-gaming.follows = "nix-gaming";
   };
 }

modules/hosts.nix

@@ -7,7 +7,7 @@ let
 in {
   den.hosts.x86_64-linux = {
     nix.users.bug = bug;
-    laptop.users.bug = bug;
+    styx.users.bug = bug;
     box.users.bug = bug;
   };
 

modules/hosts/box.nix

@@ -16,6 +16,10 @@
       # sish
       vscode-server
       gitea
+
+      catppuccin
+
+      janitor
     ];
 
     nixos = {

modules/hosts/defaults.nix

@@ -12,10 +12,7 @@
       openssh
       syncthing
 
-      catppuccin
       fish
-
-      janitor
     ];
 
     nixos = { ... }: {
@@ -23,8 +20,10 @@
         /etc/nixos/hardware-configuration.nix
       ];
 
-      home-manager.useGlobalPkgs = true;
-      home-manager.backupFileExtension = "hm-backup";
+      home-manager = {
+        useGlobalPkgs = true;
+        backupFileExtension = "hm-backup";
+      };
 
       system = {
         stateVersion = "26.05";

modules/hosts/nix.nix

@@ -4,6 +4,10 @@
       common
 
       nvidia
+
+      catppuccin
+
+      janitor
     ];
 
     nixos = {

modules/hosts/styx.nix

@@ -1,15 +1,19 @@
 { den, ... }: {
-  den.aspects.laptop = {
+  den.aspects.styx = {
     includes = with den.aspects; [
       common
 
       amdgpu
       cloudflare-warp
       cad
+
+      catppuccin
+
+      janitor
     ];
 
     nixos = {
-      networking.hostName = "nix";
+      networking.hostName = "styx";
 
       services.logind.settings.Login = {
         HandleLidSwitch = "ignore";

modules/services/ports.nix

@@ -1,12 +1,20 @@
 {
-  den.aspects.portmap.nixos.options.den.portmap = {
-    tvtun = 3001;
-    search = 8888;
-    files = 3210;
-    tube = 3030;
-    reddit = 8975;
-    git = 3002;
-    monitor = 61208;
-    matrix = 8008;
+  den.aspects.portmap.nixos = { lib, ... }: {
+    options.den.portmap = lib.mkOption {
+      type = lib.types.attrsOf lib.types.port;
+      default = {};
+      description = "ports.";
+    };
+
+    config.den.portmap = {
+      tvtun = 3001;
+      search = 8888;
+      files = 3210;
+      tube = 3030;
+      reddit = 8975;
+      git = 3002;
+      monitor = 61208;
+      matrix = 8008;
+    };
   };
 }

modules/software/compatibility/nix-alien.nix

@@ -0,0 +1,5 @@
+{
+  # nix-alien = import (
+  #     builtins.fetchTarball "https://github.com/thiagokokada/nix-alien/tarball/master"
+  # ) {};
+}

modules/software/fish.nix

@@ -2,7 +2,14 @@
   den.aspects.fish = {
     nixos = { pkgs, ...}: {
       programs.fish.shellAliases = {
+        fetch = "fastfetch --file ~/nix/nix.ans";
+
         box = "ssh box.bug.tools";
+        unbox = "sh -c 'ssh -N -L \"$1\":0.0.0.0:\"$1\" box.bug.tools &' --";
+        rebox = "sh -c 'fuser -k \"$1\"/tcp' --";
+        dock = "sh -c 'ssh -N -D \"$1\" box.bug.tools &' --";
+
+        pico = "ssh pico.sh";
       };
 
       environment.systemPackages = with pkgs.fishPlugins; [