This commit is contained in:
mjallen18
2025-12-14 20:33:39 -06:00
parent f09246dcba
commit 0012a019fc
8 changed files with 67 additions and 65 deletions

104
flake.lock generated
View File

@@ -186,11 +186,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1765065051, "lastModified": 1765684049,
"narHash": "sha256-b7W9WsvyMOkUScNxbzS45KEJp0iiqRPyJ1I3JBE+oEE=", "narHash": "sha256-svCS2r984qEowMT0y3kCrsD/m0J6zaF5I/UusS7QaH0=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "7e22bf538aa3e0937effcb1cee73d5f1bcc26f79", "rev": "9b628e171bfaea1a3d1edf31eee46251e0fe4a33",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -206,11 +206,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765270797, "lastModified": 1765688338,
"narHash": "sha256-qw9iaIIz8D+lwsTO28VOaZBAJG97jH4+ci2pe7ZJR6Q=", "narHash": "sha256-MjrytR2kiHYUnzX11cXaD31tS7kKdhM1KFaac0+KAig=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "8e68aa819d6a9964c8ac45172e68b943b597c52a", "rev": "be1a6b8a05afdd5d5fa69fcaf3c4ead7014c9fd8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -300,11 +300,11 @@
}, },
"flake-compat_5": { "flake-compat_5": {
"locked": { "locked": {
"lastModified": 1761588595, "lastModified": 1765121682,
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "narHash": "sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0+rrA=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -550,11 +550,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765217760, "lastModified": 1765682243,
"narHash": "sha256-BVVyAodLcAD8KOtR3yCStBHSE0WAH/xQWH9f0qsxbmk=", "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e5b1f87841810fc24772bf4389f9793702000c9b", "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -583,11 +583,11 @@
"homebrew-cask": { "homebrew-cask": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1765297105, "lastModified": 1765729178,
"narHash": "sha256-HVs2M54Ub8q6D6trZxMebsIy9i0p3bO9NNXkVgNQWZc=", "narHash": "sha256-9+J1VTewGmepEyJjaaQiTKYA0MOmaRm6ho9AKJXKrV0=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-cask", "repo": "homebrew-cask",
"rev": "ba766f7b16449a85d22430f19e7e6f1686adf00d", "rev": "b2a2e153e149c94521920451f12b0171d7d09ca3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -599,11 +599,11 @@
"homebrew-core": { "homebrew-core": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1765293452, "lastModified": 1765730594,
"narHash": "sha256-jovN9+BmWLG5rY6syIIoufBA9r4lKL562jrcM2EL0H0=", "narHash": "sha256-sZkUkux0mE+OuNdXpRG3/1GkneMqqc9T19vvVpFSs/M=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-core", "repo": "homebrew-core",
"rev": "5276dd98991cb4e55e766786dd5490e95ed4c935", "rev": "40fb61a3d6021ddef4a3ba0f1a331ae7ca4e0058",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -633,11 +633,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1765270480, "lastModified": 1765526639,
"narHash": "sha256-RUknLx2grxAphg1h9e4CiEAsZli2FV3U4zkFKGh0n7A=", "narHash": "sha256-4U8crbUT3PDQdqhaMLnVaxnciBlcnDAw8XAJaXiS0pA=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "491926ed7cc85a2b9a6a85ee8d3c9e932c49d14d", "rev": "457a55ed77a105088a47cb55b9eccf7768559451",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -782,11 +782,11 @@
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1761409019, "lastModified": 1765533928,
"narHash": "sha256-SMKm7eh2H1o1KeJhIc4O+QSwR+KBjKgrW+jqL7lY9hI=", "narHash": "sha256-ZyfP9fpulv00Ca+AXpZ/QWf8HgGudWYhxUdBpNWCv0w=",
"owner": "sushydev", "owner": "sushydev",
"repo": "nix-plist-manager", "repo": "nix-plist-manager",
"rev": "ca7defcbc98c2b4fd0ebd166cc3e14cae40cbe73", "rev": "c6824af7470182c73c900a750f443fa6ff15ea4f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -821,11 +821,11 @@
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1765245651, "lastModified": 1765678200,
"narHash": "sha256-/+ahII8MXi59KnRmzz+OgPXScr2Oyygin/XJWP7GvdU=", "narHash": "sha256-vDqk/sXxCDHwjoqcTBZ7REUBsNNFDMGRcm7ttEEGzGs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "32a0d010099f0b982498b11cc04d5335b0fc1556", "rev": "1532ad8fa5620c3a0d43c90e0ee3b3dc518fe046",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -889,11 +889,11 @@
"nixpkgs": "nixpkgs_10" "nixpkgs": "nixpkgs_10"
}, },
"locked": { "locked": {
"lastModified": 1764852467, "lastModified": 1765528634,
"narHash": "sha256-t20jUJE2S6aqh5YjUgjgP+u/uRmOV6CTGtBLKsA0/fQ=", "narHash": "sha256-uIavvJkDwTZD1QY/oSkDtPN9xwkLwQayoZ5xOni4SBY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-apple-silicon", "repo": "nixos-apple-silicon",
"rev": "0ec4039ef904591afd235146a9a30945b6c8c0e3", "rev": "fc1440d6e6adb24d9b2650670744bae35654c867",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -997,11 +997,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764879259, "lastModified": 1765667832,
"narHash": "sha256-ZgcCO7QFEfPdzQF8719n6I8S3J17osmyx5KpEV5sF74=", "narHash": "sha256-6KEF19MMbrVAs9OgWzmrqq9fI2h0BQDA8VHtszRn2bk=",
"owner": "mjallen18", "owner": "mjallen18",
"repo": "nixos-raspberrypi", "repo": "nixos-raspberrypi",
"rev": "2098234f2e52d588e7f5ca2aaa7782a74599ac62", "rev": "ae5d1b993413b17dd664c4f0a114bc872c4e1303",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1059,11 +1059,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1764983851, "lastModified": 1765608474,
"narHash": "sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o=", "narHash": "sha256-9Wx53UK0z8Di5iesJID0tS1dRKwGxI4i7tsSanOHhF0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d9bc5c7dceb30d8d6fafa10aeb6aa8a48c218454", "rev": "28bb483c11a1214a73f9fd2d9928a6e2ea86ec71",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1091,27 +1091,27 @@
}, },
"nixpkgs_11": { "nixpkgs_11": {
"locked": { "locked": {
"lastModified": 1765270179, "lastModified": 1765472234,
"narHash": "sha256-g2a4MhRKu4ymR4xwo+I+auTknXt/+j37Lnf0Mvfl1rE=", "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "677fbe97984e7af3175b6c121f3c39ee5c8d62c9", "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable-small", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_12": { "nixpkgs_12": {
"locked": { "locked": {
"lastModified": 1764947035, "lastModified": 1765457389,
"narHash": "sha256-EYHSjVM4Ox4lvCXUMiKKs2vETUSL5mx+J2FfutM7T9w=", "narHash": "sha256-ddhDtNYvleZeYF7g7TRFSmuQuZh7HCgqstg5YBGwo5s=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a672be65651c80d3f592a89b3945466584a22069", "rev": "f997fa0f94fb1ce55bccb97f60d41412ae8fde4c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1309,11 +1309,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765016596, "lastModified": 1765464257,
"narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=", "narHash": "sha256-dixPWKiHzh80PtD0aLuxYNQ0xP+843dfXG/yM3OzaYQ=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c", "rev": "09e45f2598e1a8499c3594fe11ec2943f34fe509",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1473,11 +1473,11 @@
"nixpkgs": "nixpkgs_12" "nixpkgs": "nixpkgs_12"
}, },
"locked": { "locked": {
"lastModified": 1765231718, "lastModified": 1765684837,
"narHash": "sha256-qdBzo6puTgG4G2RHG0PkADg22ZnQo1JmSVFRxrD4QM4=", "narHash": "sha256-fJCnsYcpQxxy/wit9EBOK33c0Z9U4D3Tvo3gf2mvHos=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "7fd1416aba1865eddcdec5bb11339b7222c2363e", "rev": "94d8af61d8a603d33d1ed3500a33fcf35ae7d3bc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1530,11 +1530,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1765047449, "lastModified": 1765474444,
"narHash": "sha256-VQcqjJ2g0kT9TW4ENwA2HBQJzfbCUd5s1Wm3K+R2QZY=", "narHash": "sha256-sDG+c73xEnIw1pFNRWffKDnTWiTuyZiEP+Iub0D3mWA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "stylix", "repo": "stylix",
"rev": "bd00e01aab676aee88e6cc5c9238b4a5a7d6639a", "rev": "dd14de4432a94e93e10d0159f1d411487e435e1e",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -1,6 +1,6 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.11";
# The name "snowfall-lib" is required due to how Snowfall Lib processes your # The name "snowfall-lib" is required due to how Snowfall Lib processes your

View File

@@ -1,18 +1,10 @@
{ pkgs, ... }: { pkgs, ... }:
let let
shellAliases = { inherit (lib.${namespace}) enabled disabled;
update-boot = "sudo nixos-rebuild boot --max-jobs 10";
update-switch = "sudo nixos-rebuild switch --max-jobs 10";
update-flake = "nix flake update nas-nixpkgs nas-authentik-nix nas-cosmic nas-crowdsec nas-home-manager nas-impermanence nas-lanzaboote nas-nixos-hardware nas-sops-nix --flake /etc/nixos";
};
in in
{ {
home.username = "admin"; home.username = "admin";
programs = {
zsh.shellAliases = shellAliases;
};
# Configure systemd user service for protonmail-bridge # Configure systemd user service for protonmail-bridge
systemd.user.services.protonmail-bridge = { systemd.user.services.protonmail-bridge = {
Service = { Service = {
@@ -24,6 +16,11 @@ in
}; };
services = { services = {
nextcloud-client = lib.mkForce disabled;
kdeconnect = {
enable = false;
indicator = false;
};
protonmail-bridge = { protonmail-bridge = {
enable = true; enable = true;
extraPackages = with pkgs; [ pass libsecret ]; extraPackages = with pkgs; [ pass libsecret ];

View File

@@ -131,7 +131,7 @@ in
pass-secret-service = lib.mkDefault enabled; pass-secret-service = lib.mkDefault enabled;
kdeconnect = { kdeconnect = {
enable = lib.mkDefault hasDestopEnvironment; enable = lib.mkDefault hasDestopEnvironment;
indicator = lib.mkDefault true; indicator = lib.mkDefault hasDestopEnvironment;
}; };
}; };
} }

View File

@@ -32,7 +32,7 @@ in
host = "0.0.0.0"; host = "0.0.0.0";
openFirewall = true; openFirewall = true;
model = "/media/nas/main/nix-app-data/llama-cpp/models/functionary-small-v3.2-GGUF/functionary-small-v3.2.Q4_0.gguf"; model = "/media/nas/main/nix-app-data/llama-cpp/models/functionary-small-v3.2-GGUF/functionary-small-v3.2.Q4_0.gguf";
package = pkgs.llama-cpp-rocm; package = pkgs.stable.llama-cpp-rocm;
extraFlags = [ extraFlags = [
"--n_gpu-layers" "--n_gpu-layers"
"500" "500"
@@ -46,7 +46,7 @@ in
services.open-webui = { services.open-webui = {
enable = true; enable = true;
package = pkgs.open-webui; package = pkgs.stable.open-webui;
host = "0.0.0.0"; host = "0.0.0.0";
port = 8888; port = 8888;
openFirewall = true; openFirewall = true;

View File

@@ -1,6 +1,7 @@
{ {
config, config,
lib, lib,
pkgs,
namespace, namespace,
... ...
}: }:
@@ -135,6 +136,7 @@ in
calibre-web = { calibre-web = {
enable = true; enable = true;
openFirewall = true; openFirewall = true;
package = pkgs.stable.calibre-web;
dataDir = cfg.webDir; dataDir = cfg.webDir;
listen = { listen = {
ip = "0.0.0.0"; ip = "0.0.0.0";

View File

@@ -1,4 +1,6 @@
{ ... }: { ... }:
final: _prev: { final: _prev: {
redis = final.valkey; redis = final.valkey;
uv = final.stable.uv;
onnxruntime = final.stable.onnxruntime;
} }

View File

@@ -307,6 +307,7 @@ in
# Configure programs # Configure programs
programs = { programs = {
kdeconnect.enable = lib.mkForce false;
virt-manager.enable = true; virt-manager.enable = true;
}; };
} }