diff --git a/.config/waybar/amd-gpu.sh b/.config/waybar/amd-gpu.sh index ed20b6f..7b1758d 120000 --- a/.config/waybar/amd-gpu.sh +++ b/.config/waybar/amd-gpu.sh @@ -1 +1,34 @@ -../polybar/amd-gpu.sh \ No newline at end of file +#!/usr/bin/env bash + +# Base path for AMD GPU sysfs +GPU_BASE_PATH="/sys/class/drm/card1/device" + +# Check if AMD GPU sysfs exists +if [ ! -d "$GPU_BASE_PATH" ]; then + echo "---" + exit 1 +fi + +# Get GPU usage +GPU_UTIL=$(cat "$GPU_BASE_PATH/gpu_busy_percent" 2>/dev/null || echo "N/A") + +# Base path for hwmon (temperature and power readings) +HWMON_PATH="$GPU_BASE_PATH/hwmon/hwmon0" + +# Get GPU temperature +TEMP_PATH="$HWMON_PATH/temp1_input" +if [ -f "$TEMP_PATH" ]; then + GPU_TEMP=$(($(cat "$TEMP_PATH") / 1000)) # Convert from millidegrees to degrees +else + GPU_TEMP="N/A" +fi + +# Get GPU power usage +POWER_PATH="$HWMON_PATH/power1_average" +if [ -f "$POWER_PATH" ]; then + GPU_POWER=$(($(cat "$POWER_PATH") / 1000000)) # Convert from microwatts to watts +else + GPU_POWER="N/A" +fi + +echo "GPU ${GPU_UTIL}%, ${GPU_TEMP}°C, ${GPU_POWER}W" diff --git a/home-manager/hyprland/hyprland-settings.nix b/home-manager/hyprland/hyprland-settings.nix index 87f4617..093e43b 100644 --- a/home-manager/hyprland/hyprland-settings.nix +++ b/home-manager/hyprland/hyprland-settings.nix @@ -316,8 +316,8 @@ in "${pkgs.hypridle}/bin/hypridle &" #"${pkgs.dunst}/bin/dunst &" ] ++ lib.lists.optionals (osConfig.networking.hostName == "kop-pc") [ - "[workspace 9 silent] discord" - "[workspace 9 silent] discordcanary" + "[workspace 9 silent] sleep 2 && discord" + "[workspace 9 silent] sleep 2 && discordcanary" "[workspace 10 silent] firefox" "xrandr --monitor ${monitor1} --primary" ] ++ [ diff --git a/modules/graphical/hyprland.nix b/modules/graphical/hyprland.nix index 07f095b..ffb6677 100644 --- a/modules/graphical/hyprland.nix +++ b/modules/graphical/hyprland.nix @@ -33,6 +33,22 @@ in { programs.hyprland = { enable = true; }; security.pam.services.hyprlock = { }; + systemd = { + user.services.polkit-gnome-authentication-agent-1 = { + description = "polkit-gnome-authentication-agent-1"; + wantedBy = [ "graphical-session.target" ]; + wants = [ "graphical-session.target" ]; + after = [ "graphical-session.target" ]; + serviceConfig = { + Type = "simple"; + ExecStart = + "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"; + Restart = "on-failure"; + RestartSec = 1; + TimeoutStopSec = 10; + }; + }; + }; # List packages installed in system profile. To search, run: # $ nix search wget diff --git a/overlays.nix b/overlays.nix index 96a60b1..21239c8 100644 --- a/overlays.nix +++ b/overlays.nix @@ -22,12 +22,12 @@ in tetrio-desktop = prev.tetrio-desktop.override { withTetrioPlus = true; }; lact = prev.rdna4-lact; vencord = prev.vencord.overrideAttrs { - version = "1.12.1"; + version = "1.12.2"; src = prev.fetchFromGitHub { owner = "Vendicated"; repo = "Vencord"; - rev = "v$1.12.1"; - hash = "sha256-Vs6S8N3q5JzXfeogfD0JrVIhMnYIio7+Dfy12gUJrlU="; + rev = "v1.12.2"; + hash = "sha256-a4lbeuXEHDMDko8wte7jUdJ0yUcjfq3UPQAuSiz1UQU="; }; }; diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix index 42db40e..b301607 100644 --- a/systems/pc/configuration.nix +++ b/systems/pc/configuration.nix @@ -79,7 +79,7 @@ sddm.enable = true; nightlight.enable = true; #plasma.enable = true; - i3.enable = true; + #i3.enable = true; #sway.enable = true; hyprland.enable = true; #gnome.enable = true;