diff --git a/nixcfgs/hosts/zp/README.md b/nixcfgs/hosts/zp/README.md new file mode 100644 index 0000000..6c1af65 --- /dev/null +++ b/nixcfgs/hosts/zp/README.md @@ -0,0 +1,6 @@ +# zp Host Status + +`zp` is currently idle and not used in daily workflow. + +The host config is intentionally kept as a minimal baseline so flake evaluation/checks do not break. +When `zp` is brought back, replace defaults in `default.nix` with real hardware-specific values. diff --git a/nixcfgs/hosts/zp/default.nix b/nixcfgs/hosts/zp/default.nix index dc90855..e9658a4 100644 --- a/nixcfgs/hosts/zp/default.nix +++ b/nixcfgs/hosts/zp/default.nix @@ -1,45 +1,18 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page, on -# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). -{ - config, - lib, - pkgs, - ... -}: { +{lib, ...}: { imports = [ - # Include the results of the hardware scan. - ../common/nixos.nix - ../common/desktop-linux.nix - ../common/packages-fonts.nix - ../common/packages-desktop.nix - ../common/packages-headless.nix - ../common/nvidia.nix - ../common/flatpak.nix - ../common/wine.nix - ../common/firefox.nix - ../common/gnome.nix - ../common/docker.nix + ../../modules/nixos + ../../modules/nixos/programs/zsh.nix ]; - networking.hostName = "zp"; # Define your hostname. + networking.hostName = "zp"; - # This option defines the first version of NixOS you have installed on this particular machine, - # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. - # - # Most users should NEVER change this value after the initial install, for any reason, - # even if you've upgraded your system to a new NixOS release. - # - # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, - # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how - # to actually do that. - # - # This value being lower than the current NixOS release does NOT mean your system is - # out of date, out of support, or vulnerable. - # - # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, - # and migrated your data accordingly. - # - # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . - system.stateVersion = "25.05"; # Did you read the comment? + boot.loader.systemd-boot.enable = lib.mkDefault true; + boot.loader.efi.canTouchEfiVariables = lib.mkDefault true; + + fileSystems."/" = lib.mkDefault { + device = "/dev/disk/by-label/nixos"; + fsType = "ext4"; + }; + + system.stateVersion = "25.05"; } diff --git a/nixcfgs/secrets/secrets.yaml b/nixcfgs/secrets/secrets.yaml index a443fef..1bdc43f 100644 --- a/nixcfgs/secrets/secrets.yaml +++ b/nixcfgs/secrets/secrets.yaml @@ -3,6 +3,7 @@ openrouter_api: ENC[AES256_GCM,data:XmsmgAEdiYP90JHnKmdy/jzgaFhmoU/wdYqxahIZ3NMZ anki_sync_key: ENC[AES256_GCM,data:58zVvhbW6DS+CaxYHBUh5w==,iv:f8XOGMHS72p8cEVuburgsWBOpkw+axNjyP09NR4P3lo=,tag:UZzrdhnEfxtxCZwviEM+4g==,type:str] openclaw_gateway_token: ENC[AES256_GCM,data:htTV/5GmsahHs+3N/L3Q1Kn2y0t0+kPMoH1P5z07xspnTwn+vxQ/QiR+1G506VM0y4Jm93tLk+sZRruLeaSFTw==,iv:mtid4CE2fyDadu2fePs4rcVLR35WUPiiRzuUA9GHWRw=,tag:ICW9ocQwgswwM/yrXMdC1A==,type:str] openclaw_tgbot_token: ENC[AES256_GCM,data:9q3Q6oYNO6Vj3UryVoS8yDgrO6zrBV6vvXWx7gH3IlG6gVnJ5pqYFSfiyItUsg==,iv:9MBfBK/k/9J6PACvyyhhdCIGrVN0LDeg1viivSZJdaA=,tag:r4w+QkE30O2QraGeXvXySA==,type:str] +telegram_userid_ams: ENC[AES256_GCM,data:3iv2I0KI4j0gTQ==,iv:k8ffNBIERE/NBaq0h2DLEBudqT8+eCOWv5U0fJ65W5Y=,tag:hIhJxZnnN7Va31LHy2V5KQ==,type:str] sops: age: - recipient: age1z2km2vu3mw6usw8p2rhjzkugddmsvk0ypwjw76cscyy3ar3tnufqtrv3nu @@ -23,7 +24,7 @@ sops: MlBBYzA4bWkyOFNzWlFWbWhDMU9VSG8KJGAr3Gjg6+1OUC+d8+Yu+AW+zzfQ2MtX 7RzIvGv4R3YtAHlX79BcIT6XwGMXVIF86Fu2QOoU7u8o4wpyAt0CXA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2026-03-08T15:47:15Z" - mac: ENC[AES256_GCM,data:jzMalds3vg6mfWgktBKRXmGqh3VRLUXRAEwEMh6Q+NUzwm7j0rkqzs2Bz8W3bu7GNL4SQwiBnHCoEL/9E/6qLOzMbyOZmXyleRByUEUMSBGCJa25vhjGF9x3oPANksEhTLZ0N4MA3xak66CKU6c2z1DGjV5cU61e6g8kEd3pAKI=,iv:JNHZgygwKoVBrNPVc2ODT4Ai9vNAh5w4HYgJLlv9R4Q=,tag:wfmBTup5fV4JSA3BdoEzRQ==,type:str] + lastmodified: "2026-03-08T19:00:23Z" + mac: ENC[AES256_GCM,data:SYfoNENCAn7PaztjBB4NeES+gFulDTpFieaaP1Jzi8Td7xfUOFqfTT1DdO0dBdbE66sU/nsDgucNln+92y7BGaE2sCkbUtB9213QTi+gq+A44gzxvibeX4SueakjLC8KwgQxbRZAYYvlLEUVuJ7qIslOqrTPm0APCOxoTMxrgxg=,iv:UlPucS8Y4OFyzI/NVx+OcWYVxBOb+ribbFRc5hmLd80=,tag:5jZ72WV5aqjxL+qzGqB1fQ==,type:str] unencrypted_suffix: _unencrypted version: 3.12.1 diff --git a/nixcfgs/users/js0ny/packages/gaming.nix b/nixcfgs/users/js0ny/packages/gaming.nix index 307b620..4d4688d 100644 --- a/nixcfgs/users/js0ny/packages/gaming.nix +++ b/nixcfgs/users/js0ny/packages/gaming.nix @@ -118,6 +118,9 @@ in { noname steamcmd + + # Celeste mod manager (for Steam version) + (olympus.override { celesteWrapper = "steam-run"; }) ]; imports = [ ../programs/retroarch.nix diff --git a/nixcfgs/users/js0ny/programs/readest.nix b/nixcfgs/users/js0ny/programs/readest.nix index b7bd022..638d91c 100644 --- a/nixcfgs/users/js0ny/programs/readest.nix +++ b/nixcfgs/users/js0ny/programs/readest.nix @@ -14,7 +14,7 @@ serifFont = "LXGW WenKai GB Screen"; defaultCJKFont = "LXGW WenKai GB Screen"; sansSerifFont = config.stylix.fonts.sansSerif.name; - monospaceFont = config.stylix.fonts.monospace.name ++ " Regular"; + monospaceFont = "${config.stylix.fonts.monospace.name} Regular"; uiLanguage = "zh-CN"; }; telemetryEnabled = false;