From 27b01771a016ed5de29a44bc8fe5c1a0f2b032d6 Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Sat, 10 Sep 2022 16:21:21 +0200 Subject: [PATCH] updates and prowlarr --- flake.lock | 24 ++++++++--------- flake.nix | 2 +- list-nix-store.sh | 27 -------------------- nixos/hosts/hades/default.nix | 1 - nixos/hosts/hades/prowlarr/configuration.nix | 10 ++++++++ nixos/pkgs/default.nix | 3 +-- 6 files changed, 24 insertions(+), 43 deletions(-) delete mode 100755 list-nix-store.sh create mode 100644 nixos/hosts/hades/prowlarr/configuration.nix diff --git a/flake.lock b/flake.lock index 201e70cc..d75fa2b0 100644 --- a/flake.lock +++ b/flake.lock @@ -209,11 +209,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1662736595, - "narHash": "sha256-43viuA7wymW9shuGxFE5U3XGauucm7sQc83P8cvNLLo=", + "lastModified": 1662759269, + "narHash": "sha256-lt8bAfEZudCQb+MxoNKmenhMTXhu3RCCyLYxU9t5FFk=", "owner": "nix-community", "repo": "home-manager", - "rev": "b92826d0c4a6a7c50fece3caaeaa0cb08536a3f3", + "rev": "9f7fe353b613d0e45d7a5cdbd1f13c96c15803dd", "type": "github" }, "original": { @@ -228,11 +228,11 @@ "wlroots": "wlroots" }, "locked": { - "lastModified": 1662743291, - "narHash": "sha256-pbkozo4JeRgvB97KYhgYlAkfWp1BNsv0vftXtkedwuE=", + "lastModified": 1662808262, + "narHash": "sha256-NCavxa3knCEJHwP4J0Om15ZfL6BqH+ksz+LbgpYV4ac=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "f663fa209ce72571bd4c551a19757ccd58b3fb7f", + "rev": "d94fe3d063a910cab64fbdc132f6aa168a52e14d", "type": "github" }, "original": { @@ -301,11 +301,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1662688833, - "narHash": "sha256-OYM3f5725gKnFQp21Ph2dsjzFjwKorsDZxZlzIzDN3s=", + "lastModified": 1662774856, + "narHash": "sha256-vgvkBNzRs3Ukwc2sVAoPGeSglltNqLHEvbxmE89fB0I=", "owner": "jyooru", "repo": "nix-minecraft-servers", - "rev": "90585ebc121d46e330673322b824596c7b8c8393", + "rev": "d5934f64d688bba60c633b8966170b575a220867", "type": "github" }, "original": { @@ -414,14 +414,14 @@ "locked": { "lastModified": 1662729926, "narHash": "sha256-klAcKYYKVtd3a/34kfi4bqUKlL4GJqh9iYWictDpsJg=", - "owner": "NULLx76", + "owner": "NixOS", "repo": "nixpkgs", "rev": "cc6ef9492eba324cc2482127f0778b8178a186bd", "type": "github" }, "original": { - "owner": "NULLx76", - "ref": "0x76", + "owner": "NixOS", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index f212e531..57e434c2 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ # * https://git.voidcorp.nl/j00lz/nixos-configs/src/branch/main/flake.nix inputs = { - nixpkgs.url = "github:NULLx76/nixpkgs/0x76"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; colmena.url = "github:zhaofengli/colmena"; colmena.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/list-nix-store.sh b/list-nix-store.sh deleted file mode 100755 index 1a78156f..00000000 --- a/list-nix-store.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env bash -# Small utility to replace `nix path-info --all` -set -euo pipefail - -for file in /nix/store/*; do - case "$file" in - *.drv) - # Avoid .drv as they are not generally useful - continue - ;; - *.drv.chroot) - # Avoid .drv.chroot as they are not generally useful - continue - ;; - *.check) - # Skip .check file produced by --keep-failed - continue - ;; - *.lock) - # Skip .lock files - continue - ;; - *) - echo "$file" - ;; - esac -done diff --git a/nixos/hosts/hades/default.nix b/nixos/hosts/hades/default.nix index f43b9694..0c65eff4 100644 --- a/nixos/hosts/hades/default.nix +++ b/nixos/hosts/hades/default.nix @@ -188,7 +188,6 @@ hostname = "prowlarr"; ip = "192.168.0.140"; mac = "3a:67:8e:98:0c:a2"; - nix = false; } { hostname = "archlinux"; diff --git a/nixos/hosts/hades/prowlarr/configuration.nix b/nixos/hosts/hades/prowlarr/configuration.nix new file mode 100644 index 00000000..e1b2035b --- /dev/null +++ b/nixos/hosts/hades/prowlarr/configuration.nix @@ -0,0 +1,10 @@ +{ config, pkgs, ... }: +{ + networking.interfaces.eth0.useDHCP = true; + system.stateVersion = "21.05"; + + services.prowlarr = { + enable = true; + openFirewall = true; + }; +} diff --git a/nixos/pkgs/default.nix b/nixos/pkgs/default.nix index c97f4beb..1f307954 100644 --- a/nixos/pkgs/default.nix +++ b/nixos/pkgs/default.nix @@ -10,7 +10,7 @@ final: prev: { catppuccin.cursors = prev.callPackage ./catppuccin/cursors { }; - + vmagent = prev.callPackage ./vmagent { }; v = { glitch-soc = prev.callPackage ./glitch-soc { }; @@ -21,7 +21,6 @@ final: prev: { withDNSCrypt = true; withTFO = true; }; - vmagent = prev.callPackage ./vmagent { }; gitea-agatheme = prev.callPackage ./gitea-agatheme { }; }; }