add shell command to fix nix when it gets in a tizz; add nix-index so fish no longer throws a wobbly when you call a commaand that doesnt exist; remove shell format since bash ide can now use it; add packages for gamescope to steam

This commit is contained in:
2025-06-02 14:03:19 +01:00
parent 2c1dfb7eb8
commit 5159cf50c9
7 changed files with 55 additions and 5 deletions

View File

@@ -11,6 +11,20 @@
gamescopeSession.enable = true; gamescopeSession.enable = true;
protontricks.enable = true; protontricks.enable = true;
extraCompatPackages = [ pkgs.proton-ge-bin ]; 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.gamemode.enable = true;
programs.gamescope.enable = true; programs.gamescope.enable = true;

View File

@@ -29,6 +29,9 @@
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager = { home-manager = {
extraSpecialArgs = { inherit inputs; }; extraSpecialArgs = { inherit inputs; };
sharedModules = [
inputs.nix-index-database.hmModules.nix-index
];
users = { users = {
"worble" = import ./home.nix; "worble" = import ./home.nix;
}; };

View File

@@ -59,7 +59,9 @@
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
extraSpecialArgs = { inherit inputs; }; extraSpecialArgs = { inherit inputs; };
sharedModules = [ ]; sharedModules = [
inputs.nix-index-database.hmModules.nix-index
];
users = { users = {
"worble" = import ./home.nix; "worble" = import ./home.nix;
}; };

3
fix-nix.sh Normal file
View File

@@ -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

21
flake.lock generated
View File

@@ -59,6 +59,26 @@
"type": "github" "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": { "nix-system-graphics": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -166,6 +186,7 @@
"inputs": { "inputs": {
"disko": "disko", "disko": "disko",
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-index-database": "nix-index-database",
"nix-system-graphics": "nix-system-graphics", "nix-system-graphics": "nix-system-graphics",
"nix-vscode-extensions": "nix-vscode-extensions", "nix-vscode-extensions": "nix-vscode-extensions",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",

View File

@@ -8,6 +8,11 @@
inputs.nixpkgs.follows = "nixpkgs"; 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"; nixos-hardware.url = "github:NixOS/nixos-hardware/master?shallow=1";
disko = { disko = {
url = "github:nix-community/disko?shallow=1"; 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 let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs { pkgs = import nixpkgs {
@@ -51,7 +56,10 @@
packages.${system}.homeConfigurations.deck = home-manager.lib.homeManagerConfiguration { packages.${system}.homeConfigurations.deck = home-manager.lib.homeManagerConfiguration {
inherit pkgs; inherit pkgs;
extraSpecialArgs = { inherit inputs; }; 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 { systemConfigs.deck = system-manager.lib.makeSystemConfig {
modules = [ modules = [

View File

@@ -27,7 +27,6 @@ in
esbenp.prettier-vscode esbenp.prettier-vscode
loriscro.super loriscro.super
mads-hartmann.bash-ide-vscode mads-hartmann.bash-ide-vscode
foxundermoon.shell-format
ms-vscode.wasm-wasi-core ms-vscode.wasm-wasi-core
rust-lang.rust-analyzer rust-lang.rust-analyzer
tamasfe.even-better-toml tamasfe.even-better-toml
@@ -81,7 +80,7 @@ in
}; };
"bashIde.shellcheckPath" = "${shellcheck}/bin/shellcheck"; "bashIde.shellcheckPath" = "${shellcheck}/bin/shellcheck";
"shellformat.path" = "${shfmt}/bin/shfmt"; "bashIde.shfmt.path" = "${shfmt}/bin/shfmt";
"rust-analyzer.rustfmt.overrideCommand" = [ "${rustfmt}/bin/rustfmt" ]; "rust-analyzer.rustfmt.overrideCommand" = [ "${rustfmt}/bin/rustfmt" ];
}; };