diff --git a/flake.lock b/flake.lock index f65ec5ed..b1e87bc5 100644 --- a/flake.lock +++ b/flake.lock @@ -103,11 +103,11 @@ "blocklist-hosts": { "flake": false, "locked": { - "lastModified": 1749741788, - "narHash": "sha256-ONPW+AAFSeG808KUyGpvIYrnKrCu9WLoLkrxsaYPD5o=", + "lastModified": 1750903025, + "narHash": "sha256-zpMyirfb+94mEVj7IUvT8iAWtg2v6uwKYXkftZfldiA=", "owner": "StevenBlack", "repo": "hosts", - "rev": "335cd7caa04c54baa49daf1093965d96b4d084df", + "rev": "3ba25afdbea34239c4925285a2ac3379c760b181", "type": "github" }, "original": { @@ -118,18 +118,18 @@ }, "chaotic": { "inputs": { - "fenix": "fenix", "flake-schemas": "flake-schemas", "home-manager": "home-manager", "jovian": "jovian", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1749948228, - "narHash": "sha256-vds3Mp4Pi7eBgGDNAPdVjYQ3USI5Lu3YYkckgL3lTdE=", + "lastModified": 1751028839, + "narHash": "sha256-FwTXzhO94urXyJz4amWiCzf0dmKbxdhqyze/qh+Od7g=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "5f7fcf0d50b726a4c1a07536d6ed16e6679d3825", + "rev": "c744288de83ee89c63ad9744f59a905b455b9017", "type": "github" }, "original": { @@ -146,11 +146,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1749978329, - "narHash": "sha256-RMnQHG0meKR5cdb6WXa3YCseyXSxdnIZTWu+X54EoxU=", + "lastModified": 1751041558, + "narHash": "sha256-uSfdzrgBAZweKqRfMcioRK1QxDz2mjc73MxVI+fbAGA=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "fc1319f0d30bc5d204210842ccfb4091bb57fa2a", + "rev": "50a1de22af011ea05433453f29c445050c4a747c", "type": "github" }, "original": { @@ -159,28 +159,6 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1749623906, - "narHash": "sha256-QD7e5WNVj4aWS5mlJZZnLJ6Lg0h5RSyyEFo2I6xBUEQ=", - "owner": "nix-community", - "repo": "fenix", - "rev": "873cccc628f5e39407e319e6711f3b7d6d1f15cc", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "firefox-gnome-theme": { "flake": false, "locked": { @@ -374,11 +352,11 @@ ] }, "locked": { - "lastModified": 1749649116, - "narHash": "sha256-pCuUfMkhlP+XqW+TXX5Tssk8IE4TpS3MbG7OQtvaQdM=", + "lastModified": 1750798083, + "narHash": "sha256-DTCCcp6WCFaYXWKFRA6fiI2zlvOLCf5Vwx8+/0R8Wc4=", "owner": "nix-community", "repo": "home-manager", - "rev": "02040b7777f65342b96c7f826a5c6aef95585057", + "rev": "ff31a4677c1a8ae506aa7e003a3dba08cb203f82", "type": "github" }, "original": { @@ -394,11 +372,11 @@ ] }, "locked": { - "lastModified": 1749944797, - "narHash": "sha256-1l6ZW+2+LDQhYgE4fo2KsM2Ms3lY3ZXv0n6uKka2yMk=", + "lastModified": 1750973805, + "narHash": "sha256-BZXgag7I0rnL/HMHAsBz3tQrfKAibpY2vovexl2lS+Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "c5f345153397f62170c18ded1ae1f0875201d49a", + "rev": "080e8b48b0318b38143d5865de9334f46d51fce3", "type": "github" }, "original": { @@ -711,11 +689,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1749162391, - "narHash": "sha256-aCiNnE26qIAxEBP6SRXjLBlIGOB18TViDreoPe96p6Q=", + "lastModified": 1750923325, + "narHash": "sha256-bIQTzgT0JD/jVEDZJCyWayOAnkCeUQ83CvOU26/2Y/8=", "ref": "refs/heads/main", - "rev": "f9d8dfab7ae0aec625e7814e16f626fabec3641b", - "revCount": 371, + "rev": "7999f448d71f673dc83c372f338ae7db8e290d7a", + "revCount": 374, "type": "git", "url": "https://code.hyprland.org/hyprwm/hyprlock.git" }, @@ -833,11 +811,11 @@ ] }, "locked": { - "lastModified": 1749627191, - "narHash": "sha256-bUv8CDE6Uyxak4UkOvRjx5xj6+msEHSpYGeAjkuTnTs=", + "lastModified": 1750403547, + "narHash": "sha256-XDDINMbHTtKQeSRpX5mwq20z23Wg/I/G4JUinA3V8Xg=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "f31df4cb6b2eeef6cf0113edb687297be72a69df", + "rev": "52b86b86d925ec00c836ecc6d36f9c947bb15736", "type": "github" }, "original": { @@ -871,11 +849,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "lastModified": 1750776420, + "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", "type": "github" }, "original": { @@ -887,11 +865,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1749668643, - "narHash": "sha256-gaWJEWGBW/g1u6o5IM4Un0vluv86cigLuBnjsKILffc=", + "lastModified": 1750646418, + "narHash": "sha256-4UAN+W0Lp4xnUiHYXUXAPX18t+bn6c4Btry2RqM9JHY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1965fd20a39c8e441746bee66d550af78f0c0a7b", + "rev": "1f426f65ac4e6bf808923eb6f8b8c2bfba3d18c5", "type": "github" }, "original": { @@ -903,11 +881,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1749834526, - "narHash": "sha256-izgPGLeUeFB9loC+n2X6TO2n8pOGvVcR3jKqxTGOwgc=", + "lastModified": 1750646418, + "narHash": "sha256-4UAN+W0Lp4xnUiHYXUXAPX18t+bn6c4Btry2RqM9JHY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "db8414903dd6b3042e1ac471eafc18ca4ccb54a4", + "rev": "1f426f65ac4e6bf808923eb6f8b8c2bfba3d18c5", "type": "github" }, "original": { @@ -918,11 +896,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "lastModified": 1750776420, + "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", "type": "github" }, "original": { @@ -1046,38 +1024,42 @@ "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable_2", "plasma-manager": "plasma-manager", - "rust-overlay": "rust-overlay", + "rust-overlay": "rust-overlay_2", "secrets": "secrets", "stylix": "stylix" } }, - "rust-analyzer-src": { - "flake": false, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "chaotic", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1749558764, - "narHash": "sha256-R9vQiqez6Gm0ARJKgbsAeLyX493vwIaexOUAz0vDhak=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "9c3476d225ccc90c081280c2a20e9f7d8a200325", + "lastModified": 1750905536, + "narHash": "sha256-Mo7yXM5IvMGNvJPiNkFsVT2UERmnvjsKgnY6UyDdySQ=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "2fa7c0aabd15fa0ccc1dc7e675a4fcf0272ad9a1", "type": "github" }, "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", + "owner": "oxalica", + "repo": "rust-overlay", "type": "github" } }, - "rust-overlay": { + "rust-overlay_2": { "inputs": { "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1749955444, - "narHash": "sha256-CllTHvHX8KAdAZ+Lxzd23AmZTxO1Pfy+zC43/5tYkAE=", + "lastModified": 1750991972, + "narHash": "sha256-jzadGZL1MtqmHb5AZcjZhHpNulOdMZPxf8Wifg8e5VA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "539ba15741f0e6691a2448743dbc601d8910edce", + "rev": "b6509555d8ffaa0727f998af6ace901c5b78dc26", "type": "github" }, "original": { @@ -1128,11 +1110,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1749988622, - "narHash": "sha256-DuZXMJoxgT1CRvoK6R5cIdIf0NRbwQ3u/iFrr9zZECI=", + "lastModified": 1750950678, + "narHash": "sha256-ZNSjRDpaR/sAtrZNPO6RpGkHKdMb1oc1lkQN+6ZBvyU=", "owner": "danth", "repo": "stylix", - "rev": "ad592a0e99386474a1826f3d90aeaff97848182c", + "rev": "c700d41bb8ee32baed490c8128c1077b2b27183b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f1a35200..346d7be4 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,12 @@ (import inputs.nixpkgs { inherit system; }).applyPatches { name = "nixpkgs-patched"; src = inputs.nixpkgs; - patches = [ ]; + patches = [ + (builtins.fetchurl { + url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/419713.patch"; + sha256 = "sha256:16giri2vwqf6lb6l8fw10zgda1d3y13g3p6hm375f2i2dbip9s9b"; + }) + ]; }; # configure pkgs diff --git a/modules/user/art/default.nix b/modules/user/art/default.nix index da3358fe..89f22181 100644 --- a/modules/user/art/default.nix +++ b/modules/user/art/default.nix @@ -15,7 +15,6 @@ in { pinta inkscape libresprite - makehuman upscayl ]; userSettings.blender.enable = true;