From a695f2a0b63414eeb903d509051c90b7acb2e2bd Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 3 Dec 2021 20:59:48 +0100 Subject: [PATCH 1/5] nixpkgs: update to 21.11 --- flake.lock | 8 ++++---- flake.nix | 11 +++++++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 0593b28..264ace8 100644 --- a/flake.lock +++ b/flake.lock @@ -59,16 +59,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1638452135, - "narHash": "sha256-5Il6hgrTgcWIsB7zug0yDFccYXx7pJCw8cwJdXMuLfM=", + "lastModified": 1638371214, + "narHash": "sha256-0kE6KhgH7n0vyuX4aUoGsGIQOqjIx2fJavpCWtn73rc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "43cdc5b364511eabdcad9fde639777ffd9e5bab1", + "rev": "a640d8394f34714578f3e6335fc767d0755d78f9", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-21.05", + "ref": "nixos-21.11", "type": "indirect" } }, diff --git a/flake.nix b/flake.nix index 4f6e88b..eca4f47 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "flake:nixpkgs/nixos-21.05"; + nixpkgs.url = "flake:nixpkgs/nixos-21.11"; nixpkgs-unstable.url = "flake:nixpkgs/nixos-unstable"; utils.url = "github:gytis-ivaskevicius/flake-utils-plus/1.3.0"; simple-nixos-mailserver = { @@ -23,6 +23,14 @@ supportedSystems = [ "x86_64-linux" ]; + channels.nixpkgs.patches = [ + (nixpkgs.legacyPackages."x86_64-linux".fetchpatch { + name = "fix-homeassistant.patch"; + url = "https://github.com/NixOS/nixpkgs/commit/8e87ea556605e6947d1edb7cd81e58814eeadcae.patch"; + sha256 = "sha256-au5JwwmdRBsbiG9H8nh5n56QVZUFajx1ALMtzu+Nfq0="; + }) + ]; + hostDefaults.modules = [ nixpkgs.nixosModules.notDetected { @@ -33,7 +41,6 @@ ]; hosts.loutreos.modules = [ - "${nixpkgs-unstable}/nixos/modules/services/audio/navidrome.nix" simple-nixos-mailserver.nixosModule dogetipbot-telegram.nixosModule ipmihddtemp.nixosModule From 0b6d80375d43bd0dab15fddf548a3d75bf229b1d Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Thu, 16 Dec 2021 19:03:14 +0100 Subject: [PATCH 2/5] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/a640d8394f34714578f3e6335fc767d0755d78f9' (2021-12-01) → 'github:NixOS/nixpkgs/573095944e7c1d58d30fc679c81af63668b54056' (2021-12-10) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/6daa4a5c045d40e6eae60a3b6e427e8700f1c07f' (2021-12-01) → 'github:NixOS/nixpkgs/a2e281f5770247855b85d70c43454ba5bff34613' (2021-12-14) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 8066803..9c9184f 100644 --- a/flake.lock +++ b/flake.lock @@ -59,11 +59,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1638371214, - "narHash": "sha256-0kE6KhgH7n0vyuX4aUoGsGIQOqjIx2fJavpCWtn73rc=", + "lastModified": 1639161226, + "narHash": "sha256-75Y08ynJDTq6HHGIF+8IADBJSVip0UyWQH7jqSFnRR8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a640d8394f34714578f3e6335fc767d0755d78f9", + "rev": "573095944e7c1d58d30fc679c81af63668b54056", "type": "github" }, "original": { @@ -74,11 +74,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1638376152, - "narHash": "sha256-ucgLpVqhFnClH7YRUHBHnmiOd82RZdFR3XJt36ks5fE=", + "lastModified": 1639525045, + "narHash": "sha256-z4GXFNzO+5V4CAUm2DDMAryLOWUKEbQif2ifvv1Ypg4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6daa4a5c045d40e6eae60a3b6e427e8700f1c07f", + "rev": "a2e281f5770247855b85d70c43454ba5bff34613", "type": "github" }, "original": { From 3621316c1cd6c7a489a08d902b76e6ca1997a247 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Thu, 16 Dec 2021 19:07:11 +0100 Subject: [PATCH 3/5] remove merged nixpkgs patch --- flake.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/flake.nix b/flake.nix index 76ae1d0..fe76ddc 100644 --- a/flake.nix +++ b/flake.nix @@ -23,14 +23,6 @@ supportedSystems = [ "x86_64-linux" ]; - channels.nixpkgs.patches = [ - (nixpkgs.legacyPackages."x86_64-linux".fetchpatch { - name = "fix-homeassistant.patch"; - url = "https://github.com/NixOS/nixpkgs/commit/8e87ea556605e6947d1edb7cd81e58814eeadcae.patch"; - sha256 = "sha256-au5JwwmdRBsbiG9H8nh5n56QVZUFajx1ALMtzu+Nfq0="; - }) - ]; - hostDefaults.modules = [ nixpkgs.nixosModules.notDetected { From 3291583f6a3caa250fe1ef8d114748c4862c2681 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Thu, 16 Dec 2021 19:07:30 +0100 Subject: [PATCH 4/5] rename obsolete transmission option --- systems/LoutreOS/medias.nix | 2 +- systems/LoutreOS/web.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/systems/LoutreOS/medias.nix b/systems/LoutreOS/medias.nix index 98685c9..b4fd57e 100644 --- a/systems/LoutreOS/medias.nix +++ b/systems/LoutreOS/medias.nix @@ -5,10 +5,10 @@ transmission = { enable = true; home = "/var/lib/transmission"; - port = 9091; group = "medias"; settings = { rpc-bind-address = "127.0.0.1"; + rpc-port = 9091; rpc-host-whitelist = "*"; rpc-whitelist-enabled = false; peer-port = 51413; diff --git a/systems/LoutreOS/web.nix b/systems/LoutreOS/web.nix index 99ffe8e..7828fea 100644 --- a/systems/LoutreOS/web.nix +++ b/systems/LoutreOS/web.nix @@ -224,7 +224,7 @@ in }; "login.nyanlout.re" = simpleReverse config.services.nginx.sso.configuration.listen.port; "grafana.nyanlout.re" = authReverse config.services.grafana.port; - "transmission.nyanlout.re" = authReverse config.services.transmission.port; + "transmission.nyanlout.re" = authReverse config.services.transmission.settings.rpc-port; "radarr.nyanlout.re" = authReverse 7878; "sonarr.nyanlout.re" = authReverse 8989; "syncthing.nyanlout.re" = authReverse 8384; From 19d440a00d73767e88db10c5f50e62cd8ef8c81a Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Thu, 16 Dec 2021 19:07:52 +0100 Subject: [PATCH 5/5] allow paul user to use cachix --- systems/LoutreOS/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/systems/LoutreOS/configuration.nix b/systems/LoutreOS/configuration.nix index 1a76410..5d42fee 100644 --- a/systems/LoutreOS/configuration.nix +++ b/systems/LoutreOS/configuration.nix @@ -12,6 +12,8 @@ ./services.nix ]; + nix.trustedUsers = [ "root" "paul" ]; + boot = { loader = { systemd-boot.enable = true;