diff --git a/config.nix b/config.nix index f9f4839..a8f4dcc 100644 --- a/config.nix +++ b/config.nix @@ -43,8 +43,8 @@ monitors = [ # "DP-2, highres@165,0x1080,1,vrr,1" # "DP-2, highres@180,0x1080,1,cm,hdr, sdrbrightness, 1.5, sdrsaturation, 0.98" - "DP-1, highres@highrr,0x0,1" - "DP-2, highres@165,0x1080,1,bitdepth,10,cm,hdr,sdrbrightness,1.4,sdrsaturation,0.98" + "DP-1, highres@165,0x1080,1,bitdepth,10,cm,hdr,sdrbrightness,1.4,sdrsaturation,0.98" + "DP-2, highres@highrr,0x0,1" "HDMI-A-1, 1920x1080@120, 20000x20000,1" # "HDMI-A-1, disabled" ]; diff --git a/hosts/hakase/configuration.nix b/hosts/hakase/configuration.nix index 7d74308..71968e5 100644 --- a/hosts/hakase/configuration.nix +++ b/hosts/hakase/configuration.nix @@ -19,7 +19,6 @@ pavucontrol wl-clipboard wget - protontricks ]; users = { @@ -161,28 +160,27 @@ boot.loader.timeout = 0; boot.loader.limine.maxGenerations = 5; hardware.amdgpu.initrd.enable = true; - boot.kernelParams = [ "quiet" "splash" "boot.shell_on_fail" "udev.log_priority=3" "rd.systemd.show_status=auto" - "iommu=pt" "amd_pstate=active" ]; boot.kernelPackages = pkgs.linuxPackages_cachyos; - boot.kernel.sysctl = { - "kernel.split_lock_mitigate" = 0; - "kernel.nmi_watchdog" = 0; - "kernel.sched_bore" = "1"; - }; - + # boot.kernel.sysctl = { + # "kernel.split_lock_mitigate" = 0; + # "kernel.nmi_watchdog" = 0; + # "kernel.sched_bore" = "1"; + # }; + # boot.initrd = { systemd.enable = true; kernelModules = []; verbose = false; }; + boot.plymouth.enable = true; boot.plymouth.theme = "seal"; boot.plymouth.themePackages = with pkgs; [ diff --git a/packages/hyprland/config/rules.nix b/packages/hyprland/config/rules.nix index 7880c4a..b3ca22d 100644 --- a/packages/hyprland/config/rules.nix +++ b/packages/hyprland/config/rules.nix @@ -44,14 +44,14 @@ "workspace special:music, initialTitle:Spotify( Free)?" "workspace special:communication, class:discord|equibop|vesktop|whatsapp" "workspace special:todo, class:Todoist" - "workspace special:gaming, class:^(steam_app_.*)$" + "workspace special:steam, class:^(steam_app_.*)$" "noinitialfocus, class:discord" "focusonactivate 0, class:discord" # Always full screen # "fullscreen, title:^(Steam Big Picture Mode)$" - # "fullscreen, title:^(steam_app_.*)$" + "fullscreen, title:^(steam_app_.*)$" # Dialogs "float, title:(Select|Open)( a)? (File|Folder)(s)?" @@ -91,15 +91,15 @@ workspace = [ "w[tv1]s[false], gapsout:20, gapsin:20" "f[1]s[false], gapsout:20, gapsin:20" - "1, monitor:DP-2, default:true" - "2, monitor:DP-2" - "3, monitor:DP-2" - "4, monitor:DP-1" - "5, monitor:DP-1" - "6, monitor:DP-1" + "1, monitor:DP-1, default:true" + "2, monitor:DP-1" + "3, monitor:DP-1" + "4, monitor:DP-2" + "5, monitor:DP-2" + "6, monitor:DP-2" - "special:gaming, monitor:DP-2, persistent:true" - "special:steam, monitor:DP-2, persistent:true, on-created-empty:steam" + "special:gaming, monitor:DP-1, persistent:true" + "special:steam, monitor:DP-1, persistent:true, on-created-empty:steam" ]; # ######## Layer rules ######## diff --git a/packages/steam/jovian.nix b/packages/steam/jovian.nix index 5ba1c08..3763b1b 100644 --- a/packages/steam/jovian.nix +++ b/packages/steam/jovian.nix @@ -19,16 +19,11 @@ jovian.hardware.has.amd.gpu = true; jovian.decky-loader.enable = true; - jovian.decky-loader.user = "kenji"; + jovian.decky-loader.user = "${myConfig.essentials.Username}"; # jovian.steamos.enableBluetoothConfig = true; # jovian.steamos.enableMesaPatches = true; jovian.steamos.useSteamOSConfig = false; - jovian.decky-loader.extraPythonPackages = pythonPackages: - with pythonPackages; [ - requests - aiohttp - ]; # jovian.devices.steamdeck.enableControllerUdevRules = true;