From 72739f110f4ec96853d2dcee4b3be28ce6629db4 Mon Sep 17 00:00:00 2001 From: TheK0tYaRa Date: Thu, 12 Mar 2026 02:53:07 +0200 Subject: [PATCH] my hatred towards `home-manager.lib.homeManagerConfiguration` multiplies by the second --- custom/overlays | 2 +- devenv.lock | 6 +++--- flake.lock | 14 +++++++------- flake.nix | 39 ++++++++++++++++++++++++++++++++------- home.nix | 5 +++++ 5 files changed, 48 insertions(+), 18 deletions(-) diff --git a/custom/overlays b/custom/overlays index 214f035..2e5b60f 160000 --- a/custom/overlays +++ b/custom/overlays @@ -1 +1 @@ -Subproject commit 214f035438b22ce935cd5a547ed368da613bd985 +Subproject commit 2e5b60fcc755b9556f16a5d9d8e06adde18cfacc diff --git a/devenv.lock b/devenv.lock index 8ded817..7f4683d 100644 --- a/devenv.lock +++ b/devenv.lock @@ -3,11 +3,11 @@ "devenv": { "locked": { "dir": "src/modules", - "lastModified": 1772909021, - "narHash": "sha256-XardsHAeueL09beWx7Z6g0Rb8GZyg5cYz4wqpOkAhcw=", + "lastModified": 1773254376, + "narHash": "sha256-r83T23qeZej7Wvr60Od/0qHTmhQc9VzKFTAFRtOKr4k=", "owner": "cachix", "repo": "devenv", - "rev": "ff810b7556261e3034f3a8f7006acdb7ff9b26b2", + "rev": "bb0de08e03d5ff271dbd8c9ecb795dc67d22ffdc", "type": "github" }, "original": { diff --git a/flake.lock b/flake.lock index fcc055c..e81e9c8 100644 --- a/flake.lock +++ b/flake.lock @@ -413,11 +413,11 @@ ] }, "locked": { - "lastModified": 1773179137, - "narHash": "sha256-EdW2bwzlfme0vbMOcStnNmKlOAA05Bp6su2O8VLGT0k=", + "lastModified": 1773264496, + "narHash": "sha256-uwFY0+UfaGEo6205ixeBjplZxHWr56UQef+MtmJ0PW0=", "owner": "nix-community", "repo": "home-manager", - "rev": "3f98e2bbc661ec0aaf558d8a283d6955f05f1d09", + "rev": "32f78141a98098efed490842923b25ecb93b9b9f", "type": "github" }, "original": { @@ -548,11 +548,11 @@ ] }, "locked": { - "lastModified": 1773188941, - "narHash": "sha256-EUX7D/Kwv70TyFXHt9dM6ld/BxEXEsPiVwlFxhB+ocE=", + "lastModified": 1773270058, + "narHash": "sha256-xDyIZu4zbhFIOHfL0nwRcW6nTDtDZ2xPy6Z/7F2OaIQ=", "ref": "refs/heads/nixos-unstable", - "rev": "0ade2c3962fcb82920e2b1098c831eb29f47c56c", - "revCount": 4, + "rev": "b05f04c584c2309eae08e6bea1f5227e2a027532", + "revCount": 5, "type": "git", "url": "https://git.sys-con.ru/thek0tyara/nixpkgs-extension.git" }, diff --git a/flake.nix b/flake.nix index dd194da..749115e 100644 --- a/flake.nix +++ b/flake.nix @@ -170,12 +170,12 @@ group = "wheel"; mode = "0440"; }; - "openrouter-open.key.age" = { - file = ./secrets/openrouter-open.key.age; - owner = "root"; - group = "wheel"; - mode = "0440"; - }; + # "openrouter-open.key.age" = { + # file = ./secrets/openrouter-open.key.age; + # owner = "root"; + # group = "wheel"; + # mode = "0440"; + # }; }; identityPaths = [ "/root/.ssh/id_ed25519" ]; }; @@ -239,7 +239,7 @@ options = [ "NOPASSWD" ]; } { - command = "/run/current-system/sw/bin/nixos-rebuild"; + command = "/run/current-system/sw/bin/nix-env"; options = [ "NOPASSWD" ]; } ]; @@ -345,5 +345,30 @@ } ]; }; + homeManager."thek0tyara@testenv" = home-manager.lib.homeManagerConfiguration { + inherit pkgs; + modules = [ + ragenix.homeManagerModules.default + ( + { config, ... }: + { + age.secrets = { + "openrouter-open.key.age" = { + file = ./secrets/openrouter-open.key.age; + # owner = "root"; + # group = "wheel"; + # mode = "0440"; + }; + }; + programs.fish = { + shellInit = '' + echo fuck + set -U OPENROUTER_API $(cat ${config.age.secrets."openrouter-open.key.age".path}) + ''; + }; + } + ) + ]; + }; }; } diff --git a/home.nix b/home.nix index 6c8b6b7..8c536ac 100644 --- a/home.nix +++ b/home.nix @@ -95,6 +95,7 @@ ### neural networks dsearch lmstudio + vllm # kdePackages.kdenlive (python313.withPackages ( @@ -523,6 +524,10 @@ echo \'=== /sys/module (loaded module names) ===\'; ls /sys/module | sort } > "$outfile"; echo "$outfile"' ''; + # openrouter-env = '' # later + # set -g OPENROUTER_API="$(cat ${config.age.secrets."openrouter-open".path})" + # exec "$@" + # ''; }; }; lutris = {