diff --git a/README.md b/README.md index f583a79..a61e28a 100644 --- a/README.md +++ b/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` | --- diff --git a/flake.nix b/flake.nix index 55ffaa8..f3b2cbd 100644 --- a/flake.nix +++ b/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"; }; } diff --git a/modules/hosts.nix b/modules/hosts.nix index 6bb7d4b..0f80671 100644 --- a/modules/hosts.nix +++ b/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; }; diff --git a/modules/hosts/box.nix b/modules/hosts/box.nix index 306315d..f5bf1a5 100644 --- a/modules/hosts/box.nix +++ b/modules/hosts/box.nix @@ -16,6 +16,10 @@ # sish vscode-server gitea + + catppuccin + + janitor ]; nixos = { diff --git a/modules/hosts/defaults.nix b/modules/hosts/defaults.nix index f92ffd4..2479b9c 100644 --- a/modules/hosts/defaults.nix +++ b/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"; diff --git a/modules/hosts/nix.nix b/modules/hosts/nix.nix index b652d4f..02035f5 100644 --- a/modules/hosts/nix.nix +++ b/modules/hosts/nix.nix @@ -4,6 +4,10 @@ common nvidia + + catppuccin + + janitor ]; nixos = { diff --git a/modules/hosts/laptop.nix b/modules/hosts/styx.nix similarity index 74% rename from modules/hosts/laptop.nix rename to modules/hosts/styx.nix index e04ac91..2cc19fc 100644 --- a/modules/hosts/laptop.nix +++ b/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"; diff --git a/modules/services/ports.nix b/modules/services/ports.nix index 2117e77..24b6813 100644 --- a/modules/services/ports.nix +++ b/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; + }; }; } diff --git a/modules/software/compatibility/nix-alien.nix b/modules/software/compatibility/nix-alien.nix new file mode 100644 index 0000000..0679680 --- /dev/null +++ b/modules/software/compatibility/nix-alien.nix @@ -0,0 +1,5 @@ +{ + # nix-alien = import ( + # builtins.fetchTarball "https://github.com/thiagokokada/nix-alien/tarball/master" + # ) {}; +} diff --git a/modules/software/fish.nix b/modules/software/fish.nix index 0c61aac..1bf8e17 100644 --- a/modules/software/fish.nix +++ b/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; [