From 991bb94ce207a401d123879f722e2ea487eeb74c Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Fri, 31 Jan 2025 20:53:40 -0500 Subject: [PATCH] clean up & steam server --- hosts/fwbook.nix | 47 ++++++++++++++++++++++++++++ hosts/hl-fws1.nix | 33 +++++++++++++++----- hosts/scripts/fw1/gs.sh | 27 ++++++++++++++++ modules/nixos/desktop/default.nix | 9 ------ modules/nixos/desktop/packages.nix | 50 ------------------------------ modules/nixos/desktop/wayland.nix | 9 ------ 6 files changed, 100 insertions(+), 75 deletions(-) create mode 100644 hosts/scripts/fw1/gs.sh diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 4a82afd..59f21c0 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -37,11 +37,13 @@ in ]; }; }; + # Desktop Env services.displayManager.cosmic-greeter.enable = false; services.displayManager.sddm.enable = true; services.displayManager.sddm.wayland.enable = true; services.displayManager.sddm.wayland.compositor = "kwin"; services.displayManager.defaultSession = "plasma"; + programs.kdeconnect.enable = true; # Firmware updater services.fwupd.enable = true; services.fprintd.enable = true; @@ -66,9 +68,54 @@ in dvc-with-remotes google-cloud-sdk awscli + # Util libusb1 + + # wine + wineWowPackages.stable + winetricks + wineWowPackages.waylandFull + + # Video recording + obs-studio + + # Browser + chromium + google-chrome + + # Photo Editing + krita + gimp-with-plugins + + # socials + zoom-us + betterdiscordctl + discord + signal-desktop + skypeforlinux + + # development + vscode + + # mail + thunderbird + + # password + bitwarden-desktop + + # documents + onlyoffice-bin_latest + ]); + services.flatpak.packages = [ + "com.slack.Slack" + "com.spotify.Client" + "com.cassidyjames.butler" + "io.dbeaver.DBeaverCommunity" + "it.fabiodistasio.AntaresSQL" + "com.github.sdv43.whaler" + ]; # Gaming programs.steam = { enable = true; diff --git a/hosts/hl-fws1.nix b/hosts/hl-fws1.nix index b2c4369..8f6f824 100644 --- a/hosts/hl-fws1.nix +++ b/hosts/hl-fws1.nix @@ -1,5 +1,9 @@ { user }: -{ pkgs, lib, config, ... }: { +{ pkgs, lib, config, ... }: +let + scriptsFolder = builtins.filterSource (p: t: true) ./scripts/fw1; +in +{ imports = [ ./hl-fws1.hardware-configuration.nix ]; skyg.user.enable = true; skyg.nixos.common.ssh-server.enable = true; @@ -19,12 +23,27 @@ boot.tmp.useTmpfs = true; # Game Engine - programs.steam = { - enable = true; - extest.enable = true; - remotePlay.openFirewall = true; - dedicatedServer.openFirewall = true; - localNetworkGameTransfers.openFirewall = true; + boot.kernelPackages = pkgs.linuxPackages; # (this is the default) some amdgpu issues on 6.10 + programs = { + gamescope = { + enable = true; + capSysNice = true; + }; + steam = { + enable = true; + gamescopeSession.enable = true; + extest.enable = true; + remotePlay.openFirewall = true; + dedicatedServer.openFirewall = true; + localNetworkGameTransfers.openFirewall = true; + }; + }; + services.getty.autologinUser = "ari"; + environment = { + systemPackages = with pkgs;[ mangohud ]; + loginShellInit = '' + [[ "$(tty)" = "/dev/tty1" ]] && ${scriptsFolder}/gs.sh + ''; }; } diff --git a/hosts/scripts/fw1/gs.sh b/hosts/scripts/fw1/gs.sh new file mode 100644 index 0000000..1e51c1c --- /dev/null +++ b/hosts/scripts/fw1/gs.sh @@ -0,0 +1,27 @@ +#!/usr/bin/env bash +set -xeuo pipefail + +gamescopeArgs=( + --adaptive-sync # VRR support + --hdr-enabled + --mangoapp # performance overlay + --rt + --steam +) +steamArgs=( + -pipewire-dmabuf + -tenfoot +) +mangoConfig=( + cpu_temp + gpu_temp + ram + vram +) +mangoVars=( + MANGOHUD=1 + MANGOHUD_CONFIG="$(IFS=,; echo "${mangoConfig[*]}")" +) + +export "${mangoVars[@]}" +exec gamescope "${gamescopeArgs[@]}" -- steam "${steamArgs[@]}" \ No newline at end of file diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index 2a4697b..d32db55 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -29,15 +29,6 @@ in terminal-exec.enable = true; portal = { enable = true; - # wlr.enable = true; - # xdgOpenUsePortal = true; - # config = { - # common.default = [ "*" ]; - # plasma6.default = [ "gtk" "kde" ]; - # }; - # extraPortals = [ - # pkgs.xdg-desktop-portal-gtk - # ]; }; }; }; diff --git a/modules/nixos/desktop/packages.nix b/modules/nixos/desktop/packages.nix index 7f04e7e..59cbf20 100644 --- a/modules/nixos/desktop/packages.nix +++ b/modules/nixos/desktop/packages.nix @@ -7,8 +7,6 @@ in config = lib.mkIf cfg.enable { # Flatpak services.flatpak.enable = true; - # Mobile Connect - programs.kdeconnect.enable = true; environment.systemPackages = [ ghostty ] ++ (with pkgs; [ # General utils busybox @@ -20,56 +18,8 @@ in wl-clipboard-x11 xclip - # socials - zoom-us - betterdiscordctl - discord - signal-desktop - skypeforlinux - - # development - vscode - - # mail - thunderbird - - # password - bitwarden-desktop - - # documents - onlyoffice-bin_latest - # video vlc - vlc-bittorrent - - # terminal - alacritty - alacritty-theme - - # wine - wineWowPackages.stable - winetricks - wineWowPackages.waylandFull - - # Video recording - obs-studio - - # Browser - chromium - google-chrome - - # Photo Editing - krita - gimp-with-plugins ]); - services.flatpak.packages = [ - "com.slack.Slack" - "com.spotify.Client" - "com.cassidyjames.butler" - "io.dbeaver.DBeaverCommunity" - "it.fabiodistasio.AntaresSQL" - "com.github.sdv43.whaler" - ]; }; } diff --git a/modules/nixos/desktop/wayland.nix b/modules/nixos/desktop/wayland.nix index c25d271..1123436 100644 --- a/modules/nixos/desktop/wayland.nix +++ b/modules/nixos/desktop/wayland.nix @@ -7,21 +7,12 @@ in { environment.sessionVariables.NIXOS_OZONE_WL = "1"; environment.systemPackages = with pkgs; [ - # wayland - # wayland-protocols wayland-utils - # xdg-desktop-portal-wlr - # xdg-desktop-portal-gtk ]; programs.xwayland.enable = true; xdg.portal = { enable = true; xdgOpenUsePortal = true; - # extraPortals = with pkgs;[ - # xdg-desktop-portal-gtk - # xdg-desktop-portal-wlr - # xdg-desktop-portal - # ]; }; }; }