From d94b35ac00cb0c78d5f4242a713e5d96b8f20fd0 Mon Sep 17 00:00:00 2001 From: Nikolaos Karaolidis Date: Tue, 23 Sep 2025 14:15:06 +0100 Subject: [PATCH] Update Signed-off-by: Nikolaos Karaolidis --- flake.lock | 100 +++++++++--------- .../nikara/configs/console/wsl/default.nix | 33 +----- .../nikara/configs/console/wsl/wsl-zsh.sh | 15 --- packages/comentario/default.nix | 6 +- packages/littlelink-server/default.nix | 8 +- .../obsidian/plugins/excalidraw/default.nix | 8 +- .../plugins/excalidraw/package-lock.patch | 27 ----- packages/obsidian/plugins/linter/default.nix | 6 +- .../prometheus-podman-exporter/default.nix | 4 +- submodules/lib | 2 +- submodules/sas | 2 +- 11 files changed, 68 insertions(+), 143 deletions(-) delete mode 100644 hosts/elara/users/nikara/configs/console/wsl/wsl-zsh.sh delete mode 100644 packages/obsidian/plugins/excalidraw/package-lock.patch diff --git a/flake.lock b/flake.lock index ab5461e..3057025 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ ] }, "locked": { - "lastModified": 1756487002, - "narHash": "sha256-hN9RfNXy53qAkT68T+IYZpl68uE1uPOVMkw0MqC43KA=", + "lastModified": 1758577685, + "narHash": "sha256-iHT0kvsQJG+Z89quGi7rNCXEg2e3DBGfuuCMu/UwiIo=", "owner": "aylur", "repo": "ags", - "rev": "8ff792dba6cc82eed10e760f551075564dd0a407", + "rev": "aa7a8a2dd6e54aaeb4e13a73ed3bc2283995090b", "type": "github" }, "original": { @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1756474652, - "narHash": "sha256-iiBU6itpEqE0spXeNJ3uJTfioSyKYjt5bNepykpDXTE=", + "lastModified": 1757497936, + "narHash": "sha256-BSfvr7wdY5SbathVlrOW7vCyI9UGVIe2b9rTJ0O5IKo=", "owner": "aylur", "repo": "astal", - "rev": "20bd8318e4136fbd3d4eb2d64dbabc3acbc915dd", + "rev": "344a6dce56437a190b99e516a6cab8332cccf19e", "type": "github" }, "original": { @@ -121,11 +121,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1754487366, - "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -183,11 +183,11 @@ ] }, "locked": { - "lastModified": 1756579987, - "narHash": "sha256-duCce8zGsaMsrqqOmLOsuaV1PVIw/vXWnKuLKZClsGg=", + "lastModified": 1758593331, + "narHash": "sha256-p+904PfmINyekyA/LieX3IYGsiFtExC00v5gSYfJtpM=", "owner": "nix-community", "repo": "home-manager", - "rev": "99a69bdf8a3c6bf038c4121e9c4b6e99706a187a", + "rev": "9a2dc0efbc569ce9352a6ffb8e8ec8dbc098e142", "type": "github" }, "original": { @@ -212,11 +212,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1754297745, - "narHash": "sha256-aD6/scLN3L4ZszmNbhhd3JQ9Pzv1ScYFphz14wHinfs=", + "lastModified": 1756744479, + "narHash": "sha256-EyZXusK/wRD3V9vDh00W2Re3Eg8UQ+LjVBQrrH9dq1U=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "892cbdca865d6b42f9c0d222fe309f7720259855", + "rev": "747b7912f49e2885090c83364d88cf853a020ac1", "type": "github" }, "original": { @@ -235,11 +235,11 @@ ] }, "locked": { - "lastModified": 1757531256, - "narHash": "sha256-aOqrRvKmHoPKVhEYgV/RbsMXYXy6W9Tt1uhGK3dWMlE=", + "lastModified": 1758632667, + "narHash": "sha256-C0aBPv8vqTI1QNVhygZxL0f49UERx2UejVdtyz67jhs=", "ref": "refs/heads/main", - "rev": "be7b39f41a1137a68944fc73db5a24544e015eb6", - "revCount": 7, + "rev": "5e0737c20f3c265dbff604170a6433cc1e1a4b41", + "revCount": 8, "type": "git", "url": "https://git.karaolidis.com/karaolidis/nix-lib.git" }, @@ -250,11 +250,11 @@ }, "mnw": { "locked": { - "lastModified": 1748710831, - "narHash": "sha256-eZu2yH3Y2eA9DD3naKWy/sTxYS5rPK2hO7vj8tvUCSU=", + "lastModified": 1756659871, + "narHash": "sha256-v6Rh4aQ6RKjM2N02kK9Usn0Ix7+OY66vNpeklc1MnGE=", "owner": "Gerg-L", "repo": "mnw", - "rev": "cff958a4e050f8d917a6ff3a5624bc4681c6187d", + "rev": "ed6cc3e48557ba18266e598a5ebb6602499ada16", "type": "github" }, "original": { @@ -289,11 +289,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1756542300, - "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", + "lastModified": 1758427187, + "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", + "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", "type": "github" }, "original": { @@ -305,11 +305,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1753579242, - "narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=", + "lastModified": 1754788789, + "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "0f36c44e01a6129be94e3ade315a5883f0228a6e", + "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", "type": "github" }, "original": { @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1756630008, - "narHash": "sha256-weZiVKbiWQzTifm6qCxzhxghEu5mbh9mWNUdkzOLCR0=", + "lastModified": 1758627334, + "narHash": "sha256-PV8pa2UWNdQfJjtAUyLEjfNUZknDFayMvzo6lFbq6sk=", "owner": "nix-community", "repo": "NUR", - "rev": "f6a5a7b60dd6065e78ef06390767e689ffa3c23f", + "rev": "2f55e54fe689ab1edfb24b21a1d40b0bba4ef222", "type": "github" }, "original": { @@ -358,11 +358,11 @@ ] }, "locked": { - "lastModified": 1755463179, - "narHash": "sha256-5Ggb1Mhf7ZlRgGi2puCa2PvWs6KbMnWBlW6KW7Vf79Y=", + "lastModified": 1758271661, + "narHash": "sha256-ENqd2/33uP5vB44ClDjjAV+J78oF8q1er4QUZuT8Z7g=", "owner": "NotAShelf", "repo": "nvf", - "rev": "03833118267ad32226b014b360692bdce9d6e082", + "rev": "b7571df4d6e9ac08506a738ddceeec0b141751b0", "type": "github" }, "original": { @@ -381,11 +381,11 @@ ] }, "locked": { - "lastModified": 1756052001, - "narHash": "sha256-dlLqyHxqiFAoIwshKe9X3PzXcJ+up88Qb2JVQswFaNE=", + "lastModified": 1758268943, + "narHash": "sha256-ufkrvMWvS+tgzs5H5iRZn/okuvmSzRLeBf+zUxES6YE=", "owner": "icewind1991", "repo": "nvidia-patch-nixos", - "rev": "780af7357d942fad2ddd9f325615a5f6ea7e37ee", + "rev": "e7358911c8f611eb1eb8e0758aa668d4d2d55cd9", "type": "github" }, "original": { @@ -495,11 +495,11 @@ ] }, "locked": { - "lastModified": 1757531894, - "narHash": "sha256-GwV3ES7n/2mwPeu8FGfViI6QfzbTrvNob3OZOsPQId0=", + "lastModified": 1758633052, + "narHash": "sha256-IBfdW6W/CxyuFfMVjSazL2F6z/kwCGec6X3eOk9PJSg=", "ref": "refs/heads/main", - "rev": "3d069983345ea83549c641dd3f8875e54aaf1c2b", - "revCount": 12, + "rev": "f12387528b67f0c2095eb42fa0983a4223152717", + "revCount": 13, "type": "git", "url": "ssh://git@karaolidis.com/karaolidis/nix-sas.git" }, @@ -531,11 +531,11 @@ ] }, "locked": { - "lastModified": 1754988908, - "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", + "lastModified": 1758425756, + "narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", + "rev": "e0fdaea3c31646e252a60b42d0ed8eafdb289762", "type": "github" }, "original": { @@ -554,11 +554,11 @@ ] }, "locked": { - "lastModified": 1756614537, - "narHash": "sha256-qyszmZO9CEKAlj5NBQo1AIIADm5Fgqs5ZggW1sU1TVo=", + "lastModified": 1758584568, + "narHash": "sha256-FDxTheW6ynpbro/8eTZHhAY7J+HOf0jXeXq3jrJDcS8=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "374eb5d97092b97f7aaafd58a2012943b388c0df", + "rev": "9e9e48ca16628bf09a02bc5449d4b0761e15eebd", "type": "github" }, "original": { @@ -589,11 +589,11 @@ ] }, "locked": { - "lastModified": 1755934250, - "narHash": "sha256-CsDojnMgYsfshQw3t4zjRUkmMmUdZGthl16bXVWgRYU=", + "lastModified": 1758206697, + "narHash": "sha256-/DbPkh6PZOgfueCbs3uzlk4ASU2nPPsiVWhpMCNkAd0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "74e1a52d5bd9430312f8d1b8b0354c92c17453e5", + "rev": "128222dc911b8e2e18939537bed1762b7f3a04aa", "type": "github" }, "original": { diff --git a/hosts/elara/users/nikara/configs/console/wsl/default.nix b/hosts/elara/users/nikara/configs/console/wsl/default.nix index 8b96760..5be028c 100644 --- a/hosts/elara/users/nikara/configs/console/wsl/default.nix +++ b/hosts/elara/users/nikara/configs/console/wsl/default.nix @@ -1,36 +1,5 @@ { user, home }: -{ config, pkgs, ... }: -let - systemctl = "${pkgs.systemd}/bin/systemctl"; -in +{ pkgs, ... }: { - # FIXME: https://github.com/nix-community/NixOS-WSL/issues/375 - # FIXME: https://github.com/Mic92/sops-nix/issues/687 - # FIXME: https://github.com/microsoft/WSL/issues/8842 - # FIXME: https://github.com/microsoft/WSL/issues/10205 - # Fuck Microsoft. - security.sudo.extraRules = [ - { - users = [ config.users.users.${user}.name ]; - commands = [ - { - command = "${systemctl} restart user@${toString config.users.users.${user}.uid}.service"; - options = [ "NOPASSWD" ]; - } - { - command = "${systemctl} restart user@${toString config.users.users.${user}.uid}"; - options = [ "NOPASSWD" ]; - } - ]; - } - ]; - - users.users.${user}.shell = pkgs.writeShellApplication { - name = "wsl-zsh"; - runtimeInputs = with pkgs; [ systemd ]; - text = builtins.readFile ./wsl-zsh.sh; - passthru.shellPath = "/bin/wsl-zsh"; - }; - home-manager.users.${user}.home.packages = with pkgs; [ wsl-wl-clipboard ]; } diff --git a/hosts/elara/users/nikara/configs/console/wsl/wsl-zsh.sh b/hosts/elara/users/nikara/configs/console/wsl/wsl-zsh.sh deleted file mode 100644 index 2f9e9eb..0000000 --- a/hosts/elara/users/nikara/configs/console/wsl/wsl-zsh.sh +++ /dev/null @@ -1,15 +0,0 @@ -# shellcheck shell=bash - -user_bus="${DBUS_SESSION_BUS_ADDRESS#unix:path=}" - -if [ -S "$user_bus" ]; then - exec zsh -fi - -until [ -S /run/dbus/system_bus_socket ]; do - sleep 0.1 -done - -sudo systemctl restart "user@${UID}.service" - -exec zsh diff --git a/packages/comentario/default.nix b/packages/comentario/default.nix index 67cee9c..66621f2 100644 --- a/packages/comentario/default.nix +++ b/packages/comentario/default.nix @@ -2,14 +2,14 @@ # AUTO-UPDATE: nix-update --flake comentario --version=branch=dev --subpackage frontend pkgs.buildGo125Module (finalAttrs: { pname = "comentario"; - version = "3.14.0-unstable-2025-09-20"; + version = "3.14.0-unstable-2025-09-23"; src = pkgs.fetchFromGitLab { owner = "comentario"; repo = "comentario"; # FIXME: Stable rev once type error is fixed - rev = "73cf8040cb9adb31794ec780e5905c2e747ca63f"; - hash = "sha256-8rch1sL81wQblaUBebUA/C2HxtAfYHPadt2X2qJWJIk="; + rev = "7774ecce56565b25aa378ab5ff230e9d98d82c79"; + hash = "sha256-7z7TQp380E/XdZ0J68jUznj8gmZqApn37wnYHdPmIK0="; }; patches = [ ./superuser-claim.patch ]; diff --git a/packages/littlelink-server/default.nix b/packages/littlelink-server/default.nix index 67bfd39..fe2699c 100644 --- a/packages/littlelink-server/default.nix +++ b/packages/littlelink-server/default.nix @@ -2,18 +2,18 @@ # AUTO-UPDATE: nix-update --flake --version=branch=master littlelink-server pkgs.stdenv.mkDerivation (finalAttrs: { pname = "littlelink-server"; - version = "0-unstable-2025-08-25"; + version = "0-unstable-2025-09-04"; src = pkgs.fetchFromGitHub { owner = "techno-tim"; repo = "littlelink-server"; - rev = "9c65c4f389a92b2bf2ca85e545960ef3be4e72e9"; - hash = "sha256-nd3dMWuYz2Af5XokTgMJdF0U2L98EW6CVuDGSXSOlls="; + rev = "cafae98693fe0a0b34225be9dbfc7b4ef0c363d4"; + hash = "sha256-pjXmQm0iXZA9oc/zP4t2R3/Bsw6/89T8Hbx15mqzS3A="; }; offlineCache = pkgs.fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-Ikd2PUBIPTTv7e08HbANk4chwMtObyZtnd6pyiWKqps="; + hash = "sha256-9qOHA1fj4yAl879K8sWvnNtMVrQZE29FLF8aiQio0Dg="; }; nativeBuildInputs = with pkgs; [ diff --git a/packages/obsidian/plugins/excalidraw/default.nix b/packages/obsidian/plugins/excalidraw/default.nix index bcdadf6..df41e66 100644 --- a/packages/obsidian/plugins/excalidraw/default.nix +++ b/packages/obsidian/plugins/excalidraw/default.nix @@ -2,13 +2,13 @@ # AUTO-UPDATE: nix-update --flake obsidian-plugin-excalidraw --subpackage mathjaxToSVG pkgs.buildNpmPackage (finalAttrs: { pname = "obsidian.plugins.excalidraw"; - version = "2.15.1"; + version = "2.15.3"; pkg = pkgs.fetchFromGitHub { owner = "zsviczian"; repo = "obsidian-excalidraw-plugin"; rev = finalAttrs.version; - hash = "sha256-EsyR5PTZkR+/+5F9mteZ06smbX0mhxtbagO6ZDloHgs="; + hash = "sha256-r5L+QWwVfx0j2z/dB86+uZSETFeApCscgWoappiRulw="; }; mathjaxToSVG = pkgs.buildNpmPackage { @@ -30,9 +30,7 @@ pkgs.buildNpmPackage (finalAttrs: { src = finalAttrs.pkg; - patches = [ ./package-lock.patch ]; - - npmDepsHash = "sha256-QuhHPLjPpZNKZH7qhOr77CCZS9+ls35+ka4WYOEt4zI="; + npmDepsHash = "sha256-SmAh2S4eGZKY5QtP1HxISdHJ2xnSFVtZwfIMKwSPiaY="; npmPackFlags = [ "--ignore-scripts" ]; configurePhase = '' diff --git a/packages/obsidian/plugins/excalidraw/package-lock.patch b/packages/obsidian/plugins/excalidraw/package-lock.patch deleted file mode 100644 index f7d1d89..0000000 --- a/packages/obsidian/plugins/excalidraw/package-lock.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/package-lock.json b/package-lock.json -index 21d66bd..fc0b033 100644 ---- a/package-lock.json -+++ b/package-lock.json -@@ -11,7 +11,7 @@ - "dependencies": { - "@popperjs/core": "^2.11.8", - "@zsviczian/colormaster": "^1.2.2", -- "@zsviczian/excalidraw": "0.18.0-31", -+ "@zsviczian/excalidraw": "0.18.0-37", - "chroma-js": "^3.1.2", - "clsx": "^2.0.0", - "es6-promise-pool": "2.5.0", -@@ -3494,9 +3494,10 @@ - "license": "MIT" - }, - "node_modules/@zsviczian/excalidraw": { -- "version": "0.18.0-31", -- "resolved": "https://registry.npmjs.org/@zsviczian/excalidraw/-/excalidraw-0.18.0-31.tgz", -- "integrity": "sha512-A1wyp8EVOhCdoxdX7middc8LoLpjPLtxiSTeBbdMtungl8VQzAcQ2tSGCkncK/8RBcBaUk44Hr6KcWjezHnQew==", -+ "version": "0.18.0-37", -+ "resolved": "https://registry.npmjs.org/@zsviczian/excalidraw/-/excalidraw-0.18.0-37.tgz", -+ "integrity": "sha512-SC4a6wj6IzE9HucxImDoOPcojojW/8FSry1hSA+hXfU350DhY6VlpFQ1DHJMPqVgIkFHB/hbCHt3klV+66+ouw==", -+ "license": "MIT", - "dependencies": { - "@braintree/sanitize-url": "6.0.2", - "@excalidraw/random-username": "1.1.0", diff --git a/packages/obsidian/plugins/linter/default.nix b/packages/obsidian/plugins/linter/default.nix index 55b37a1..2084146 100644 --- a/packages/obsidian/plugins/linter/default.nix +++ b/packages/obsidian/plugins/linter/default.nix @@ -2,16 +2,16 @@ # AUTO-UPDATE: nix-update --flake obsidian-plugin-linter pkgs.buildNpmPackage (finalAttrs: { pname = "linter"; - version = "1.29.2"; + version = "1.30.0"; src = pkgs.fetchFromGitHub { owner = "platers"; repo = "obsidian-linter"; rev = finalAttrs.version; - hash = "sha256-I60nP99bdQfvq+GYtUvHPpYqp/nqpn3BqrgZzgPzRpI="; + hash = "sha256-pqbCt5h1KXwe2wXoF8v9xj3ntKcWwClQrcO6RHQa5QY="; }; - npmDepsHash = "sha256-5e7eFX25818dsux9hSdNRsTJPHbaR8n69s6/nnIHFyc="; + npmDepsHash = "sha256-6VgGl27vYunzU3QvPT4ljFtG/7RxhmrUPQZHE7eGepo="; npmPackFlags = [ "--ignore-scripts" ]; installPhase = '' diff --git a/packages/prometheus-podman-exporter/default.nix b/packages/prometheus-podman-exporter/default.nix index 1ea2bdd..0f92b47 100644 --- a/packages/prometheus-podman-exporter/default.nix +++ b/packages/prometheus-podman-exporter/default.nix @@ -2,13 +2,13 @@ # AUTO-UPDATE: nix-update --flake prometheus-podman-exporter pkgs.buildGoModule (finalAttrs: { pname = "prometheus-podman-exporter"; - version = "1.18.0"; + version = "1.18.1"; src = pkgs.fetchFromGitHub { owner = "containers"; repo = "prometheus-podman-exporter"; rev = "v${finalAttrs.version}"; - hash = "sha256-hrecxJp78c8LruXTGRDU6zNWnyh+vwgCpVJsm026NYw="; + hash = "sha256-h4bOb1xbQTKnN5m4Xa28C2cBoXDo/EAleUNVUC03ixQ="; }; vendorHash = null; diff --git a/submodules/lib b/submodules/lib index be7b39f..5e0737c 160000 --- a/submodules/lib +++ b/submodules/lib @@ -1 +1 @@ -Subproject commit be7b39f41a1137a68944fc73db5a24544e015eb6 +Subproject commit 5e0737c20f3c265dbff604170a6433cc1e1a4b41 diff --git a/submodules/sas b/submodules/sas index 3d06998..f123875 160000 --- a/submodules/sas +++ b/submodules/sas @@ -1 +1 @@ -Subproject commit 3d069983345ea83549c641dd3f8875e54aaf1c2b +Subproject commit f12387528b67f0c2095eb42fa0983a4223152717