commit e099c0fd35c739f6390bd5579cf8fcb97277450d
parent b013605b98f76d23d0dc1885860890b7f89f3231
Author: vin <vin@vineetk.net>
Date: Tue, 22 Apr 2025 01:48:56 -0400
grah
Diffstat:
5 files changed, 54 insertions(+), 48 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -163,11 +163,11 @@
]
},
"locked": {
- "lastModified": 1743556466,
- "narHash": "sha256-rvU79DJ6rPDxiH0sTp686Vlm+JewwAZPGcwt8OfHJbM=",
+ "lastModified": 1743869639,
+ "narHash": "sha256-Xhe3whfRW/Ay05z9m1EZ1/AkbV1yo0tm1CbgjtCi4rQ=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "5ee44bc7c2e853f144390a12ebe5174ad7e3b9e0",
+ "rev": "d094c6763c6ddb860580e7d3b4201f8f496a6836",
"type": "github"
},
"original": {
@@ -184,17 +184,17 @@
]
},
"locked": {
- "lastModified": 1743543845,
- "narHash": "sha256-JabannLlz3nFSdF/VBKoLsSGzyfQQoajfV6KKBBno7c=",
- "owner": "ggml-org",
- "repo": "llama.cpp",
- "rev": "267c1399f15a278ec8c3cdcf9c90dc94151fbc38",
- "type": "github"
+ "lastModified": 1743881352,
+ "narHash": "sha256-YGUvl41PVJ33caO6FA9uN6H2bZgGioDd+vGRPd07v0w=",
+ "ref": "refs/heads/master",
+ "rev": "4f6cd70966ac81ed4a64d1fcbd9eb1d4874fc36f",
+ "revCount": 5054,
+ "type": "git",
+ "url": "file:///data/src/clones/llm/llama.cpp_hjc4869"
},
"original": {
- "owner": "ggml-org",
- "repo": "llama.cpp",
- "type": "github"
+ "type": "git",
+ "url": "file:///data/src/clones/llm/llama.cpp_hjc4869"
}
},
"nix-filter": {
@@ -214,11 +214,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1743515758,
- "narHash": "sha256-UdPdn4LYmyW9bYzV+hGCMGJUU8y8ySq1Ag5gIjzErrE=",
+ "lastModified": 1743862455,
+ "narHash": "sha256-I/QXtrqznq1321mYR9TyMPX/zCWb9iAH64hO+pEBY00=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "a18002797a7128bfc247a090b6c2349b4a1877f7",
+ "rev": "06f3516b0397bd241bde2daefc8538fc886c5467",
"type": "github"
},
"original": {
@@ -275,11 +275,11 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1743367904,
- "narHash": "sha256-sOos1jZGKmT6xxPvxGQyPTApOunXvScV4lNjBCXd/CI=",
+ "lastModified": 1743703532,
+ "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "7ffe0edc685f14b8c635e3d6591b0bbb97365e6c",
+ "rev": "bdb91860de2f719b57eef819b5617762f7120c70",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
@@ -27,7 +27,9 @@
};
llama-cpp = {
- url = "github:ggml-org/llama.cpp";
+ # url = "github:ggerganov/llama.cpp";
+ # url = "github:hjc4869/llama.cpp";
+ url = "/data/src/clones/llm/llama.cpp_hjc4869";
inputs.nixpkgs.follows = "nixpkgs";
};
};
diff --git a/home.nix b/home.nix
@@ -275,6 +275,8 @@ in {
programs = {
home-manager.enable = true;
+ aerc.enable = true;
+
alacritty = {
enable = true;
@@ -922,7 +924,7 @@ interceptor.register(int_fn)
mimeApps = {
enable = true;
defaultApplications = {
- "application/pdf" = [ "mupdf.desktop" ];
+ "application/pdf" = [ "zathura.desktop" ];
"application/xhtml+xml" = [ "qutebrowser.desktop" "librewolf.desktop" ];
"text/html" = [ "qutebrowser.desktop" "librewolf.desktop" ];
"text/xml" = [ "qutebrowser.desktop" "librewolf.desktop" ];
diff --git a/hosts/demiurge/default.nix b/hosts/demiurge/default.nix
@@ -13,6 +13,7 @@
# selectively allow unfree packages
allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [
+/*
"cuda_cccl"
"cuda_cudart"
"cuda_nvcc"
@@ -21,6 +22,7 @@
"libcufile"
"quartus-prime-lite"
"quartus-prime-lite-unwrapped"
+*/
"steam"
"steam-unwrapped"
];
@@ -30,6 +32,8 @@
"dotnet-sdk-6.0.428"
"aspnetcore-runtime-6.0.36"
];
+
+ cudaSupport = false;
};
overlays = [
@@ -162,12 +166,9 @@
];
packages = with pkgs; [
- (llama-cpp.legacyPackages.x86_64-linux.llamaPackages.llama-cpp.override {
- useVulkan = true;
- useRocm = true;
- rocmGpuTargets = "gfx1030";
- })
- (quartus-prime-lite.override { supportedDevices = [ "MAX 10 FPGA" ]; })
+ distrobox
+ (llama-cpp.packages.x86_64-linux.rocm.override { useVulkan = true; })
+ #(quartus-prime-lite.override { supportedDevices = [ "MAX 10 FPGA" ]; })
#(vllm.override { cudaSupport = false; rocmSupport = true; gpuTargets = [ "gfx906" "gfx1100" ]; })
];
};
@@ -175,7 +176,6 @@
# default packages for both me and root
environment = {
systemPackages = with pkgs; [
- distrobox
doas-sudo-shim
emacs
git
@@ -398,7 +398,10 @@ FQsOJMjIvhTm2IiOS8xIaZz7EJORxFjtOkLEIGGZBNK6QcnD714/nYbHSrQx4eNM
addSSL = true;
sslCertificate = "/var/demiurge.epistemia.crt";
sslCertificateKey = "/var/demiurge.epistemia.key";
- locations."/".proxyPass = "http://127.0.0.1:8083";
+ locations."/" = {
+ proxyPass = "http://127.0.0.1:8083";
+ proxyWebsockets = true;
+ };
};
"navidrome.demiurge.epistemia" = {
@@ -441,29 +444,10 @@ FQsOJMjIvhTm2IiOS8xIaZz7EJORxFjtOkLEIGGZBNK6QcnD714/nYbHSrQx4eNM
};
# llm
- ollama = {
- enable = false;
- acceleration = "rocm";
- rocmOverrideGfx = "10.3.0";
- package = pkgs.ollama-rocm;
-
- environmentVariables.LD_LIBRARY_PATH = "run/opengl-driver/lib";
-
- loadModels = [
- "deepseek-r1:14b"
- "qwen2.5:14b"
- "qwen2.5:32b"
- "qwen2.5-coder:14b"
- "qwen2.5-coder:32b"
- "qwq:32b"
- "phi4"
- "hf.co/mradermacher/Darkest-muse-v1-GGUF:Q5_K_M"
- ];
- };
-
open-webui = {
enable = true;
environment = {
+ REQUESTS_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt";
WEBUI_AUTH = "False";
};
port = 8083;
@@ -539,6 +523,12 @@ FQsOJMjIvhTm2IiOS8xIaZz7EJORxFjtOkLEIGGZBNK6QcnD714/nYbHSrQx4eNM
};
};
+ # monero node
+ monero = {
+ enable = true;
+ dataDir = "/data_wd/monero";
+ };
+
# searching
searx = {
enable = true;
diff --git a/hosts/saklas/default.nix b/hosts/saklas/default.nix
@@ -154,6 +154,12 @@
};
services = {
+ # git
+ cgit."git.vineetk.net" = {
+ enable = true;
+ scanPath = "/var/lib/git";
+ };
+
# VPN
headscale = {
enable = true;
@@ -233,6 +239,12 @@
};
};
+ "git.vineetk.net" = {
+ useACMEHost = "vineetk.net";
+ forceSSL = true;
+ locations."/".proxyPass = "http://127.0.0.1:3000/";
+ };
+
"13f0.net" = {
enableACME = true;
forceSSL = true;
