Compare commits

...

2 Commits

Author SHA1 Message Date
uttarayan21
8bd6da8f75 feat(home): add prismlauncher and ida apps, enable ollama service
Some checks failed
Flake checker / Build Nix targets (push) Has been cancelled
feat(nixos): enable ollama service with cuda support
fix(nixos): update llama service to use fixed port and remove commented code
chore(home): reorganize app imports and remove unused packages
2025-12-09 17:45:27 +05:30
uttarayan21
f0bb05678c chore: update flake.lock to latest 2025-12-09 15:28:53 +05:30
7 changed files with 83 additions and 92 deletions

84
flake.lock generated
View File

@@ -1616,11 +1616,11 @@
"zon2nix": "zon2nix" "zon2nix": "zon2nix"
}, },
"locked": { "locked": {
"lastModified": 1765206016, "lastModified": 1765256324,
"narHash": "sha256-ztdPSC4SCxDXAkgYOFIcWiUoxz+MHZgVowN/nYFp49I=", "narHash": "sha256-LB4FO4xP9XlmaxEzruiW88S2n6SEYqALdzKE3oybGkI=",
"owner": "ghostty-org", "owner": "ghostty-org",
"repo": "ghostty", "repo": "ghostty",
"rev": "049b8826f635fb668f509cd064a0a8b63404f445", "rev": "cf06417b7dfbd0daeb58a9143f9b6ee194cbce26",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1952,11 +1952,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1765206280, "lastModified": 1765234193,
"narHash": "sha256-Nl9i1glUR41XgV4zwsYKTY6OzpN/WxlVi6174N1zEu4=", "narHash": "sha256-DsURvH9UZbaPvpLR1LctCymxRJIsznUOGcS5J7z9St4=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "920353370bba555010506a1c0b204675c60362fe", "rev": "efe665b4558370af6e89921c487cd92890183961",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -2330,11 +2330,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765170585, "lastModified": 1765259453,
"narHash": "sha256-bt78Ivm18tYy+xkOCHhbssBHVIGdSQXAIUVwLiIdljo=", "narHash": "sha256-MiiZDzPxb5Vtt5FTt/BfeW5+1ZPrijvcBGVSzIQiNOI=",
"owner": "ikawrakow", "owner": "ikawrakow",
"repo": "ik_llama.cpp", "repo": "ik_llama.cpp",
"rev": "808ce4907cf4f46d41efa7a60d4996416cd041f6", "rev": "53f693a708a9cf22898f86f241991550367c469c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -2693,11 +2693,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1765080594, "lastModified": 1765267181,
"narHash": "sha256-5t3d655GqLblE+p5xN5ntkeRfZBesN7vehOWcRcU88M=", "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "4194c582d0a3f440382ee00b729ea5cc5ef59754", "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -2713,11 +2713,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1765159651, "lastModified": 1765245994,
"narHash": "sha256-sRER7WZ0ZmAgO6RcW2t/l/myG5Er6QlRcmvgGwxWO24=", "narHash": "sha256-6mra5F/nfee/MXqSXMSxSpjll6U/jfo8D9X+5H2ldmM=",
"owner": "Infinidoge", "owner": "Infinidoge",
"repo": "nix-minecraft", "repo": "nix-minecraft",
"rev": "8b393c6ec0eb0d56dde360dcef6d6f198c8167f9", "rev": "b83769c7fd3f3ab87221fdfda23f454ae95efc46",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -2861,11 +2861,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1765224106, "lastModified": 1765271087,
"narHash": "sha256-zr9GkwloaFOZucxTpnlJPXEj4nOYFsgQpNDvTOv6oLc=", "narHash": "sha256-u38f0e122QdMNWcgUVEzjDklxOauP/k0bEYNMg+Eeac=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a55a45583efc071120089f2cbf7da1223de27e69", "rev": "adf3274db725a05e8c2722e1ca62c781cea33cd0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -2902,11 +2902,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1765157498, "lastModified": 1765243871,
"narHash": "sha256-ThfeUfESQ51vxahZ++ig+dGC0SffwlRhO5fpqKWfGr8=", "narHash": "sha256-O21elg43N78HduN23eCa2NcIvcGJIs9ROB9D89y0TgE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-xr", "repo": "nixpkgs-xr",
"rev": "f8ed9c907a168fa7f8c6ae343fec4db1bc96ec03", "rev": "807b80412fad9dd33e774d282cb4e55599d0dab3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -3108,11 +3108,11 @@
"systems": "systems_19" "systems": "systems_19"
}, },
"locked": { "locked": {
"lastModified": 1765210697, "lastModified": 1765267309,
"narHash": "sha256-Gq6/MRmBhNjGdMDFvZBcnPcfuw/j/dk6N1Y9R+HSA7Q=", "narHash": "sha256-0YnWaq2uKYCeu0p+FPK+aQrJqiWdyutSEzL4C36L7T0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "05c57f2e74d39e87ef0696e450b7e817dde5378d", "rev": "53b702b36794512d87c846162081c594b4852818",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -3193,11 +3193,11 @@
"nixpkgs": "nixpkgs_12" "nixpkgs": "nixpkgs_12"
}, },
"locked": { "locked": {
"lastModified": 1765222505, "lastModified": 1765271418,
"narHash": "sha256-3S9pIQLTDU3G7iCx/vGVhESWNwr7FtmPWe9pa/mV1ZU=", "narHash": "sha256-01vU8TYPYIWiSb+97Sr15t5NvmTFZE9yWDvAT0OmsZo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "2f1e5fe41d1e1f19f9e76d9cdea9e99bce30a263", "rev": "17bb8238856f8765c68d333e31138acc69ad44f7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -3654,11 +3654,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765161692, "lastModified": 1765248027,
"narHash": "sha256-XdY9AFzmgRPYIhP4N+WiCHMNxPoifP5/Ld+orMYBD8c=", "narHash": "sha256-ngar+yP06x3+2k2Iey29uU0DWx5ur06h3iPBQXlU+yI=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "7ed7e8c74be95906275805db68201e74e9904f07", "rev": "7b50ad68415ae5be7ee4cc68fa570c420741b644",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -3695,11 +3695,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765079830, "lastModified": 1765231718,
"narHash": "sha256-i9GMbBLkeZ7MVvy7+aAuErXkBkdRylHofrAjtpUPKt8=", "narHash": "sha256-qdBzo6puTgG4G2RHG0PkADg22ZnQo1JmSVFRxrD4QM4=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "aeb517262102f13683d7a191c7e496b34df8d24c", "rev": "7fd1416aba1865eddcdec5bb11339b7222c2363e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -4436,11 +4436,11 @@
"tree-sitter-slint": { "tree-sitter-slint": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1758580669, "lastModified": 1765233732,
"narHash": "sha256-1jC4ZqkVbKgq35LUo4Gbj6Hw3Yg1zsDWFhPBMuLewxI=", "narHash": "sha256-60DfIx7aQqe0/ocxbpr00eU3IPs23E8TUILcVGrBYVs=",
"owner": "slint-ui", "owner": "slint-ui",
"repo": "tree-sitter-slint", "repo": "tree-sitter-slint",
"rev": "927f3e2f0213d0eea7f12c978c81067c3dc4289d", "rev": "f2e4e5a7bccb177562de8f5b4fe49a5531c9f7ca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -4532,11 +4532,11 @@
"systems": "systems_25" "systems": "systems_25"
}, },
"locked": { "locked": {
"lastModified": 1765223514, "lastModified": 1765272078,
"narHash": "sha256-Ku2x3nVpMo4Jz/NKx44jJwv/vgo9YkMqTAIdaPaDyG0=", "narHash": "sha256-etv2HJA9OWvTkjnrjaNSqvebu9gWLIGPYb9PWr4qkfM=",
"owner": "vicinaehq", "owner": "vicinaehq",
"repo": "vicinae", "repo": "vicinae",
"rev": "ab6451a4e536fd5b7b513e9860d0a897b84486d1", "rev": "32cf6b1f82e007cddba9c9ae037eff670219cd55",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -4569,11 +4569,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765202729, "lastModified": 1765271440,
"narHash": "sha256-iy1XRSYuFZfw/zlCFLgpjWo9c0eO0Hcc8D9rj9aZINI=", "narHash": "sha256-ntgl5T4loe4JYDOHp0IkeKEQFnWVz+ihYTyVs3T9hX4=",
"owner": "wivrn", "owner": "wivrn",
"repo": "wivrn", "repo": "wivrn",
"rev": "281dd6000ed843605c24ec3abe766e72e2e31042", "rev": "db622b42529a70140989f2db267239a3cab234f6",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -16,6 +16,7 @@ lib.optionalAttrs device.hasGui {
./gimp.nix ./gimp.nix
# ./guitarix.nix # ./guitarix.nix
./hyprpicker.nix ./hyprpicker.nix
./ida.nix
# ./jellyflix.nix # ./jellyflix.nix
# ./kicad.nix # ./kicad.nix
./kitty.nix ./kitty.nix
@@ -27,19 +28,19 @@ lib.optionalAttrs device.hasGui {
# ./openscad.nix # ./openscad.nix
./orcaslicer.nix ./orcaslicer.nix
# ./pcsx2.nix # ./pcsx2.nix
./prismlauncher.nix
# ./rpcs3.nix # ./rpcs3.nix
# ./shadps4.nix # ./shadps4.nix
./slack.nix ./slack.nix
# ./thunderbird.nix # ./thunderbird.nix
# ./tsukimi.nix # ./tsukimi.nix
# ./vial.nix # ./vial.nix
./vicinae.nix
./vlc.nix ./vlc.nix
./vscode.nix ./vscode.nix
./wezterm.nix ./wezterm.nix
./zathura.nix ./zathura.nix
./zed.nix ./zed.nix
./zen.nix ./zen.nix
./vicinae.nix
./ida.nix
]; ];
} }

View File

@@ -0,0 +1,13 @@
{pkgs, ...}: {
home.packages = with pkgs; [
(prismlauncher.override {
additionalPrograms = [ffmpeg zenity];
jdks = [
# graalvm-ce
zulu8
zulu17
zulu
];
})
];
}

View File

@@ -32,14 +32,5 @@
spotify spotify
steam-run steam-run
wl-clipboard wl-clipboard
# (prismlauncher.override {
# additionalPrograms = [ffmpeg zenity];
# jdks = [
# # graalvm-ce
# zulu8
# zulu17
# zulu
# ];
# })
]; ];
} }

View File

@@ -4,8 +4,8 @@
# ./sunshine.nix # ./sunshine.nix
# ./zerotier.nix # ./zerotier.nix
# ./dnscrypt.nix # ./dnscrypt.nix
# ./ollama.nix
./llama.nix ./llama.nix
./ollama.nix
./tailscale.nix ./tailscale.nix
./samba.nix ./samba.nix
./mullvad.nix ./mullvad.nix

View File

@@ -4,35 +4,32 @@
inputs, inputs,
... ...
}: { }: {
# llama-cpp = {
# enable = false;
# port = 11345;
# # model = "/nix/store/ch6z9di3l0k54ad29pzv8k3zv47q30d1-Qwen3-Coder-30B-A3B-Instruct-Q4_K_M.gguf";
# model = pkgs.fetchurl {
# # url = "https://huggingface.co/lmstudio-community/gpt-oss-20b-GGUF/resolve/main/gpt-oss-20b-MXFP4.gguf";
# # sha256 = "65d06d31a3977d553cb3af137b5c26b5f1e9297a6aaa29ae7caa98788cde53ab";
# url = "https://huggingface.co/lmstudio-community/Qwen3-Coder-30B-A3B-Instruct-GGUF/resolve/main/Qwen3-Coder-30B-A3B-Instruct-Q4_K_M.gguf";
# sha256 = "79ad15a5ee3caddc3f4ff0db33a14454a5a3eb503d7fa1c1e35feafc579de486";
# };
# extraFlags = [
# "-c"
# "98304"
# "--jinja"
# "--chat-template-file"
# "${../../../assets/chat.hbs}"
# # "/nix/store/4zk1p50hrzghp3jzzysz96pa64i2kmjl-promp.hbs"
# ];
# # package = inputs.llama-cpp.packages.${pkgs.system}.cuda;
# };
services = { services = {
llama-cpp = {
enable = false;
port = 11345;
# model = "/nix/store/ch6z9di3l0k54ad29pzv8k3zv47q30d1-Qwen3-Coder-30B-A3B-Instruct-Q4_K_M.gguf";
model = pkgs.fetchurl {
# url = "https://huggingface.co/lmstudio-community/gpt-oss-20b-GGUF/resolve/main/gpt-oss-20b-MXFP4.gguf";
# sha256 = "65d06d31a3977d553cb3af137b5c26b5f1e9297a6aaa29ae7caa98788cde53ab";
url = "https://huggingface.co/lmstudio-community/Qwen3-Coder-30B-A3B-Instruct-GGUF/resolve/main/Qwen3-Coder-30B-A3B-Instruct-Q4_K_M.gguf";
sha256 = "79ad15a5ee3caddc3f4ff0db33a14454a5a3eb503d7fa1c1e35feafc579de486";
};
extraFlags = [
"-c"
"98304"
"--jinja"
"--chat-template-file"
"${../../../assets/chat.hbs}"
# "/nix/store/4zk1p50hrzghp3jzzysz96pa64i2kmjl-promp.hbs"
];
# package = inputs.llama-cpp.packages.${pkgs.system}.cuda;
};
caddy = { caddy = {
virtualHosts."llama.ryu.darksailor.dev".extraConfig = '' virtualHosts."llama.ryu.darksailor.dev".extraConfig = ''
import cloudflare import cloudflare
reverse_proxy localhost:${builtins.toString config.services.llama-cpp.port} reverse_proxy localhost:11345
''; '';
}; };
}; };
environment.systemPackages = with pkgs; [
llama-cpp
];
} }

View File

@@ -6,30 +6,19 @@
}: { }: {
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"]; # 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 = {
OLLAMA_ORIGINS = "*"; OLLAMA_ORIGINS = "*";
OLLAMA_LLM_LIBRARY = "cuda"; OLLAMA_LLM_LIBRARY = "cuda";
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-cuda;
# version = "0.11.0";
# src = pkgs.fetchFromGitHub {
# owner = "ollama";
# repo = "ollama";
# tag = "v0.11.0";
# hash = "sha256-po7BxJAj9eOpOaXsLDmw6/1RyjXPtXza0YUv0pVojZ0=";
# fetchSubmodules = true;
# };
# doCheck = false;
# vendorHash = "sha256-SlaDsu001TUW+t9WRp7LqxUSQSGDF1Lqu9M1bgILoX4=";
# };
}; };
# open-webui = { # open-webui = {
# enable = false; # enable = false;