diff --git a/builders/tsuba.nix b/builders/tsuba.nix index c674b092..63f3e40b 100644 --- a/builders/tsuba.nix +++ b/builders/tsuba.nix @@ -1,5 +1,5 @@ { - hostName = "rpi"; + hostName = "tsuba"; sshUser = "remotebuilder"; system = "aarch64-linux"; protocol = "ssh-ng"; diff --git a/flake.nix b/flake.nix index f7e689d9..451aceea 100644 --- a/flake.nix +++ b/flake.nix @@ -333,6 +333,12 @@ }; }; + installerImages = let + nixos = self.nixosConfigurations; + mkImage = nixosConfig: nixosConfig.config.system.build.sdImage; + in { + tsuba = mkImage nixos.tsuba; + }; deploy = import ./deploy.nix {inherit inputs self;}; inherit devices; } diff --git a/home/apps/default.nix b/home/apps/default.nix index 8adafd21..543b0fc7 100644 --- a/home/apps/default.nix +++ b/home/apps/default.nix @@ -29,10 +29,11 @@ lib.optionalAttrs device.hasGui { ./zed.nix ./discord.nix ./slack.nix - ./rpcs3.nix + # ./rpcs3.nix ./pcsx2.nix + # ./shadps4.nix + # ./seafile.nix ./blueman.nix ./zen.nix - # ./seafile.nix ]; } diff --git a/home/apps/rpcs3.nix b/home/apps/rpcs3.nix index e78b30f8..b535531a 100644 --- a/home/apps/rpcs3.nix +++ b/home/apps/rpcs3.nix @@ -4,9 +4,19 @@ ... }: { home.packages = lib.optionals pkgs.stdenv.isLinux [ - (pkgs.rpcs3.overrideAttrs (oldAttrs: { - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [pkgs.cudatoolkit]; - buildInputs = oldAttrs.buildInputs ++ [pkgs.cudatoolkit]; - })) + ((pkgs.rpcs3.override { + opencv = + (pkgs.opencv.override { + enableCuda = true; + }) + .overrideAttrs (oldAttrs: { + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [pkgs.cudatoolkit]; + buildInputs = oldAttrs.buildInputs ++ [pkgs.cudatoolkit]; + }); + }) + .overrideAttrs (oldAttrs: { + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [pkgs.cudatoolkit]; + buildInputs = oldAttrs.buildInputs ++ [pkgs.cudatoolkit]; + })) ]; } diff --git a/home/apps/shadps4.nix b/home/apps/shadps4.nix new file mode 100644 index 00000000..1afca72a --- /dev/null +++ b/home/apps/shadps4.nix @@ -0,0 +1,13 @@ +{ + pkgs, + lib, + ... +}: { + home.packages = lib.optionals pkgs.stdenv.isLinux [ + (pkgs.shadps4.overrideAttrs + (oldAttrs: { + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [pkgs.cudatoolkit]; + buildInputs = oldAttrs.buildInputs ++ [pkgs.cudatoolkit]; + })) + ]; +} diff --git a/nixos/tsuba/default.nix b/nixos/tsuba/default.nix index ccd506f6..6f03c346 100644 --- a/nixos/tsuba/default.nix +++ b/nixos/tsuba/default.nix @@ -14,6 +14,7 @@ system = device.system; specialArgs = { inherit device; + nixos-raspberrypi = inputs.nixos-raspberrypi; stablePkgs = inputs.nixpkgs-stable.legacyPackages.${device.system}; }; modules = [