diff --git a/flake.lock b/flake.lock index 45405e0..7753bde 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1778716662, - "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", "type": "github" }, "original": { @@ -161,15 +161,15 @@ "nixpkgs": "nixpkgs", "npm-lockfile-fix": "npm-lockfile-fix", "pyproject-build-systems": "pyproject-build-systems", - "pyproject-nix": "pyproject-nix_2", - "uv2nix": "uv2nix_2" + "pyproject-nix": "pyproject-nix", + "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1782503243, - "narHash": "sha256-NgWj5RVjLFN4hNQaols+ADGeTeXqXEpdi1OFROOwPiA=", + "lastModified": 1783603624, + "narHash": "sha256-duBin6IEnWXKShM9UAXpD4yG/rtcxcRjPBTktY0NRaI=", "owner": "NousResearch", "repo": "hermes-agent", - "rev": "f509f6e59860c45dea990c4d2716a010b895711c", + "rev": "daedf4f627c73859974e587783b7cef8ce80e19a", "type": "github" }, "original": { @@ -185,11 +185,11 @@ ] }, "locked": { - "lastModified": 1781365335, - "narHash": "sha256-zqDBhXMzfbdlO7F2bGHe7MOtB3xngd/+4ieMHDC+ZXo=", + "lastModified": 1783550008, + "narHash": "sha256-qbbZUk9IG9dLNwCPwdPBs6I5clxwugRpP+1YU+GPK20=", "owner": "nix-community", "repo": "home-manager", - "rev": "5b6f5733726a1b2ccafb5dec6ac4ca7299fad66c", + "rev": "f4d01c1d87c7c2ec909549165d5a8338f1bd3315", "type": "github" }, "original": { @@ -278,11 +278,11 @@ ] }, "locked": { - "lastModified": 1781190061, - "narHash": "sha256-QRMpLbsmlciMGv4yx75FUoIl54K02JbIX1tgdPHPw1s=", + "lastModified": 1781772065, + "narHash": "sha256-xIbRSwDB1GBAUsWsQZUjudGfAGQt3BOpsWaO/ugVa4w=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "f2b3fdb347f91dfd344ad196666a0b0fe8aad05c", + "rev": "adda04f0bf4819575b1978c2f8d78401b3c2be12", "type": "github" }, "original": { @@ -325,11 +325,11 @@ ] }, "locked": { - "lastModified": 1781422160, - "narHash": "sha256-W7S8O86bVrw2gaomEwkHStOzmPpnFIHQ6lS4Q2HffJ0=", + "lastModified": 1783414108, + "narHash": "sha256-RY8e+gR2/DhXsYDxGDL6Hhe9+POD9u4+llwxMBqMQDs=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "854d04e2368fb2e9c328a36b3c0a04cd713bfae1", + "rev": "96d6de10eb281b98f5cfcd1841394c03da5df77c", "type": "github" }, "original": { @@ -374,11 +374,11 @@ "vpn-confinement": "vpn-confinement" }, "locked": { - "lastModified": 1780934252, - "narHash": "sha256-3++axEzhGBPO3QpajU7Ni1Byk9XI4+m3p0944HJNe6Q=", + "lastModified": 1783006321, + "narHash": "sha256-JbzDiK4lQ+Wt7cAC3rhaG+PBnv5OHVMMHgGKUoxWjaA=", "owner": "kiriwalawren", "repo": "nixflix", - "rev": "b34d4959c7092d17121b5da03d01704187ac7eeb", + "rev": "2aa1d080f760584d1205575f730525349f5c38cb", "type": "github" }, "original": { @@ -453,11 +453,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1777168982, - "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", + "lastModified": 1782614948, + "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", + "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c", "type": "github" }, "original": { @@ -468,11 +468,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1781074563, - "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=", + "lastModified": 1783224372, + "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca", + "rev": "d407951447dcd00442e97087bf374aad70c04cea", "type": "github" }, "original": { @@ -500,11 +500,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1781216227, - "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=", + "lastModified": 1783389287, + "narHash": "sha256-0xIy4dVLqq47rA+mRy0hXDfjhQd4E5PoIns/RmB7nR4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0", + "rev": "0ad6f47ea4fe188f4bc8f0380f93ae8523337c6c", "type": "github" }, "original": { @@ -516,11 +516,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1775888245, - "narHash": "sha256-nwASzrRDD1JBEu/o8ekKYEXm/oJW6EMCzCRdrwcLe90=", + "lastModified": 1782175435, + "narHash": "sha256-EMzXKmnOtBQ2MnvpiNOm7E+kOMvdPrIKaeg52Tip2Uk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "13043924aaa7375ce482ebe2494338e058282925", + "rev": "89570f24e97e614aa34aa9ab1c927b6578a43775", "type": "github" }, "original": { @@ -611,8 +611,14 @@ "hermes-agent", "nixpkgs" ], - "pyproject-nix": "pyproject-nix", - "uv2nix": "uv2nix" + "pyproject-nix": [ + "hermes-agent", + "pyproject-nix" + ], + "uv2nix": [ + "hermes-agent", + "uv2nix" + ] }, "locked": { "lastModified": 1772555609, @@ -629,28 +635,6 @@ } }, "pyproject-nix": { - "inputs": { - "nixpkgs": [ - "hermes-agent", - "pyproject-build-systems", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1769936401, - "narHash": "sha256-kwCOegKLZJM9v/e/7cqwg1p/YjjTAukKPqmxKnAZRgA=", - "owner": "nix-community", - "repo": "pyproject.nix", - "rev": "b0d513eeeebed6d45b4f2e874f9afba2021f7812", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "pyproject.nix", - "type": "github" - } - }, - "pyproject-nix_2": { "inputs": { "nixpkgs": [ "hermes-agent", @@ -671,28 +655,6 @@ "type": "github" } }, - "pyproject-nix_3": { - "inputs": { - "nixpkgs": [ - "hermes-agent", - "uv2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1771518446, - "narHash": "sha256-nFJSfD89vWTu92KyuJWDoTQJuoDuddkJV3TlOl1cOic=", - "owner": "pyproject-nix", - "repo": "pyproject.nix", - "rev": "eb204c6b3335698dec6c7fc1da0ebc3c6df05937", - "type": "github" - }, - "original": { - "owner": "pyproject-nix", - "repo": "pyproject.nix", - "type": "github" - } - }, "root": { "inputs": { "flake-parts": "flake-parts", @@ -798,11 +760,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1780547341, - "narHash": "sha256-Gq8KNx5A7hBB3uGJaj6eQfLDIz5YdLu92gqBcvHvoUo=", + "lastModified": 1783174389, + "narHash": "sha256-aCWC8ngycU7OdJrU2+Je3qf+1a2ykuBvpPhZT/9tXMc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "9ed65852b6257fbeae4355bc24ecfea307ca759a", + "rev": "f1406619a3884cd5c47992a70b8b35c9c0fcb4c9", "type": "github" }, "original": { @@ -888,37 +850,13 @@ "inputs": { "nixpkgs": [ "hermes-agent", - "pyproject-build-systems", "nixpkgs" ], "pyproject-nix": [ "hermes-agent", - "pyproject-build-systems", "pyproject-nix" ] }, - "locked": { - "lastModified": 1770770348, - "narHash": "sha256-A2GzkmzdYvdgmMEu5yxW+xhossP+txrYb7RuzRaqhlg=", - "owner": "pyproject-nix", - "repo": "uv2nix", - "rev": "5d1b2cb4fe3158043fbafbbe2e46238abbc954b0", - "type": "github" - }, - "original": { - "owner": "pyproject-nix", - "repo": "uv2nix", - "type": "github" - } - }, - "uv2nix_2": { - "inputs": { - "nixpkgs": [ - "hermes-agent", - "nixpkgs" - ], - "pyproject-nix": "pyproject-nix_3" - }, "locked": { "lastModified": 1773039484, "narHash": "sha256-+boo33KYkJDw9KItpeEXXv8+65f7hHv/earxpcyzQ0I=", @@ -955,11 +893,11 @@ ] }, "locked": { - "lastModified": 1780661205, - "narHash": "sha256-3F5DixT3Gk91lBI9E+TGMm0ko5HrRbDiL23di16TJGA=", + "lastModified": 1782135443, + "narHash": "sha256-vAmbArdCyjqpVW+37aCy/PMBOLIqukUXLQuEKLwUhA4=", "owner": "BirdeeHub", "repo": "nix-wrapper-modules", - "rev": "8dd304c3582ddd339217e1cc5fb53f50acb63c2d", + "rev": "6e7f66fa2cdf4d63162580b438f7fcf87c28a46f", "type": "github" }, "original": { diff --git a/modules/desktop.nix b/modules/desktop.nix index eaf2c30..312b49e 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -17,7 +17,6 @@ withVencord = true; # can do this here too }) scrcpy - (yt-dlp.override { javascriptSupport = false; }) nvtopPackages.full cool-retro-term yubikey-manager @@ -40,6 +39,7 @@ home.packages = with pkgs; [ dracula-theme librewolf + yt-dlp #claude-code ]; qt = { diff --git a/modules/shell.nix b/modules/shell.nix index 470e2cd..8c14b3c 100644 --- a/modules/shell.nix +++ b/modules/shell.nix @@ -124,6 +124,8 @@ enable = true; enableZshIntegration = true; enableFishIntegration = false; + # HM master asserts fzf >= 0.73 for this; 26.05 ships 0.72 and nushell is unused + enableNushellIntegration = false; }; programs.btop = { enable = true;