From 7ad3ef2ba1e4f7e5425e09e422f3a3ac0e4ea7e8 Mon Sep 17 00:00:00 2001 From: noe Date: Wed, 8 Jan 2025 20:22:15 -0800 Subject: [PATCH] plexaawawawa --- flake.lock | 95 ++++++++++++++++++------------ flake.nix | 3 +- nixos/hosts/plex/default.nix | 1 + nixos/hosts/seedbox/www/index.html | 66 ++++++++++++++++++--- overlays/default.nix | 2 +- 5 files changed, 118 insertions(+), 49 deletions(-) diff --git a/flake.lock b/flake.lock index 03e16c9..6d1eeb6 100644 --- a/flake.lock +++ b/flake.lock @@ -155,11 +155,11 @@ ] }, "locked": { - "lastModified": 1735774679, - "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=", + "lastModified": 1736143030, + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66", + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "type": "github" }, "original": { @@ -346,11 +346,11 @@ ] }, "locked": { - "lastModified": 1736089250, - "narHash": "sha256-/LPWMiiJGPHGd7ZYEgmbE2da4zvBW0acmshUjYC3WG4=", + "lastModified": 1736366465, + "narHash": "sha256-Fo68EF6p/N9GJyHiAUbXtiE7IJlb3IMjK86LuxFMsRU=", "owner": "nix-community", "repo": "home-manager", - "rev": "172b91bfb2b7f5c4a8c6ceac29fd53a01ef07196", + "rev": "7e00856596891850ba5ad4c5ecd2ed74468c08c5", "type": "github" }, "original": { @@ -367,11 +367,11 @@ ] }, "locked": { - "lastModified": 1735979091, - "narHash": "sha256-WpFjt6+8UD81EP386c269ZTqpEmlGJgcPw+OB4b7EBs=", + "lastModified": 1736089250, + "narHash": "sha256-/LPWMiiJGPHGd7ZYEgmbE2da4zvBW0acmshUjYC3WG4=", "owner": "nix-community", "repo": "home-manager", - "rev": "11ab08541e61ac3bbf2ab27229f68622629401df", + "rev": "172b91bfb2b7f5c4a8c6ceac29fd53a01ef07196", "type": "github" }, "original": { @@ -537,11 +537,11 @@ ] }, "locked": { - "lastModified": 1735956190, - "narHash": "sha256-svzx3yVXD5tbBJZCn3Lt1RriH8GHo6CyVUPTHejf7sU=", + "lastModified": 1736085891, + "narHash": "sha256-bTl9fcUo767VaSx4Q5kFhwiDpFQhBKna7lNbGsqCQiA=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "3feaf376d75d3d58ebf7e9a4f584d00628548ad9", + "rev": "ba9b3173b0f642ada42b78fb9dfc37ca82266f6c", "type": "github" }, "original": { @@ -586,11 +586,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1735388221, - "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", + "lastModified": 1736283893, + "narHash": "sha256-BG1FfTexFwNty5VhYjaQLMR6CMPfI3QRcaZrFQYu2EM=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", + "rev": "4f339f6be2b61662f957c2ee9eda0fa597d8a6d6", "type": "github" }, "original": { @@ -676,29 +676,45 @@ "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" } }, - "nixpkgs-stable": { + "nixpkgs-master": { "locked": { - "lastModified": 1720535198, - "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", + "lastModified": 1736394720, + "narHash": "sha256-WHz4YZbGhsAthr+teG64E7PVmIZeD8S3OORVMVw5Br0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", + "rev": "f3762b9c4b04856beec3d8ecb781df3c8aac7b04", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.11", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1736200483, + "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1735834308, - "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { @@ -742,11 +758,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1735834308, - "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { @@ -787,11 +803,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1736112263, - "narHash": "sha256-tSYWCZhs21SVg+X6jQrHGchok3db6nqZ4vL+x2ySJWk=", + "lastModified": 1736374433, + "narHash": "sha256-oziJ5klXSS/wTJaoyL6oSYmRGpRFCYpJhq8Jl6q6NRU=", "owner": "nix-community", "repo": "nixvim", - "rev": "7896856db1de897e95333aed381f06fa8788fff7", + "rev": "83153e96c25d989020d028af51cf947aa843dc3c", "type": "github" }, "original": { @@ -808,11 +824,11 @@ ] }, "locked": { - "lastModified": 1736140611, - "narHash": "sha256-91LE62GlfXn4tjdwXyvv8YNTF/GZZ/Fyp1WoHDUKEAw=", + "lastModified": 1736141144, + "narHash": "sha256-B8+ufizwKxcsiim1JwGMWuBV0mzT21YTOWGJ8vB++Cg=", "ref": "refs/heads/main", - "rev": "8622e741a8271d21cecd2590d51e699fc566dd44", - "revCount": 98, + "rev": "05677857384453abcccc4ea2a3b5273753673a4e", + "revCount": 99, "type": "git", "url": "https://git.sapphic.engineer/noe/noe.sh" }, @@ -906,6 +922,7 @@ "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_4", + "nixpkgs-master": "nixpkgs-master", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", @@ -959,11 +976,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1736064798, - "narHash": "sha256-xJRN0FmX9QJ6+w8eIIIxzBU1AyQcLKJ1M/Gp6lnSD20=", + "lastModified": 1736203741, + "narHash": "sha256-eSjkBwBdQk+TZWFlLbclF2rAh4JxbGg8az4w/Lfe7f4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5dc08f9cc77f03b43aacffdfbc8316807773c930", + "rev": "c9c88f08e3ee495e888b8d7c8624a0b2519cb773", "type": "github" }, "original": { @@ -1045,11 +1062,11 @@ ] }, "locked": { - "lastModified": 1735905407, - "narHash": "sha256-1hKMRIT+QZNWX46e4gIovoQ7H8QRb7803ZH4qSKI45o=", + "lastModified": 1736115332, + "narHash": "sha256-FBG9d7e0BTFfxVdw4b5EmNll2Mv7hfRc54hbB4LrKko=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "29806abab803e498df96d82dd6f34b32eb8dd2c8", + "rev": "1788ca5acd4b542b923d4757d4cfe4183cc6a92d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 895318b..7af1c49 100644 --- a/flake.nix +++ b/flake.nix @@ -9,8 +9,9 @@ # Nixpkgs (usually unstable) nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-master.url = "github:nixos/nixpkgs/master"; # Home manageKr home-manager = { diff --git a/nixos/hosts/plex/default.nix b/nixos/hosts/plex/default.nix index 8b51be4..b4cb696 100644 --- a/nixos/hosts/plex/default.nix +++ b/nixos/hosts/plex/default.nix @@ -13,6 +13,7 @@ services.plex = { enable = true; openFirewall = true; + package = pkgs.master.plex; }; internal.nas0 = { diff --git a/nixos/hosts/seedbox/www/index.html b/nixos/hosts/seedbox/www/index.html index a418642..a8313f3 100644 --- a/nixos/hosts/seedbox/www/index.html +++ b/nixos/hosts/seedbox/www/index.html @@ -1,10 +1,12 @@ + seedbox
-

the seedbox

+
+

the seedbox

+
📺
Shows & Anime
-
sonarr
+
sonarr
🎥
Movies
-
Radarr
+
radarr
🎶
Music
-
Lidarr
+
lidarr
Tracker Management
-
prowlarr
+
prowlarr
Torrent Client
-
transmission
+
transmission
-
diff --git a/overlays/default.nix b/overlays/default.nix index d39b19a..81f5316 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -27,7 +27,7 @@ config.allowUnfree = true; }; - master = import inputs.nixpkgs-unstable { + master = import inputs.nixpkgs-master { system = final.system; config.allowUnfree = true; };