From b508526e0803fabc5f539071b219d0c0abb14601 Mon Sep 17 00:00:00 2001 From: Eric Tossell Date: Tue, 31 Dec 2024 16:04:56 -0500 Subject: [PATCH] feat: gamescope for steam launch options --- flake.lock | 26 +++++++++++++------------- modules/core/terminal/default.nix | 1 + modules/hyprland/config/desktop.nix | 10 +++++++++- modules/hyprland/default.nix | 9 +-------- modules/steam/default.nix | 20 +++++--------------- 5 files changed, 29 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index 40508068..c9ffe534 100644 --- a/flake.lock +++ b/flake.lock @@ -768,11 +768,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1735513757, - "narHash": "sha256-Vb8OXyDbSjOGFNYSxUYYMZgMgIIwk6BqIeeNO/eUCwE=", + "lastModified": 1735556315, + "narHash": "sha256-T96Mer4Ttp3pQe1vR2TTD1qfkjesWM9oCXU2nGlFji0=", "ref": "refs/heads/main", - "rev": "5b37d53992f3f9bfd7f5483a85f99adf7ac104f3", - "revCount": 5601, + "rev": "8c14c2a5f472cf3d361d3cbb90ee7d2d455aae08", + "revCount": 5604, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -907,11 +907,11 @@ "systems": "systems_11" }, "locked": { - "lastModified": 1735497496, - "narHash": "sha256-lT6f/5NB73xj9cVesi2SNsL5jVciwZJp8QRohiv+3Hk=", + "lastModified": 1735572766, + "narHash": "sha256-A9aJ1bDNwdvLH5/VjjNWXbbBEnE8rOyWP2BDYR+Z3b4=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "3d63d9b129d5def270bc8a2471347e6f97274e2b", + "rev": "2c5ae4d6610a0e0aeb42c6eac9ccbe11586d9898", "type": "github" }, "original": { @@ -1255,11 +1255,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1735291276, - "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "type": "github" }, "original": { @@ -1561,11 +1561,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1735512660, - "narHash": "sha256-mIorq1Wuu42H0+9HCNp6cMu7ZlddF9Q1u4CYJiWDBKk=", + "lastModified": 1735524788, + "narHash": "sha256-R4i8VCdSGLWHt6cL5p2Cmlh9MRodZsYO8moUjvxYb54=", "owner": "danth", "repo": "stylix", - "rev": "71eea3f02ae5c560bbc25e6d05e04beaf52f9dce", + "rev": "a4ed4168fb83289374f24cb8a039c6983637a076", "type": "github" }, "original": { diff --git a/modules/core/terminal/default.nix b/modules/core/terminal/default.nix index b4f97b42..2e1ffb91 100644 --- a/modules/core/terminal/default.nix +++ b/modules/core/terminal/default.nix @@ -28,6 +28,7 @@ brightnessctl btop gh + ghostty mods nitch pavucontrol diff --git a/modules/hyprland/config/desktop.nix b/modules/hyprland/config/desktop.nix index f6fdedb9..4e3e35f5 100644 --- a/modules/hyprland/config/desktop.nix +++ b/modules/hyprland/config/desktop.nix @@ -14,7 +14,7 @@ }; ".config/hypr/hyprland.conf".text = '' - monitor=DP-2,preferred,1080x400,1 + monitor=DP-2,highres,1080x400,1 monitor=HDMI-A-1,preferred,3640x400,1 monitor=DP-1,preferred,0x0,1,transform,3 monitor=,preferred,auto,auto @@ -36,6 +36,9 @@ env=QT_AUTO_SCREEN_SCALE_FACTOR,1 env=QT_QPA_PLATFORM,wayland + env = GDK_SCALE,2 + env = XCURSORSIZE,32 + $mainMod = SUPER @@ -140,6 +143,11 @@ swallow_regex = ^(foot)$ background_color = 0x232136 } + + xwayland { + force_zero_scaling = true + } + windowrulev2 = float,title:^(Yazi) windowrulev2 = size 600 400,title:^(Yazi)(.*)$ diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix index db2be0f1..68977397 100644 --- a/modules/hyprland/default.nix +++ b/modules/hyprland/default.nix @@ -24,18 +24,10 @@ enable = true; cursorTheme.name = "Adwaita"; cursorTheme.package = pkgs.adwaita-icon-theme; - #theme.name = "adw-gtk3-dark"; - #theme.package = pkgs.adw-gtk3; }; - #programs.eww = { - # enable = true; - # configDir = ./eww; - #}; }; environment = { - # Deprecated - #sessionVariables.WLR_NO_HARDWARE_CURSORS = "1"; sessionVariables.NIXOS_OZONE_WL = "1"; systemPackages = with pkgs; [ gammastep @@ -47,6 +39,7 @@ wl-clipboard # Required if applications are having trouble opening links xdg-utils + xfce.thunar xfce.tumbler xfce.thunar-volman diff --git a/modules/steam/default.nix b/modules/steam/default.nix index 34cd291a..fa67c36b 100644 --- a/modules/steam/default.nix +++ b/modules/steam/default.nix @@ -1,21 +1,11 @@ -{ pkgs, username, ... }: +{ pkgs, ...}: { - # Required to run Windows applications ie World of Warcraft - #users.users.${username} = { - # packages = with pkgs; [ - # (wineWowPackages.full.override { - # wineRelease = "staging"; - # mingwSupport = true; - # }) - # winetricks - # ]; - #}; - - #environment.systemPackages = with pkgs; [ lutris ]; - - # This can optionally be installed via flatpack. # Proton Experimental is pretty sweet programs = { steam.enable = true; }; + environment.systemPackages = with pkgs; [ + gamescope + ]; + }