diff --git a/flake.lock b/flake.lock index 5380741..4567e41 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ }, "amp-pkgs": { "locked": { - "lastModified": 1781607440, - "narHash": "sha256-rxO+uc/KFbSJp+pgyXRuAX6QlG9hJdnt0BXpEQRXY+U=", + "lastModified": 1783279667, + "narHash": "sha256-/NAkDSsve+GNM0Bt6tleJdCGfsTlK89nPjkVOzZMo0s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e41b24abd260e8f71dbe2f5737d24122f972158", + "rev": "f205b5574fd0cb7da5b702a2da51507b7f4fdd1b", "type": "github" }, "original": { @@ -45,11 +45,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1780258891, - "narHash": "sha256-KURy7kHE9TZG2wrQX0xaKScWp3JqEx7cYxboCJO/KPU=", + "lastModified": 1783380155, + "narHash": "sha256-SwUwKaLrZ+c5y4GoZHKBf1nUsDHVsIUtn2CFloZrV2A=", "owner": "sadjow", "repo": "claude-code-nix", - "rev": "e65e7eca7efe776d0bf5f53e317d33b3ff973623", + "rev": "25d979d1a39d0acdbcb1b8d0b9d83ffdd10b5f43", "type": "github" }, "original": { @@ -144,11 +144,11 @@ ] }, "locked": { - "lastModified": 1779726825, - "narHash": "sha256-RUkMrREjKDQrA+dA9+xZviGAxM5W1aVdyOr/bSYpHrE=", + "lastModified": 1783221248, + "narHash": "sha256-ESQnuNHEDChsB4IxoLRhscVahqkDWkTb+qdIz8euYt4=", "owner": "nix-community", "repo": "home-manager", - "rev": "b179bde238977f7d4454fc770b1a727eaf55111c", + "rev": "af2beae5f0fae0a4310cc0e6aef2572f56090353", "type": "github" }, "original": { @@ -180,11 +180,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1780030872, - "narHash": "sha256-u6WU/yd/o8iYQrHX3RAwO1hYa3LkoSL+WNQD0rJfJZQ=", + "lastModified": 1783279667, + "narHash": "sha256-/NAkDSsve+GNM0Bt6tleJdCGfsTlK89nPjkVOzZMo0s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9a7635a57597d9754eccebdfc7045e6c8600e6b", + "rev": "f205b5574fd0cb7da5b702a2da51507b7f4fdd1b", "type": "github" }, "original": { @@ -196,11 +196,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1781607440, - "narHash": "sha256-rxO+uc/KFbSJp+pgyXRuAX6QlG9hJdnt0BXpEQRXY+U=", + "lastModified": 1783279667, + "narHash": "sha256-/NAkDSsve+GNM0Bt6tleJdCGfsTlK89nPjkVOzZMo0s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e41b24abd260e8f71dbe2f5737d24122f972158", + "rev": "f205b5574fd0cb7da5b702a2da51507b7f4fdd1b", "type": "github" }, "original": { @@ -212,11 +212,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1782666739, - "narHash": "sha256-2CYuaRDT7hcYnGW+3TTTy+fNnY4jQ6/mGk6ew035XP4=", + "lastModified": 1783279667, + "narHash": "sha256-/NAkDSsve+GNM0Bt6tleJdCGfsTlK89nPjkVOzZMo0s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "534ee3d8beb1737b5342995f8837e2b2705ce0d8", + "rev": "f205b5574fd0cb7da5b702a2da51507b7f4fdd1b", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1780203844, - "narHash": "sha256-K5sT4jTpGs15ADhviMKNBH38REpPf5Q6mM1+N6cArVE=", + "lastModified": 1783148766, + "narHash": "sha256-uslt2pqShTIXDdAHRHv2QkYLsVdY8Oqwz0EA48/RSM8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b51242d7d43689db2f3be91bd05d5b24fbb469c4", + "rev": "a50de1b7d8a586adc18d2395c19de7d6058e6030", "type": "github" }, "original": { @@ -244,54 +244,27 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1779560665, - "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", - "type": "github" + "lastModified": 1782959384, + "narHash": "sha256-l57y2CK9dTSChgb6Edg7kkXu5DA4rucVbNFoQHUBjmw=", + "rev": "65179426c83bb3f6bc14898b42ea1c6f01d374b0", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1026231.65179426c83b/nixexprs.tar.xz" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "noctalia-qs": { - "inputs": { - "nixpkgs": [ - "noctalia-shell", - "nixpkgs" - ], - "systems": "systems_4", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1780194487, - "narHash": "sha256-M+YtjKCTkHrkplNaKVyaxfa8hAWjRF6wFOUBAZvxQ4U=", - "owner": "noctalia-dev", - "repo": "noctalia-qs", - "rev": "07398e12b54f194e3a2d47c87e3fd10b8eeaa27d", - "type": "github" - }, - "original": { - "owner": "noctalia-dev", - "repo": "noctalia-qs", - "type": "github" + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, "noctalia-shell": { "inputs": { - "nixpkgs": "nixpkgs_4", - "noctalia-qs": "noctalia-qs" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1780197945, - "narHash": "sha256-zeluNQgRgTglqKnv5EaM7DzSaqmrCdqTocmaWC7dxy0=", + "lastModified": 1783434244, + "narHash": "sha256-htyNZPgi5ZfT8CpALQ7MpwU2odWNL/jifoQQ/S4WVQ4=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "b16dc50250af05d5048ac454dbf4e898d1adcac0", + "rev": "b57faefe739b69a07199763eb98e85102c402d0b", "type": "github" }, "original": { @@ -356,43 +329,6 @@ "repo": "default", "type": "github" } - }, - "systems_4": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "noctalia-shell", - "noctalia-qs", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1775636079, - "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } } }, "root": "root", diff --git a/home.nix b/home.nix index cf8ff9f..2b384d1 100644 --- a/home.nix +++ b/home.nix @@ -57,13 +57,7 @@ # of WEBKIT_* env vars — use Bambu Studio for MakerWorld access instead (Bambu's # 3D canvas is blank on this machine but its WebKit panels work). (pkgs.symlinkJoin { name = "orca-slicer"; paths = [ pkgs.orca-slicer ]; buildInputs = [ pkgs.makeWrapper ]; postBuild = '' wrapProgram $out/bin/orca-slicer --set GDK_BACKEND x11 --set MESA_GL_VERSION_OVERRIDE 3.3 ''; }) - # bambu-studio: wxWidgets 3.1.7 GTK3 backend crashes child-window allocation - # at fractional GTK scale factors (the HDMI-1 monitor is at 1.25x), which - # leaves the wxGLCanvas at width=0 and the 3D view blank. GDK_SCALE=1 forces - # integer scaling for this app only — UI will look slightly smaller on the - # fractional-scaled display but the 3D view will render. - # __NV_DISABLE_EXPLICIT_SYNC=1 covers NVIDIA 595 + Mutter sync glitches. - (pkgs.symlinkJoin { name = "bambu-studio"; paths = [ pkgs.bambu-studio ]; buildInputs = [ pkgs.makeWrapper ]; postBuild = '' wrapProgram $out/bin/bambu-studio --set GDK_SCALE 1 --set __NV_DISABLE_EXPLICIT_SYNC 1 ''; }) + (pkgs.symlinkJoin { name = "moonlight-qt"; paths = [ pkgs.moonlight-qt ]; buildInputs = [ pkgs.makeWrapper ]; postBuild = '' wrapProgram $out/bin/moonlight --set QT_QPA_PLATFORM wayland ''; }) pkgs.losslesscut-bin # rpi-imager: needs root to write to /dev/sd*. Wrap so the bin is replaced diff --git a/packages.txt b/packages.txt index 436db12..8c64293 100644 --- a/packages.txt +++ b/packages.txt @@ -4,6 +4,7 @@ certbot cfssl grype nerdctl +podman regctl # Development