upgrades and hhstream
This commit is contained in:
1 parent
206f353b77
commit
42b8cf4e4f
12 files changed
+50
-13
No files matched your search
@@ -1 +1 @@
|
|||||||
/nix/store/irqhrjyjaz9rb8ns04fp12dlcc6hq2q5-pre-commit-config.json
|
/nix/store/8wpcklj1m0cp057gvc6ksvkc6znlipd5-pre-commit-config.json
|
||||||
+1
-1
@@ -105,7 +105,7 @@ export def "skyg remote" [
|
|||||||
}
|
}
|
||||||
$"Using [(ansi green_bold)($profile)(ansi reset)]" | print
|
$"Using [(ansi green_bold)($profile)(ansi reset)]" | print
|
||||||
$"($cmd) on ($target_host) with ($profile)" | 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 != "" {
|
if $build_host != "" {
|
||||||
$runcmd = $"($runcmd) --build-host ($build_host).lab.internal"
|
$runcmd = $"($runcmd) --build-host ($build_host).lab.internal"
|
||||||
}
|
}
|
||||||
|
|||||||
Generated
+21
@@ -1144,6 +1144,26 @@
|
|||||||
"type": "github"
|
"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": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@@ -3115,6 +3135,7 @@
|
|||||||
"herdr": "herdr",
|
"herdr": "herdr",
|
||||||
"hermenix": "hermenix",
|
"hermenix": "hermenix",
|
||||||
"hermes-agent": "hermes-agent",
|
"hermes-agent": "hermes-agent",
|
||||||
|
"hhstream": "hhstream",
|
||||||
"home-manager": "home-manager_2",
|
"home-manager": "home-manager_2",
|
||||||
"hyprland": "hyprland",
|
"hyprland": "hyprland",
|
||||||
"hyprlauncher": "hyprlauncher",
|
"hyprlauncher": "hyprlauncher",
|
||||||
|
|||||||
@@ -4,6 +4,11 @@
|
|||||||
skygqts.url = "git+ssh://gitea@gitea.app.internal:22/ari/skygqts.git";
|
skygqts.url = "git+ssh://gitea@gitea.app.internal:22/ari/skygqts.git";
|
||||||
skygqts.inputs.nixpkgs.follows = "nixpkgs";
|
skygqts.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
hermenix.url = "git+ssh://gitea@gitea.app.internal:22/ari/hermenix.git";
|
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
|
# Hardware
|
||||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||||
systems.url = "github:nix-systems/default";
|
systems.url = "github:nix-systems/default";
|
||||||
@@ -99,6 +104,7 @@
|
|||||||
{ self
|
{ self
|
||||||
, skygqts
|
, skygqts
|
||||||
, hermenix
|
, hermenix
|
||||||
|
, hhstream
|
||||||
, nixpkgs-unstable
|
, nixpkgs-unstable
|
||||||
, flox
|
, flox
|
||||||
, determinate
|
, determinate
|
||||||
@@ -180,6 +186,7 @@
|
|||||||
hermes-agent
|
hermes-agent
|
||||||
skygqts
|
skygqts
|
||||||
hermenix
|
hermenix
|
||||||
|
hhstream
|
||||||
flox
|
flox
|
||||||
determinate
|
determinate
|
||||||
tether
|
tether
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{ pkgs, unstablePkgs, config, ... }:
|
{ pkgs, unstablePkgs, config, hyprland, ... }:
|
||||||
{
|
{
|
||||||
services.tailscale.enable = true;
|
services.tailscale.enable = true;
|
||||||
services.tailscale.extraDaemonFlags = [ "--statedir=/var/lib/tailscale" ];
|
services.tailscale.extraDaemonFlags = [ "--statedir=/var/lib/tailscale" ];
|
||||||
@@ -53,4 +53,9 @@
|
|||||||
"modesetting"
|
"modesetting"
|
||||||
"fbdev"
|
"fbdev"
|
||||||
];
|
];
|
||||||
|
services.hyprland-headless-stream = {
|
||||||
|
enable = true;
|
||||||
|
hyprlandPackage = hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
|
||||||
|
sessions.enable = true;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
@@ -3,6 +3,7 @@ let
|
|||||||
ports = {
|
ports = {
|
||||||
hermes = 8642;
|
hermes = 8642;
|
||||||
hermesDashboard = 9119;
|
hermesDashboard = 9119;
|
||||||
|
hhstreamView = 9988;
|
||||||
hermesCache = 5001;
|
hermesCache = 5001;
|
||||||
ollama = 11434;
|
ollama = 11434;
|
||||||
ds4 = 8000;
|
ds4 = 8000;
|
||||||
@@ -41,6 +42,7 @@ in
|
|||||||
publish = [
|
publish = [
|
||||||
{ hostPort = ports.hermes; guestPort = 8642; }
|
{ hostPort = ports.hermes; guestPort = 8642; }
|
||||||
{ hostPort = ports.hermesDashboard; guestPort = 9119; }
|
{ hostPort = ports.hermesDashboard; guestPort = 9119; }
|
||||||
|
{ hostPort = ports.hhstreamView; guestPort = ports.hhstreamView; }
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
+2
-1
@@ -8,7 +8,8 @@ All reusable NixOS and Home Manager modules. Every host gets the full module tre
|
|||||||
```
|
```
|
||||||
modules/
|
modules/
|
||||||
├── lib.nix # makeNixOs / makeIso / makeHomeManagerUsers / makeDarwinModule / eachSystem
|
├── 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
|
├── main.nix # Base module imported by every host: core/ + nixos/ + network-drives.nix
|
||||||
│ # + skyg.internalNetworkingMap (global app registry + appNetwork)
|
│ # + skyg.internalNetworkingMap (global app registry + appNetwork)
|
||||||
├── internal-networking.nix # Renders skyg.internalNetworkingMap → router generalMappings
|
├── internal-networking.nix # Renders skyg.internalNetworkingMap → router generalMappings
|
||||||
|
|||||||
@@ -50,6 +50,7 @@ let
|
|||||||
specialArgs.nix-index-database.nixosModules.nix-index
|
specialArgs.nix-index-database.nixosModules.nix-index
|
||||||
specialArgs.hermes-agent.nixosModules.default
|
specialArgs.hermes-agent.nixosModules.default
|
||||||
specialArgs.tether.nixosModules.default
|
specialArgs.tether.nixosModules.default
|
||||||
|
specialArgs.hhstream.nixosModules.default
|
||||||
{ programs.nix-index-database.comma.enable = true; }
|
{ programs.nix-index-database.comma.enable = true; }
|
||||||
];
|
];
|
||||||
makeHomeConfig = {}: import ./home { };
|
makeHomeConfig = {}: import ./home { };
|
||||||
|
|||||||
@@ -23,11 +23,11 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
pname = "buzz-desktop";
|
pname = "buzz-desktop";
|
||||||
version = "0.5.25";
|
version = "0.5.27";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/block/buzz/releases/download/desktop-v${version}/Buzz_${version}_amd64.AppImage";
|
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 {
|
extracted = appimageTools.extractType2 {
|
||||||
|
|||||||
@@ -77,13 +77,13 @@ let
|
|||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "colibri" + lib.optionalString (backend == "rocm") "-rocm";
|
pname = "colibri" + lib.optionalString (backend == "rocm") "-rocm";
|
||||||
version = "1.12.1";
|
version = "2.0.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "JustVugg";
|
owner = "JustVugg";
|
||||||
repo = "colibri";
|
repo = "colibri";
|
||||||
rev = "1c59bff28738f808b130d14758d5a76fc7047e0d"; # tag v1.5.0
|
rev = "a7f535a9b34ffa31a4eef18c8a0bb6775c973a6e"; # tag v1.5.0
|
||||||
hash = "sha256-A2+k57KNvTBKWe8Ts1XrQaJn5X7C5G5TLFo+5Uu5Mkk=";
|
hash = "sha256-4gxlmTiB3RfWdeqQfkr6nstBrQktRA0jUP7TY29KpM0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
pname = "delta-editor";
|
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";
|
apiUrl = "https://delta.dev/api/releases/nightly/${version}/asset?asset=delta&os=linux&arch=x86_64";
|
||||||
|
|
||||||
@@ -38,7 +38,7 @@ let
|
|||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
outputHashMode = "flat";
|
outputHashMode = "flat";
|
||||||
outputHash = "sha256-+AUZre1HCN2hzmF95jY0Xs0n4Fd/yPnfCTG+QGBt6MU=";
|
outputHash = "sha256-gtSFnzH45o0DBx/vyx0N8cUQkvZwSc8lNcPlrQ0MIYI=";
|
||||||
|
|
||||||
nativeBuildInputs = [ curl jq cacert ];
|
nativeBuildInputs = [ curl jq cacert ];
|
||||||
SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
|
SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||||
|
|||||||
@@ -23,11 +23,11 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
pname = "superset-desktop";
|
pname = "superset-desktop";
|
||||||
version = "1.30.2";
|
version = "1.37.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/superset-sh/superset/releases/download/desktop-v${version}/superset-${version}-x86_64.AppImage";
|
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 {
|
extracted = appimageTools.extractType2 {
|
||||||
|
|||||||
Reference in new issue
Block a user