Compare commits
3 commits
72739f110f
...
575e2db66c
| Author | SHA1 | Date | |
|---|---|---|---|
| 575e2db66c | |||
| 047e41747e | |||
| 7751c36e7c |
4 changed files with 71 additions and 102 deletions
|
|
@ -1,29 +1,4 @@
|
||||||
final: prev: {
|
final: prev: {
|
||||||
# ccacheWrapper = prev.ccacheWrapper.override {
|
|
||||||
# extraConfig = ''
|
|
||||||
# export CCACHE_COMPRESS=1
|
|
||||||
# export CCACHE_SLOPPINESS=random_seed,time_macros
|
|
||||||
# export CCACHE_COMPILERCHECK=content
|
|
||||||
# export CCACHE_DIR="/home/thek0tyara/Documents/cache/ccache/"
|
|
||||||
# export CCACHE_UMASK=007
|
|
||||||
# if [ ! -d "$CCACHE_DIR" ]; then
|
|
||||||
# echo "====="
|
|
||||||
# echo "Directory '$CCACHE_DIR' does not exist"
|
|
||||||
# echo "Please create it with:"
|
|
||||||
# echo " sudo mkdir -m0770 '$CCACHE_DIR'"
|
|
||||||
# echo " sudo chown root:nixbld '$CCACHE_DIR'"
|
|
||||||
# echo "====="
|
|
||||||
# exit 1
|
|
||||||
# fi
|
|
||||||
# if [ ! -w "$CCACHE_DIR" ]; then
|
|
||||||
# echo "====="
|
|
||||||
# echo "Directory '$CCACHE_DIR' is not accessible for user $(whoami)"
|
|
||||||
# echo "Please verify its access permissions"
|
|
||||||
# echo "====="
|
|
||||||
# exit 1
|
|
||||||
# fi
|
|
||||||
# '';
|
|
||||||
# };
|
|
||||||
# xdg-desktop-portal-cosmic = prev.xdg-desktop-portal-cosmic.overrideAttrs (old: {
|
# xdg-desktop-portal-cosmic = prev.xdg-desktop-portal-cosmic.overrideAttrs (old: {
|
||||||
# postPatch = (old.postPatch or "") + ''
|
# postPatch = (old.postPatch or "") + ''
|
||||||
# unitDir="$out/lib/systemd/user"
|
# unitDir="$out/lib/systemd/user"
|
||||||
|
|
@ -31,37 +6,17 @@ final: prev: {
|
||||||
# "$unitDir/xdg-desktop-portal-cosmic.service"
|
# "$unitDir/xdg-desktop-portal-cosmic.service"
|
||||||
# '';
|
# '';
|
||||||
# });
|
# });
|
||||||
# codex = prev.codex.overrideAttrs (
|
|
||||||
# old:
|
|
||||||
# let
|
|
||||||
# version = "0.111.0";
|
|
||||||
# src = prev.fetchFromGitHub {
|
|
||||||
# owner = "openai";
|
|
||||||
# repo = "codex";
|
|
||||||
# tag = "rust-v${version}";
|
|
||||||
# hash = "sha256-hdR70BhiMg9G/ibLCeHnRSY3PcGZDv0vnqBCbzSRD6I=";
|
|
||||||
# };
|
|
||||||
# in
|
|
||||||
# {
|
|
||||||
# cargoDeps = old.cargoDeps.overrideAttrs (_: {
|
|
||||||
# inherit src;
|
|
||||||
# name = "codex-${version}-vendor.tar.gz";
|
|
||||||
# sourceRoot = "${src.name}/codex-rs";
|
|
||||||
# outputHash = "sha256-FR0GQenZ6CFhHUdi3FnuwIsqo0argAJo5STBwlGCsdg=";
|
|
||||||
# outputHashMode = "recursive";
|
|
||||||
# });
|
|
||||||
# }
|
|
||||||
# );
|
# );
|
||||||
codex = prev.codex.overrideAttrs (
|
codex = prev.codex.overrideAttrs (
|
||||||
old:
|
old:
|
||||||
let
|
let
|
||||||
version = "0.112.0";
|
version = "0.114.0";
|
||||||
src = prev.fetchFromGitHub {
|
src = prev.fetchFromGitHub {
|
||||||
owner = "openai";
|
owner = "openai";
|
||||||
repo = "codex";
|
repo = "codex";
|
||||||
tag = "rust-v${version}";
|
tag = "rust-v${version}";
|
||||||
hash = "sha256-tOrqGXh4k5GzcPhCUaiYoUVt4liYfgRd2ejkrdQpqWs=";
|
hash = "sha256-7t+mVwP4+YrG1ciI+OLqsK7TUM9SrDbPsJNrt26iy9c=";
|
||||||
# hash = "";
|
#hash = "";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
@ -71,8 +26,8 @@ final: prev: {
|
||||||
cargoDeps = prev.rustPlatform.fetchCargoVendor {
|
cargoDeps = prev.rustPlatform.fetchCargoVendor {
|
||||||
inherit src;
|
inherit src;
|
||||||
sourceRoot = "${src.name}/codex-rs";
|
sourceRoot = "${src.name}/codex-rs";
|
||||||
hash = "sha256-2+9cIslfR8BD3oN6Icfpmzz9vDMGr1NcIwiHK3qoukE=";
|
hash = "sha256-XThIexu3V18JG4OtyvYmybaRMctYpDuBLLH+lUvrtt8=";
|
||||||
# hash = prev.lib.fakeHash;
|
#hash = prev.lib.fakeHash;
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = (old.buildInputs or [ ]) ++ [ prev.libcap ];
|
buildInputs = (old.buildInputs or [ ]) ++ [ prev.libcap ];
|
||||||
|
|
|
||||||
32
flake.lock
generated
32
flake.lock
generated
|
|
@ -413,11 +413,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773264496,
|
"lastModified": 1773367248,
|
||||||
"narHash": "sha256-uwFY0+UfaGEo6205ixeBjplZxHWr56UQef+MtmJ0PW0=",
|
"narHash": "sha256-FFMc1uAwy2GYasd0rdNDVxKyAgzuoJH2M+GglBQbqf0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "32f78141a98098efed490842923b25ecb93b9b9f",
|
"rev": "be0c641a6a5564caa33982faa1fe2c60d92131c7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -548,11 +548,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773270058,
|
"lastModified": 1773276679,
|
||||||
"narHash": "sha256-xDyIZu4zbhFIOHfL0nwRcW6nTDtDZ2xPy6Z/7F2OaIQ=",
|
"narHash": "sha256-ybzGoAbp8f6syh33JzUS0ABa+Prt/gfaF50FrzBS9zM=",
|
||||||
"ref": "refs/heads/nixos-unstable",
|
"ref": "refs/heads/nixos-unstable",
|
||||||
"rev": "b05f04c584c2309eae08e6bea1f5227e2a027532",
|
"rev": "2e5b60fcc755b9556f16a5d9d8e06adde18cfacc",
|
||||||
"revCount": 5,
|
"revCount": 6,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.sys-con.ru/thek0tyara/nixpkgs-extension.git"
|
"url": "https://git.sys-con.ru/thek0tyara/nixpkgs-extension.git"
|
||||||
},
|
},
|
||||||
|
|
@ -573,11 +573,11 @@
|
||||||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773170801,
|
"lastModified": 1773390002,
|
||||||
"narHash": "sha256-TB9/4xKh8tZcbOtxlHB24EO4NlEIorxtcL3L7LOWLqA=",
|
"narHash": "sha256-0RVjh9h0sgPHngxEs/Wd2/xdGsgKgZWjxFu5JsX3ASw=",
|
||||||
"owner": "sodiboo",
|
"owner": "sodiboo",
|
||||||
"repo": "niri-flake",
|
"repo": "niri-flake",
|
||||||
"rev": "5336c8d137d1a3ad055e83fa08dcb17c1f2b9444",
|
"rev": "adc63b19724247f947385381481effd225a6e2fc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -688,11 +688,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773068389,
|
"lastModified": 1773222311,
|
||||||
"narHash": "sha256-vMrm7Pk2hjBRPnCSjhq1pH0bg350Z+pXhqZ9ICiqqCs=",
|
"narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "44bae273f9f82d480273bab26f5c50de3724f52f",
|
"rev": "0590cd39f728e129122770c029970378a79d076a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -733,11 +733,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772963539,
|
"lastModified": 1773282481,
|
||||||
"narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=",
|
"narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "9dcb002ca1690658be4a04645215baea8b95f31d",
|
"rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
63
flake.nix
63
flake.nix
|
|
@ -113,6 +113,7 @@
|
||||||
"root"
|
"root"
|
||||||
"thek0tyara"
|
"thek0tyara"
|
||||||
];
|
];
|
||||||
|
sandbox = "relaxed";
|
||||||
extra-sandbox-paths = [
|
extra-sandbox-paths = [
|
||||||
"/run/sccache"
|
"/run/sccache"
|
||||||
"/var/cache/sccache"
|
"/var/cache/sccache"
|
||||||
|
|
@ -170,12 +171,12 @@
|
||||||
group = "wheel";
|
group = "wheel";
|
||||||
mode = "0440";
|
mode = "0440";
|
||||||
};
|
};
|
||||||
# "openrouter-open.key.age" = {
|
"openrouter-open.key.age" = {
|
||||||
# file = ./secrets/openrouter-open.key.age;
|
file = ./secrets/openrouter-open.key.age;
|
||||||
# owner = "root";
|
owner = "root";
|
||||||
# group = "wheel";
|
group = "wheel";
|
||||||
# mode = "0440";
|
mode = "0440";
|
||||||
# };
|
};
|
||||||
};
|
};
|
||||||
identityPaths = [ "/root/.ssh/id_ed25519" ];
|
identityPaths = [ "/root/.ssh/id_ed25519" ];
|
||||||
};
|
};
|
||||||
|
|
@ -345,30 +346,30 @@
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
homeManager."thek0tyara@testenv" = home-manager.lib.homeManagerConfiguration {
|
# homeManager."thek0tyara@testenv" = home-manager.lib.homeManagerConfiguration {
|
||||||
inherit pkgs;
|
# inherit pkgs;
|
||||||
modules = [
|
# modules = [
|
||||||
ragenix.homeManagerModules.default
|
# ragenix.homeManagerModules.default
|
||||||
(
|
# (
|
||||||
{ config, ... }:
|
# { config, ... }:
|
||||||
{
|
# {
|
||||||
age.secrets = {
|
# age.secrets = {
|
||||||
"openrouter-open.key.age" = {
|
# "openrouter-open.key.age" = {
|
||||||
file = ./secrets/openrouter-open.key.age;
|
# file = ./secrets/openrouter-open.key.age;
|
||||||
# owner = "root";
|
# # owner = "root";
|
||||||
# group = "wheel";
|
# # group = "wheel";
|
||||||
# mode = "0440";
|
# # mode = "0440";
|
||||||
};
|
# };
|
||||||
};
|
# };
|
||||||
programs.fish = {
|
# programs.fish = {
|
||||||
shellInit = ''
|
# shellInit = ''
|
||||||
echo fuck
|
# echo fuck
|
||||||
set -U OPENROUTER_API $(cat ${config.age.secrets."openrouter-open.key.age".path})
|
# set -U OPENROUTER_API $(cat ${config.age.secrets."openrouter-open.key.age".path})
|
||||||
'';
|
# '';
|
||||||
};
|
# };
|
||||||
}
|
# }
|
||||||
)
|
# )
|
||||||
];
|
# ];
|
||||||
};
|
# };
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
23
home.nix
23
home.nix
|
|
@ -95,7 +95,7 @@
|
||||||
### neural networks
|
### neural networks
|
||||||
dsearch
|
dsearch
|
||||||
lmstudio
|
lmstudio
|
||||||
vllm
|
# vllm
|
||||||
|
|
||||||
# kdePackages.kdenlive
|
# kdePackages.kdenlive
|
||||||
(python313.withPackages (
|
(python313.withPackages (
|
||||||
|
|
@ -117,6 +117,17 @@
|
||||||
SCCACHE_DIR = "${config.home.homeDirectory}/.cache/sccache";
|
SCCACHE_DIR = "${config.home.homeDirectory}/.cache/sccache";
|
||||||
SCCACHE_SERVER_UDS = "${config.home.homeDirectory}/.cache/sccache/server.sock";
|
SCCACHE_SERVER_UDS = "${config.home.homeDirectory}/.cache/sccache/server.sock";
|
||||||
};
|
};
|
||||||
|
sessionVariablesExtra = ''
|
||||||
|
if [ -r /run/agenix/openrouter-open.key.age ]; then
|
||||||
|
export OPENROUTER_API_KEY="$(cat /run/agenix/openrouter-open.key.age)"
|
||||||
|
export ANTHROPIC_AUTH_TOKEN="$OPENROUTER_API_KEY"
|
||||||
|
|
||||||
|
export \
|
||||||
|
ANTHROPIC_BASE_URL="https://openrouter.ai/api" \
|
||||||
|
ANTHROPIC_API_KEY="" \
|
||||||
|
ANTHROPIC_MODEL="openrouter/free"
|
||||||
|
fi
|
||||||
|
'';
|
||||||
file = {
|
file = {
|
||||||
".config/waybar/power_menu.xml".text = ''
|
".config/waybar/power_menu.xml".text = ''
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
@ -467,11 +478,13 @@
|
||||||
codex = {
|
codex = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
# model = "gpt-5.4";
|
model = "gpt-5.4";
|
||||||
# approval_policy = "on-request";
|
approval_policy = "on-request";
|
||||||
# model_reasoning_effort = "high";
|
model_reasoning_effort = "high";
|
||||||
#
|
#
|
||||||
model_provider = "openrouter";
|
# model_provider = "openrouter";
|
||||||
|
# model_providers = {
|
||||||
|
# };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
# command-not-found.enable = true;
|
# command-not-found.enable = true;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue