diff --git a/configuration/modules/gaming.nix b/configuration/modules/gaming.nix index 6aeef16..f0e15eb 100644 --- a/configuration/modules/gaming.nix +++ b/configuration/modules/gaming.nix @@ -11,6 +11,20 @@ gamescopeSession.enable = true; protontricks.enable = true; extraCompatPackages = [ pkgs.proton-ge-bin ]; + package = pkgs.steam.override { + extraPkgs = pkgs': with pkgs'; [ + xorg.libXcursor + xorg.libXi + xorg.libXinerama + xorg.libXScrnSaver + libpng + libpulseaudio + libvorbis + stdenv.cc.cc.lib # Provides libstdc++.so.6 + libkrb5 + keyutils + ]; + }; }; programs.gamemode.enable = true; programs.gamescope.enable = true; diff --git a/devices/starlite/configuration.nix b/devices/starlite/configuration.nix index b2889f3..7742eda 100644 --- a/devices/starlite/configuration.nix +++ b/devices/starlite/configuration.nix @@ -29,6 +29,9 @@ home-manager.useGlobalPkgs = true; home-manager = { extraSpecialArgs = { inherit inputs; }; + sharedModules = [ + inputs.nix-index-database.hmModules.nix-index + ]; users = { "worble" = import ./home.nix; }; diff --git a/devices/tuxedo/configuration.nix b/devices/tuxedo/configuration.nix index 43fe757..c15bf34 100644 --- a/devices/tuxedo/configuration.nix +++ b/devices/tuxedo/configuration.nix @@ -59,7 +59,9 @@ home-manager = { useGlobalPkgs = true; extraSpecialArgs = { inherit inputs; }; - sharedModules = [ ]; + sharedModules = [ + inputs.nix-index-database.hmModules.nix-index + ]; users = { "worble" = import ./home.nix; }; diff --git a/fix-nix.sh b/fix-nix.sh new file mode 100644 index 0000000..95ca8de --- /dev/null +++ b/fix-nix.sh @@ -0,0 +1,3 @@ +# Occasionally the nix store can get into a tizz and all updates will fail +# This should fix that +sudo nix-store --repair --verify --check-contents diff --git a/flake.lock b/flake.lock index 543c992..3596249 100644 --- a/flake.lock +++ b/flake.lock @@ -59,6 +59,26 @@ "type": "github" } }, + "nix-index-database": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1748751003, + "narHash": "sha256-i4GZdKAK97S0ZMU3w4fqgEJr0cVywzqjugt2qZPrScs=", + "owner": "nix-community", + "repo": "nix-index-database", + "rev": "2860bee699248d828c2ed9097a1cd82c2f991b43", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-index-database", + "type": "github" + } + }, "nix-system-graphics": { "inputs": { "nixpkgs": [ @@ -166,6 +186,7 @@ "inputs": { "disko": "disko", "home-manager": "home-manager", + "nix-index-database": "nix-index-database", "nix-system-graphics": "nix-system-graphics", "nix-vscode-extensions": "nix-vscode-extensions", "nixos-hardware": "nixos-hardware", diff --git a/flake.nix b/flake.nix index a26382f..ef3aaa1 100644 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + nix-index-database = { + url = "github:nix-community/nix-index-database"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nixos-hardware.url = "github:NixOS/nixos-hardware/master?shallow=1"; disko = { url = "github:nix-community/disko?shallow=1"; @@ -26,7 +31,7 @@ }; }; - outputs = { self, nixpkgs, nixos-hardware, home-manager, system-manager, nix-system-graphics, ... }@inputs: + outputs = { self, nixpkgs, nixos-hardware, home-manager, system-manager, nix-system-graphics, nix-index-database, ... }@inputs: let system = "x86_64-linux"; pkgs = import nixpkgs { @@ -51,7 +56,10 @@ packages.${system}.homeConfigurations.deck = home-manager.lib.homeManagerConfiguration { inherit pkgs; extraSpecialArgs = { inherit inputs; }; - modules = [ ./devices/deck/home.nix ]; + modules = [ + nix-index-database.hmModules.nix-index + ./devices/deck/home.nix + ]; }; systemConfigs.deck = system-manager.lib.makeSystemConfig { modules = [ diff --git a/home-manager/development/vscode.nix b/home-manager/development/vscode.nix index 4f2473c..2d2f5b1 100644 --- a/home-manager/development/vscode.nix +++ b/home-manager/development/vscode.nix @@ -27,7 +27,6 @@ in esbenp.prettier-vscode loriscro.super mads-hartmann.bash-ide-vscode - foxundermoon.shell-format ms-vscode.wasm-wasi-core rust-lang.rust-analyzer tamasfe.even-better-toml @@ -81,7 +80,7 @@ in }; "bashIde.shellcheckPath" = "${shellcheck}/bin/shellcheck"; - "shellformat.path" = "${shfmt}/bin/shfmt"; + "bashIde.shfmt.path" = "${shfmt}/bin/shfmt"; "rust-analyzer.rustfmt.overrideCommand" = [ "${rustfmt}/bin/rustfmt" ]; };