diff --git a/configs/fwbook/hypr/conf/env.lua b/configs/fwbook/hypr/conf/env.lua index ff35167..cc81109 100644 --- a/configs/fwbook/hypr/conf/env.lua +++ b/configs/fwbook/hypr/conf/env.lua @@ -4,7 +4,7 @@ -- Mirrors the environment block in configs/niri/shared/general.kdl. hl.env("XCURSOR_SIZE", "24") -hl.env("XCURSOR_THEME", "Adwaita") +hl.env("XCURSOR_THEME", "oreo_spark_orange_bordered_cursors") hl.env("HYPRCURSOR_SIZE", "24") hl.env("HYPRCURSOR_THEME", "") -- No HYPRCURSOR_THEME set: no hyprcursor themes are installed, so Hyprland diff --git a/configs/fwbook/hypr/conf/general.lua b/configs/fwbook/hypr/conf/general.lua index 9c097fd..fff8c1d 100644 --- a/configs/fwbook/hypr/conf/general.lua +++ b/configs/fwbook/hypr/conf/general.lua @@ -26,7 +26,7 @@ hl.config({ cursor = { sync_gsettings_theme = true, - enable_hyprcursor = false, + enable_hyprcursor = true, }, misc = { diff --git a/configs/hl-fwdesk/hypr/conf/general.lua b/configs/hl-fwdesk/hypr/conf/general.lua index 95a76a6..1215b73 100644 --- a/configs/hl-fwdesk/hypr/conf/general.lua +++ b/configs/hl-fwdesk/hypr/conf/general.lua @@ -27,7 +27,7 @@ hl.config({ cursor = { sync_gsettings_theme = true, - enable_hyprcursor = false, + enable_hyprcursor = true, }, misc = { diff --git a/configs/hl-fws1/hypr/conf/cec.lua b/configs/hl-fws1/hypr/conf/cec.lua index 56ffd6b..5150f14 100644 --- a/configs/hl-fws1/hypr/conf/cec.lua +++ b/configs/hl-fws1/hypr/conf/cec.lua @@ -5,7 +5,9 @@ ---@param cmd string raw cec-client command, e.g. "on" or "as" ---@param target integer CEC logical address (0 = TV) local function cec_send(cmd, target) - hl.exec_cmd(string.format("bash -c \"echo '%s %d' | cec-client -s -d 1\"", cmd, target)) + hl.exec_cmd( + string.format("bash -c \"echo '%s %d' | cec-client -s -d 1 -o SkygBox -t p\"", cmd, target) + ) end ---Wake a CEC device and make this box its active source. diff --git a/configs/hl-fws1/hypr/conf/general.lua b/configs/hl-fws1/hypr/conf/general.lua index 9c097fd..fff8c1d 100644 --- a/configs/hl-fws1/hypr/conf/general.lua +++ b/configs/hl-fws1/hypr/conf/general.lua @@ -26,7 +26,7 @@ hl.config({ cursor = { sync_gsettings_theme = true, - enable_hyprcursor = false, + enable_hyprcursor = true, }, misc = { diff --git a/configs/hl-fws1/hypr/conf/window-rules.lua b/configs/hl-fws1/hypr/conf/window-rules.lua index 3fb99a7..04c7486 100644 --- a/configs/hl-fws1/hypr/conf/window-rules.lua +++ b/configs/hl-fws1/hypr/conf/window-rules.lua @@ -40,3 +40,9 @@ hl.window_rule({ fullscreen = true, name = "fulll-chrome", }) +-- HDMI AVI content type Cinema (Wayland "video") for the whole box. +hl.window_rule({ + name = "hdmi-cinema", + match = { class = ".*" }, + content = "video", +}) diff --git a/configs/hl-pi1/hypr/conf/general.lua b/configs/hl-pi1/hypr/conf/general.lua index 68e487b..0eb6030 100644 --- a/configs/hl-pi1/hypr/conf/general.lua +++ b/configs/hl-pi1/hypr/conf/general.lua @@ -16,7 +16,7 @@ hl.config({ }, cursor = { - enable_hyprcursor = false, + enable_hyprcursor = true, }, misc = { diff --git a/configs/hypr-types/hl.lua b/configs/hypr-types/hl.lua index dab14e6..a9e7c97 100644 --- a/configs/hypr-types/hl.lua +++ b/configs/hypr-types/hl.lua @@ -326,6 +326,7 @@ function hl.animation(opts) end ---@field rounding? number Override corner rounding ---@field move? string Position string, e.g. "20 monitor_h-120" ---@field suppress_event? string Event name to suppress, e.g. "maximize" +---@field content? "none"|"photo"|"video"|"game" HDMI AVI content type ---Add a window rule. Returns a handle with a `:set_enabled(bool)` method. ---@param opts hl.WindowRuleOpts diff --git a/flake.lock b/flake.lock index c7f78b6..d907fa4 100644 --- a/flake.lock +++ b/flake.lock @@ -264,6 +264,18 @@ "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.3/macOS" } }, + "determinate-nixd-aarch64-darwin_2": { + "flake": false, + "locked": { + "narHash": "sha256-hG3WJH3ox9F4jzQX6Tm4kkuu5Jld5ahSHWWLkLvqptg=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.3/macOS" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.3/macOS" + } + }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { @@ -276,6 +288,18 @@ "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.3/aarch64-linux" } }, + "determinate-nixd-aarch64-linux_2": { + "flake": false, + "locked": { + "narHash": "sha256-JD6kygFDs/JIlFOe45IgeI5r/UjQOE0QyX90EB0s5mg=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.3/aarch64-linux" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.3/aarch64-linux" + } + }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { @@ -288,6 +312,39 @@ "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.3/x86_64-linux" } }, + "determinate-nixd-x86_64-linux_2": { + "flake": false, + "locked": { + "narHash": "sha256-njskQtmrE+ynHHz1TOP1Ws0tgL9XJgDdQIM1KA/kW7E=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.3/x86_64-linux" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.3/x86_64-linux" + } + }, + "determinate_2": { + "inputs": { + "determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin_2", + "determinate-nixd-aarch64-linux": "determinate-nixd-aarch64-linux_2", + "determinate-nixd-x86_64-linux": "determinate-nixd-x86_64-linux_2", + "nix": "nix_2", + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1788427446, + "narHash": "sha256-3JntNU/vT11eljUs+NKvVea8u+TTA3d+pGBZOD9KZBI=", + "rev": "cb76ac22754f6b36c008a3c39477c174a146dd6b", + "revCount": 436, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.22.3/01a06698-e4aa-7ed0-adb3-2be018fc0c1f/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/determinate/3" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -449,6 +506,22 @@ "type": "github" } }, + "flake-compat_6": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -471,6 +544,28 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "hermenix", + "determinate", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", + "revCount": 480, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/hercules-ci/flake-parts/0.1.480%2Brev-17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e/019f2195-dee5-7233-9747-eca0c27f7406/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/hercules-ci/flake-parts/0.1" + } + }, + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "hermes-agent", @@ -491,7 +586,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -611,6 +706,29 @@ "url": "https://flakehub.com/f/cachix/git-hooks.nix/0.1.941" } }, + "git-hooks-nix_2": { + "inputs": { + "flake-compat": "flake-compat_5", + "nixpkgs": [ + "hermenix", + "determinate", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1784288435, + "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=", + "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9", + "revCount": 1231, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/cachix/git-hooks.nix/0.1.1231%2Brev-43b3c1ab9d40fb1dbb008f451988a91e375825e9/019f7135-8fdf-76f0-b1a1-d2c67e91af8d/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/cachix/git-hooks.nix/0.1.941" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -669,11 +787,31 @@ "type": "github" } }, + "hermenix": { + "inputs": { + "determinate": "determinate_2", + "nixos-generators": "nixos-generators", + "nixpkgs": "nixpkgs_7" + }, + "locked": { + "lastModified": 1789495170, + "narHash": "sha256-i3sHwKzO8xSztTDwBDalK8K/m71iyo9IbxSoUp+6++c=", + "ref": "refs/heads/main", + "rev": "de2649f6e0d0695ec359bc3d27f124f160bc432b", + "revCount": 3, + "type": "git", + "url": "ssh://gitea@minipc1.lab.internal:22/ari/hermenix.git" + }, + "original": { + "type": "git", + "url": "ssh://gitea@minipc1.lab.internal:22/ari/hermenix.git" + } + }, "hermes-agent": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_8", "npm-lockfile-fix": "npm-lockfile-fix", "pyproject-build-systems": "pyproject-build-systems", "pyproject-nix": "pyproject-nix", @@ -854,7 +992,7 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "hyprwire": "hyprwire", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_9", "pre-commit-hooks": "pre-commit-hooks_2", "systems": "systems_3", "xdph": "xdph" @@ -1043,7 +1181,7 @@ "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner_2", "hyprwire": "hyprwire_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_10", "systems": "systems_4" }, "locked": { @@ -1389,9 +1527,67 @@ "type": "github" } }, + "nix_2": { + "inputs": { + "flake-parts": "flake-parts_2", + "git-hooks-nix": "git-hooks-nix_2", + "nixpkgs": "nixpkgs_5", + "nixpkgs-23-11": "nixpkgs-23-11_2", + "nixpkgs-regression": "nixpkgs-regression_2" + }, + "locked": { + "lastModified": 1788380291, + "narHash": "sha256-bv8yt03cVAPdAc6/9nntqW2/QJeFsvuuYK0bbT99MDA=", + "rev": "3ed5caa3bbde51ab87977c8a80e27c6ed0ea8534", + "revCount": 27315, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.22.3/01a063f1-9def-7051-9003-4691ca024a72/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/nix-src/%2A" + } + }, + "nixlib": { + "locked": { + "lastModified": 1736643958, + "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixos-generators": { + "inputs": { + "nixlib": "nixlib", + "nixpkgs": [ + "hermenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1769813415, + "narHash": "sha256-nnVmNNKBi1YiBNPhKclNYDORoHkuKipoz7EtVnXO50A=", + "owner": "nix-community", + "repo": "nixos-generators", + "rev": "8946737ff703382fda7623b9fab071d037e897d5", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixos-generators", + "type": "github" + } + }, "nixos-hardware": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1789127271, @@ -1440,6 +1636,22 @@ "type": "github" } }, + "nixpkgs-23-11_2": { + "locked": { + "lastModified": 1717159533, + "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + } + }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, @@ -1456,6 +1668,22 @@ "type": "github" } }, + "nixpkgs-regression_2": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1789006805, @@ -1470,6 +1698,49 @@ "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1786247143, + "narHash": "sha256-8S3Kcxs7D4UtxJxSJZz0m14CGhuW0MxfrIwJxeGWGnQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "279b4a8275f032c566576b3f181fa0f27197f588", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1767892417, + "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", + "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" + } + }, + "nixpkgs_12": { + "locked": { + "lastModified": 1789009968, + "narHash": "sha256-GB16oaxpsrnGNnGIE+0uYBqMRzB9X6FYDUvjvnJAYew=", + "rev": "d58a46e3bc02d91ebe04667f8397752a749c0024", + "revCount": 1013789, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2605.1013789%2Brev-d58a46e3bc02d91ebe04667f8397752a749c0024/01a08c66-89e7-7412-a065-b78992b3113a/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nixpkgs/0" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1787962033, @@ -1517,6 +1788,48 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1787962033, + "narHash": "sha256-u6z9VTZA4Kf3RkHQo9sQI7NI4Ei/uiU9vrMqOiwWP1Y=", + "rev": "c5c4a43b0e8056328ec4529f735cabdb8f1942bb", + "revCount": 1012930, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2605.1012930%2Brev-c5c4a43b0e8056328ec4529f735cabdb8f1942bb/01a053c0-7061-7382-b001-102e9148a5b5/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2605" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1787498568, + "narHash": "sha256-9i/VTdusq/+NM/tz+J1Re+ojkMB8MBf0QshnYfzHz30=", + "rev": "56c02bc00adcf003215cc4bd996d6efaf4cff188", + "revCount": 1060451, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.1060451%2Brev-56c02bc00adcf003215cc4bd996d6efaf4cff188/01a05b78-a1af-7e32-b8fa-6b77e11317d1/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/nixpkgs-weekly/0.1" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1789286504, + "narHash": "sha256-eiEK7cKZORNEvX0GeF3RtNEF/JXhgf2RqSp3230q13E=", + "rev": "ef34387ddd751e1ab8857adf4676492d32eb24ec", + "revCount": 1073009, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.1073009%2Brev-ef34387ddd751e1ab8857adf4676492d32eb24ec/01a09f6e-d65c-7c23-9b52-4dcddb9c94b7/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1" + } + }, + "nixpkgs_8": { "locked": { "lastModified": 1785318670, "narHash": "sha256-dN6Ou5x/+23FZLEpYP3IffO+NyJFzUlGumt1uu3MMaY=", @@ -1532,7 +1845,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_9": { "locked": { "lastModified": 1788404924, "narHash": "sha256-lhEhY8X5EgkQ/eg6IFz4cc8jRuSYSvnxx1al7d1dvZ0=", @@ -1548,49 +1861,6 @@ "type": "github" } }, - "nixpkgs_7": { - "locked": { - "lastModified": 1786247143, - "narHash": "sha256-8S3Kcxs7D4UtxJxSJZz0m14CGhuW0MxfrIwJxeGWGnQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "279b4a8275f032c566576b3f181fa0f27197f588", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { - "locked": { - "lastModified": 1767892417, - "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", - "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", - "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz" - }, - "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" - } - }, - "nixpkgs_9": { - "locked": { - "lastModified": 1789009968, - "narHash": "sha256-GB16oaxpsrnGNnGIE+0uYBqMRzB9X6FYDUvjvnJAYew=", - "rev": "d58a46e3bc02d91ebe04667f8397752a749c0024", - "revCount": 1013789, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2605.1013789%2Brev-d58a46e3bc02d91ebe04667f8397752a749c0024/01a08c66-89e7-7412-a065-b78992b3113a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nixpkgs/0" - } - }, "noctalia": { "inputs": { "nixpkgs": [ @@ -1682,7 +1952,7 @@ }, "pre-commit-hooks_2": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_6", "nixpkgs": [ "hyprland", "nixpkgs" @@ -1762,6 +2032,7 @@ "flox": "flox", "git-hooks": "git-hooks", "herdr": "herdr", + "hermenix": "hermenix", "hermes-agent": "hermes-agent", "home-manager": "home-manager_3", "hyprland": "hyprland", @@ -1770,7 +2041,7 @@ "nix-flatpak": "nix-flatpak", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_12", "nixpkgs-unstable": "nixpkgs-unstable", "noctalia": "noctalia", "skygqts": "skygqts", @@ -1844,7 +2115,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_4", "gnome-shell": "gnome-shell", "nixpkgs": [ "nixpkgs" diff --git a/flake.nix b/flake.nix index 1e6c571..18e0f0d 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ # my apps skygqts.url = "git+ssh://gitea@minipc1.lab.internal:22/ari/skygqts.git"; skygqts.inputs.nixpkgs.follows = "nixpkgs"; + hermenix.url = "git+ssh://gitea@minipc1.lab.internal:22/ari/hermenix.git"; # Hardware nixos-hardware.url = "github:NixOS/nixos-hardware/master"; systems.url = "github:nix-systems/default"; @@ -78,6 +79,7 @@ outputs = { self , skygqts + , hermenix , nixpkgs-unstable , flox , determinate @@ -135,6 +137,7 @@ hermes-agent claude-desktop skygqts + hermenix flox determinate tether @@ -266,6 +269,7 @@ ./hosts/hl-fwdesk.nix ./hosts/hl-fwdesk.hardware-configuration.nix nixos-hardware.nixosModules.framework-desktop-amd-ai-max-300-series + hermenix.nixosModules.default ]; }; hl-bigbox1 = lib.makeNixOs { diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 3fc4da7..1faac3a 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -154,6 +154,7 @@ in kdePackages.qtdeclarative piper-tts ffmpeg + oreo-cursors-plus # Work postgresql @@ -253,6 +254,7 @@ in # My apps skygqts + hermenix ]); services.usbmuxd.enable = true; diff --git a/hosts/hl-fwdesk.nix b/hosts/hl-fwdesk.nix index 699227e..ee37d6d 100644 --- a/hosts/hl-fwdesk.nix +++ b/hosts/hl-fwdesk.nix @@ -27,8 +27,6 @@ let ports.comfyui ports.libretranslate ports.ds4 - ports.hermes - ports.hermesDashboard ports.vnc ]; in @@ -233,44 +231,26 @@ in }; systemd.services.libretranslate.environment.ARGOS_DEVICE_TYPE = "cpu"; - # Hermes Agent gateway (Docker container) - age.secrets.hermes-env.file = ../secrets/hermes-env.age; - skyg.nixos.common.container-services.hermes-agent = { + # Hermes Agent — hardened, self-managing NixOS VM + services.hermenix = { enable = true; - timeoutStopSec = 210; - services = { - hermes = { - image = "nousresearch/hermes-agent"; - command = [ "gateway" "run" ]; - ports = [ - "${toString ports.hermes}:8642" - "${toString ports.hermesDashboard}:9119" - ]; - volumes = [ - "/var/lib/hermes:/opt/data" - # Expose the host Nix store + daemon so nix works inside the container - "/nix/store:/nix/store:ro" - "/nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket" - ]; - environmentFiles = [ config.age.secrets.hermes-env.path ]; - environment = { - PUID = "1000"; - PGID = "100"; - HERMES_HOME = "/opt/data"; - NIX_REMOTE = "daemon"; - NIX_CONFIG = "experimental-features = nix-command flakes"; - PATH = "${pkgs.nix}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"; - }; - shm_size = "1g"; - extra_hosts = [ "host.docker.internal:host-gateway" ]; - networks = [ - "main" - ]; - }; - }; - networks = { - "main" = { }; - }; + disk.baseDir = "/var/lib/hermes-vm"; + disk.stateSize = "60G"; + network.externalInterface = "enp191s0"; + vcpu = 8; + mem = 16384; + hermesHome = "/var/lib/hermes"; + hostAccess = [ + { port = ports.ollama; } + { port = ports.ds4; } + ]; + lanAccess = [ + { address = "10.0.12.1"; port = 80; } # Home Assistant + ]; + publish = [ + { hostPort = ports.hermes; guestPort = 8642; } + { hostPort = ports.hermesDashboard; guestPort = 9119; } + ]; }; hardware.enableAllFirmware = true; hardware.amdgpu = { diff --git a/modules/core/default.nix b/modules/core/default.nix index 800ba00..528d1ac 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -1,4 +1,4 @@ -{ lib, herdr, flox, claude-desktop, skygqts, ... }: +{ lib, herdr, flox, claude-desktop, skygqts, hermenix, ... }: { imports = [ ./user.nix @@ -36,6 +36,8 @@ # flox (flox/flox) — see flake.nix input. flox_dev = flox.packages.${final.system}.default; skygqts = skygqts.packages.${final.system}.default; + # hermenix CLI (setup/migrate/remote) — see flake.nix input. + hermenix = hermenix.packages.${final.system}.hermenix; }) (final: prev: { pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [