diff --git a/WORKAROUNDS.md b/WORKAROUNDS.md index 1f72918d..877d54b2 100644 --- a/WORKAROUNDS.md +++ b/WORKAROUNDS.md @@ -19,7 +19,6 @@ A version or revision pinned for a reason that can go away. | ID | What & where | Why | Removal condition | Added | Revisit | Status | | ------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------- | ---------- | -------------------------- | ------ | | WA-004 | `catppuccin` on `main` — `flake.nix` | `main` carries the nodejs→nodejs-slim deprecation fix, which is not in a release | Switch to a release tag once it includes the fix | 2026-09-25 | on catppuccin release | active | -| WA-005 | `tuios` input — `flake.nix`; `home/base/tui/tuios/` | nixpkgs lags behind upstream | Use nixpkgs' `tuios` once it is recent enough | 2026-10-03 | on nixpkgs bump | active | | WA-006 | `nixpkgs-blender` — `flake.nix` | Blender 5.2 LTS + CUDA/OptiX pin; keeps `just up` from triggering a full source rebuild | Bump deliberately when needed; drop the pin if the current nixpkgs build is acceptable | 2026-07-24 | deliberate | active | | WA-020 | `fcitx5-vinput` pinned to release tag `v2.4.2` — `flake.nix`; consumer `home/linux/gui/base/vinput/default.nix` | Tracks a release tag instead of a branch, so `just up` stays on that release | Bump to a newer release tag when its changes are wanted | 2026-10-04 | on vinput release | active | | WA-021 | `nix-x86-on-aarch64` input — our fork of rowanG077's patched FEX + muvm runtime — `flake.nix`; `hosts/12kingdoms-shoukei/game/` | FEX does not support 16K pages, so x86/x86_64 apps and games on shoukei need this pinned flake's 4K-page microVM runtime; our fork lets upstream changes be reviewed before use | Drop once FEX supports 16K pages directly, or nixpkgs/nixos-apple-silicon ships an equivalent runtime | 2026-10-07 | on FEX/nixpkgs/muvm update | active | diff --git a/flake.lock b/flake.lock index 977097a8..aabf236a 100644 --- a/flake.lock +++ b/flake.lock @@ -124,27 +124,6 @@ "type": "github" } }, - "devshell": { - "inputs": { - "nixpkgs": [ - "tuios", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1768818222, - "narHash": "sha256-460jc0+CZfyaO8+w8JNtlClB2n4ui1RbHfPTLkpwhU8=", - "owner": "numtide", - "repo": "devshell", - "rev": "255a2b1725a20d060f566e4755dbf571bbbb5f76", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "disko": { "inputs": { "nixpkgs": [ @@ -288,22 +267,6 @@ "type": "github" } }, - "flake-compat_6": { - "flake": false, - "locked": { - "lastModified": 1761640442, - "narHash": "sha256-AtrEP6Jmdvrqiv4x2xa5mrtaIp3OEe8uBYCDZDS+hu8=", - "owner": "nix-community", - "repo": "flake-compat", - "rev": "4a56054d8ffc173222d09dad23adf4ba946c8884", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -364,42 +327,6 @@ "type": "github" } }, - "flake-parts_4": { - "inputs": { - "nixpkgs-lib": [ - "tuios", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1787559586, - "narHash": "sha256-onL0VLf9vPllmT0H/OlURIU5r5t5WIEl7t4tVNKT0Nw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9d0d87172c374f89da73c1cfe6d81ae62feac1f1", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-root": { - "locked": { - "lastModified": 1723604017, - "narHash": "sha256-rBtQ8gg+Dn4Sx/s+pvjdq3CB2wQNzx9XGFq/JVGCB6k=", - "owner": "srid", - "repo": "flake-root", - "rev": "b759a56851e10cb13f6b8e5698af7b59c44be26e", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "flake-root", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -443,31 +370,6 @@ "type": "github" } }, - "git-hooks-nix": { - "inputs": { - "flake-compat": [ - "tuios", - "flake-compat" - ], - "nixpkgs": [ - "tuios", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1787424939, - "narHash": "sha256-O2tBn84NNuHrnqNVxx/XqsXwfYvS1YwBh+7CBnbCYsk=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "809414f0cdadf82cf11b06c2b29ba9b3168b3297", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "haumea": { "inputs": { "nixpkgs": [ @@ -705,35 +607,6 @@ "type": "github" } }, - "nix-fast-build": { - "inputs": { - "flake-parts": [ - "tuios", - "flake-parts" - ], - "nixpkgs": [ - "tuios", - "nixpkgs" - ], - "treefmt-nix": [ - "tuios", - "treefmt-nix" - ] - }, - "locked": { - "lastModified": 1787488599, - "narHash": "sha256-oe3nq8sRFRLtRHQgnNqD26ETFfXtQ4tJPgP7RryApRE=", - "owner": "Mic92", - "repo": "nix-fast-build", - "rev": "d5a820b15111cf70b2eb1fef94a4d65ded1a555f", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "nix-fast-build", - "type": "github" - } - }, "nix-gaming": { "inputs": { "flake-compat": "flake-compat_3", @@ -1152,7 +1025,6 @@ "ponytail": "ponytail", "pre-commit-hooks": "pre-commit-hooks", "preservation": "preservation", - "tuios": "tuios", "wallpapers": "wallpapers" } }, @@ -1265,55 +1137,6 @@ "type": "github" } }, - "treefmt-nix_2": { - "inputs": { - "nixpkgs": [ - "tuios", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1786901030, - "narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "tuios": { - "inputs": { - "devshell": "devshell", - "flake-compat": "flake-compat_6", - "flake-parts": "flake-parts_4", - "flake-root": "flake-root", - "git-hooks-nix": "git-hooks-nix", - "nix-fast-build": "nix-fast-build", - "nixpkgs": [ - "nixpkgs" - ], - "treefmt-nix": "treefmt-nix_2" - }, - "locked": { - "lastModified": 1793015645, - "narHash": "sha256-ifgOqJGihtLQIpdfNJZ27mhqGwKvJ/bxR2/4cmGR1q4=", - "owner": "Gaurav-Gosain", - "repo": "tuios", - "rev": "12dedac04d57a60ae02e58ea73c2aadb596c515c", - "type": "github" - }, - "original": { - "owner": "Gaurav-Gosain", - "ref": "v0.11.1", - "repo": "tuios", - "type": "github" - } - }, "wallpapers": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 09d1372f..40d195fa 100644 --- a/flake.nix +++ b/flake.nix @@ -135,13 +135,6 @@ # AI coding agents llm-agents.url = "github:numtide/llm-agents.nix"; - # terminal window manager / multiplexer; nixpkgs lags behind upstream, - # so track the upstream flake. - tuios = { - url = "github:Gaurav-Gosain/tuios/v0.11.1"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - # -------------- Gaming --------------------- nix-gaming = { diff --git a/home/base/tui/tuios/default.nix b/home/base/tui/tuios/default.nix index 770251d6..b263d440 100644 --- a/home/base/tui/tuios/default.nix +++ b/home/base/tui/tuios/default.nix @@ -1,19 +1,15 @@ { config, pkgs, - tuios, ... }: let - # nixpkgs lags behind upstream; use the flake input. - tuiosPkg = tuios.packages.${pkgs.stdenv.hostPlatform.system}.tuios; - # tuios watches config.toml and its settings page writes it back, so link the # checked-in file out-of-store instead of into the store. configDir = "${config.home.homeDirectory}/nix-config/home/base/tui/tuios"; in { - home.packages = [ tuiosPkg ]; + home.packages = [ pkgs.tuios ]; xdg.configFile."tuios/config.toml".source = config.lib.file.mkOutOfStoreSymlink "${configDir}/config.toml";