diff --git a/flake.lock b/flake.lock index 52f5555..8eaa5e6 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1762618334, - "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", + "lastModified": 1770165109, + "narHash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I=", "owner": "ryantm", "repo": "agenix", - "rev": "fcdea223397448d35d9b31f798479227e80183f6", + "rev": "b027ee29d959fda4b60b57566d64c98a202e0feb", "type": "github" }, "original": { @@ -225,11 +225,11 @@ ] }, "locked": { - "lastModified": 1766150702, - "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=", + "lastModified": 1769524058, + "narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=", "owner": "nix-community", "repo": "disko", - "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378", + "rev": "71a3fc97d80881e91710fe721f1158d3b96ae14d", "type": "github" }, "original": { @@ -504,11 +504,11 @@ ] }, "locked": { - "lastModified": 1768603898, - "narHash": "sha256-vRV1dWJOCpCal3PRr86wE2WTOMfAhTu6G7bSvOsryUo=", + "lastModified": 1770260404, + "narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=", "owner": "nix-community", "repo": "home-manager", - "rev": "2a63d0e9d2c72ac4d4150ebb242cf8d86f488c8c", + "rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b", "type": "github" }, "original": { @@ -565,11 +565,11 @@ ] }, "locked": { - "lastModified": 1765267181, - "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", + "lastModified": 1770315571, + "narHash": "sha256-hy0gcAgAcxrnSWKGuNO+Ob0x6jQ2xkR6hoaR0qJBHYs=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", + "rev": "2684bb8080a6f2ca5f9d494de5ef875bc1c4ecdb", "type": "github" }, "original": { @@ -618,13 +618,28 @@ "type": "github" } }, - "nixpkgs-unstable": { + "nixpkgs-mesa-26": { "locked": { - "lastModified": 1768564909, - "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", + "lastModified": 1770837954, + "narHash": "sha256-B9rn+KSP/+lgM7j406sDIapS1IedxgACFdiRHzMTzVU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", + "rev": "157721757fca10d3f26d11ace9883f1f0b0bccef", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "rev": "157721757fca10d3f26d11ace9883f1f0b0bccef", + "type": "indirect" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", "type": "github" }, "original": { @@ -681,11 +696,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1768621446, - "narHash": "sha256-6YwHV1cjv6arXdF/PQc365h1j+Qje3Pydk501Rm4Q+4=", + "lastModified": 1770464364, + "narHash": "sha256-z5NJPSBwsLf/OfD8WTmh79tlSU8XgIbwmk6qB1/TFzY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "72ac591e737060deab2b86d6952babd1f896d7c5", + "rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457", "type": "github" }, "original": { @@ -696,11 +711,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1767364772, - "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", + "lastModified": 1770107345, + "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", + "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", "type": "github" }, "original": { @@ -790,6 +805,7 @@ "nix-index-database": "nix-index-database", "nixos-mailserver": "nixos-mailserver", "nixpkgs": "nixpkgs_5", + "nixpkgs-mesa-26": "nixpkgs-mesa-26", "nixpkgs-unstable": "nixpkgs-unstable", "plymouth-themes": "plymouth-themes", "ranger-icons": "ranger-icons", @@ -854,11 +870,11 @@ ] }, "locked": { - "lastModified": 1768481291, - "narHash": "sha256-NjKtkJraCZEnLHAJxLTI+BfdU//9coAz9p5TqveZwPU=", + "lastModified": 1770526836, + "narHash": "sha256-xbvX5Ik+0inJcLJtJ/AajAt7xCk6FOCrm5ogpwwvVDg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e085e303dfcce21adcb5fec535d65aacb066f101", + "rev": "d6e0e666048a5395d6ea4283143b7c9ac704720d", "type": "github" }, "original": { @@ -1014,11 +1030,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1768158989, - "narHash": "sha256-67vyT1+xClLldnumAzCTBvU0jLZ1YBcf4vANRWP3+Ak=", + "lastModified": 1770228511, + "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "e96d59dff5c0d7fddb9d113ba108f03c3ef99eca", + "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7", "type": "github" }, "original": { @@ -1029,11 +1045,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1767796149, - "narHash": "sha256-yGpWUuiHyCH18s8cYfLp8d98dqPy/BkAcw/KdtjclUs=", + "lastModified": 1770130846, + "narHash": "sha256-B9uMrG9ghVJWNBXOMmKMqfxErh58A2AINXsdqMpgyvc=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "861043cfdbc47d41618d4fe496f0208f7cb4ab5d", + "rev": "5e3a56de3af9244d2ebab808c24e5d590115534b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 250b02b..14c4636 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,8 @@ nixpkgs.url = "nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; + nixpkgs-mesa-26.url = "nixpkgs/157721757fca10d3f26d11ace9883f1f0b0bccef"; + home-manager.url = "github:nix-community/home-manager/release-25.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/monolith/amdgpu.nix b/hosts/monolith/amdgpu.nix index 3a9785b..df50d97 100644 --- a/hosts/monolith/amdgpu.nix +++ b/hosts/monolith/amdgpu.nix @@ -12,9 +12,12 @@ # }; # }; + hardware.graphics.package = pkgs.pkgs-mesa-26.mesa; + hardware.graphics.enable32Bit = true; hardware.graphics.extraPackages = with pkgs; [ - libva + # libva needs to match `hardware.graphics.package` + pkgs-mesa-26.libva ]; } diff --git a/hosts/stonehenge/default.nix b/hosts/stonehenge/default.nix index 4f0ff32..c299dab 100644 --- a/hosts/stonehenge/default.nix +++ b/hosts/stonehenge/default.nix @@ -91,6 +91,8 @@ extraGroups = [ "networkmanager" "wheel" + "libvirtd" + "kvm" ]; packages = with pkgs; [ # kdePackages.kate @@ -102,6 +104,8 @@ virtualisation.virtualbox.host.enable = true; + virtualisation.libvirtd.enable = true; + # Install firefox. programs.firefox.enable = true; @@ -113,8 +117,11 @@ environment.systemPackages = with pkgs; [ # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. # wget + dnsmasq ]; + networking.firewall.trustedInterfaces = [ "virbr0" ]; + # Some programs need SUID wrappers, can be configured further or are # started in user sessions. # programs.mtr.enable = true; diff --git a/overlays/default.nix b/overlays/default.nix index c2b01c9..6e00ae2 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -14,6 +14,7 @@ rec { unstable = final: prev: { unstable = import inputs.nixpkgs-unstable { inherit (final) system config; }; + pkgs-mesa-26 = import inputs.nixpkgs-mesa-26 { inherit (final) system config; }; }; themes = ( diff --git a/user/mangohud.nix b/user/mangohud.nix index 7caba3c..415cb1d 100644 --- a/user/mangohud.nix +++ b/user/mangohud.nix @@ -10,9 +10,13 @@ let settings = { # Display no_display = true; # Hidden by default - toggle_hud = "Shift_R+F12"; font_size = "20"; + toggle_preset = "Control_R+F9"; + toggle_fps_limit = "Shift_R+F10"; + toggle_hud_position = "Shift_R+F11"; + toggle_hud = "Shift_R+F12"; + # GPU pci_dev = "0:03:00.0"; gpu_text = "RX 7800 XT";