diff --git a/flake.lock b/flake.lock index dbb3d61..af7249d 100644 --- a/flake.lock +++ b/flake.lock @@ -31,11 +31,11 @@ ] }, "locked": { - "lastModified": 1747093850, - "narHash": "sha256-SaHAtzUyfm4urAcUEZlBFn7dWhoDqA6kaeFZ11CCTf8=", + "lastModified": 1748505737, + "narHash": "sha256-289InRDisoGlKbs4wvWfoNLJJaoBXd2Vq0cxi7PR+d0=", "owner": "aylur", "repo": "astal", - "rev": "4820a3e37cc8eb81db6ed991528fb23472a8e4de", + "rev": "2f2f23133dfd1d8068ffc238579eecd6a5c4e4a9", "type": "github" }, "original": { @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1747742835, - "narHash": "sha256-kYL4GCwwznsypvsnA20oyvW8zB/Dvn6K5G/tgMjVMT4=", + "lastModified": 1748225455, + "narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=", "owner": "nix-community", "repo": "disko", - "rev": "df522e787fdffc4f32ed3e1fca9ed0968a384d62", + "rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba", "type": "github" }, "original": { @@ -115,11 +115,11 @@ ] }, "locked": { - "lastModified": 1748132905, - "narHash": "sha256-7wZcOAzxu/Sa9XzzTsN4OVBBkx4yxUOiYzoSjcSWZO8=", + "lastModified": 1748523756, + "narHash": "sha256-Dp7jYh9sPQw6G7ob3pJnjBzkxxFWir17yhlzAPnYJPs=", "owner": "karaolidis", "repo": "home-manager", - "rev": "503f97a829090f0aaa290ec15a258ca93bcbf656", + "rev": "205adabdcae88eb5eab5b2c2dbe2a74f8be21f23", "type": "github" }, "original": { @@ -131,11 +131,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748132921, - "narHash": "sha256-r5tooEVWEKEWHNHLX1VLXTqzaV7cd4QqE5TTWtYe4fA=", + "lastModified": 1748529242, + "narHash": "sha256-JA6sGuGPTCY6rDMpAP1BopvVNyawjBuW1gaAWnMWnRw=", "owner": "karaolidis", "repo": "nixpkgs", - "rev": "0f2b341b46a73911c747897ca0bc65d022fc1109", + "rev": "c2332b8df21fbf1b0839c99aca528133edf70c7f", "type": "github" }, "original": { @@ -156,11 +156,11 @@ ] }, "locked": { - "lastModified": 1748124399, - "narHash": "sha256-AWYa6QSgYbd0YiOecaTyJ78XSHcLI7yljdSpBTQWB+8=", + "lastModified": 1748523337, + "narHash": "sha256-7JsRh/WVZWy4rS/fmknkcJlIpjfkk+8h0/FddtiSJ5M=", "owner": "nix-community", "repo": "NUR", - "rev": "d8bccb87461726979bc4fe9facbdfa0739fe24a2", + "rev": "50a65345d91b37457c947f37afd93cfe07cdeea7", "type": "github" }, "original": { @@ -172,11 +172,11 @@ }, "quadlet-nix": { "locked": { - "lastModified": 1747780935, - "narHash": "sha256-QXXHXZ4mBN+CWNBdqoOhDxCJN5yVnu1hA2vZGvwyd9o=", + "lastModified": 1748295604, + "narHash": "sha256-GDqEYNafnb4kpz3OUhfrpS7ys5r8QR/t1t7fPA6XLRQ=", "owner": "SEIAROTg", "repo": "quadlet-nix", - "rev": "4845c759415374401f053a7fc4bff81657761fbb", + "rev": "5f4bc5934584eb2b6f0b8e3e13041fe76f2947b6", "type": "github" }, "original": { @@ -233,11 +233,11 @@ ] }, "locked": { - "lastModified": 1747607404, - "narHash": "sha256-xj2Ji+rE+oYjf0BsTDT7K/StnYuZQK9MTbX8U1DUcC0=", + "lastModified": 1748147548, + "narHash": "sha256-9IaAQkgyF4PFtVyui8vF6oJah0iVcO9DaOefjdTMthE=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "8c1be0e5e9a7f35ccd6f7b10bcfa08f2734dad91", + "rev": "f0595e3b59260457042450749eaec00a5a47db35", "type": "github" }, "original": { @@ -270,11 +270,11 @@ ] }, "locked": { - "lastModified": 1747912973, - "narHash": "sha256-XgxghfND8TDypxsMTPU2GQdtBEsHTEc3qWE6RVEk8O0=", + "lastModified": 1748243702, + "narHash": "sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "020cb423808365fa3f10ff4cb8c0a25df35065a3", + "rev": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007", "type": "github" }, "original": { diff --git a/hosts/himalia/hardware/default.nix b/hosts/himalia/hardware/default.nix index 690ca40..42bc168 100644 --- a/hosts/himalia/hardware/default.nix +++ b/hosts/himalia/hardware/default.nix @@ -64,9 +64,7 @@ ]; initrd = { - prepend = [ - "${import ./gu605c-spi-cs-gpio { inherit pkgs; }}/asus-gu605c-acpi.cpio" - ]; + prepend = [ "${import ./gu605c-spi-cs-gpio { inherit pkgs; }}/asus-gu605c-acpi.cpio" ]; kernelModules = [ "i915" diff --git a/packages/darktable/lua-scripts/default.nix b/packages/darktable/lua-scripts/default.nix index d7f03a1..fdcb731 100644 --- a/packages/darktable/lua-scripts/default.nix +++ b/packages/darktable/lua-scripts/default.nix @@ -2,13 +2,13 @@ # AUTO-UPDATE: nix-update --flake --version=branch=master darktable-lua-scripts pkgs.stdenv.mkDerivation rec { pname = "darktable-lua-scripts"; - version = "release-2.0.0-unstable-2025-04-11"; + version = "release-2.0.0-unstable-2025-05-02"; src = pkgs.fetchFromGitHub { owner = "darktable-org"; repo = "lua-scripts"; - rev = "00437699463ce771f4eb474de9a67578b7ced36a"; - hash = "sha256-eBKu5Z4bKHE4hIWIUSFOT2d9zE2mGJy6fM69RC29bSA="; + rev = "62e932990e702a28daefb892583820ad0f9aba7a"; + hash = "sha256-Dmhmq0Ybp8olxg8zoixgHiTwUiLtm/ZkgjevbylsSKY="; }; installPhase = '' diff --git a/packages/obsidian/plugins/excalidraw/default.nix b/packages/obsidian/plugins/excalidraw/default.nix index 0c0adc2..ec213bc 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 rec { pname = "obsidian.plugins.excalidraw"; - version = "2.9.2"; + version = "2.12.2"; pkg = pkgs.fetchFromGitHub { owner = "zsviczian"; repo = "obsidian-excalidraw-plugin"; rev = version; - hash = "sha256-w6+8/VGQyvn1Oh4eSW2vrC8XPOmDU7+0xa6eMhngWHQ="; + hash = "sha256-HiYFFaXxTjhew3ZSYC2HITl2o6c/EKur5Rrsn6UrrQo="; }; mathjaxToSVG = pkgs.buildNpmPackage { @@ -29,9 +29,8 @@ pkgs.buildNpmPackage rec { }; src = pkg; - patches = [ ./package-lock.patch ]; - npmDepsHash = "sha256-l4wEBtUt36xtnNI6LHI1kY95wRVuQrX4ImdQXLU3gO4="; + npmDepsHash = "sha256-Mukv1eaE/wV/dNOgAyvmn8EAAJubHHdE0BKEQ3ca5Oc="; 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 b47b052..0000000 --- a/packages/obsidian/plugins/excalidraw/package-lock.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/package-lock.json b/package-lock.json -index d26372c..a2ac1fb 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-2", -+ "@zsviczian/excalidraw": "0.18.0-3", - "chroma-js": "^2.4.2", - "clsx": "^2.0.0", - "es6-promise-pool": "2.5.0", -@@ -3430,9 +3430,10 @@ - "license": "MIT" - }, - "node_modules/@zsviczian/excalidraw": { -- "version": "0.18.0-2", -- "resolved": "https://registry.npmjs.org/@zsviczian/excalidraw/-/excalidraw-0.18.0-2.tgz", -- "integrity": "sha512-Ge1Dnng9/4iEalNr3DvDfmzoYcccKtKFJREvfx9J2Nqzf6eX2xNOusMYmSYzkC5WWhYaTDGdGP6aUPWsRkc8HA==", -+ "version": "0.18.0-3", -+ "resolved": "https://registry.npmjs.org/@zsviczian/excalidraw/-/excalidraw-0.18.0-3.tgz", -+ "integrity": "sha512-08AByVck6aaybSmYoa25UW9tXwWHkDH5Rg7xNS3dAFGnhLupLB91A/BM8Za0QrM9WPhUNK9JkOTtahaHEOWe5w==", -+ "license": "MIT", - "dependencies": { - "@braintree/sanitize-url": "6.0.2", - "@excalidraw/random-username": "1.1.0", -@@ -5399,19 +5400,6 @@ - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true - }, -- "node_modules/fsevents": { -- "version": "2.3.3", -- "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", -- "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", -- "hasInstallScript": true, -- "optional": true, -- "os": [ -- "darwin" -- ], -- "engines": { -- "node": "^8.16.0 || ^10.6.0 || >=11.0.0" -- } -- }, - "node_modules/function-bind": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", diff --git a/packages/obsidian/plugins/linter/default.nix b/packages/obsidian/plugins/linter/default.nix index 186b92f..c2b51b1 100644 --- a/packages/obsidian/plugins/linter/default.nix +++ b/packages/obsidian/plugins/linter/default.nix @@ -2,13 +2,13 @@ # AUTO-UPDATE: nix-update --flake obsidian-plugin-linter pkgs.buildNpmPackage rec { pname = "obsidian-plugin-linter"; - version = "1.29.0"; + version = "1.29.2"; src = pkgs.fetchFromGitHub { owner = "platers"; repo = "obsidian-linter"; rev = version; - hash = "sha256-h2+rksKBMSfOR288G4ZbyituyrFRXGcQiHL6NnYB35A="; + hash = "sha256-I60nP99bdQfvq+GYtUvHPpYqp/nqpn3BqrgZzgPzRpI="; }; npmDepsHash = "sha256-5e7eFX25818dsux9hSdNRsTJPHbaR8n69s6/nnIHFyc="; diff --git a/packages/obsidian/themes/minimal/default.nix b/packages/obsidian/themes/minimal/default.nix index 3d09f37..d85c688 100644 --- a/packages/obsidian/themes/minimal/default.nix +++ b/packages/obsidian/themes/minimal/default.nix @@ -2,13 +2,13 @@ # AUTO-UPDATE: nix-update --flake obsidian-theme-minimal pkgs.buildNpmPackage rec { pname = "obsidian-theme-minimal"; - version = "7.7.19"; + version = "8.0.0"; src = pkgs.fetchFromGitHub { owner = "kepano"; repo = "obsidian-minimal"; rev = version; - hash = "sha256-1NUnOmQVbikUNcQcPSi0JYxMR6z7s1gZ1iFmR5SOkbM="; + hash = "sha256-wzopDdMy70AciMRmeOza5uTD4J3BNsHgQB0vdQSH/PQ="; }; npmDepsHash = "sha256-R+XeEkDP0MxNQsFCWmHXKtLBcmiOTv9Nw7t2e27kvQg="; diff --git a/submodules/home-manager b/submodules/home-manager index 503f97a..205adab 160000 --- a/submodules/home-manager +++ b/submodules/home-manager @@ -1 +1 @@ -Subproject commit 503f97a829090f0aaa290ec15a258ca93bcbf656 +Subproject commit 205adabdcae88eb5eab5b2c2dbe2a74f8be21f23 diff --git a/submodules/nixpkgs b/submodules/nixpkgs index 0f2b341..c2332b8 160000 --- a/submodules/nixpkgs +++ b/submodules/nixpkgs @@ -1 +1 @@ -Subproject commit 0f2b341b46a73911c747897ca0bc65d022fc1109 +Subproject commit c2332b8df21fbf1b0839c99aca528133edf70c7f