servius/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat(nix): add nix-auth and update flake-utils dependencies

Browse Source
This commit is contained in:
uttarayan21
2025-10-30 22:37:43 +05:30
parent e68b9ca00a
commit 64380acf01
8 changed files with 132 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
flake.lock generated
View File

@@ -1069,7 +1069,7 @@
}, },
"flake-utils_13": { "flake-utils_13": {
"inputs": { "inputs": {
"systems": "systems_18" "systems": "systems_17"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@@ -1086,12 +1086,15 @@
} }
}, },
"flake-utils_14": { "flake-utils_14": {
"inputs": {
"systems": "systems_19"
},
"locked": { "locked": {
"lastModified": 1644229661, "lastModified": 1731533236,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1116,8 +1119,23 @@
} }
}, },
"flake-utils_16": { "flake-utils_16": {
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_17": {
"inputs": { "inputs": {
"systems": "systems_19" "systems": "systems_20"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@@ -1133,9 +1151,9 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_17": { "flake-utils_18": {
"inputs": { "inputs": {
"systems": "systems_21" "systems": "systems_22"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@@ -1151,34 +1169,16 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_18": {
"inputs": {
"systems": "systems_22"
},
"locked": {
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_19": { "flake-utils_19": {
"inputs": { "inputs": {
"systems": "systems_23" "systems": "systems_23"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1726560853,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1205,6 +1205,24 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_20": {
"inputs": {
"systems": "systems_24"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_3": { "flake-utils_3": {
"inputs": { "inputs": {
"systems": "systems_4" "systems": "systems_4"
@@ -2216,6 +2234,27 @@
"type": "github" "type": "github"
} }
}, },
"nix-auth": {
"inputs": {
"flake-utils": "flake-utils_11",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1752151075,
"narHash": "sha256-epsg+elWnZoPjFV/hc113j+JGuxL/ggcEmJJv+Niajo=",
"owner": "numtide",
"repo": "nix-auth",
"rev": "a75e08a3083ebe40dabfa2f463caab86ef78ecfa",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "nix-auth",
"type": "github"
}
},
"nix-darwin": { "nix-darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -2362,7 +2401,7 @@
"nix-minecraft": { "nix-minecraft": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_7", "flake-compat": "flake-compat_7",
"flake-utils": "flake-utils_11", "flake-utils": "flake-utils_12",
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
@@ -2681,7 +2720,7 @@
"nixpkgs" "nixpkgs"
], ],
"nuschtosSearch": "nuschtosSearch", "nuschtosSearch": "nuschtosSearch",
"systems": "systems_17" "systems": "systems_18"
}, },
"locked": { "locked": {
"lastModified": 1761534198, "lastModified": 1761534198,
@@ -2699,7 +2738,7 @@
}, },
"nno": { "nno": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_13", "flake-utils": "flake-utils_14",
"neorg": "neorg", "neorg": "neorg",
"neorg-telescope": "neorg-telescope", "neorg-telescope": "neorg-telescope",
"nixpkgs": [ "nixpkgs": [
@@ -2725,7 +2764,7 @@
"norg": { "norg": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_8", "flake-compat": "flake-compat_8",
"flake-utils": "flake-utils_14", "flake-utils": "flake-utils_15",
"nixpkgs": "nixpkgs_10" "nixpkgs": "nixpkgs_10"
}, },
"locked": { "locked": {
@@ -2746,7 +2785,7 @@
"norg-meta": { "norg-meta": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_9", "flake-compat": "flake-compat_9",
"flake-utils": "flake-utils_15", "flake-utils": "flake-utils_16",
"nixpkgs": "nixpkgs_11" "nixpkgs": "nixpkgs_11"
}, },
"locked": { "locked": {
@@ -2809,7 +2848,7 @@
}, },
"nuschtosSearch": { "nuschtosSearch": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_12", "flake-utils": "flake-utils_13",
"ixx": "ixx", "ixx": "ixx",
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
@@ -2832,7 +2871,7 @@
}, },
"onepassword-shell-plugins": { "onepassword-shell-plugins": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_16", "flake-utils": "flake-utils_17",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@@ -2979,6 +3018,7 @@
"musnix": "musnix", "musnix": "musnix",
"navigator": "navigator", "navigator": "navigator",
"neogit": "neogit", "neogit": "neogit",
"nix-auth": "nix-auth",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nix-minecraft": "nix-minecraft", "nix-minecraft": "nix-minecraft",
@@ -3290,7 +3330,7 @@
"nixpkgs" "nixpkgs"
], ],
"nur": "nur_2", "nur": "nur_2",
"systems": "systems_20", "systems": "systems_21",
"tinted-foot": "tinted-foot", "tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty", "tinted-kitty": "tinted-kitty",
"tinted-schemes": "tinted-schemes", "tinted-schemes": "tinted-schemes",
@@ -3551,6 +3591,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_24": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_3": { "systems_3": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
@@ -3741,7 +3796,7 @@
"inputs": { "inputs": {
"advisory-db": "advisory-db_5", "advisory-db": "advisory-db_5",
"crane": "crane_6", "crane": "crane_6",
"flake-utils": "flake-utils_17", "flake-utils": "flake-utils_18",
"nix-github-actions": "nix-github-actions_4", "nix-github-actions": "nix-github-actions_4",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@@ -3958,7 +4013,7 @@
"inputs": { "inputs": {
"advisory-db": "advisory-db_6", "advisory-db": "advisory-db_6",
"crane": "crane_7", "crane": "crane_7",
"flake-utils": "flake-utils_18", "flake-utils": "flake-utils_19",
"nix-github-actions": "nix-github-actions_5", "nix-github-actions": "nix-github-actions_5",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@@ -4011,7 +4066,7 @@
"zjstatus": { "zjstatus": {
"inputs": { "inputs": {
"crane": "crane_8", "crane": "crane_8",
"flake-utils": "flake-utils_19", "flake-utils": "flake-utils_20",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],

5
flake.nix
View File

@@ -214,11 +214,14 @@
url = "github:koekeishiya/yabai"; url = "github:koekeishiya/yabai";
flake = false; flake = false;
}; };
lfca = { lfca = {
url = "git+ssh://gitea@git.darksailor.dev/servius/lfca"; url = "git+ssh://gitea@git.darksailor.dev/servius/lfca";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-auth = {
url = "github:numtide/nix-auth";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = { outputs = {

2
home/services/xdg.nix
View File

@@ -5,7 +5,7 @@
# #
# }; # };
extraPortals = with pkgs; [ extraPortals = with pkgs; [
xdg-desktop-portal-hyprland # xdg-desktop-portal-hyprland
kdePackages.xdg-desktop-portal-kde kdePackages.xdg-desktop-portal-kde
]; ];
}; };

4
nixos/ryu/configuration.nix
View File

@@ -46,8 +46,12 @@
trusted-substituters = [ trusted-substituters = [
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
"https://nixos-raspberrypi.cachix.org" "https://nixos-raspberrypi.cachix.org"
"https://llama-cpp.cachix.org"
"https://cuda-maintainers.cachix.org"
]; ];
trusted-public-keys = [ trusted-public-keys = [
"cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
"llama-cpp.cachix.org-1:H75X+w83wUKTIPSO1KWy9ADUrzThyGs8P5tmAbkWhQc="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI=" "nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI="
]; ];

2
nixos/ryu/services/default.nix
View File

@@ -5,7 +5,7 @@
# ./zerotier.nix # ./zerotier.nix
# ./dnscrypt.nix # ./dnscrypt.nix
./ollama.nix ./ollama.nix
./llama.nix # ./llama.nix
./tailscale.nix ./tailscale.nix
./samba.nix ./samba.nix
./mullvad.nix ./mullvad.nix

10
nixos/ryu/services/llama.nix
View File

@@ -1,13 +1,11 @@
{ {
inputs,
pkgs, pkgs,
lib,
config, config,
... ...
}: { }: {
services = { services = {
llama-cpp = { llama-cpp = {
enable = false; enable = true;
port = 11435; port = 11435;
model = pkgs.fetchurl { model = pkgs.fetchurl {
url = "https://huggingface.co/lmstudio-community/gpt-oss-20b-GGUF/resolve/main/gpt-oss-20b-MXFP4.gguf"; url = "https://huggingface.co/lmstudio-community/gpt-oss-20b-GGUF/resolve/main/gpt-oss-20b-MXFP4.gguf";
@@ -15,6 +13,9 @@
}; };
# package = pkgs.ik_llama; # package = pkgs.ik_llama;
}; };
ollama = {
enable = true;
};
caddy = { caddy = {
virtualHosts."llama.ryu.darksailor.dev".extraConfig = '' virtualHosts."llama.ryu.darksailor.dev".extraConfig = ''
import hetzner import hetzner
@@ -22,4 +23,7 @@
''; '';
}; };
}; };
# environment.systemPackages = with pkgs; [
# vllm
# ];
} }

27
nixos/ryu/services/ollama.nix
View File

@@ -6,9 +6,10 @@
}: { }: {
services = { services = {
ollama = { ollama = {
enable = false; enable = true;
host = "0.0.0.0"; host = "0.0.0.0";
# loadModels = ["deepseek-r1:7b" "deepseek-r1:14b" "RobinBially/nomic-embed-text-8k" "qwen3:8b" "qwen3:14b"]; # loadModels = ["deepseek-r1:7b" "deepseek-r1:14b" "RobinBially/nomic-embed-text-8k" "qwen3:8b" "qwen3:14b"];
# loadModels = ["deepseek-r1:7b" "deepseek-r1:14b" "RobinBially/nomic-embed-text-8k" "qwen3:8b" "qwen3:14b"];
port = 11434; port = 11434;
acceleration = "cuda"; acceleration = "cuda";
environmentVariables = { environmentVariables = {
@@ -17,18 +18,18 @@
LD_LIBRARY_PATH = "run/opengl-driver/lib"; LD_LIBRARY_PATH = "run/opengl-driver/lib";
HTTP_PROXY = "https://ollama.ryu.darksailor.dev"; HTTP_PROXY = "https://ollama.ryu.darksailor.dev";
}; };
package = pkgs.ollama.overrideAttrs { # package = pkgs.ollama.overrideAttrs {
version = "0.11.0"; # version = "0.11.0";
src = pkgs.fetchFromGitHub { # src = pkgs.fetchFromGitHub {
owner = "ollama"; # owner = "ollama";
repo = "ollama"; # repo = "ollama";
tag = "v0.11.0"; # tag = "v0.11.0";
hash = "sha256-po7BxJAj9eOpOaXsLDmw6/1RyjXPtXza0YUv0pVojZ0="; # hash = "sha256-po7BxJAj9eOpOaXsLDmw6/1RyjXPtXza0YUv0pVojZ0=";
fetchSubmodules = true; # fetchSubmodules = true;
}; # };
doCheck = false; # doCheck = false;
vendorHash = "sha256-SlaDsu001TUW+t9WRp7LqxUSQSGDF1Lqu9M1bgILoX4="; # vendorHash = "sha256-SlaDsu001TUW+t9WRp7LqxUSQSGDF1Lqu9M1bgILoX4=";
}; # };
}; };
# open-webui = { # open-webui = {
# enable = false; # enable = false;

12
overlays.nix
View File

@@ -125,11 +125,11 @@
src = inputs.ik_llama; src = inputs.ik_llama;
version = "5995"; version = "5995";
}); });
llama-cpp = prev.llama-cpp.overrideAttrs (oldAttrs: { # llama-cpp = prev.llama-cpp.overrideAttrs (oldAttrs: {
src = inputs.llama-cpp; # src = inputs.llama-cpp;
version = "6178"; # version = "6178";
cmakeFlags = oldAttrs.cmakeFlags; # cmakeFlags = oldAttrs.cmakeFlags;
}); # });
python312 = prev.python312.override { python312 = prev.python312.override {
packageOverrides = final: prev: { packageOverrides = final: prev: {
pysaml2 = prev.pysaml2.overridePythonAttrs (orig: { pysaml2 = prev.pysaml2.overridePythonAttrs (orig: {
@@ -166,6 +166,7 @@
plugins = ["github.com/caddy-dns/hetzner@v1.0.0"]; plugins = ["github.com/caddy-dns/hetzner@v1.0.0"];
hash = "sha256-OKzPdgF+tgsu9CxXr3kj9qXcXvyu3eJeajF90PKRatw="; hash = "sha256-OKzPdgF+tgsu9CxXr3kj9qXcXvyu3eJeajF90PKRatw=";
}; };
nix-auth = inputs.nix-auth.packages.${prev.system}.nix-auth;
}; };
anyrun-overlay = final: prev: { anyrun-overlay = final: prev: {
anyrun = anyrun =
@@ -303,6 +304,7 @@ in [
inputs.rust-overlay.overlays.default inputs.rust-overlay.overlays.default
inputs.nix-minecraft.overlay inputs.nix-minecraft.overlay
inputs.lfca.overlays.default inputs.lfca.overlays.default
# inputs.ik_llama.overlays.default
jellyfin jellyfin
libfprint libfprint
misc-applications misc-applications