This commit is contained in:
Simon Gardling 2025-02-07 22:29:57 -05:00
parent 8dd6f08304
commit 9426dc77a7
Signed by: titaniumtown
GPG Key ID: 9AB28AC10ECE533D
9 changed files with 79 additions and 62 deletions

36
etcnixos/flake.lock generated
View File

@ -34,11 +34,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738707394, "lastModified": 1738869872,
"narHash": "sha256-XXrOqNs9a4L6p6/KXxIGotHOxzjPxva1queN3JK0E4c=", "narHash": "sha256-lN1HkC+NXxlO5eGFjVWVkedObBoBCWPhAMucHH0/ck8=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "236da2b18bfbddf782f85ee664fdfb9d50606229", "rev": "eeb2fd1d5c96ec9755dba4ccd3d22802444cb55f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -94,11 +94,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1738477724, "lastModified": 1738823732,
"narHash": "sha256-S1x0F7q9cJ6EEmZsakse2Ps6Adi7NadxRtGiuWUlwT0=", "narHash": "sha256-1NnSYno8qRN5zBF7xhaOn1WmC52qKBh7tEuRaDRFuMs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "1936bb37b1d8597273e3611873dc09dd61b09818", "rev": "17bbc481e3d0cb52a605dd9316043c66ceaa17d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -209,11 +209,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738448366, "lastModified": 1738841109,
"narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=", "narHash": "sha256-sEgE3nifaRU5gfAx33ds0tx/j+qM0/5/bHopv/w6c0c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93", "rev": "f99c704fe3a4cf8d72b2d568ec80bc38be1a9407",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -231,11 +231,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738478597, "lastModified": 1738656811,
"narHash": "sha256-it7lc+HRSQiLV+3CcA+c6fkr2355HyT2GGUowHdfa/E=", "narHash": "sha256-z7Dzz713ueSQJYSdsWcH+D7o2pbq/sAl7/nBxru5oNA=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "77fb0818cb42ca0db98839d47bbc6a317c286282", "rev": "cd9caf9afb1c8fe848f140a7831fe462b73df91a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -310,11 +310,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1738680400, "lastModified": 1738824222,
"narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", "narHash": "sha256-U3SNq+waitGIotmgg/Et3J7o4NvUtP2gb2VhME5QXiw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "799ba5bffed04ced7067a91798353d360788b30d", "rev": "550e11f27ba790351d390d9eca3b80ad0f0254e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -379,11 +379,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1738433753, "lastModified": 1738754241,
"narHash": "sha256-lyhEsEf5FQzV+KHVkfxIApMOFWHqyls5+llcQ/uhV6Y=", "narHash": "sha256-hiw8wVE2tTrLPtIz1xSbJ3eEXCOx729kRq7UpMRTaU0=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "88b901878e684e4f68f104fdbc48749f41bcccd3", "rev": "ca47cddc31ae76a05e8709ed4aec805c5ef741d3",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -61,14 +61,13 @@
users.users."${username}".extraGroups = [ "libvirtd" ]; users.users."${username}".extraGroups = [ "libvirtd" ];
# boot.kernelPatches = [ boot.kernelPatches = [
# { {
# name = "undetected-kvm"; name = "undetected-kvm";
# patch = pkgs.fetchurl { patch = pkgs.fetchurl {
# url = "https://raw.githubusercontent.com/Scrut1ny/Hypervisor-Phantom/d09d66813570704e2b05440f290d6f9bdf2d26c7/Hypervisor-Phantom/patches/Kernel/linux-6.13-svm.patch"; url = "https://raw.githubusercontent.com/Scrut1ny/Hypervisor-Phantom/d09d66813570704e2b05440f290d6f9bdf2d26c7/Hypervisor-Phantom/patches/Kernel/linux-6.13-svm.patch";
# sha256 = "zz18xerutulLGzlHhnu26WCY8rVQXApyeoDtCjbejIk="; sha256 = "zz18xerutulLGzlHhnu26WCY8rVQXApyeoDtCjbejIk=";
# }; };
# } }
# ]; ];
} }

View File

@ -79,11 +79,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1738835520, "lastModified": 1738958180,
"narHash": "sha256-qvaWZ3PDJ0MC7t0wD8MdoGdVnMu0ps/ZWCXGepCFo5s=", "narHash": "sha256-I1BUQ6qbXg0vZMffrdD/dV/1R+YMBVySgSk3fA9snf8=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "4e72debdb5675b41278ddd492168b6c9c9ed09a0", "rev": "eaf57f2dbdd448d541bda6049ce99aab070f0db1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -112,11 +112,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1738827003, "lastModified": 1738911818,
"narHash": "sha256-s3bBfzPRRWybVSzRYStIwQxSOH5/9kR0Kfqi4IsvG7E=", "narHash": "sha256-7bhr9ldHrNP71qOmKI1Hu80uclx+Tco0RNmO+GKtC1Y=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "b31c0359ebce114ae2f9b4e5df3dc37a93f5115e", "rev": "397e704d644d1bfe7736f2fdacbfe5742c7b2f9f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -127,11 +127,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1738680400, "lastModified": 1738824222,
"narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", "narHash": "sha256-U3SNq+waitGIotmgg/Et3J7o4NvUtP2gb2VhME5QXiw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "799ba5bffed04ced7067a91798353d360788b30d", "rev": "550e11f27ba790351d390d9eca3b80ad0f0254e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -143,11 +143,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1738702386, "lastModified": 1738843498,
"narHash": "sha256-nJj8f78AYAxl/zqLiFGXn5Im1qjFKU8yBPKoWEeZN5M=", "narHash": "sha256-7x+Q4xgFj9UxZZO9aUDCR8h4vyYut4zPUvfj3i+jBHE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "030ba1976b7c0e1a67d9716b17308ccdab5b381e", "rev": "f5a32fa27df91dfc4b762671a0e0a859a8a0058f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -174,11 +174,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738808867, "lastModified": 1738981474,
"narHash": "sha256-m5rbY/ck0NAlfSBxo++vl7EZn8fkZ02H3kGGc7q883c=", "narHash": "sha256-YIELTXxfATG0g1wXjyaOWA4qrlubds3MG4FvMPCxSGg=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "ae46f37fb727030ddc2ef65a675b751484c90032", "rev": "5c571e5ff246d8fc5f76ba6e38dc8edb6e4002fe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -242,11 +242,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738880187, "lastModified": 1738951757,
"narHash": "sha256-1RieTOf8k5WQDMUpk2y24jmCUGS5Z8vyVb1xOaZu6cc=", "narHash": "sha256-I0Bmxpjid9m7Gg+z2HVASlpQpKzR7QJq5X8b9wCZFVY=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "6449d5cd3ddd3e21650ed2b80c59acfbb196fb2b", "rev": "e2f657fb55f62fb57e614a1e22e9e667996f5234",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -68,7 +68,7 @@
patches = [ patches = [
(builtins.fetchurl { (builtins.fetchurl {
url = "https://github.com/NixOS/nixpkgs/pull/372723.diff"; url = "https://github.com/NixOS/nixpkgs/pull/372723.diff";
sha256 = "039vr6xssic2bdkax440w9xfrvq8jrmm54xhsgpi93mnwj4m8fz1"; sha256 = "0kfx5vzsssv40iffr7cfdik9mxa7fcg1489i578vqsgcz230fhaf";
}) })
]; ];
}) { } }) { }

View File

@ -118,7 +118,8 @@
] ]
)) ))
binwalk # dep fails to build
# binwalk
smartmontools smartmontools
@ -131,7 +132,9 @@
# clang-format and clang-tidy # clang-format and clang-tidy
clang-tools clang-tools
clang clang
lldb
# broken
# lldb
fio fio

View File

@ -1,5 +1,5 @@
#!/usr/bin/env sh #!/usr/bin/env bash
count=$(wpctl get-volume @DEFAULT_SINK@ | sed 's/Volume: //g' | sed -E 's/0\.0?//g') count=$(wpctl get-volume @DEFAULT_SINK@ | cut -d' ' -f2- | sed -E 's/\.//g' | sed 's/^0*//g')
color="green" color="green"
if ((count > 75)); then color="yellow"; fi if ((count > 75)); then color="yellow"; fi
if ((count > 90)); then color="peach"; fi if ((count > 90)); then color="peach"; fi

View File

@ -130,7 +130,7 @@
(defwidget volume [] (defwidget volume []
(eventbox :tooltip volumesink (eventbox :tooltip volumesink
:onclick `pwvucontrol &` :onclick `pwvucontrol &`
(label :text "${volumevalue.count}%" :class {volumevalue.color}))) (label :text "${volumevalue.count}" :class {volumevalue.color})))
(defpoll currentworkspace :interval "1s" `scripts/currentWorkspace.fish`) (defpoll currentworkspace :interval "1s" `scripts/currentWorkspace.fish`)

View File

@ -8,11 +8,11 @@ let
models = [ models = [
rec { rec {
name = "DeepSeek-R1-Distill-Qwen-14B-IQ4_XS"; name = "DeepSeek-R1-Distill-Qwen-14B-IQ4_XS";
filename = builtins.elemAt (lib.splitString "?" src.name) 0; filename = src.name;
context_length = 32768; context_length = 131072;
gen_length = 8192; gen_length = 32768;
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "https://huggingface.co/bartowski/DeepSeek-R1-Distill-Qwen-14B-GGUF/resolve/main/DeepSeek-R1-Distill-Qwen-14B-IQ4_XS.gguf?download=true"; url = "https://huggingface.co/bartowski/DeepSeek-R1-Distill-Qwen-14B-GGUF/resolve/main/DeepSeek-R1-Distill-Qwen-14B-IQ4_XS.gguf";
sha256 = "031b190e7aa81770b5d069de181dcfe4b284bf5d75fa12f82f5e54a3178adcfd"; sha256 = "031b190e7aa81770b5d069de181dcfe4b284bf5d75fa12f82f5e54a3178adcfd";
}; };
} }
@ -34,7 +34,8 @@ let
] ]
); );
system_prompt = ""; system_prompt = "You are a helpful and harmless assistant. You should think step-by-step.";
chat_name_prompt = "Make a 3 word headline for this conversation";
in in
{ {
home.packages = [ home.packages = [
@ -48,16 +49,12 @@ in
'' ''
[General] [General]
chatTheme=Dark chatTheme=Dark
height=940
suggestionMode=Off suggestionMode=Off
threadCount=8 threadCount=8
userDefaultModel=${ userDefaultModel=${
# select the first element of `models` to be the default model # select the first element of `models` to be the default model
(builtins.elemAt models 0).name (builtins.elemAt models 0).name
} }
width=1472
x=0
y=0
[download] [download]
lastVersionStarted=${gpt4all_package.version} lastVersionStarted=${gpt4all_package.version}
@ -68,8 +65,9 @@ in
filename=${model.filename} filename=${model.filename}
maxLength=${builtins.toString model.gen_length} maxLength=${builtins.toString model.gen_length}
promptBatchSize=256 promptBatchSize=256
chatNamePrompt=${chat_name_prompt}
systemMessage="${ systemMessage="${
# replace newlines with the string "\n" for gpt4all to properly parse # replace newlines with the string literal "\n" for gpt4all to properly parse
builtins.replaceStrings [ "\n" ] [ "\\n" ] system_prompt builtins.replaceStrings [ "\n" ] [ "\\n" ] system_prompt
}" }"
'') models) '') models)
@ -78,6 +76,18 @@ in
[network] [network]
isActive=false isActive=false
usageStatsActive=false usageStatsActive=false
[localdocs]
fileExtensions=${
lib.concatStringsSep ", " [
"docx"
"pdf"
"txt"
"md"
"rst"
"rs"
]
}
''; '';
} }
( (

View File

@ -73,4 +73,9 @@
title = "lwn"; title = "lwn";
url = "https://lwn.net/headlines/Features"; url = "https://lwn.net/headlines/Features";
} }
{
title = "Jellyfin Blog";
url = "https://jellyfin.org/posts/rss.xml";
}
] ]