diff --git a/configuration/base.nix b/configuration/base.nix index 1725891..ed33fea 100644 --- a/configuration/base.nix +++ b/configuration/base.nix @@ -68,16 +68,18 @@ # $ nix search wget environment.systemPackages = with pkgs; [ + # utils vim curl inetutils rar - - nuspell - hunspellDicts.en-gb-large - libva-utils smartmontools + appimage-run + + # dicts + nuspell + hunspellDicts.en-gb-large # For cursor in steam? xsettingsd diff --git a/configuration/modules/gaming.nix b/configuration/modules/gaming.nix index 443b9e8..86b25a7 100644 --- a/configuration/modules/gaming.nix +++ b/configuration/modules/gaming.nix @@ -1,4 +1,4 @@ -{ ... }: +{ pkgs, ... }: { hardware.graphics.enable32Bit = true; # For 32 bit applications @@ -10,11 +10,12 @@ dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server #gamescopeSession.enable = true; protontricks.enable = true; + extraCompatPackages = [ pkgs.proton-ge-bin ]; }; programs.gamemode.enable = true; programs.gamescope.enable = true; # ensure users who need access to this have `cdrom` as `extraGroups` - # Wait for https://github.com/NixOS/nixpkgs/issues/393534 to be in stable to reenable - # programs.cdemu.enable = true; + # Wait for https://github.com/NixOS/nixpkgs/pull/397358 to be in stable to reenable + programs.cdemu.enable = true; } diff --git a/flake.lock b/flake.lock index 691b2e2..bcd49af 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1743598667, - "narHash": "sha256-ViE7NoFWytYO2uJONTAX35eGsvTYXNHjWALeHAg8OQY=", + "lastModified": 1744145203, + "narHash": "sha256-I2oILRiJ6G+BOSjY+0dGrTPe080L3pbKpc+gCV3Nmyk=", "owner": "nix-community", "repo": "disko", - "rev": "329d3d7e8bc63dd30c39e14e6076db590a6eabe6", + "rev": "76c0a6dba345490508f36c1aa3c7ba5b6b460989", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1743387206, - "narHash": "sha256-24N3NAuZZbYqZ39NgToZgHUw6M7xHrtrAm18kv0+2Wo=", + "lastModified": 1744117652, + "narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=", "owner": "nix-community", "repo": "home-manager", - "rev": "15c5f9d04fabd176f30286c8f52bbdb2c853a146", + "rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f", "type": "github" }, "original": { @@ -85,11 +85,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1743731627, - "narHash": "sha256-gFvZTGlSGCl7MZ5MrihUf7pkIY0zwaUVhl/iUBto/3I=", + "lastModified": 1744422829, + "narHash": "sha256-rvWFZG02MQuzKLueDQryCLEljRV0Ot4uo44hoKC3CHg=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "c8270f31af9c37e4fe5711567a6412460e94e9b7", + "rev": "eda6606c9e4790ebe074d18ef074906a750f0d53", "type": "github" }, "original": { @@ -100,11 +100,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1743420942, - "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=", + "lastModified": 1744366945, + "narHash": "sha256-OuLhysErPHl53BBifhesrRumJNhrlSgQDfYOTXfgIMg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4", + "rev": "1fe3cc2bc5d2dc9c81cb4e63d2f67c1543340df1", "type": "github" }, "original": { @@ -132,11 +132,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1743583204, - "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "lastModified": 1744232761, + "narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "rev": "f675531bc7e6657c10a18b565cfebd8aa9e24c14", "type": "github" }, "original": { @@ -148,11 +148,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1743703532, - "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=", + "lastModified": 1744309437, + "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bdb91860de2f719b57eef819b5617762f7120c70", + "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7", "type": "github" }, "original": { @@ -181,11 +181,11 @@ ] }, "locked": { - "lastModified": 1742420363, - "narHash": "sha256-60i929vmFO5ZJ+gAltfOZ3kUz6PdwNCxjtOpI3OHdVw=", + "lastModified": 1744139528, + "narHash": "sha256-ABIcmxzf8399pJzXqHzShXtzw7iC+zxjhOxp/qS0fQk=", "owner": "numtide", "repo": "system-manager", - "rev": "1027975497a91f4db6540528a726b323ef14cfbe", + "rev": "803322102ed51f29c250d4bff2973625adc4a521", "type": "github" }, "original": { diff --git a/home-manager/development/games.nix b/home-manager/development/games.nix index 27a3a4d..48b943a 100644 --- a/home-manager/development/games.nix +++ b/home-manager/development/games.nix @@ -1,8 +1,16 @@ { pkgs, inputs, ... }: { - home.packages = [ - pkgs.jetbrains.rider - inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".godot-mono + home.packages = with pkgs;[ + jetbrains.rider + # Remove when https://github.com/NixOS/nixpkgs/issues/393332 resolved (likely when 25.05 is out) + (symlinkJoin { + name = "godot-mono"; + paths = [ inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".godot-mono ]; + buildInputs = [ makeWrapper ]; + postBuild = '' + wrapProgram $out/bin/godot4-mono --set DOTNET_SYSTEM_GLOBALIZATION_INVARIANT 1 + ''; + }) ]; }