From 8d74606039cf3d503cd71bbb537d9f693bfa3dfb Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Mon, 24 Feb 2025 21:12:58 -0500 Subject: [PATCH 1/7] get nixos-rebuild working again --- nixosConfigurations/gerg-desktop/main.nix | 2 +- nixosModules/misc.nix | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/nixosConfigurations/gerg-desktop/main.nix b/nixosConfigurations/gerg-desktop/main.nix index e498566..c7db2bb 100644 --- a/nixosConfigurations/gerg-desktop/main.nix +++ b/nixosConfigurations/gerg-desktop/main.nix @@ -144,7 +144,7 @@ !include ${config.sops.secrets.github_token.path} ''; }; - sops.secrets.github_token = { }; + sops.secrets.github_token.owner = "gerg"; environment.etc = { "jdks/17".source = "${pkgs.openjdk17}/bin"; diff --git a/nixosModules/misc.nix b/nixosModules/misc.nix index c12e7b6..1fce4e0 100644 --- a/nixosModules/misc.nix +++ b/nixosModules/misc.nix @@ -14,7 +14,6 @@ nix-output-monitor # nom nom nom nom; nix-tree # view packages pciutils # lspci - nixos-rebuild-ng ; nix-janitor = pkgs.symlinkJoin { name = "nix-janitor"; @@ -25,6 +24,13 @@ --suffix PATH : ${lib.makeBinPath [ config.nix.package ]} ''; }; + nixos-rebuild-ng = pkgs.symlinkJoin { + name = "nixos-rebuild-ng"; + paths = [ pkgs.nixos-rebuild-ng ]; + postBuild = '' + ln -s "$out/bin/nixos-rebuild-ng" "$out/bin/nixos-rebuild" + ''; + }; }; @@ -32,7 +38,7 @@ # Mr sandro why services.libinput.enable = true; programs.nano.enable = false; - programs.less.enable = false; + programs.less.enable = lib.mkForce false; environment.defaultPackages = lib.mkForce [ ]; @@ -74,6 +80,7 @@ programs.command-not-found.enable = false; system.disableInstallerTools = true; + services.userborn.enable = true; boot.enableContainers = false; From fadc34f4a8e50792aa7f9ebc526868b7af7e650e Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Mon, 24 Feb 2025 21:20:29 -0500 Subject: [PATCH 2/7] <3 mic92 --- .../gerg-desktop/services/vocard/vocard.nix | 73 +++++++++++-------- 1 file changed, 42 insertions(+), 31 deletions(-) diff --git a/nixosConfigurations/gerg-desktop/services/vocard/vocard.nix b/nixosConfigurations/gerg-desktop/services/vocard/vocard.nix index 7ddcdf8..469a003 100644 --- a/nixosConfigurations/gerg-desktop/services/vocard/vocard.nix +++ b/nixosConfigurations/gerg-desktop/services/vocard/vocard.nix @@ -24,48 +24,59 @@ }; templates = { - vocard.content = - builtins.replaceStrings - [ - "@token@" - "@client_id@" - "@spotify_client_id@" - "@spotify_client_secret@" - "@password@" - ] - [ - config.sops.placeholder."vocard/token" - config.sops.placeholder."vocard/client_id" - config.sops.placeholder."vocard/spotify_client_id" - config.sops.placeholder."vocard/spotify_client_secret" - config.sops.placeholder."lavalink/password" + vocard = { + path = "/persist/services/vocard/settings.json"; + restartUnits = [ + "vocard.service" + "lavalink.service" + ]; + content = + builtins.replaceStrings + [ + "@token@" + "@client_id@" + "@spotify_client_id@" + "@spotify_client_secret@" + "@password@" + ] + [ + config.sops.placeholder."vocard/token" + config.sops.placeholder."vocard/client_id" + config.sops.placeholder."vocard/spotify_client_id" + config.sops.placeholder."vocard/spotify_client_secret" + config.sops.placeholder."lavalink/password" - ] - (builtins.readFile ./settings.json); + ] + (builtins.readFile ./settings.json); + }; - lavalink.content = - builtins.replaceStrings - [ - "@refresh_token@" + lavalink = { + path = "/persist/services/lavalink/application.yml"; + restartUnits = [ + "vocard.service" + "lavalink.service" + ]; + content = + builtins.replaceStrings + [ + "@refresh_token@" - "@password@" - ] - [ - config.sops.placeholder."lavalink/refresh_token" + "@password@" + ] + [ + config.sops.placeholder."lavalink/refresh_token" - config.sops.placeholder."lavalink/password" + config.sops.placeholder."lavalink/password" - ] - (builtins.readFile ./application.yml); + ] + (builtins.readFile ./application.yml); + }; }; }; systemd.tmpfiles.rules = [ "d /persist/services/vocard - - - - -" "d /persist/services/lavalink - - - - -" - - "L+ /persist/services/vocard/settings.json - - - - ${config.sops.templates.vocard.path}" - "L+ /persist/services/lavalink/application.yml - - - - ${config.sops.templates.lavalink.path}" ]; systemd.services = { From c498b867f95c7ee326790850241a91ca5bdf774e Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Tue, 25 Feb 2025 17:35:43 -0500 Subject: [PATCH 3/7] smarter nix-serve --- .../gerg-desktop/services/nix-serve.nix | 33 +++++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/nixosConfigurations/gerg-desktop/services/nix-serve.nix b/nixosConfigurations/gerg-desktop/services/nix-serve.nix index 39a8ef4..4b6eff1 100644 --- a/nixosConfigurations/gerg-desktop/services/nix-serve.nix +++ b/nixosConfigurations/gerg-desktop/services/nix-serve.nix @@ -1,4 +1,8 @@ -{ config, pkgs }: +{ + config, + pkgs, + lib, +}: { sops.secrets.store_key.owner = "nix-serve"; @@ -48,30 +52,23 @@ path = [ config.nix.package pkgs.bzip2 - pkgs.nix-serve-ng ]; + serviceConfig = { + ExecStart = "${lib.getExe pkgs.nix-serve-ng} --socket /run/nix-serve/nix-serve.sock"; + Restart = "always"; + RestartSec = "5s"; + User = "nix-serve"; + Group = "nix-serve"; + RuntimeDirectory = "nix-serve"; + UMask = "0117"; + }; + environment = { NIX_REMOTE = "daemon"; NIX_SECRET_KEY_FILE = config.sops.secrets.store_key.path; }; - script = '' - nix-serve --socket /run/nix-serve/nix-serve.sock & - PID=$! - sleep 1 - chmod 660 /run/nix-serve/nix-serve.sock - wait "$PID" - ''; - - serviceConfig = { - Restart = "always"; - RestartSec = "5s"; - User = "nix-serve"; - Group = "nix-serve"; - }; }; - systemd.tmpfiles.rules = [ "d /run/nix-serve - nix-serve nix-serve - -" ]; - local.nginx.proxyVhosts."cache.gerg-l.com" = "http://unix:/run/nix-serve/nix-serve.sock"; } From 37e81dcb422e0bc52577c3742d0832232a85923f Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Tue, 25 Feb 2025 17:36:01 -0500 Subject: [PATCH 4/7] ensure mediaLocation is created --- nixosConfigurations/gerg-desktop/services/immich.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/nixosConfigurations/gerg-desktop/services/immich.nix b/nixosConfigurations/gerg-desktop/services/immich.nix index a0e4c90..62b9719 100644 --- a/nixosConfigurations/gerg-desktop/services/immich.nix +++ b/nixosConfigurations/gerg-desktop/services/immich.nix @@ -1,6 +1,13 @@ { config, ... }: +let + cfg = config.services.immich; +in { - users.users.${config.services.immich.user}.extraGroups = [ "postgres" ]; + systemd.tmpfiles.rules = + + [ "d ${cfg.mediaLocation} - ${cfg.user} ${cfg.group} - -" ]; + + users.users.${cfg.user}.extraGroups = [ "postgres" ]; services.immich = { enable = true; openFirewall = true; @@ -15,6 +22,5 @@ host = "0.0.0.0"; }; - local.nginx.proxyVhosts."photos.gerg-l.com" = - "http://localhost:${toString config.services.immich.port}"; + local.nginx.proxyVhosts."photos.gerg-l.com" = "http://localhost:${toString cfg.port}"; } From 8f0a9bf7f5cef3c1d48ff8ebe210d0d1fc0a33d4 Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Tue, 25 Feb 2025 17:59:10 -0500 Subject: [PATCH 5/7] update github PAT --- nixosConfigurations/gerg-desktop/secrets.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixosConfigurations/gerg-desktop/secrets.yaml b/nixosConfigurations/gerg-desktop/secrets.yaml index 988cbaa..0bf9159 100644 --- a/nixosConfigurations/gerg-desktop/secrets.yaml +++ b/nixosConfigurations/gerg-desktop/secrets.yaml @@ -5,7 +5,7 @@ searxngenv: ENC[AES256_GCM,data:HtH4KxXWoQEJp88Bgfhfj5Y4Up+inHu8mnVtay64XvCRpVKH minifluxenv: ENC[AES256_GCM,data:wgz6sxSbbjXrgBAak0Q0TlvG78+JHPpiPtcbqGo9HpSF3qY78edECCDB3qqIaynxdhI4,iv:mbsr+OG8fE5MggmC+TNkLmhhDNGvJo+uelNRo/rMLoo=,tag:xN+FbNHZIVCruQh23aMt5g==,type:str] gerg: ENC[AES256_GCM,data:iSwWGIIxQenCPMd/Tith/eagjVINn0mgrO99IG85cP4UXtut6GF2R57XDMeD7SU18vW1ULod/lYuTo0SmmrkmX+wlDWgm4cODw==,iv:fHTcn4ZmjSqLC8jQkuualRbp+RwvgblS1ic6WPb2WEY=,tag:rkDuXhvleKekv3bVpdNNuw==,type:str] store_key: ENC[AES256_GCM,data:2XioKwoH0V5QuedXl4w2IFrT2qOQWF0kbchYTMhyL9BaUqYHhXQi4buvKUVbBQ8AnzD1GJT3ZRy1S13CxEkdQvXE0IY0iX5nkTJtI3VgpiF64wfvZqcLQGaaNTCg+AEDP304KtIZZiao,iv:PV0bORWHoRDM8HvFwOI2sl7QjfD9G0VXSZ9RrPBUsyM=,tag:caVnOow466eBT/5bqYU0Iw==,type:str] -github_token: ENC[AES256_GCM,data:i/mSQOXLNa6SY6hEISr4sG1xWYS4sk8ugwaVUg+g9arUP04ijr+SM0rKo0iE/R3JqBm4bpK6ZeONQUax1PnVFHTviTKOTc7AMGIDAS6+36BPkeqGfUZK41QqXeFr5n/T8ZA06pMFp4iTQ4r98uPzQWvjQWTiV+CFEg==,iv:N14UgFEB3rPoyJkMIxIMVfBIpw9X6FBZJSOINPpU8Zw=,tag:t8Kg1HdwUHSLOu6pSJEMsA==,type:str] +github_token: ENC[AES256_GCM,data:LijyCmMkfaCmh3rVKB96GHd7eM5Qbj9Jea1UZbQGgf67rof1uS+XML+3hmC6lOf6iOeJQtg12fC3ODHnzGuiC+dd1VbIkL5xRR7VBpFF2g6q5ixz9On/IRP74lX7SexCbcOx6YHi6eU6FX6fXe8wWhM87RYZcuiaEw==,iv:GWpI5Q2svJCz28wPVwTPq/+aLN7bWFz4gHNm3Qe6YFI=,tag:1KO9shVI0m2DSomDAuGnsQ==,type:str] gerg_ssl_key: ENC[AES256_GCM,data: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,iv:fq1npi+bC2O1OqsizTAgK6qRf8MG98ACyydnGGNptwQ=,tag:kBR6cPmS7uvWlRo1CLQG3Q==,type:str] gerg_ssl_cert: ENC[AES256_GCM,data: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,iv:VHH48PmpIsrWOtTqHmmT+q7CE+HmsEX9+DaXmGXreFE=,tag:s+zhy9blkNBUZDD8cJJnyg==,type:str] sops: @@ -23,8 +23,8 @@ sops: dGhDRXRTWE9xSGtxQU80RVpuL1A5MkEKxAxC/wDkq+6hM8eXkWd/RBDNIUtGYnPy MvVxB6dkj+S11oRcMpdFqiM9jSzz/gYecB2tfuDgj+UX/VAzSkvPxA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-02-07T01:48:25Z" - mac: ENC[AES256_GCM,data:cjNnYL1DXy2PGQKxnNh00bXfrDhL4577pjQPLB69/GnJxK7Gv1ZUorBEC07M0rXW9Ynkm+wbYt7mOxcfkjeTmQqTp6p4eR62qxMYuFXzi1S4XD+OoviEDiiT7y5bdA5vOTBfj5NSgpW4+B55C4FV5/AN/hqYSo9Bjts8C352KT0=,iv:jB1bZ+0c4SDpldvBPtgCXUkbV8BQ2hZyv0qsKA5nFlk=,tag:u9Aq0UdnsDNMBdLqNRz08A==,type:str] + lastmodified: "2025-02-25T22:55:01Z" + mac: ENC[AES256_GCM,data:/TumMnTtiarcoWQmqXMJ1tJ8TBIJ37+E3V+aAQkGVGmOHcA1HaG8cf2LC2yDaDMD8H+mLXqNgw9iU22ZiXopIAmzP+wRRkkVnE61RpI8BFnW25guUE1h3j109rKV94j9fem/ejzqAIh3d1CcewULokOTD6TtS2QCMKZLhSVShp0=,iv:UvAZDLzrA+HGTFdNwZoB5K30tNwJDXBDJN/ZP/tllcA=,tag:2H5EST0cPEMXCIwz4i0Aag==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.9.4 From 8d7d579558cf9b41775bc3b12c866d155ac2f7e8 Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Tue, 25 Feb 2025 17:59:21 -0500 Subject: [PATCH 6/7] lavalink broken --- .../services/vocard/{vocard.nix => _vocard.nix} | 3 --- .../gerg-desktop/services/vocard/application.yml | 6 ++++-- packages/lavalink/package.nix | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) rename nixosConfigurations/gerg-desktop/services/vocard/{vocard.nix => _vocard.nix} (99%) diff --git a/nixosConfigurations/gerg-desktop/services/vocard/vocard.nix b/nixosConfigurations/gerg-desktop/services/vocard/_vocard.nix similarity index 99% rename from nixosConfigurations/gerg-desktop/services/vocard/vocard.nix rename to nixosConfigurations/gerg-desktop/services/vocard/_vocard.nix index 469a003..3062f6b 100644 --- a/nixosConfigurations/gerg-desktop/services/vocard/vocard.nix +++ b/nixosConfigurations/gerg-desktop/services/vocard/_vocard.nix @@ -60,14 +60,11 @@ builtins.replaceStrings [ "@refresh_token@" - "@password@" ] [ config.sops.placeholder."lavalink/refresh_token" - config.sops.placeholder."lavalink/password" - ] (builtins.readFile ./application.yml); }; diff --git a/nixosConfigurations/gerg-desktop/services/vocard/application.yml b/nixosConfigurations/gerg-desktop/services/vocard/application.yml index b025eea..65f40ac 100644 --- a/nixosConfigurations/gerg-desktop/services/vocard/application.yml +++ b/nixosConfigurations/gerg-desktop/services/vocard/application.yml @@ -13,18 +13,20 @@ plugins: # Clients are queried in the order they are given (so the first client is queried first and so on...) clients: - MUSIC + - TVHTML5EMBEDDED + - TV - ANDROID_VR - WEB - WEBEMBEDDED oauth: enabled: true - refreshToken: "@refresh_token@" +# refreshToken: "@refresh_token@" # name: # Name of the plugin # some_key: some_value # Some key-value pair for the plugin # another_key: another_value lavalink: plugins: - - dependency: "dev.lavalink.youtube:youtube-plugin:1.11.4" + - dependency: "dev.lavalink.youtube:youtube-plugin:1.11.5" snapshot: false # setting "enabled: true" is the bare minimum to get OAuth working. enabled: true diff --git a/packages/lavalink/package.nix b/packages/lavalink/package.nix index 80b18ac..301cae8 100644 --- a/packages/lavalink/package.nix +++ b/packages/lavalink/package.nix @@ -15,8 +15,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { }; plugin = fetchurl { - url = "https://github.com/lavalink-devs/youtube-source/releases/download/1.11.4/youtube-plugin-1.11.4.jar"; - hash = "sha256-OznpsYoiWa6y+/8kukWN66leLi2mZU/1x+zN+uyIk1k="; + url = "https://github.com/lavalink-devs/youtube-source/releases/download/1.11.5/youtube-plugin-1.11.5.jar"; + hash = "sha256-Zz4S5mWcsVFWGmN41L34GqZeCOswt/CAn+1PN1XJtbk="; }; dontUnpack = true; From b9e276d69fbac5681d5b86e87ba913b9e3e9010c Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Tue, 25 Feb 2025 17:59:30 -0500 Subject: [PATCH 7/7] update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index a628646..646514f 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ ] }, "locked": { - "lastModified": 1739841949, - "narHash": "sha256-lSOXdgW/1zi/SSu7xp71v+55D5Egz8ACv0STkj7fhbs=", + "lastModified": 1740485968, + "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=", "owner": "nix-community", "repo": "disko", - "rev": "15dbf8cebd8e2655a883b74547108e089f051bf0", + "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940", "type": "github" }, "original": { @@ -356,11 +356,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1739186342, - "narHash": "sha256-2j+sln9RwQn+g7J4GmdFFgvqXnLkvWBNMaUzONlkzUE=", + "lastModified": 1740440383, + "narHash": "sha256-w8ixbqOGrVWMQZFFs4uAwZpuwuGMzFoKjocMFxTR5Ts=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "3bdeebbc484a09391c4f0ec8a37bb77809426660", + "rev": "6321bc060d757c137c1fbae2057c7e941483878f", "type": "github" }, "original": { @@ -371,11 +371,11 @@ }, "master": { "locked": { - "lastModified": 1740287033, - "narHash": "sha256-/MIT8/gFk2Yswm/uUzTg65Cl9GmS1iXT2REPVflJRxM=", + "lastModified": 1740522700, + "narHash": "sha256-77otAPAYGMMFZh8b2i2FoEQkIkJ+rAMhQ+iNf23VDsA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "06b36bb519629003bc79e4dcc0c4132b2e9e5c47", + "rev": "6db976712c41a29fa7c09801e54f874d60e5fa10", "type": "github" }, "original": { @@ -827,11 +827,11 @@ }, "stable": { "locked": { - "lastModified": 1740162160, - "narHash": "sha256-SSYxFhqCOb3aiPb6MmN68yEzBIltfom8IgRz7phHscM=", + "lastModified": 1740339700, + "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "11415c7ae8539d6292f2928317ee7a8410b28bb9", + "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195", "type": "github" }, "original": { @@ -930,11 +930,11 @@ }, "unstable": { "locked": { - "lastModified": 1739866667, - "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", + "lastModified": 1740367490, + "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", + "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", "type": "github" }, "original": {