diff --git a/flake.lock b/flake.lock index 26f8a90..d8b47eb 100644 --- a/flake.lock +++ b/flake.lock @@ -14,11 +14,11 @@ ] }, "locked": { - "lastModified": 1747575206, - "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=", + "lastModified": 1750173260, + "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=", "owner": "ryantm", "repo": "agenix", - "rev": "4835b1dc898959d8547a871ef484930675cb47f1", + "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf", "type": "github" }, "original": { @@ -29,7 +29,6 @@ }, "chaotic": { "inputs": { - "fenix": "fenix", "flake-schemas": "flake-schemas", "home-manager": [ "home-manager" @@ -37,14 +36,15 @@ "jovian": "jovian", "nixpkgs": [ "nixpkgs" - ] + ], + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1749939902, - "narHash": "sha256-7M/3Uu945Blu/1+16/q04Stls7cHBNdJiZbUXiqsN34=", + "lastModified": 1750428432, + "narHash": "sha256-aICx9O+ci4j/0Rr5doOt0UxZIIDvpCU2G7aqQ5S0p3g=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "fa36ce97b2848346111c76ac65187ef3d8e82dfa", + "rev": "b2d61842410c2884f45f33e3f9f5edf40bb7fca0", "type": "github" }, "original": { @@ -98,11 +98,11 @@ ] }, "locked": { - "lastModified": 1749436314, - "narHash": "sha256-CqmqU5FRg5AadtIkxwu8ulDSOSoIisUMZRLlcED3Q5w=", + "lastModified": 1750040002, + "narHash": "sha256-KrC9iOVYIn6ukpVlHbqSA4hYCZ6oDyJKrcLqv4c5v84=", "owner": "nix-community", "repo": "disko", - "rev": "dfa4d1b9c39c0342ef133795127a3af14598017a", + "rev": "7f1857b31522062a6a00f88cbccf86b43acceed1", "type": "github" }, "original": { @@ -257,28 +257,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" - } - }, "flake-compat": { "flake": false, "locked": { @@ -469,11 +447,11 @@ ] }, "locked": { - "lastModified": 1749999552, - "narHash": "sha256-iCUuEq9qXUh8L1c2bRyCayAqfuUEs9nGAUlXv2RcoF8=", + "lastModified": 1750304462, + "narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=", "owner": "nix-community", "repo": "home-manager", - "rev": "04672588c61aebd18c0d0ada66dd7bb4d8edab0d", + "rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c", "type": "github" }, "original": { @@ -491,11 +469,11 @@ ] }, "locked": { - "lastModified": 1749627191, - "narHash": "sha256-bUv8CDE6Uyxak4UkOvRjx5xj6+msEHSpYGeAjkuTnTs=", + "lastModified": 1750230721, + "narHash": "sha256-rg/lnazeno/f4VNSv+t2Zwio/OyCYKx5zV9/8hfhfgA=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "f31df4cb6b2eeef6cf0113edb687297be72a69df", + "rev": "6c88df8c85ad3f80a5832edc50534a5add255b47", "type": "github" }, "original": { @@ -513,14 +491,14 @@ "nixpkgs" ], "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay" + "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1749471908, - "narHash": "sha256-uGfPqd43KTomeIVWUzHu3hGLWFsqYibhWLt2OaRic28=", + "lastModified": 1750168384, + "narHash": "sha256-PBfJ7dGsR02im/RYN8wXII8yNPFhKxiPdq+JDfbvD2k=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "00292388ad3b497763b81568d6ee5e1c4a2bcf85", + "rev": "38c2addd2e0cedcb03708de6e6c21fb1be86d410", "type": "github" }, "original": { @@ -552,11 +530,11 @@ ] }, "locked": { - "lastModified": 1749796250, - "narHash": "sha256-oxvVAFUO9husnRk6XZcLFLjLWL9z0pW25Fk6kVKwt1c=", + "lastModified": 1750047244, + "narHash": "sha256-vluLARrk4485npdyHOj8XKr0yk6H22pNf+KVRNL+i/Y=", "owner": "oxalica", "repo": "nil", - "rev": "9e4cccb088440c20703d62db9de8d5ae06d4a449", + "rev": "870a4b1b5f12004832206703ac15aa85c42c247b", "type": "github" }, "original": { @@ -693,11 +671,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "lastModified": 1750365781, + "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", "type": "github" }, "original": { @@ -747,11 +725,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1750002698, - "narHash": "sha256-jGE6PtV2w41lJI5I1CVSBaMfQi03nnDOSVrXZbZhtQM=", + "lastModified": 1750440251, + "narHash": "sha256-iBzrVSW5leJxwIv5nEUT/QjmB2KAau6+eeDJqFGGCy8=", "owner": "nix-community", "repo": "NUR", - "rev": "3190e1b9e749b88bccb838c8b6bf0f9d7f0cd8a4", + "rev": "4a6b1ed21192aecf399aee6926a90ebc03572427", "type": "github" }, "original": { @@ -772,11 +750,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1749895904, - "narHash": "sha256-D7ZLf2ApiHMLlS6Imu7yHaB4Nbf9Hi8a8/64xOt6qOo=", + "lastModified": 1750441488, + "narHash": "sha256-JuFBp2xM4JD/XGb69dTSDOdGbUD0fVHlgY9X9GHGTFE=", "owner": "notashelf", "repo": "nvf", - "rev": "77a32f0961edbeda82e80c1bcd465cad21004fc7", + "rev": "18c17b7b8dbf6e0f10e3eb5f1fa5341a9175a3b1", "type": "github" }, "original": { @@ -878,11 +856,11 @@ ] }, "locked": { - "lastModified": 1747372754, - "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", + "lastModified": 1749636823, + "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", + "rev": "623c56286de5a3193aa38891a6991b28f9bab056", "type": "github" }, "original": { @@ -941,24 +919,28 @@ "type": "github" } }, - "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": 1750214276, + "narHash": "sha256-1kniuhH70q4TAC/xIvjFYH46aHiLrbIlcr6fdrRwO1A=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "f9b2b2b1327ff6beab4662b8ea41689e0a57b8d4", "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": [ "lanzaboote", @@ -966,11 +948,11 @@ ] }, "locked": { - "lastModified": 1749436897, - "narHash": "sha256-OkDtaCGQQVwVFz5HWfbmrMJR99sFIMXHCHEYXzUJEJY=", + "lastModified": 1749955444, + "narHash": "sha256-CllTHvHX8KAdAZ+Lxzd23AmZTxO1Pfy+zC43/5tYkAE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e7876c387e35dc834838aff254d8e74cf5bd4f19", + "rev": "539ba15741f0e6691a2448743dbc601d8910edce", "type": "github" }, "original": { diff --git a/hosts/perso-desktop/configuration.nix b/hosts/perso-desktop/configuration.nix index b5becbd..5bdf653 100644 --- a/hosts/perso-desktop/configuration.nix +++ b/hosts/perso-desktop/configuration.nix @@ -58,7 +58,9 @@ # Revert to RADV when this https://gitlab.freedesktop.org/mesa/mesa/-/issues/12865 is resolved chaotic.mesa-git = { enable = true; - extraPackages = with pkgs; [ rocmPackages.clr.icd amdvlk ]; + # NOTE: Fixed when https://github.com/NixOS/nixpkgs/pull/418461 is available + # rocmPackages.clr.icd + extraPackages = with pkgs; [ amdvlk ]; extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ]; }; diff --git a/hosts/perso-laptop/configuration.nix b/hosts/perso-laptop/configuration.nix index a6a859f..e347f68 100644 --- a/hosts/perso-laptop/configuration.nix +++ b/hosts/perso-laptop/configuration.nix @@ -60,7 +60,9 @@ graphics.nvidia.enable = true; audio.pipewire.enable = true; printing.enable = true; - waydroid.enable = true; + # waydroid.enable = true; Broken }; }; + + warnings = [ "waydroid disabled for now because it's broken" ]; } diff --git a/modules/home/editors/vscode.nix b/modules/home/editors/vscode.nix index b27a2d5..4de78ad 100644 --- a/modules/home/editors/vscode.nix +++ b/modules/home/editors/vscode.nix @@ -11,6 +11,8 @@ in ''; }; config = mkIf cfg.enable { + warnings = [ "home(editors.vscode): C# support disabled for now. Can be re-enabled when this issue is resolved https://github.com/NixOS/nixpkgs/issues/418521" ]; + # Inspired by https://github.com/khaneliman/khanelinix/blob/1cc1ff0435671804666cdc732a0b792178441e2f/modules/home/programs/graphical/editors/vscode/default.nix programs.vscode = { enable = true; @@ -47,19 +49,20 @@ in ++ [ ms-vscode.cpptools ms-vscode.cmake-tools ms-vscode.cpptools-extension-pack ]; }; - C_Sharp = { - extensions = - with pkgs.vscode-extensions; - commonExtensions - ++ [ ms-dotnettools.csdevkit ms-dotnettools.csharp ms-dotnettools.vscode-dotnet-runtime ]; - }; - - UnrealEngine = { - extensions = - commonExtensions - ++ C_CPP.extensions - ++ C_Sharp.extensions; - }; + # NOTE: Don't compile, missing libxml2 ? See https://github.com/NixOS/nixpkgs/issues/418521 + # C_Sharp = { + # extensions = + # with pkgs.vscode-extensions; + # commonExtensions + # ++ [ ms-dotnettools.csdevkit ms-dotnettools.csharp ms-dotnettools.vscode-dotnet-runtime ]; + # }; + # + # UnrealEngine = { + # extensions = + # commonExtensions + # ++ C_CPP.extensions + # ++ C_Sharp.extensions; + # }; Phoenix = { extensions = @@ -97,4 +100,4 @@ in }; }; }; -} \ No newline at end of file +} diff --git a/modules/system/hardware/graphics/amdgpu.nix b/modules/system/hardware/graphics/amdgpu.nix index c621d72..2eaf973 100644 --- a/modules/system/hardware/graphics/amdgpu.nix +++ b/modules/system/hardware/graphics/amdgpu.nix @@ -11,10 +11,12 @@ in ''; }; config = mkIf cfg.enable { + warnings = [ "system(hardware.graphics.amdgpu): ROCM Disabled for now. Re-enable it when https://github.com/NixOS/nixpkgs/pull/418461 is available" ]; + boot.initrd.kernelModules = [ "amdgpu" ]; # Set acceleration to rocm - services.ollama.acceleration = "rocm"; + # services.ollama.acceleration = "rocm"; # Load amdgpu driver for Xorg and Wayland services.xserver = { @@ -22,10 +24,11 @@ in videoDrivers = ["amdgpu"]; }; + # NOTE: Fixed when https://github.com/NixOS/nixpkgs/pull/418461 is available hardware.graphics = { enable = true; enable32Bit = true; - extraPackages = with pkgs; [ rocmPackages.clr.icd ]; + # extraPackages = with pkgs; [ rocmPackages.clr.icd ]; }; }; }