diff --git a/flake.lock b/flake.lock index 738a6cf..1403341 100644 --- a/flake.lock +++ b/flake.lock @@ -86,11 +86,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1759348172, - "narHash": "sha256-ZPUJX2ZA0ndcHndIA/S/nRESIJV0rifPr91SUpzJtEM=", + "lastModified": 1760344646, + "narHash": "sha256-ong/r42W1SkvQsdX5J8vM0Y4oy/EKTsHh+9ZB4nep4w=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "dd1af56ad79c965ee20c236ba6adbb2135ac02af", + "rev": "72ee6f4622d41d0b19c2bb4f521ef4cd970424c4", "type": "github" }, "original": { @@ -141,11 +141,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1758805352, - "narHash": "sha256-BHdc43Lkayd+72W/NXRKHzX5AZ+28F3xaUs3a88/Uew=", + "lastModified": 1760338583, + "narHash": "sha256-IGwy02SH5K2hzIFrKMRsCmyvwOwWxrcquiv4DbKL1S4=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "c48e963a5558eb1c3827d59d21c5193622a1477c", + "rev": "9a9ab01072f78823ca627ae5e895e40d493c3ecf", "type": "github" }, "original": { @@ -345,7 +345,7 @@ }, "flake-utils-plus": { "inputs": { - "flake-utils": "flake-utils_5" + "flake-utils": "flake-utils_4" }, "locked": { "lastModified": 1715533576, @@ -402,24 +402,6 @@ "inputs": { "systems": "systems_4" }, - "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_5": { - "inputs": { - "systems": "systems_5" - }, "locked": { "lastModified": 1694529238, "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", @@ -485,11 +467,11 @@ ] }, "locked": { - "lastModified": 1759261733, - "narHash": "sha256-G104PUPKBgJmcu4NWs0LUaPpSOTD4jiq4mamLWu3Oc0=", + "lastModified": 1760312644, + "narHash": "sha256-U9SkK45314urw9P7MmjhEgiQwwD/BTj+T3HTuz1JU1Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "5a21f4819ee1be645f46d6b255d49f4271ef6723", + "rev": "e121f3773fa596ecaba5b22e518936a632d72a90", "type": "github" }, "original": { @@ -505,11 +487,11 @@ ] }, "locked": { - "lastModified": 1759337100, - "narHash": "sha256-CcT3QvZ74NGfM+lSOILcCEeU+SnqXRvl1XCRHenZ0Us=", + "lastModified": 1760312644, + "narHash": "sha256-U9SkK45314urw9P7MmjhEgiQwwD/BTj+T3HTuz1JU1Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "004753ae6b04c4b18aa07192c1106800aaacf6c3", + "rev": "e121f3773fa596ecaba5b22e518936a632d72a90", "type": "github" }, "original": { @@ -518,14 +500,31 @@ "type": "github" } }, + "home-manager_3": { + "inputs": { + "nixpkgs": "nixpkgs_7" + }, + "locked": { + "lastModified": 1760295538, + "narHash": "sha256-SgnrSgyWj2ezIftKRpf+C6AdYqTkXN4iJA+JRQtdjrk=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "904fa32d77609f281ef32d5209926d81848b687a", + "type": "github" + }, + "original": { + "id": "home-manager", + "type": "indirect" + } + }, "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1759453557, - "narHash": "sha256-N2P5wIszwvh+aPRXgNusp03cb1PuMFk7mZrwlTMUQ9c=", + "lastModified": 1760394225, + "narHash": "sha256-glgAFaMn6gIH+EoG2VADjl6P9vIZXuZJvXz2AGCKFvA=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "e159d2e969ae2cc9c1b19e88b3a9745e89d1a7b0", + "rev": "0ef2d82c21a55538180e54eb7e7be4bdfcb7245c", "type": "github" }, "original": { @@ -537,11 +536,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1759450426, - "narHash": "sha256-f4SzMERQZ3Mhvhjk1ui9YIWt6n9v7K3GL5RVaM25Exw=", + "lastModified": 1760397451, + "narHash": "sha256-Jf6FuAvg1CFksE+ll2Hio7WkkWPAHdyphr4m02SJYyE=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "afb62180b517ed7df9a2ebd9f0fb923670db0f34", + "rev": "c9cb4f6e237e2430c217affd0788e683bcfcbe2a", "type": "github" }, "original": { @@ -574,11 +573,11 @@ ] }, "locked": { - "lastModified": 1759217228, - "narHash": "sha256-P13ExJlhMVkrc5LxZLNkIJZhjNYo3LLXnxDsUNrdnMQ=", + "lastModified": 1760266702, + "narHash": "sha256-TP19RpzIyo1JeYAhKii13seYwmhkv7IOD+dCnQOrcgQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "e52c15ab25f7dc68dde527c8df5bfa9d80d8e64f", + "rev": "3d7e970d4cac5d3ee3fe7cafa17cc9868fa21fed", "type": "github" }, "original": { @@ -593,11 +592,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1759387127, - "narHash": "sha256-uuwJAP92SkHmnI1zo7rrK/gEuHtb97vFZcMa5w+0SZA=", + "lastModified": 1760266702, + "narHash": "sha256-TP19RpzIyo1JeYAhKii13seYwmhkv7IOD+dCnQOrcgQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "0cc290e05882745060fccfe6d7d073f913e0cce7", + "rev": "3d7e970d4cac5d3ee3fe7cafa17cc9868fa21fed", "type": "github" }, "original": { @@ -746,11 +745,11 @@ ] }, "locked": { - "lastModified": 1759032422, - "narHash": "sha256-WZf+FhebP2/1pK2np5xj/NuDjD6fXK2BHnq/tPUN18o=", + "lastModified": 1760241904, + "narHash": "sha256-OD7QnaGEVNdukYEbJbUNWPsvnDrpbZOZxVIk6Pt9Jhw=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ec7a78cb0e098832d8acac091a4df393259c4839", + "rev": "c9f5ea45f25652ec2f771f9426ccacb21cbbaeaa", "type": "github" }, "original": { @@ -761,15 +760,15 @@ }, "nix-plist-manager": { "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_7" + "home-manager": "home-manager_3", + "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1756757912, - "narHash": "sha256-I3JefDvTscSbb9/b0oP0MpO9vzJktm89NMZXh2vUT/o=", + "lastModified": 1760306020, + "narHash": "sha256-g3DprDmL6QEiYv49ISB3d86Gn/Au9WaHHRHP5DvqO/g=", "owner": "sushydev", "repo": "nix-plist-manager", - "rev": "82d6f886b5a5afe4325b2a511a1ca8245b71f989", + "rev": "aa9ffa8b7ce07d398f98543dae527ba28d4902d7", "type": "github" }, "original": { @@ -780,15 +779,15 @@ }, "nix-vscode-extensions": { "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_8" + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1759369908, - "narHash": "sha256-IIhaE6jAge64z+fIyi/8Vtu0JdTtapbp4CvwiuIkZ1E=", + "lastModified": 1760320782, + "narHash": "sha256-1ycwVgQbDxEc4/zf8OxvnwJJwZ4wNIqgigOv/R/KdW8=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "a66ad2141b1440a838ead278c6edfe8a4ce75e6c", + "rev": "b227991f119ccaf404e9236d527c1d0e7412fe95", "type": "github" }, "original": { @@ -799,8 +798,8 @@ }, "nixai": { "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_9" + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1755942173, @@ -819,14 +818,14 @@ "nixos-apple-silicon": { "inputs": { "flake-compat": "flake-compat_4", - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1759244631, - "narHash": "sha256-b8k+l2ygOZD3ABD8H2Nl/oiZ7byT52SLrqiU3D5FG88=", + "lastModified": 1759818599, + "narHash": "sha256-4Go3gVl3E+geWMcFQ+06qlkO/lJlSvS9dyhYiXLWYq0=", "owner": "nix-community", "repo": "nixos-apple-silicon", - "rev": "db555f5ac04144c5a56d60dbf4e15a3e58ccae08", + "rev": "24ab28e47b586f741910b3a2f0428f3523a0fff3", "type": "github" }, "original": { @@ -837,11 +836,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1759261527, - "narHash": "sha256-wPd5oGvBBpUEzMF0kWnXge0WITNsITx/aGI9qLHgJ4g=", + "lastModified": 1760106635, + "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e087756cf4abbe1a34f3544c480fc1034d68742f", + "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903", "type": "github" }, "original": { @@ -881,7 +880,7 @@ "inputs": { "argononed": "argononed", "nixos-images": "nixos-images", - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1759767678, @@ -962,11 +961,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1759281824, - "narHash": "sha256-FIBE1qXv9TKvSNwst6FumyHwCRH3BlWDpfsnqRDCll0=", + "lastModified": 1760139962, + "narHash": "sha256-4xggC56Rub3WInz5eD7EZWXuLXpNvJiUPahGtMkwtuc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5b5be50345d4113d04ba58c444348849f5585b4a", + "rev": "7e297ddff44a3cc93673bb38d0374df8d0ad73e4", "type": "github" }, "original": { @@ -978,11 +977,27 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", - "owner": "nixos", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1759756860, + "narHash": "sha256-7QLUQZein1TbpouPOAsTka8vQLujHRmmTqze2IkdrqY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d3baaf296366efdea6737124f05b65d1cf25fa7c", "type": "github" }, "original": { @@ -992,7 +1007,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1758583444, "narHash": "sha256-OnYthHIsVIMrZDWtCEp6Zde8ZtMcEBnpyCIdtTKU7bo=", @@ -1008,29 +1023,29 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1760334914, + "narHash": "sha256-+eKK1TjjjYoJ7uNAf64nistrdf7K1qAxYpid+RNWssI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "662e2ea08d7caacdfacdb92512a13b3f336f6e56", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_14": { "locked": { - "lastModified": 1758029226, - "narHash": "sha256-TjqVmbpoCqWywY9xIZLTf6ANFvDCXdctCjoYuYPYdMI=", + "lastModified": 1759070547, + "narHash": "sha256-JVZl8NaVRYb0+381nl7LvPE+A774/dRpif01FKLrYFQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "08b8f92ac6354983f5382124fef6006cade4a1c1", + "rev": "647e5c14cbd5067f44ac86b74f014962df460840", "type": "github" }, "original": { @@ -1040,13 +1055,13 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_15": { "locked": { - "lastModified": 1758976413, - "narHash": "sha256-hEIDTaIqvW1NMfaNgz6pjhZPZKTmACJmXxGr/H6isIg=", + "lastModified": 1760164275, + "narHash": "sha256-gKl2Gtro/LNf8P+4L3S2RsZ0G390ccd5MyXYrTdMCFE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e3a3b32cc234f1683258d36c6232f150d57df015", + "rev": "362791944032cb532aabbeed7887a441496d5e6e", "type": "github" }, "original": { @@ -1058,11 +1073,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1759147044, - "narHash": "sha256-3ZPFytJOcLjTChljeaGgoaNj+tOqzgEpqZAvRe3bU90=", - "owner": "PedroHLC", + "lastModified": 1760038930, + "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "18e83bbe13aa50992777832b52bd0e0d8585fb3b", + "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3", "type": "github" }, "original": { @@ -1138,15 +1153,15 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", - "owner": "nixos", + "lastModified": 1759831965, + "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "c9b6fb798541223bbb396d287d16f43520250518", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -1154,33 +1169,33 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1744868846, - "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", - "owner": "NixOS", + "lastModified": 1757068644, + "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", + "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", - "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", "type": "github" } }, "nixpkgs_9": { "locked": { - "lastModified": 1751271578, - "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", - "owner": "NixOS", + "lastModified": 1759770925, + "narHash": "sha256-CZwkCtzTNclqlhuwDsVtGoRumTpqCUK0xSnFIMgd8ls=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "rev": "674c2b09c59a220204350ced584cadaacee30038", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "owner": "nixos", "repo": "nixpkgs", + "rev": "674c2b09c59a220204350ced584cadaacee30038", "type": "github" } }, @@ -1215,14 +1230,14 @@ "inputs": { "flake-compat": "flake-compat_5", "gitignore": "gitignore_2", - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_14" }, "locked": { - "lastModified": 1758108966, - "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", + "lastModified": 1760392170, + "narHash": "sha256-WftxJgr2MeDDFK47fQKywzC72L2jRc/PWcyGdjaDzkw=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", + "rev": "46d55f0aeb1d567a78223e69729734f3dca25a85", "type": "github" }, "original": { @@ -1303,7 +1318,7 @@ "nixos-apple-silicon": "nixos-apple-silicon", "nixos-hardware": "nixos-hardware", "nixos-raspberrypi": "nixos-raspberrypi", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_13", "nixpkgs-stable": "nixpkgs-stable_3", "pre-commit-hooks-nix": "pre-commit-hooks-nix_2", "snowfall-lib": "snowfall-lib", @@ -1320,11 +1335,11 @@ ] }, "locked": { - "lastModified": 1759286284, - "narHash": "sha256-JLdGGc4XDutzSD1L65Ni6Ye+oTm8kWfm0KTPMcyl7Y4=", + "lastModified": 1760236527, + "narHash": "sha256-h9+WEQtUIZaZMvA1pnbZbMM+5X39OFnW92Q8hNoToD0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f6f2da475176bb7cff51faae8b3fe879cd393545", + "rev": "a38dd7f462825c75ce8567816ae38c2e7d826bfa", "type": "github" }, "original": { @@ -1399,14 +1414,14 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_14" + "nixpkgs": "nixpkgs_15" }, "locked": { - "lastModified": 1759188042, - "narHash": "sha256-f9QC2KKiNReZDG2yyKAtDZh0rSK2Xp1wkPzKbHeQVRU=", + "lastModified": 1760393368, + "narHash": "sha256-8mN3kqyqa2PKY0wwZ2UmMEYMcxvNTwLaOrrDsw6Qi4E=", "owner": "Mic92", "repo": "sops-nix", - "rev": "9fcfabe085281dd793589bdc770a2e577a3caa5d", + "rev": "ab8d56e85b8be14cff9d93735951e30c3e86a437", "type": "github" }, "original": { @@ -1498,21 +1513,6 @@ "type": "github" } }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1520,11 +1520,11 @@ ] }, "locked": { - "lastModified": 1758728421, - "narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=", + "lastModified": 1760120816, + "narHash": "sha256-gq9rdocpmRZCwLS5vsHozwB6b5nrOBDNc2kkEaTXHfg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1", + "rev": "761ae7aff00907b607125b2f57338b74177697ed", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 345c2a3..d0a1ac8 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05"; # The name "snowfall-lib" is required due to how Snowfall Lib processes your diff --git a/modules/nixos/boot/common/default.nix b/modules/nixos/boot/common/default.nix index 75e095e..10d4eda 100644 --- a/modules/nixos/boot/common/default.nix +++ b/modules/nixos/boot/common/default.nix @@ -23,9 +23,6 @@ in config = mkIf cfg.enable { boot = { - kernelParams = [ - "quiet" - ]; binfmt = lib.mkIf isArm { registrations."x86_64-linux" = { diff --git a/modules/nixos/services/ai/default.nix b/modules/nixos/services/ai/default.nix index 142b690..d644088 100755 --- a/modules/nixos/services/ai/default.nix +++ b/modules/nixos/services/ai/default.nix @@ -21,13 +21,13 @@ in group = "jallen-nas"; openFirewall = true; acceleration = "rocm"; + rocmOverrideGfx = "11.0.2"; + loadModels = [ "mistral:instruct" ]; home = "/media/nas/main/nix-app-data/ollama"; }; - environment.systemPackages = [ pkgs.stable.llama-cpp ]; - services.llama-cpp = { - enable = true; + enable = false; port = 8127; host = "0.0.0.0"; openFirewall = true; @@ -45,7 +45,7 @@ in }; services.open-webui = { - enable = false; + enable = true; host = "0.0.0.0"; port = 8888; openFirewall = true; diff --git a/overlays/rcon/default.nix b/overlays/rcon/default.nix index f15d97f..4c08163 100644 --- a/overlays/rcon/default.nix +++ b/overlays/rcon/default.nix @@ -1,5 +1,9 @@ -{ ... }: -_final: _prev: { - # rcon = inputs.nixpkgs-stable.legacyPackages."x86_64-linux".rcon; - # llama-cpp = inputs.nixpkgs-stable.legacyPackages."x86_64-linux".llama-cpp; +{ inputs, ... }: +final: prev: { + rcon = inputs.nixpkgs-stable.legacyPackages.${prev.system}.rcon; + open-webui = inputs.nixpkgs-stable.legacyPackages.${prev.system}.open-webui; + immich-machine-learning = inputs.nixpkgs-stable.legacyPackages.${prev.system}.immich-machine-learning; + wyoming-faster-whisper = inputs.nixpkgs-stable.legacyPackages.${prev.system}.wyoming-faster-whisper; + calibre = inputs.nixpkgs-stable.legacyPackages.${prev.system}.calibre; + ollama = inputs.nixpkgs-stable.legacyPackages.${prev.system}.ollama; } diff --git a/systems/x86_64-linux/jallen-nas/default.nix b/systems/x86_64-linux/jallen-nas/default.nix index 04d7555..5ca6477 100755 --- a/systems/x86_64-linux/jallen-nas/default.nix +++ b/systems/x86_64-linux/jallen-nas/default.nix @@ -10,7 +10,7 @@ ... }: let - inherit (lib.${namespace}) enabled; + inherit (lib.${namespace}) enabled disabled; in { imports = [ @@ -21,7 +21,7 @@ in ./sops.nix ]; - services.kmscon.enable = false; + services.kmscon.enable = true; powerManagement.cpuFreqGovernor = "powersave"; @@ -36,7 +36,7 @@ in # # Desktop # # # ################################################### - desktop.cosmic = enabled; + desktop.cosmic = disabled; # ################################################### # # Development # # @@ -151,6 +151,7 @@ in 3000 2222 8181 + 5432 ]; allowedUDPPorts = config.${namespace}.network.firewall.allowedTCPPorts; }; @@ -257,9 +258,6 @@ in boot.initrd.luks.devices.cryptroot.device = "/dev/disk/by-partlabel/disk-main-jallen-nas-cryptroot"; - boot.initrd.systemd.services."unlock-bcachefs-media-nas-main".enable = false; - systemd.services."unlock-bcachefs-media-nas-main".enable = false; - # Configure environment environment = { systemPackages = with pkgs; [ @@ -273,14 +271,12 @@ in ffmpeg ipset keyutils - llama-cpp networkmanagerapplet nut packagekit pass protonmail-bridge protonvpn-cli - python3Packages.llama-cpp-python qrencode rcon sbctl diff --git a/systems/x86_64-linux/jallen-nas/services.nix b/systems/x86_64-linux/jallen-nas/services.nix index 2707e73..92caef8 100755 --- a/systems/x86_64-linux/jallen-nas/services.nix +++ b/systems/x86_64-linux/jallen-nas/services.nix @@ -23,6 +23,7 @@ postgresql = { enable = true; package = pkgs.postgresql_16; + enableTCPIP = true; dataDir = "/media/nas/main/nix-app-data/postgresql"; ensureDatabases = [ "authentik" "homeassistant" ]; ensureUsers = [