From a9a06fb5fc534506f761f3f857a3df9aa988747e Mon Sep 17 00:00:00 2001 From: Noah Masur <7386960+nmasur@users.noreply.github.com> Date: Sun, 5 Feb 2023 17:16:20 -0500 Subject: [PATCH] fix steam games not launching --- flake.lock | 48 ++++++++++++------------ hosts/desktop/default.nix | 12 ++++-- hosts/desktop/hardware-configuration.nix | 30 ++++++++------- nixos/gaming/default.nix | 1 + 4 files changed, 50 insertions(+), 41 deletions(-) diff --git a/flake.lock b/flake.lock index e419498..be3a36c 100644 --- a/flake.lock +++ b/flake.lock @@ -156,11 +156,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1675303228, - "narHash": "sha256-dHJbFg7gTuTyEUdJoNDp6l2bac6HXAT/bz9cVEqL+Uw=", + "lastModified": 1675371293, + "narHash": "sha256-LrCjtrAXj/WJphhGEMnHgZs7oTsfOlvPfOjFTIvg39k=", "owner": "nix-community", "repo": "home-manager", - "rev": "4a958524903e6019f5f69a23e0c0f16e5af01eb0", + "rev": "d1c7730bb707bf8124d997952f7babd2a281ae68", "type": "github" }, "original": { @@ -177,11 +177,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1674921146, - "narHash": "sha256-PsDZsQ3EJUW5i4qiNZ3z5H+N+oQaKOqC7xNkd+aUqQw=", + "lastModified": 1675427255, + "narHash": "sha256-d53add4Cuh0ik8YYncdoqqR6irQbnh/X4vg12TQ/FEQ=", "owner": "oxalica", "repo": "nil", - "rev": "dfd91e3b7e760559bd79226ad5ad41444078a882", + "rev": "3de72eefd8114b30f8ea82ead846a9401c262475", "type": "github" }, "original": { @@ -265,11 +265,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1673947312, - "narHash": "sha256-xx/2nRwRy3bXrtry6TtydKpJpqHahjuDB5sFkQ/XNDE=", + "lastModified": 1675309347, + "narHash": "sha256-D3CQ6HRDT2m3XJlrzb5jKq4vNFR5xFTEFKC7iSjlFpM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2d38b664b4400335086a713a0036aafaa002c003", + "rev": "006c3bd4dd2f5d1d2094047f307cbf9e2b73d9c5", "type": "github" }, "original": { @@ -329,11 +329,11 @@ }, "nur": { "locked": { - "lastModified": 1675325243, - "narHash": "sha256-KdvpDpvM1SnXQAmjtA/PWjIEaOl5MU9nRuO66W9JP44=", + "lastModified": 1675390386, + "narHash": "sha256-VK1EGF9+U2A72Gy5lgHHa6DaGOnx3Ml51E0TewYh5L8=", "owner": "nix-community", "repo": "nur", - "rev": "d2540a896eba1945c76d90b9b95648036efb6134", + "rev": "f9a67871a7c1dcd424a20b6e3723eacc0704bc97", "type": "github" }, "original": { @@ -377,11 +377,11 @@ "nvim-treesitter-src": { "flake": false, "locked": { - "lastModified": 1675341636, - "narHash": "sha256-wgMcA1fdjkGW04lj9JTixDoTIeJVn1nVb1LreOiSoR8=", + "lastModified": 1675373326, + "narHash": "sha256-uC5AMeoWvjxf4b7Mysnsze/SRTawRjS9pBddMveUNYI=", "owner": "nvim-treesitter", "repo": "nvim-treesitter", - "rev": "69867ffe7e05559fdb055f6b5a2589fc6bee1070", + "rev": "660a070af7131387c690c7b839718371916e27f9", "type": "github" }, "original": { @@ -426,11 +426,11 @@ ] }, "locked": { - "lastModified": 1674095406, - "narHash": "sha256-RexH/1rZTiX4OhdYkuJP3MuANJ+JRgoLKL60iHm//T0=", + "lastModified": 1675391458, + "narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5f7315b9800e2e500e6834767a57e39f7dbfd495", + "rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf", "type": "github" }, "original": { @@ -474,11 +474,11 @@ "toggleterm-nvim-src": { "flake": false, "locked": { - "lastModified": 1673603637, - "narHash": "sha256-qsEtCDEy/EsMChZ9Ysv0Z5knKp4sISb2BnSrfWsECR8=", + "lastModified": 1675358836, + "narHash": "sha256-9O7p/7tRStg51OFhMc88M5ewYquiYC9x9CV4s5veVP8=", "owner": "akinsho", "repo": "toggleterm.nvim", - "rev": "a54e6c471ce1cd8ef8357e34598a28a955297131", + "rev": "19aad0f41f47affbba1274f05e3c067e6d718e1e", "type": "github" }, "original": { @@ -525,11 +525,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1675340793, - "narHash": "sha256-+FuLbM5gpRHt1ZSOrJhMjHSm7hhvYZIaBnL2mw6rF50=", + "lastModified": 1675351082, + "narHash": "sha256-4Oi4k4Qp1vOvKoACHDcz0xiVj7DuMaCL57fP3W77eA0=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "e110ed426e1823b32a2409227560af88348f7e24", + "rev": "52cadf92e1bfdef235d5cd77b9a4b2ab848baa8a", "type": "github" }, "original": { diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index 4e4f4e6..0bbf3aa 100644 --- a/hosts/desktop/default.nix +++ b/hosts/desktop/default.nix @@ -42,13 +42,19 @@ nixpkgs.lib.nixosSystem { mail.enable = true; mail.aerc.enable = true; mail.himalaya.enable = true; - gaming.enable = true; - gaming.steam.enable = true; - gaming.legendary.enable = true; keybase.enable = true; # mullvad.enable = true; nixlang.enable = true; dotfiles.enable = true; + + gaming = { + enable = true; + steam.enable = true; + legendary.enable = true; + lutris.enable = true; + leagueoflegends.enable = true; + }; + } ]; } diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix index e4e7a0b..82abb50 100644 --- a/hosts/desktop/hardware-configuration.nix +++ b/hosts/desktop/hardware-configuration.nix @@ -4,24 +4,25 @@ { config, lib, pkgs, modulesPath, ... }: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; + boot.initrd.availableKernelModules = + [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.kernelModules = [ "amdgpu" ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/f0313f58-971a-46e3-9191-909fe5eb7f7e"; - fsType = "ext4"; - }; + services.xserver.videoDrivers = [ "amdgpu" ]; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/FB26-799C"; - fsType = "vfat"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/f0313f58-971a-46e3-9191-909fe5eb7f7e"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/FB26-799C"; + fsType = "vfat"; + }; swapDevices = [ ]; @@ -34,5 +35,6 @@ # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.amd.updateMicrocode = + lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/nixos/gaming/default.nix b/nixos/gaming/default.nix index 1b459de..c1fe519 100644 --- a/nixos/gaming/default.nix +++ b/nixos/gaming/default.nix @@ -13,6 +13,7 @@ config = lib.mkIf (config.gaming.enable && pkgs.stdenv.isLinux) { hardware.opengl = { enable = true; + driSupport = true; driSupport32Bit = true; }; };