From 53a2d01a83ca3c2f71f50843417a08d8d65d0507 Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Mon, 22 Dec 2025 14:55:32 -0600 Subject: [PATCH] up --- flake.lock | 174 +++++++++++------------ modules/nixos/nix/default.nix | 22 ++- systems/x86_64-linux/jallen-nas/apps.nix | 6 +- 3 files changed, 106 insertions(+), 96 deletions(-) diff --git a/flake.lock b/flake.lock index 5a06c7d..3d41166 100644 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1763643080, - "narHash": "sha256-jlYmjrTw3g5iOYDZBGb5Plw6IyRa+WY60e3GzU19bkk=", + "lastModified": 1765971510, + "narHash": "sha256-HdGpVTqPguAvkDbgjWi38sGUaI0MvxJJX2bFVZTKXaE=", "owner": "nix-community", "repo": "authentik-nix", - "rev": "4a670757083d94a9dceb4929eb88eb9995bc1363", + "rev": "e929253deddb8398c7010b28187d9d43603db950", "type": "github" }, "original": { @@ -46,16 +46,16 @@ "authentik-src": { "flake": false, "locked": { - "lastModified": 1763564826, - "narHash": "sha256-xBnAfoAOUslOrxNzY5kV0h67qWMXKZnPC/wgRGXZleQ=", + "lastModified": 1765907481, + "narHash": "sha256-d0pPNE2T30COdFse0T15Mx8XW4BGg8hgPQvmW2dAV9s=", "owner": "goauthentik", "repo": "authentik", - "rev": "2fedc3d0a0ba91c16bb71bd4b2432108ca02e890", + "rev": "0d617e4ad1eb9e4540ba5381e6ce06e971affc63", "type": "github" }, "original": { "owner": "goauthentik", - "ref": "version/2025.10.2", + "ref": "version/2025.10.3", "repo": "authentik", "type": "github" } @@ -81,17 +81,17 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1754405784, - "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", + "lastModified": 1765809053, + "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" } }, @@ -186,11 +186,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1765684049, - "narHash": "sha256-svCS2r984qEowMT0y3kCrsD/m0J6zaF5I/UusS7QaH0=", + "lastModified": 1766038392, + "narHash": "sha256-ht/GuKaw5NT3M12xM+mkUtkSBVtzjJ8IHIy6R/ncv9g=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "9b628e171bfaea1a3d1edf31eee46251e0fe4a33", + "rev": "5fb45ece6129bd7ad8f7310df0ae9c00bae7c562", "type": "github" }, "original": { @@ -206,11 +206,11 @@ ] }, "locked": { - "lastModified": 1765688338, - "narHash": "sha256-MjrytR2kiHYUnzX11cXaD31tS7kKdhM1KFaac0+KAig=", + "lastModified": 1766150702, + "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=", "owner": "nix-community", "repo": "disko", - "rev": "be1a6b8a05afdd5d5fa69fcaf3c4ead7014c9fd8", + "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378", "type": "github" }, "original": { @@ -238,11 +238,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "lastModified": 1765121682, + "narHash": "sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0+rrA=", "owner": "edolstra", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3", "type": "github" }, "original": { @@ -334,11 +334,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1762980239, - "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", "type": "github" }, "original": { @@ -550,11 +550,11 @@ ] }, "locked": { - "lastModified": 1765682243, - "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=", + "lastModified": 1766387499, + "narHash": "sha256-AjK3/UKDzeXFeYNLVBaJ3+HLE9he1g5UrlNd4/BM3eA=", "owner": "nix-community", "repo": "home-manager", - "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03", + "rev": "527ad07e6625302b648ed3b28c34b62a79bd103e", "type": "github" }, "original": { @@ -583,11 +583,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1765729178, - "narHash": "sha256-9+J1VTewGmepEyJjaaQiTKYA0MOmaRm6ho9AKJXKrV0=", + "lastModified": 1766413525, + "narHash": "sha256-55VKrh1EBq1C0KkGSuUX4S+wk1nbMifUZglyXHglZWA=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "b2a2e153e149c94521920451f12b0171d7d09ca3", + "rev": "566e7923dad1a52ecd901853c83106189ac3b97f", "type": "github" }, "original": { @@ -599,11 +599,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1765730594, - "narHash": "sha256-sZkUkux0mE+OuNdXpRG3/1GkneMqqc9T19vvVpFSs/M=", + "lastModified": 1766416303, + "narHash": "sha256-2evKobNM8kvQEqN3+aXH56vMaF3XRSPHzphl0FuPu6M=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "40fb61a3d6021ddef4a3ba0f1a331ae7ca4e0058", + "rev": "ae735ab936c6662e50911b1a70026423d5e040ac", "type": "github" }, "original": { @@ -633,11 +633,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1765526639, - "narHash": "sha256-4U8crbUT3PDQdqhaMLnVaxnciBlcnDAw8XAJaXiS0pA=", + "lastModified": 1766225187, + "narHash": "sha256-6hcaU8qtmixsaEUbjPiOFd5aJPZxAIBokl5d7dkab3k=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "457a55ed77a105088a47cb55b9eccf7768559451", + "rev": "bb53a85db9210204a98f771f10f1f5b4e06ccb2d", "type": "github" }, "original": { @@ -821,11 +821,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1765678200, - "narHash": "sha256-vDqk/sXxCDHwjoqcTBZ7REUBsNNFDMGRcm7ttEEGzGs=", + "lastModified": 1766369649, + "narHash": "sha256-8Z/4upd/AS7pU72QS3GesaWeTgM4VcrSf85bh9fxum8=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "1532ad8fa5620c3a0d43c90e0ee3b3dc518fe046", + "rev": "94058abef65a5f2916f4d9da67d9966039366514", "type": "github" }, "original": { @@ -889,11 +889,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1765528634, - "narHash": "sha256-uIavvJkDwTZD1QY/oSkDtPN9xwkLwQayoZ5xOni4SBY=", + "lastModified": 1766064315, + "narHash": "sha256-aMoYLYIj+yYGhDKuSromj+VZYnMyN3lRRAZ+dk1IOiE=", "owner": "nix-community", "repo": "nixos-apple-silicon", - "rev": "fc1440d6e6adb24d9b2650670744bae35654c867", + "rev": "f94f4496775f9ca6e8a9e9e83f5aa4e4210fbb5d", "type": "github" }, "original": { @@ -1012,11 +1012,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763421233, - "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", + "lastModified": 1765779637, + "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", + "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "type": "github" }, "original": { @@ -1028,11 +1028,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1761765539, - "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", + "lastModified": 1765674936, + "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", + "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", "type": "github" }, "original": { @@ -1059,11 +1059,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1765608474, - "narHash": "sha256-9Wx53UK0z8Di5iesJID0tS1dRKwGxI4i7tsSanOHhF0=", + "lastModified": 1766201043, + "narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "28bb483c11a1214a73f9fd2d9928a6e2ea86ec71", + "rev": "b3aad468604d3e488d627c0b43984eb60e75e782", "type": "github" }, "original": { @@ -1091,11 +1091,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1765472234, - "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", + "lastModified": 1766309749, + "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", + "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816", "type": "github" }, "original": { @@ -1107,11 +1107,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1765457389, - "narHash": "sha256-ddhDtNYvleZeYF7g7TRFSmuQuZh7HCgqstg5YBGwo5s=", + "lastModified": 1766125104, + "narHash": "sha256-l/YGrEpLromL4viUo5GmFH3K5M1j0Mb9O+LiaeCPWEM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f997fa0f94fb1ce55bccb97f60d41412ae8fde4c", + "rev": "7d853e518814cca2a657b72eeba67ae20ebf7059", "type": "github" }, "original": { @@ -1139,11 +1139,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1747728033, - "narHash": "sha256-NnXFQu7g4LnvPIPfJmBuZF7LFy/fey2g2+LCzjQhTUk=", + "lastModified": 1765934234, + "narHash": "sha256-pJjWUzNnjbIAMIc5gRFUuKCDQ9S1cuh3b2hKgA7Mc4A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2f9173bde1d3fbf1ad26ff6d52f952f9e9da52ea", + "rev": "af84f9d270d404c17699522fab95bbf928a2d92f", "type": "github" }, "original": { @@ -1155,11 +1155,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1763966396, - "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", + "lastModified": 1766070988, + "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", + "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", "type": "github" }, "original": { @@ -1219,17 +1219,17 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1759770925, - "narHash": "sha256-CZwkCtzTNclqlhuwDsVtGoRumTpqCUK0xSnFIMgd8ls=", + "lastModified": 1766025857, + "narHash": "sha256-Lav5jJazCW4mdg1iHcROpuXqmM94BWJvabLFWaJVJp0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "674c2b09c59a220204350ced584cadaacee30038", + "rev": "def3da69945bbe338c373fddad5a1bb49cf199ce", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "674c2b09c59a220204350ced584cadaacee30038", + "rev": "def3da69945bbe338c373fddad5a1bb49cf199ce", "type": "github" } }, @@ -1309,11 +1309,11 @@ ] }, "locked": { - "lastModified": 1765464257, - "narHash": "sha256-dixPWKiHzh80PtD0aLuxYNQ0xP+843dfXG/yM3OzaYQ=", + "lastModified": 1765911976, + "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "09e45f2598e1a8499c3594fe11ec2943f34fe509", + "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27", "type": "github" }, "original": { @@ -1338,11 +1338,11 @@ ] }, "locked": { - "lastModified": 1761781027, - "narHash": "sha256-YDvxPAm2WnxrznRqWwHLjryBGG5Ey1ATEJXrON+TWt8=", + "lastModified": 1763662255, + "narHash": "sha256-4bocaOyLa3AfiS8KrWjZQYu+IAta05u3gYZzZ6zXbT0=", "owner": "pyproject-nix", "repo": "build-system-pkgs", - "rev": "795a980d25301e5133eca37adae37283ec3c8e66", + "rev": "042904167604c681a090c07eb6967b4dd4dae88c", "type": "github" }, "original": { @@ -1359,11 +1359,11 @@ ] }, "locked": { - "lastModified": 1763435975, - "narHash": "sha256-SKdpcVuJKMNEXloIpLXY+jDI42+6Ew21vdkl894DxHo=", + "lastModified": 1764134915, + "narHash": "sha256-xaKvtPx6YAnA3HQVp5LwyYG1MaN4LLehpQI8xEdBvBY=", "owner": "pyproject-nix", "repo": "pyproject.nix", - "rev": "7d3d8848358ccbd415afe2139f12b9e1508d3ace", + "rev": "2c8df1383b32e5443c921f61224b198a2282a657", "type": "github" }, "original": { @@ -1473,11 +1473,11 @@ "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1765684837, - "narHash": "sha256-fJCnsYcpQxxy/wit9EBOK33c0Z9U4D3Tvo3gf2mvHos=", + "lastModified": 1766289575, + "narHash": "sha256-BOKCwOQQIP4p9z8DasT5r+qjri3x7sPCOq+FTjY8Z+o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "94d8af61d8a603d33d1ed3500a33fcf35ae7d3bc", + "rev": "9836912e37aef546029e48c8749834735a6b9dad", "type": "github" }, "original": { @@ -1530,11 +1530,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1765474444, - "narHash": "sha256-sDG+c73xEnIw1pFNRWffKDnTWiTuyZiEP+Iub0D3mWA=", + "lastModified": 1766360762, + "narHash": "sha256-g0aHXl+htuBpBpYxeXemocARRr1xtyNPzIIV1/tofAc=", "owner": "nix-community", "repo": "stylix", - "rev": "dd14de4432a94e93e10d0159f1d411487e435e1e", + "rev": "c53b4a548a75895c69811a719bb4ed750ea41a17", "type": "github" }, "original": { @@ -1691,11 +1691,11 @@ ] }, "locked": { - "lastModified": 1762938485, - "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", + "lastModified": 1766000401, + "narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", + "rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd", "type": "github" }, "original": { @@ -1716,11 +1716,11 @@ ] }, "locked": { - "lastModified": 1763421857, - "narHash": "sha256-8JurcmEzAkrpm+eUDm8W/+KkU/w/viAeyJhJlIX2qOQ=", + "lastModified": 1765631794, + "narHash": "sha256-90d//IZ4GXipNsngO4sb2SAPbIC/a2P+IAdAWOwpcOM=", "owner": "pyproject-nix", "repo": "uv2nix", - "rev": "c9752c6c5915eece99505612d8f7805185cff990", + "rev": "4cca323a547a1aaa9b94929c4901bed5343eafe8", "type": "github" }, "original": { diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix/default.nix index 48f2362..4a733b3 100644 --- a/modules/nixos/nix/default.nix +++ b/modules/nixos/nix/default.nix @@ -1,6 +1,7 @@ { config, lib, + pkgs, namespace, ... }: @@ -16,6 +17,8 @@ "cachyos-server-lto-znver4" "cachyos-rc-lto" "cachyos-rc-lto-znver4" + "chromium" + "electron" "ffmpeg" "ffmpeg-full" "ffmpeg-headless-rpi" @@ -27,10 +30,11 @@ "libraspberrypi" "libsecret" "linux" + "onnxruntime" "opencv" "pipewire" "qemu" - # qemu.pname + "qtwebengine" "raspberrypi-utils" "sdl" "sdl2" @@ -42,11 +46,17 @@ cacheDir = "/var/cache/ccache"; # default location }; - # nixpkgs.overlays = [ - # (self: super: { - # "jellyfin-ffmpeg" = super."jellyfin-ffmpeg".override { stdenv = super.ccacheStdenv; }; - # }) - # ]; + nixpkgs.overlays = [ + (self: super: { + "webkitgtk_4_1" = super."webkitgtk_4_1".override { clangStdenv = super.ccacheStdenv; }; + }) + (self: super: { + "jellyfin-ffmpeg" = super."jellyfin-ffmpeg".override { ffmpeg_7-full = super.ffmpeg_7-full.override { stdenv = super.ccacheStdenv; }; }; + }) + (self: super: { + "ffmpeg-headless-rpi" = super."ffmpeg-headless-rpi".override { ffmpeg_7-full = super.ffmpeg_7-headless.override { stdenv = super.ccacheStdenv; }; }; + }) + ]; nix = { settings = { diff --git a/systems/x86_64-linux/jallen-nas/apps.nix b/systems/x86_64-linux/jallen-nas/apps.nix index b6d60b4..47c84e8 100755 --- a/systems/x86_64-linux/jallen-nas/apps.nix +++ b/systems/x86_64-linux/jallen-nas/apps.nix @@ -42,11 +42,11 @@ in # environmentFile = "/run/secrets/jallen-nas/authentik-env"; # TODO }; calibre = { - enable = true; + enable = false; port = 8084; }; calibre-web = { - enable = true; + enable = false; port = 8083; }; code-server = { @@ -121,7 +121,7 @@ in mongodb = disabled; netbootxyz = { enable = false; - port = 3000; + port = 4000; }; nextcloud = { enable = true;