From 82dd99c699a2127606253f726b15b8b2b9ad9785 Mon Sep 17 00:00:00 2001 From: poslop Date: Thu, 9 Jul 2026 10:15:06 -0500 Subject: [PATCH] hermes changes --- flake.lock | 161 +++++++------------------- flake.nix | 5 - modules/core/user.nix | 5 +- modules/core/zsh/.zshrc | 2 + modules/hermes/hermes.nix | 52 ++++++++- modules/hermes/secrets/hermes-env.age | Bin 367 -> 799 bytes modules/home/packages.nix | 2 - 7 files changed, 93 insertions(+), 134 deletions(-) diff --git a/flake.lock b/flake.lock index c06c450..aa4af4f 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1778857089, - "narHash": "sha256-TclWRW2SdFeETLaiTG4BA8C8C4m/LppQEldncqyTzAQ=", + "lastModified": 1782073106, + "narHash": "sha256-dnS5SaZlPqR1E0dPXaPc+lFkBwLUbAgbwsVMk7uA6dY=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "ab2b0af63fbc9fb779d684f19149b790978be8a8", + "rev": "6d6e2384f381def4ea4ea81543cba4bbdac72457", "type": "github" }, "original": { @@ -145,11 +145,11 @@ "uv2nix": "uv2nix_2" }, "locked": { - "lastModified": 1780529046, - "narHash": "sha256-UvnNgoUoPJdFguPmSAmBej6Zdis6pf4UquEMSH+j+Xg=", + "lastModified": 1783122776, + "narHash": "sha256-Qvtj2AGQKdXrV5u7Z8hxNEDXKaeovZvX2Z2cjZKItPA=", "owner": "NousResearch", "repo": "hermes-agent", - "rev": "5c0a1fec0c14bb21a09512f485683e4f41fa0e62", + "rev": "5445e42b87b9918d5b1bfa9f4eadd8e4bb10ff37", "type": "github" }, "original": { @@ -160,17 +160,16 @@ }, "hjem": { "inputs": { - "nix-darwin": "nix-darwin", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1780199518, - "narHash": "sha256-NhtWx0youXYRvcqtL+sjdqoZinMcnjcwRsh6eBJUZLg=", + "lastModified": 1782267080, + "narHash": "sha256-so1hIImuLtTKTVUokJ/6C2D2b2D4znCx+/PAjMSAnpw=", "owner": "feel-co", "repo": "hjem", - "rev": "ffa433dd86e761de45ef985d4293f31a4d2a775d", + "rev": "dd0ba9e22fb46581f843e6121de33ca7a4a80224", "type": "github" }, "original": { @@ -184,17 +183,17 @@ "hjem": [ "hjem" ], - "nix-darwin": "nix-darwin_2", + "nix-darwin": "nix-darwin", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1779599065, - "narHash": "sha256-L35xnhNcCJIHTkwmpey/sBFZMnPm2eD9Ha4NCwWuy68=", + "lastModified": 1782226699, + "narHash": "sha256-xSafE2wgqjunLwrxPYEiTvOUDMy2PjFxDpzw8uqDWL4=", "owner": "snugnug", "repo": "hjem-rum", - "rev": "e04efc81865f68f541471186090cc703d99bc62d", + "rev": "c9e1ee9cccc13f462f874d81f6cb97f2a4293afa", "type": "github" }, "original": { @@ -224,27 +223,6 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "zen-browser", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1780099287, - "narHash": "sha256-efIPwVGtIWIjWcznhaop6XN6HxnOL8800hF6CBNvlqQ=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "7d8127d308c3fb9664f7e643eec944be74ebb37d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "hyprcursor": { "inputs": { "hyprlang": [ @@ -290,11 +268,11 @@ ] }, "locked": { - "lastModified": 1776426399, - "narHash": "sha256-RUESLKNikIeEq9ymGJ6nmcDXiSFQpUW1IhJ245nL3xM=", + "lastModified": 1782566056, + "narHash": "sha256-haEZcHzYrePnjFOYSWTbxm/Nrla0aPslJfmvdCvqtVc=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "68d064434787cf1ed4a2fe257c03c5f52f33cf84", + "rev": "c6e7b9f673f4360bc813d3dc75028f75ee88d3f8", "type": "github" }, "original": { @@ -320,11 +298,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1780519208, - "narHash": "sha256-Ic3I/mnmsT1HPew7owqDsJ8NxRV9HOWu8zpG6aeKH78=", + "lastModified": 1783110106, + "narHash": "sha256-PRnnFkTfQ+sQHSrcWw0512zEMNp5/1WHJeVuDf6FmxI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "04435fb857d4e3c5845bc43b077568d28e048c54", + "rev": "14fa1fd0273973b7a40966b4fa9e081d6bf67dae", "type": "github" }, "original": { @@ -366,11 +344,11 @@ ] }, "locked": { - "lastModified": 1776426575, - "narHash": "sha256-KI6nIfVihn/DPaeB5Et46Xg3dkNHrrEtUd5LBBVomB0=", + "lastModified": 1782563850, + "narHash": "sha256-rs/EzgrgPHbCtJjFZN4aR1HYldH/0NtGAempWVpWQTs=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "a968d211048e3ed538e47b84cb3649299578f19d", + "rev": "5ba080ee036c30cb2485f2647ff8a61f7aa08178", "type": "github" }, "original": { @@ -472,11 +450,11 @@ ] }, "locked": { - "lastModified": 1772462885, - "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=", + "lastModified": 1782554491, + "narHash": "sha256-+p3MlyN/nqRefcf2IckPlGRUn9+hielqpS9XClbLleM=", "owner": "hyprwm", "repo": "hyprtoolkit", - "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998", + "rev": "bdba25ced39ea39ab004a8f31593ba0b0ff1ca35", "type": "github" }, "original": { @@ -497,11 +475,11 @@ ] }, "locked": { - "lastModified": 1779475241, - "narHash": "sha256-Nw4DN0A5krWNcPBvuWe5Gz2yuxsUUPiDgtu6SVPJQeU=", + "lastModified": 1783002634, + "narHash": "sha256-xGqHIUK0wIZoW7SiMalwvO6uGOO/VrlQwoRobpE7dDI=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "3cd3972b2ee658a14d2610d8494e09259e530124", + "rev": "41fb809557abd29a57151b6e1aaeabd05f9437e1", "type": "github" }, "original": { @@ -565,27 +543,6 @@ } }, "nix-darwin": { - "inputs": { - "nixpkgs": [ - "hjem", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1777780666, - "narHash": "sha256-8wURyQMdDkGUarSTKOGdCuFfYiwa3HbzwscUfn3STDE=", - "owner": "nix-darwin", - "repo": "nix-darwin", - "rev": "8c62fba0854ba15c8917aed18894dbccb48a3777", - "type": "github" - }, - "original": { - "owner": "nix-darwin", - "repo": "nix-darwin", - "type": "github" - } - }, - "nix-darwin_2": { "inputs": { "nixpkgs": [ "hjem-rum", @@ -640,11 +597,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1779357205, - "narHash": "sha256-cCO8aTqss5x9Ky8GWkpY0Hy5fyTZEbtifSUV8QjSzic=", + "lastModified": 1782467914, + "narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f83fc3c307e74bc5fd5adb7eb6b8b13ffd2a36e1", + "rev": "e73de5be04e0eff4190a1432b946d469c794e7b4", "type": "github" }, "original": { @@ -656,27 +613,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1780243769, - "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", + "lastModified": 1782959384, + "narHash": "sha256-xnJJk+ct+D2+wdRxj1wk36w5zV9RVESwRqcklPdt3fM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1779560665, - "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", + "rev": "65179426c83bb3f6bc14898b42ea1c6f01d374b0", "type": "github" }, "original": { @@ -717,11 +658,11 @@ ] }, "locked": { - "lastModified": 1778507602, - "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=", + "lastModified": 1781733627, + "narHash": "sha256-U3yTuGBnmXvXoQI3qkpfEDsn9RovQPAjN7ndRco+3u0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a", + "rev": "3bbec39bc90eadfa031e6f3b77272f3f60803e39", "type": "github" }, "original": { @@ -825,8 +766,7 @@ "hjem": "hjem", "hjem-rum": "hjem-rum", "hyprland": "hyprland", - "nixpkgs": "nixpkgs_4", - "zen-browser": "zen-browser" + "nixpkgs": "nixpkgs_4" } }, "systems": { @@ -936,11 +876,11 @@ ] }, "locked": { - "lastModified": 1778265244, - "narHash": "sha256-8jlPtGSsv/CQY6tVVyLF4Jjd0gnS+Zbn9yk/V13A9nM=", + "lastModified": 1782311043, + "narHash": "sha256-07zLc2M3/ax+JsjxGTft17/Joua41LHE9/9AC/F9zeU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "813ea5ca9a1702a9a2d1f5836bc00172ef698968", + "rev": "882ad01e195ce201b07c618bbee44a0cad8b9e5a", "type": "github" }, "original": { @@ -948,25 +888,6 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } - }, - "zen-browser": { - "inputs": { - "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1780512239, - "narHash": "sha256-hRHaK71WF/UK2ka6uoHPXmbUPNh8pUf+Da47134O348=", - "owner": "0xc000022070", - "repo": "zen-browser-flake", - "rev": "735371d9ccc5c9bd7981df54fe9adbb6be666965", - "type": "github" - }, - "original": { - "owner": "0xc000022070", - "repo": "zen-browser-flake", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index cd009ad..65dd8a0 100644 --- a/flake.nix +++ b/flake.nix @@ -16,11 +16,6 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.hjem.follows = "hjem"; }; - - zen-browser = { - url = "github:0xc000022070/zen-browser-flake"; - }; - }; outputs = diff --git a/modules/core/user.nix b/modules/core/user.nix index 72bbdc2..b5e290f 100644 --- a/modules/core/user.nix +++ b/modules/core/user.nix @@ -4,7 +4,10 @@ users.users.${username} = { isNormalUser = true; description = "${username}"; - extraGroups = [ "wheel" ]; + extraGroups = [ + "wheel" + "docker" + ]; shell = pkgs.zsh; }; nix.settings.allowed-users = [ "@wheel" ]; diff --git a/modules/core/zsh/.zshrc b/modules/core/zsh/.zshrc index bf24491..9503e9d 100644 --- a/modules/core/zsh/.zshrc +++ b/modules/core/zsh/.zshrc @@ -15,6 +15,8 @@ alias gc='git commit' alias gp='git push' alias gs='git status' +alias hermes-age='cd /etc/rice-flakes/modules/hermes/secrets && sudo EDITOR=nvim agenix -e ./hermes-env.age -i /etc/ssh/ssh_host_ed25519_key' + ga() { if [[ -z "$1" ]]; then git add -u diff --git a/modules/hermes/hermes.nix b/modules/hermes/hermes.nix index 070992d..40828a3 100644 --- a/modules/hermes/hermes.nix +++ b/modules/hermes/hermes.nix @@ -2,6 +2,7 @@ inputs, config, pkgs, + username, ... }: @@ -11,7 +12,6 @@ services.hermes-agent = { enable = true; addToSystemPackages = true; - package = inputs.hermes-agent.packages.${pkgs.system}.full; environmentFiles = [ config.age.secrets.hermes-env.path ]; @@ -21,14 +21,15 @@ backend = "docker"; enable = true; hostUsers = [ "poslop" ]; + extraOptions = [ + "-p" + "9119:9119" + "-p" + "8642:8642" + ]; }; settings = { - model = { - #default = "Qwen3.6-35B-A3B-Uncensored-HauhauCS-Aggressive-Q4_K_P.gguf"; - provider = "local"; - }; - approvals = { mode = "off"; cron_mode = "deny"; @@ -47,12 +48,51 @@ }; }; + bedrock = { + discovery = { + enable = true; + provider_filter = [ "anthropic" ]; + }; + }; + custom_providers = [ { name = "local"; base_url = "http://10.0.1.139:42069/v1"; } ]; + + discord = { + group_sessions_per_user = false; + reactions = false; + }; + + dashboard = { + basic_auth = { + username = "poslop"; + password_hash = "scrypt$16384$8$1$XpurTBPYAwR7lqHEXjmudg==$1tKObL9EWptqLNHjCyTX+phYB7Qp0RuIgF2X8C/jO0A="; + }; + }; + }; + }; + + networking.firewall.allowedTCPPorts = [ + 9119 + 8642 + ]; + + systemd.services.hermes-dashboard = { + description = "Hermes Agent Web Dashboard"; + after = [ "hermes-agent.service" ]; + bindsTo = [ "hermes-agent.service" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "simple"; + ExecStart = "${pkgs.docker}/bin/docker exec -u hermes hermes-agent /data/current-package/bin/hermes dashboard --host 0.0.0.0 --port 9119 --no-open"; + Restart = "on-failure"; + RestartSec = 5; + StartLimitIntervalSec = 60; + StartLimitBurst = 3; }; }; } diff --git a/modules/hermes/secrets/hermes-env.age b/modules/hermes/secrets/hermes-env.age index 130e2b00e23333e145b8925c04e38ea1f069c214..1583299daf7985e512b8e829a2af83cbe44e30ed 100644 GIT binary patch delta 767 zcmVV-`IHQn$@G^D00OTc~p5R}Pvw zvi)JekQPKNPno@Hd(Gy`%w0+%a!+xq_{l-j_EXvb*?(TbU>tn+TkK?uT6J}wbk?UZ zOT{6DdSb<$3P8=YFDl-^XIO(x5Ff>zHVY7l(iK;QL@kVJD6iF27@3~%D5Yx3RV=PFIijh-+Sl!#aOQP8i|x zSK%k9NM3>BvM0&7Duvk+r-Ltt@gN|_;qWDx=6FZk9?7J~EkLTbXHu}vG2Sy2h=1TP zR9HlgqjOk`Xt&j*LVk=W6pb7@WZSa6$qr)0I;4^z_la5+G#{8R*jJOLsv8nLA*vBN xNYA=U+m#{%KxtJA`(i$zVwH;Mzy5R3i(K~GmpZ)apoP)9FqXlr6^d1F#mQ7=$$QDs7FMo>&) zY*#gCFbY&sP;^sTLSs`eYGPDkXmm$WO>Hn#Q*vQ&IW$dGb!AO+MQ~X-Nk=eQFbXX# zEg)ffXGc^wcPmzUZ8kG=c{XxOa7jTgQh8QzG&XQ&c}-$iHGgd{c~LoTY%~gLS8xY! z1@hF&Nqfh_IyP1iSRGYNuX9-C{-Db%dYS$8InAj$sZ$Sj62PcV(k7HLY3FLnPLdP&g@G` e3CCY#TO^FTlX{c-=C%|+R)a$+Z2e&&ZEG@W_lFMv diff --git a/modules/home/packages.nix b/modules/home/packages.nix index e6c19f2..ddd5622 100644 --- a/modules/home/packages.nix +++ b/modules/home/packages.nix @@ -1,13 +1,11 @@ { pkgs, username, - inputs, ... }: { hjem.users.${username}.packages = with pkgs; [ - inputs.zen-browser.packages."${system}".default kitty foot ];