From 00e93b7789fd6d73a8f091d737120d1bf10acd5c Mon Sep 17 00:00:00 2001 From: chaos Date: Wed, 4 Sep 2024 09:00:16 +0100 Subject: [PATCH] logitech & minecraft --- hosts/raspberry-pi5/hardware.nix | 7 ------- presets/home-manager/gaming.nix | 2 +- presets/nixos/gaming.nix | 1 + profiles/home-manager/gaming/minecraft.nix | 2 +- profiles/home-manager/gaming/steam.nix | 1 + profiles/nixos/logitech.nix | 1 + 6 files changed, 5 insertions(+), 9 deletions(-) create mode 100644 profiles/nixos/logitech.nix diff --git a/hosts/raspberry-pi5/hardware.nix b/hosts/raspberry-pi5/hardware.nix index e57d6a7..b1d8e86 100644 --- a/hosts/raspberry-pi5/hardware.nix +++ b/hosts/raspberry-pi5/hardware.nix @@ -76,9 +76,6 @@ in { imports = with tree; [ presets.nixos.serverEncryptedDrive - - #inputs.nixos-hardware.nixosModules.raspberry-pi-4 - #inputs.nixos-hardware.nixosModules.raspberry-pi-5 ]; services.xserver.videoDrivers = [ @@ -92,10 +89,6 @@ in { kernelParams = [ "kunit.enable=0" - "8250.nr_uarts=11" - "console=ttyAMA10,115200" - "console=tty0" - "ip=192.168.178.26::192.168.178.1:255.255.255.0:raspberry:end0:any" "boot.shell_on_fail" "nohibernate" diff --git a/presets/home-manager/gaming.nix b/presets/home-manager/gaming.nix index 4bcdb4b..32aedf9 100644 --- a/presets/home-manager/gaming.nix +++ b/presets/home-manager/gaming.nix @@ -11,7 +11,7 @@ in { steam lutris arrpc - #minecraft + minecraft ]) ]); } diff --git a/presets/nixos/gaming.nix b/presets/nixos/gaming.nix index 8277192..b4d4c86 100644 --- a/presets/nixos/gaming.nix +++ b/presets/nixos/gaming.nix @@ -1,5 +1,6 @@ {tree, ...}: { imports = with tree.profiles.nixos; [ gaming.steam + logitech ]; } diff --git a/profiles/home-manager/gaming/minecraft.nix b/profiles/home-manager/gaming/minecraft.nix index 3e09e7e..f94668d 100644 --- a/profiles/home-manager/gaming/minecraft.nix +++ b/profiles/home-manager/gaming/minecraft.nix @@ -2,7 +2,7 @@ home.packages = with pkgs; [ (prismlauncher.override { jdks = with pkgs; [jdk8 jdk11 jdk17 jdk21]; - withWaylandGLFW = true; + withWaylandGLFW = false; # TODO: won't build with }) ]; } diff --git a/profiles/home-manager/gaming/steam.nix b/profiles/home-manager/gaming/steam.nix index 84fa128..44af042 100644 --- a/profiles/home-manager/gaming/steam.nix +++ b/profiles/home-manager/gaming/steam.nix @@ -1,5 +1,6 @@ {pkgs, ...}: { home.packages = with pkgs; [ steam + steamtinkerlaunch ]; } diff --git a/profiles/nixos/logitech.nix b/profiles/nixos/logitech.nix new file mode 100644 index 0000000..dbb2423 --- /dev/null +++ b/profiles/nixos/logitech.nix @@ -0,0 +1 @@ +{...}: { hardware.logitech.wireless = { enable = true; enableGraphical = true; }; } \ No newline at end of file