diff --git a/configs/common.nix b/configs/common.nix index b5a5fa6..e0e5ae2 100644 --- a/configs/common.nix +++ b/configs/common.nix @@ -190,7 +190,7 @@ mpv prismlauncher delfin - libreoffice-qt6 + onlyoffice-desktopeditors syncthing xremap blueman @@ -216,10 +216,6 @@ }; # User programs - programs.steam = { - enable = true; - package = pkgs.unstable.steam; - }; programs.walker.enable = true; programs.dconf.enable = true; programs.xfconf.enable = true; diff --git a/configs/configuration-pc.nix b/configs/configuration-pc.nix index 249a355..6e1a378 100644 --- a/configs/configuration-pc.nix +++ b/configs/configuration-pc.nix @@ -64,6 +64,7 @@ bottles ferdium android-tools + anki vesktop wine64 delfin @@ -75,6 +76,23 @@ ]; }; + environment.systemPackages = [ + inputs.sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.wrapped + ]; + + programs.steam = { + enable = true; + package = pkgs.steam.override { + extraEnv = { + LD_AUDIT = "${ + inputs.sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam + }/library-inject.so:${ + inputs.sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam + }/SLSsteam.so"; + }; + }; + }; + services.wivrn = { enable = true; package = pkgs.unstable.wivrn; diff --git a/flake.lock b/flake.lock index 8708532..f171674 100644 --- a/flake.lock +++ b/flake.lock @@ -151,6 +151,22 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1771008912, + "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a82ccc39b39b621151d6732718e3e250109076fa", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1756787288, "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", @@ -166,7 +182,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1768564909, "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", @@ -182,7 +198,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1761597516, "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", @@ -222,6 +238,7 @@ "elephant": "elephant", "mesa-davinci": "mesa-davinci", "nixpkgs": "nixpkgs_4", + "sls-steam": "sls-steam", "tree-sitter": "tree-sitter", "walker": "walker", "way-edges": "way-edges" @@ -248,6 +265,24 @@ "type": "github" } }, + "sls-steam": { + "inputs": { + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1769361037, + "narHash": "sha256-dWnjQpGNKEwIMPNoUp765q2QlVRCX58KbNm0ZBrTL80=", + "owner": "AceSLS", + "repo": "SLSsteam", + "rev": "6aae05be2fa2f8d5f1c5906658a3d41ad30d6352", + "type": "github" + }, + "original": { + "owner": "AceSLS", + "repo": "SLSsteam", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -295,7 +330,7 @@ }, "tree-sitter": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1765318765, @@ -335,7 +370,7 @@ "elephant": [ "elephant" ], - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "systems": "systems_3" }, "locked": { @@ -354,7 +389,7 @@ }, "way-edges": { "inputs": { - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "rust-overlay": "rust-overlay" }, "locked": { diff --git a/flake.nix b/flake.nix index 7a25b19..b344529 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,10 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; + sls-steam = { + url = "github:AceSLS/SLSsteam"; + }; + elephant.url = "github:abenz1267/elephant"; walker = { url = "github:abenz1267/walker"; @@ -28,35 +32,29 @@ }@inputs: let system = "x86_64-linux"; + hardwareConfig = import /etc/nixos/hardware-configuration.nix; + common = import ./configs/common.nix; + + mkSystem = + extraModules: + nixpkgs.lib.nixosSystem { + inherit system; + specialArgs = { inherit inputs; }; + modules = [ + common + hardwareConfig + ] + ++ extraModules; + }; in { - nixosConfigurations.mobile02 = nixpkgs.lib.nixosSystem { - inherit system; - specialArgs = { inherit inputs; }; - - modules = [ - ./configs/configuration-laptop.nix - ./configs/common.nix - hardwareConfig - { - nixpkgs.config.allowUnfree = true; - } - ]; - }; - nixosConfigurations.hackstation = nixpkgs.lib.nixosSystem { - inherit system; - specialArgs = { inherit inputs; }; - - modules = [ + nixosConfigurations = { + mobile02 = mkSystem [ ./configs/configuration-laptop.nix ]; + hackstation = mkSystem [ ./configs/configuration-pc.nix - ./configs/common.nix ./modules/davinci/davinci.nix ./modules/i3/i3.nix - hardwareConfig - { - nixpkgs.config.allowUnfree = true; - } ]; }; }; diff --git a/modules/chataigne/chataigne.nix b/modules/chataigne/chataigne.nix index 8881920..be92a9d 100644 --- a/modules/chataigne/chataigne.nix +++ b/modules/chataigne/chataigne.nix @@ -13,7 +13,7 @@ let curl SDL2 hidapi - xorg.libXrandr + libXrandr ]; # 2b. Libraries pulled from the older, pinned package set (ONLY the ones that failed).