From 709bc501649de7b8053e8a8ed363942f57faeb4f Mon Sep 17 00:00:00 2001 From: Erik Simon Date: Mon, 16 Nov 2026 05:57:39 +0100 Subject: [PATCH] feat(flake): hyprchrome harness replaces the per-app inputs hyprchrome-claude and hyprchrome-files now come from one `hyprchrome` input (the harness repo carrying both as submodules with their shared patches). The lock also bumps nixpkgs-unstable, nix-citizen and nix-gaming. Co-Authored-By: Claude Opus 5.5 --- flake.lock | 97 +++++++++++++---------------------- flake.nix | 20 +++----- hosts/terra/configuration.nix | 10 ++-- 3 files changed, 50 insertions(+), 77 deletions(-) diff --git a/flake.lock b/flake.lock index 0b843c3..dd10ffd 100644 --- a/flake.lock +++ b/flake.lock @@ -133,11 +133,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1787559586, - "narHash": "sha256-onL0VLf9vPllmT0H/OlURIU5r5t5WIEl7t4tVNKT0Nw=", + "lastModified": 1793576659, + "narHash": "sha256-V1h85lUaJBQoHFrB2vpXZOE0Ju1MYSnIpsehoVZYlDo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9d0d87172c374f89da73c1cfe6d81ae62feac1f1", + "rev": "ea2630b7470978622c7689a1ff75d2b389175399", "type": "github" }, "original": { @@ -181,11 +181,11 @@ ] }, "locked": { - "lastModified": 1787424939, - "narHash": "sha256-O2tBn84NNuHrnqNVxx/XqsXwfYvS1YwBh+7CBnbCYsk=", + "lastModified": 1793686154, + "narHash": "sha256-Zb/0L3soxrkfcrywpfp0J++0WFLB3tzh0Xtx9up+VNc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "809414f0cdadf82cf11b06c2b29ba9b3168b3297", + "rev": "204b6977e00caac19e2313015a598543ca7be150", "type": "github" }, "original": { @@ -255,44 +255,25 @@ "url": "https://git.mgaction.town/darman/hypr-chrome.git" } }, - "hyprchrome-claude": { + "hyprchrome": { "inputs": { "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1793643205, - "narHash": "sha256-7DrwTLdHDy6Azhr1ExyHmhNvJ9ydkkNQhAEQokXDGp8=", + "lastModified": 1794684228, + "narHash": "sha256-Tn9JdMOSHfnhdmnTc9brl1dQPB/qkYkjH8ka2J3E8FU=", "ref": "refs/heads/master", - "rev": "af01c833d5dc7604b527ee544e63d3952dcc5262", - "revCount": 19, + "rev": "61959090074cbc3bfb7bdf22d861ab82e2dce397", + "revCount": 2, + "submodules": true, "type": "git", - "url": "ssh://gitea@git.mgaction.town:2222/darman/hyprchrome-claude.git" + "url": "ssh://gitea@git.mgaction.town:2222/darman/hyprchrome.git" }, "original": { "type": "git", - "url": "ssh://gitea@git.mgaction.town:2222/darman/hyprchrome-claude.git" - } - }, - "hyprchrome-files": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1794679440, - "narHash": "sha256-FgqPo/hhETwCdtAmve4PuZ232F7sKfDpAS0vmWZq9dw=", - "ref": "refs/heads/master", - "rev": "9d9856349edcc67e07d4daa24bbb4265dcc685a7", - "revCount": 12, - "type": "git", - "url": "ssh://gitea@git.mgaction.town:2222/darman/hyprchrome-files.git" - }, - "original": { - "type": "git", - "url": "ssh://gitea@git.mgaction.town:2222/darman/hyprchrome-files.git" + "url": "ssh://gitea@git.mgaction.town:2222/darman/hyprchrome.git" } }, "livesync-bridge": { @@ -419,11 +400,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1793560706, - "narHash": "sha256-rdq2yGEPkX4pOZJ+7MvUgZuA9OzwEimx01JjoOX+GQ8=", + "lastModified": 1794766393, + "narHash": "sha256-qtNL+kX2ru2k6kwmPhqG/mWjo83orqSi6wEXMxMmErI=", "owner": "LovingMelody", "repo": "nix-citizen", - "rev": "f9a3b08ea31c586ffee0e604af9dc7ffc22e9723", + "rev": "6b732ddacf308fa5820ca00133d4d72336bf3442", "type": "github" }, "original": { @@ -461,11 +442,11 @@ ] }, "locked": { - "lastModified": 1788236945, - "narHash": "sha256-MmEtOeX/RQlnan/jIgjFhm1j7KUKv8p5o7zRsXEEq3g=", + "lastModified": 1794375173, + "narHash": "sha256-x97M5XOV+IDcm7K9Bv6a7OUePyEVCjPeLpr3iD3BJD8=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "f4434220501c23e7154bca5262e5b2fd7efa4490", + "rev": "3d460ece2fde6ba86a7f9deacc9a65e40f9ed19e", "type": "github" }, "original": { @@ -613,11 +594,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1785031560, - "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=", + "lastModified": 1793504054, + "narHash": "sha256-ThkfL3D/FhCiZFc9+3BtxwuMmpuK+/bGtXCSo1+yVew=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c", + "rev": "7851ba61fd862b277cb6a9cef37394bc18bb94e4", "type": "github" }, "original": { @@ -628,11 +609,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1794495034, - "narHash": "sha256-E0hYoioqUtM2XmPPvYYpJgdADF5AW9oOoPSEiM9dTHQ=", + "lastModified": 1794644783, + "narHash": "sha256-3GnIGIy15bMduoS9RnWqKTmsJLWThla42UFtm0S7+us=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2074cc672349f14240fb7ea90d509e0b643e9dd4", + "rev": "5d2b81a7a3be3e2f832879028e4d60abbf58e9a0", "type": "github" }, "original": { @@ -644,18 +625,15 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1788316716, - "narHash": "sha256-bc7rSpXIdn9QWGNqfWcPZWOhEVF8NoeAZkWq0XWnf/k=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3ed67ec0a4d3c7ab4ae1f04f8ee8df07bfa506a2", - "type": "github" + "lastModified": 1794386569, + "narHash": "sha256-W60urNAgQVS8bhNWH0bQsYoiagds8m38oTDUjEOM9FE=", + "rev": "d4f25a3e562008648d45bcf2d70bcc7422cad84e", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1117658.d4f25a3e5620/nixexprs.tar.zst?lastModified=1794386569&rev=d4f25a3e562008648d45bcf2d70bcc7422cad84e" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.zst" } }, "nixpkgs_3": { @@ -781,8 +759,7 @@ "home-manager": "home-manager", "honcho-console": "honcho-console", "hypr-chrome": "hypr-chrome", - "hyprchrome-claude": "hyprchrome-claude", - "hyprchrome-files": "hyprchrome-files", + "hyprchrome": "hyprchrome", "livesync-bridge": "livesync-bridge", "mediamanager-nix": "mediamanager-nix", "millennium": "millennium", @@ -877,11 +854,11 @@ ] }, "locked": { - "lastModified": 1786901030, - "narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=", + "lastModified": 1791885023, + "narHash": "sha256-C3alQ2MEt0zVrUSho5NUDo3jmhbff72++bfwoqT9Omo=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa", + "rev": "0d6d739a833ba9a9c93034862e4a7b061a062a1c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 40a74b9..ec201d9 100644 --- a/flake.nix +++ b/flake.nix @@ -73,18 +73,14 @@ url = "git+file:///mnt/hdd_01/dev/repos/openbeach"; inputs.nixpkgs.follows = "nixpkgs"; }; - # hyprchrome-claude: the HyprChrome desktop app around the claude CLI - # (terra). Own repo on our gitea: push there, then - # `nix flake update hyprchrome-claude` here. - hyprchrome-claude = { - url = "git+ssh://gitea@git.mgaction.town:2222/darman/hyprchrome-claude.git"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - # hyprchrome-files: keyboard-first HyprChrome file manager (terra's - # default). Own repo on our gitea: push there, then - # `nix flake update hyprchrome-files` here. - hyprchrome-files = { - url = "git+ssh://gitea@git.mgaction.town:2222/darman/hyprchrome-files.git"; + # hyprchrome: harness for the HyprChrome apps on our gitea. Carries + # hyprchrome-files (terra's default file manager), hyprchrome-claude + # (desktop app around the claude CLI) and hyprchrome-widgets as + # submodules, plus their shared libcosmic/winit patches, and builds the + # packages. Push the app and the harness there, then + # `nix flake update hyprchrome` here. + hyprchrome = { + url = "git+ssh://gitea@git.mgaction.town:2222/darman/hyprchrome.git"; inputs.nixpkgs.follows = "nixpkgs"; }; # NexusMods.App (terra): source of nixpkgs' package overridden with the diff --git a/hosts/terra/configuration.nix b/hosts/terra/configuration.nix index 37b9950..bbefc4c 100644 --- a/hosts/terra/configuration.nix +++ b/hosts/terra/configuration.nix @@ -35,16 +35,16 @@ in }; # hyprchrome-claude (dev): HyprChrome desktop app around the claude CLI, - # built from its gitea repo (see the flake input). Needs `claude` on + # built from the hyprchrome harness (see the flake input). Needs `claude` on # PATH, which home/desktop already provides. environment.systemPackages = [ - inputs.hyprchrome-claude.packages.${pkgs.stdenv.hostPlatform.system}.default + inputs.hyprchrome.packages.${pkgs.stdenv.hostPlatform.system}.hyprchrome-claude pkgs.teamspeak6-client # successor of the TeamSpeak 5 beta unstable.heroic # Epic/GOG/Amazon launcher; 2.22.4 fixes GOG login, 26.05 has 2.22.1 ]; # hyprchrome-files (dev): the default file manager and file picker, built - # from its gitea repo (see the flake input). Its home-manager module + # from the hyprchrome harness (see the flake input). Its home-manager module # installs it with its fonts. Both defaults are set system-wide instead of # through the module: its defaultFileManager would make home-manager own # ~/.config/mimeapps.list, where apps register handlers, and its filePicker @@ -53,12 +53,12 @@ in # extraPortals also puts its D-Bus activation files (portal backend, # FileManager1 "show in folder") on the session bus. home-manager.users.darman = { - imports = [ inputs.hyprchrome-files.homeManagerModules.default ]; + imports = [ inputs.hyprchrome.homeManagerModules.hyprchrome-files ]; programs.hyprchrome-files.enable = true; }; xdg.mime.defaultApplications."inode/directory" = "town.mgaction.HyprchromeFiles.desktop"; xdg.portal.extraPortals = [ - inputs.hyprchrome-files.packages.${pkgs.stdenv.hostPlatform.system}.default + inputs.hyprchrome.packages.${pkgs.stdenv.hostPlatform.system}.hyprchrome-files ]; xdg.portal.config.common."org.freedesktop.impl.portal.FileChooser" = [ "hyprchromefiles" ];