diff --git a/home/gaming/platforms/lutris.nix b/home/gaming/platforms/lutris.nix index e41c85d..14ab9b4 100644 --- a/home/gaming/platforms/lutris.nix +++ b/home/gaming/platforms/lutris.nix @@ -1 +1,3 @@ -{pkgs, ...}: {home.packages = with pkgs; [lutris];} +{pkgs, ...}: { + home.packages = with pkgs; [(lutris.override {extraPkgs = pkgs: with pkgs; [gamescope];}) wineWowPackages.staging]; +} diff --git a/home/gui/base/gtk.nix b/home/gui/base/gtk.nix index 1177520..2892079 100644 --- a/home/gui/base/gtk.nix +++ b/home/gui/base/gtk.nix @@ -11,7 +11,7 @@ }; font = { name = "Comic Code"; - size = 16; + size = 12; package = pkgs.comic-code; }; }; diff --git a/home/gui/environments/gnome/default.nix b/home/gui/environments/gnome/default.nix index a144d41..70daaf5 100644 --- a/home/gui/environments/gnome/default.nix +++ b/home/gui/environments/gnome/default.nix @@ -12,14 +12,10 @@ homeManagerLib = inputs.home-manager.lib.hm; fontSizesAll = { - "lappy-t495" = { + default = { small = "10"; medium = "12"; }; - default = { - small = "14"; - medium = "16"; - }; }; fontSizes = diff --git a/hosts/lappy-t495/lappy-t495.nix b/hosts/lappy-t495/lappy-t495.nix index 4f0605b..a7b4b3f 100644 --- a/hosts/lappy-t495/lappy-t495.nix +++ b/hosts/lappy-t495/lappy-t495.nix @@ -36,6 +36,7 @@ home.programming.languages.nix home.gaming.platforms.steam + home.gaming.platforms.lutris ]; home.stateVersion = "24.05"; }; diff --git a/profiles/gaming/steam.nix b/profiles/gaming/steam.nix index fbc810f..9d5d6b6 100644 --- a/profiles/gaming/steam.nix +++ b/profiles/gaming/steam.nix @@ -4,4 +4,5 @@ remotePlay.openFirewall = true; dedicatedServer.openFirewall = true; }; + hardware.opengl.driSupport32Bit = true; } diff --git a/profiles/usbAutoMount.nix b/profiles/usbAutoMount.nix index 0b4db82..832f362 100644 --- a/profiles/usbAutoMount.nix +++ b/profiles/usbAutoMount.nix @@ -2,16 +2,18 @@ encryptedUSB = import ../data/drives/encryptedUSB.nix; encUSBMount = pkgs.writeShellScriptBin "enc_usb_mount" '' + export MAPPER_NAME=''${MAPPER_NAME:-${encryptedUSB.mapperName}} set -x ${encUSBUnmount}/bin/enc_usb_unmount - cat /secrets/usb_encryption_passphrase | cryptsetup luksOpen ${encryptedUSB.encryptedPath} ${encryptedUSB.mapperName} - - mount ${encryptedUSB.mapperPath} -o rw ${encryptedUSB.mountpoint} + cat /secrets/usb_encryption_passphrase | cryptsetup luksOpen ${encryptedUSB.encryptedPath} $MAPPER_NAME - + mount /dev/mapper/$MAPPER_NAME -o rw ${encryptedUSB.mountpoint} ''; encUSBUnmount = pkgs.writeShellScriptBin "enc_usb_unmount" '' - set -x - umount -flR ${encryptedUSB.mountpoint} || true - cryptsetup close ${encryptedUSB.mapperName} || true + export MAPPER_NAME=''${MAPPER_NAME:-${encryptedUSB.mapperName}} + set -x + umount -flR ${encryptedUSB.mountpoint} || true + cryptsetup close $MAPPER_NAME || true ''; in { environment.systemPackages = [encUSBMount encUSBUnmount];