diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8472e35..a5ddd03 120000 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1 +1 @@ -/nix/store/irqhrjyjaz9rb8ns04fp12dlcc6hq2q5-pre-commit-config.json \ No newline at end of file +/nix/store/8wpcklj1m0cp057gvc6ksvkc6znlipd5-pre-commit-config.json \ No newline at end of file diff --git a/bin/lib/cmds.nu b/bin/lib/cmds.nu index 0899a55..a36002d 100644 --- a/bin/lib/cmds.nu +++ b/bin/lib/cmds.nu @@ -105,7 +105,7 @@ export def "skyg remote" [ } $"Using [(ansi green_bold)($profile)(ansi reset)]" | print $"($cmd) on ($target_host) with ($profile)" | print - mut runcmd = $"nh os ($cmd) --target-host ($target_host) --ask .#($profile)" + mut runcmd = $"nh os ($cmd) --no-nom --target-host ($target_host) --ask .#($profile)" if $build_host != "" { $runcmd = $"($runcmd) --build-host ($build_host).lab.internal" } diff --git a/flake.lock b/flake.lock index 9512c64..1050d7a 100644 --- a/flake.lock +++ b/flake.lock @@ -1144,6 +1144,26 @@ "type": "github" } }, + "hhstream": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1791559962, + "narHash": "sha256-LKr7B5TBfusmRxgJlWwhZTS4d69wFLRwFZ/y59wciOk=", + "ref": "refs/heads/main", + "rev": "934774f15ea36ec6f9e4005d6669729520265032", + "revCount": 53, + "type": "git", + "url": "ssh://gitea@gitea.app.internal:22/Hermenix/hyprland-headless-stream-plugin.git" + }, + "original": { + "type": "git", + "url": "ssh://gitea@gitea.app.internal:22/Hermenix/hyprland-headless-stream-plugin.git" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -3115,6 +3135,7 @@ "herdr": "herdr", "hermenix": "hermenix", "hermes-agent": "hermes-agent", + "hhstream": "hhstream", "home-manager": "home-manager_2", "hyprland": "hyprland", "hyprlauncher": "hyprlauncher", diff --git a/flake.nix b/flake.nix index dfad8a8..510f1c4 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,11 @@ skygqts.url = "git+ssh://gitea@gitea.app.internal:22/ari/skygqts.git"; skygqts.inputs.nixpkgs.follows = "nixpkgs"; hermenix.url = "git+ssh://gitea@gitea.app.internal:22/ari/hermenix.git"; + # Headless Hyprland session streamed over a Unix socket. + hhstream = { + url = "git+ssh://gitea@gitea.app.internal:22/Hermenix/hyprland-headless-stream-plugin.git"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # Hardware nixos-hardware.url = "github:NixOS/nixos-hardware/master"; systems.url = "github:nix-systems/default"; @@ -99,6 +104,7 @@ { self , skygqts , hermenix + , hhstream , nixpkgs-unstable , flox , determinate @@ -180,6 +186,7 @@ hermes-agent skygqts hermenix + hhstream flox determinate tether diff --git a/hosts/fwbook/services.nix b/hosts/fwbook/services.nix index 06b9148..b51d557 100644 --- a/hosts/fwbook/services.nix +++ b/hosts/fwbook/services.nix @@ -1,4 +1,4 @@ -{ pkgs, unstablePkgs, config, ... }: +{ pkgs, unstablePkgs, config, hyprland, ... }: { services.tailscale.enable = true; services.tailscale.extraDaemonFlags = [ "--statedir=/var/lib/tailscale" ]; @@ -53,4 +53,9 @@ "modesetting" "fbdev" ]; + services.hyprland-headless-stream = { + enable = true; + hyprlandPackage = hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; + sessions.enable = true; + }; } diff --git a/hosts/hl-fwdesk/services/hermenix.nix b/hosts/hl-fwdesk/services/hermenix.nix index b8bcb35..03ee09e 100644 --- a/hosts/hl-fwdesk/services/hermenix.nix +++ b/hosts/hl-fwdesk/services/hermenix.nix @@ -3,6 +3,7 @@ let ports = { hermes = 8642; hermesDashboard = 9119; + hhstreamView = 9988; hermesCache = 5001; ollama = 11434; ds4 = 8000; @@ -41,6 +42,7 @@ in publish = [ { hostPort = ports.hermes; guestPort = 8642; } { hostPort = ports.hermesDashboard; guestPort = 9119; } + { hostPort = ports.hhstreamView; guestPort = ports.hhstreamView; } ]; }; } diff --git a/modules/ABOUTME.md b/modules/ABOUTME.md index f2b631b..6bd6171 100644 --- a/modules/ABOUTME.md +++ b/modules/ABOUTME.md @@ -8,7 +8,8 @@ All reusable NixOS and Home Manager modules. Every host gets the full module tre ``` modules/ ├── lib.nix # makeNixOs / makeIso / makeHomeManagerUsers / makeDarwinModule / eachSystem -│ # (registers the `tether` flake input's NixOS module → programs.tether.*) +│ # (registers flake-input NixOS modules: tether → programs.tether.*, +│ # hhstream → services.hyprland-headless-stream) ├── main.nix # Base module imported by every host: core/ + nixos/ + network-drives.nix │ # + skyg.internalNetworkingMap (global app registry + appNetwork) ├── internal-networking.nix # Renders skyg.internalNetworkingMap → router generalMappings diff --git a/modules/lib.nix b/modules/lib.nix index 1ae9702..ff558bc 100644 --- a/modules/lib.nix +++ b/modules/lib.nix @@ -50,6 +50,7 @@ let specialArgs.nix-index-database.nixosModules.nix-index specialArgs.hermes-agent.nixosModules.default specialArgs.tether.nixosModules.default + specialArgs.hhstream.nixosModules.default { programs.nix-index-database.comma.enable = true; } ]; makeHomeConfig = {}: import ./home { }; diff --git a/pkgs/buzz-desktop/default.nix b/pkgs/buzz-desktop/default.nix index 722ccaf..7ede121 100644 --- a/pkgs/buzz-desktop/default.nix +++ b/pkgs/buzz-desktop/default.nix @@ -23,11 +23,11 @@ let pname = "buzz-desktop"; - version = "0.5.25"; + version = "0.5.27"; src = fetchurl { url = "https://github.com/block/buzz/releases/download/desktop-v${version}/Buzz_${version}_amd64.AppImage"; - hash = "sha256-cTYnPVPjqQzwY/PpyDXlU0a+NQLY7StpayPHg5fU8Ek="; + hash = "sha256-GVlFK6n3yCuMZH0fySHrZSqQ4AdypGq9q9yr1o2tmyg="; }; extracted = appimageTools.extractType2 { diff --git a/pkgs/colibri/default.nix b/pkgs/colibri/default.nix index df74e56..a3898d9 100644 --- a/pkgs/colibri/default.nix +++ b/pkgs/colibri/default.nix @@ -77,13 +77,13 @@ let in stdenv.mkDerivation { pname = "colibri" + lib.optionalString (backend == "rocm") "-rocm"; - version = "1.12.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "JustVugg"; repo = "colibri"; - rev = "1c59bff28738f808b130d14758d5a76fc7047e0d"; # tag v1.5.0 - hash = "sha256-A2+k57KNvTBKWe8Ts1XrQaJn5X7C5G5TLFo+5Uu5Mkk="; + rev = "a7f535a9b34ffa31a4eef18c8a0bb6775c973a6e"; # tag v1.5.0 + hash = "sha256-4gxlmTiB3RfWdeqQfkr6nstBrQktRA0jUP7TY29KpM0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/delta-editor/default.nix b/pkgs/delta-editor/default.nix index c6715ab..9b7e1bb 100644 --- a/pkgs/delta-editor/default.nix +++ b/pkgs/delta-editor/default.nix @@ -29,7 +29,7 @@ let pname = "delta-editor"; - version = "0.17.0"; + version = "0.19.2"; apiUrl = "https://delta.dev/api/releases/nightly/${version}/asset?asset=delta&os=linux&arch=x86_64"; @@ -38,7 +38,7 @@ let inherit version; outputHashMode = "flat"; - outputHash = "sha256-+AUZre1HCN2hzmF95jY0Xs0n4Fd/yPnfCTG+QGBt6MU="; + outputHash = "sha256-gtSFnzH45o0DBx/vyx0N8cUQkvZwSc8lNcPlrQ0MIYI="; nativeBuildInputs = [ curl jq cacert ]; SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; diff --git a/pkgs/superset-desktop/default.nix b/pkgs/superset-desktop/default.nix index d2e31a3..7bd0b62 100644 --- a/pkgs/superset-desktop/default.nix +++ b/pkgs/superset-desktop/default.nix @@ -23,11 +23,11 @@ let pname = "superset-desktop"; - version = "1.30.2"; + version = "1.37.0"; src = fetchurl { url = "https://github.com/superset-sh/superset/releases/download/desktop-v${version}/superset-${version}-x86_64.AppImage"; - hash = "sha256-OWlTGKNOS4WiTrRow0tFju2Ut8wLK20iQt5fhoh/9gw="; + hash = "sha256-kWVH+BsZxUGgHwWL6RjjhRjHQ7+vH4LEIM1FAdsGyKo="; }; extracted = appimageTools.extractType2 {