From 4b3ad8917a5c0d6b50d243fcaefa08fbbf227130 Mon Sep 17 00:00:00 2001 From: ooks-io Date: Fri, 12 Apr 2024 18:02:59 +1200 Subject: [PATCH] feat(nixarr): add nixarr input --- flake.lock | 191 ++++++++++++++++++++- flake.nix | 4 + system/modules/services/nixarr/default.nix | 5 +- system/modules/user/ooks.nix | 2 + 4 files changed, 192 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index a6af15c..233e34a 100644 --- a/flake.lock +++ b/flake.lock @@ -100,6 +100,28 @@ "devshell": { "inputs": { "flake-utils": "flake-utils_3", + "nixpkgs": [ + "nixarr", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1711099426, + "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=", + "owner": "numtide", + "repo": "devshell", + "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "devshell_2": { + "inputs": { + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixvim", "nixpkgs" @@ -194,6 +216,27 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nixarr", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -214,6 +257,21 @@ "type": "github" } }, + "flake-root": { + "locked": { + "lastModified": 1692742795, + "narHash": "sha256-f+Y0YhVCIJ06LemO+3Xx00lIcqQxSKJHXT/yk1RTKxw=", + "owner": "srid", + "repo": "flake-root", + "rev": "d9a70d9c7a5fd7f3258ccf48da9335e9b47c3937", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "flake-root", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1629284811, @@ -269,6 +327,24 @@ "inputs": { "systems": "systems_10" }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { + "inputs": { + "systems": "systems_11" + }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -283,9 +359,9 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_6": { "inputs": { - "systems": "systems_11" + "systems": "systems_12" }, "locked": { "lastModified": 1709126324, @@ -756,6 +832,29 @@ "type": "github" } }, + "nixarr": { + "inputs": { + "devshell": "devshell", + "flake-parts": "flake-parts_2", + "flake-root": "flake-root", + "nixpkgs": "nixpkgs_5", + "treefmt-nix": "treefmt-nix", + "vpnconfinement": "vpnconfinement" + }, + "locked": { + "lastModified": 1711370011, + "narHash": "sha256-PpaiwmQ8EjDogQJLsk1R0J+mKmXLnQ0yygPApIm8tPE=", + "owner": "rasmus-kirk", + "repo": "nixarr", + "rev": "b3f42c2f5f5cb316374a25017df0959d01649a3b", + "type": "github" + }, + "original": { + "owner": "rasmus-kirk", + "repo": "nixarr", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1708475490, @@ -852,6 +951,22 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1711231723, + "narHash": "sha256-dARJQ8AJOv6U+sdRePkbcVyVbXJTi1tReCrkkOeusiA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "e1d501922fd7351da4200e1275dfcf5faaad1220", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1712163089, "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", @@ -867,7 +982,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1709294055, "narHash": "sha256-7EECkQYoNKJZOf2+miJdrMpxpvsn/qZFwIhUI3fQpLs=", @@ -885,9 +1000,9 @@ }, "nixvim": { "inputs": { - "devshell": "devshell", + "devshell": "devshell_2", "flake-compat": "flake-compat", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", "nixpkgs": [ @@ -932,7 +1047,7 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "gitignore": "gitignore", "nixpkgs": [ "nixvim", @@ -973,7 +1088,8 @@ "hyprwm-contrib": "hyprwm-contrib", "nh": "nh", "nix-colors": "nix-colors", - "nixpkgs": "nixpkgs_5", + "nixarr": "nixarr", + "nixpkgs": "nixpkgs_6", "nixvim": "nixvim", "ooks-scripts": "ooks-scripts", "sops-nix": "sops-nix", @@ -1096,6 +1212,21 @@ "type": "github" } }, + "systems_12": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1689347949, @@ -1216,6 +1347,48 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nixarr", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1710781103, + "narHash": "sha256-nehQK/XTFxfa6rYKtbi8M1w+IU1v5twYhiyA4dg1vpg=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "7ee5aaac63c30d3c97a8c56efe89f3b2aa9ae564", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "vpnconfinement": { + "inputs": { + "nixpkgs": [ + "nixarr", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1711303689, + "narHash": "sha256-XelIFUk1AdOzPuotnhCzj4jYJ9LlrJ3qEptzkYppQMk=", + "owner": "Maroka-chan", + "repo": "VPN-Confinement", + "rev": "5964d68b584799ed9b4eb3d41b81b0c0bb1f7720", + "type": "github" + }, + "original": { + "owner": "Maroka-chan", + "repo": "VPN-Confinement", + "type": "github" + } + }, "wlroots": { "flake": false, "locked": { @@ -1271,8 +1444,8 @@ "zjstatus": { "inputs": { "crane": "crane_2", - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_6", + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_7", "rust-overlay": "rust-overlay_2" }, "locked": { diff --git a/flake.nix b/flake.nix index 0e75d9e..6537206 100644 --- a/flake.nix +++ b/flake.nix @@ -75,6 +75,10 @@ }; zjstatus.url = "github:dj95/zjstatus"; + + nixarr = { + url = "github:rasmus-kirk/nixarr"; + }; }; diff --git a/system/modules/services/nixarr/default.nix b/system/modules/services/nixarr/default.nix index f9e9976..564a92b 100644 --- a/system/modules/services/nixarr/default.nix +++ b/system/modules/services/nixarr/default.nix @@ -1,4 +1,4 @@ -{ lib, config, pkgs, ... }: +{ lib, config, inputs, ... }: let cfg = config.systemModules.services.nixarr; @@ -8,11 +8,14 @@ in { options.systemModules.services.nixarr.enable = mkEnableOption "Enable nixarr module"; + imports = [ inputs.nixarr.nixosModules.default ]; + config = mkIf cfg.enable { nixarr = { enable = true; mediaDir = "/jellyfin"; stateDir = "/var/lib/nixarr"; + mediaUsers = ["ooks"]; jellyfin.enable = true; sonarr.enable = true; diff --git a/system/modules/user/ooks.nix b/system/modules/user/ooks.nix index 352bc3b..da5f378 100644 --- a/system/modules/user/ooks.nix +++ b/system/modules/user/ooks.nix @@ -19,6 +19,8 @@ in "network" "libvirtd" "deluge" + "streamer" + "torrenter" ]; packages = [ pkgs.home-manager ];