Periodic/system-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[idle;lock] Switches to swaylock

Browse Source
This commit is contained in:
Drew Haven
2025-05-28 12:23:14 -07:00
parent efab3866c2
commit aa6402cf7c
6 changed files with 96 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
home-manager/features/hypr/hypridle.nix
View File

@@ -4,7 +4,7 @@
enable = true; enable = true;
settings = { settings = {
general = { general = {
lock_cmd = "pidof hyprlock || hyprlock"; # avoid starting multiple hyprlock instances. lock_cmd = "pidof swaylock || swaylock"; # avoid starting multiple lock instances.
before_sleep_cmd = "loginctl lock-session"; # lock before suspend. before_sleep_cmd = "loginctl lock-session"; # lock before suspend.
after_sleep_cmd = "hyprctl dispatch dpms on"; # to avoid having to press a key twice to turn on the display. after_sleep_cmd = "hyprctl dispatch dpms on"; # to avoid having to press a key twice to turn on the display.
}; };

3
home-manager/features/hyprland.nix
View File

@@ -1,6 +1,7 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
imports = [ imports = [
./swaylock.nix
./hypr/hypridle.nix ./hypr/hypridle.nix
]; ];
@@ -426,7 +427,7 @@
}; };
programs.hyprlock = { programs.hyprlock = {
enable = true; enable = false;
settings = { settings = {
general = { general = {
disable_loading_bar = true; disable_loading_bar = true;

133
home-manager/features/rofi/config/powermenu/powermenu.sh
View File

@@ -11,7 +11,7 @@ dir="${HOME}/.config/rofi/powermenu"
# CMDs # CMDs
uptime="$(uptime | awk -F ' ' '{print $2}' | sed -e 's/,//g')" uptime="$(uptime | awk -F ' ' '{print $2}' | sed -e 's/,//g')"
host=`hostname` host=$(hostname)
# Options # Options
shutdown='󰐥' shutdown='󰐥'
@@ -24,89 +24,94 @@ no=''
# Rofi CMD # Rofi CMD
rofi_cmd() { rofi_cmd() {
rofi -dmenu \ rofi -dmenu \
-p "Uptime: $uptime" \ -p "Uptime: $uptime" \
-mesg "Uptime: $uptime" \ -mesg "Uptime: $uptime" \
-theme ${dir}/style.rasi -theme ${dir}/style.rasi
} }
# Confirmation CMD # Confirmation CMD
confirm_cmd() { confirm_cmd() {
rofi -theme-str 'window {location: center; anchor: center; fullscreen: false; width: 350px;}' \ rofi -theme-str 'window {location: center; anchor: center; fullscreen: false; width: 350px;}' \
-theme-str 'mainbox {children: [ "message", "listview" ];}' \ -theme-str 'mainbox {children: [ "message", "listview" ];}' \
-theme-str 'listview {columns: 2; lines: 1;}' \ -theme-str 'listview {columns: 2; lines: 1;}' \
-theme-str 'element-text {horizontal-align: 0.5;}' \ -theme-str 'element-text {horizontal-align: 0.5;}' \
-theme-str 'textbox {horizontal-align: 0.5;}' \ -theme-str 'textbox {horizontal-align: 0.5;}' \
-dmenu \ -dmenu \
-p 'Confirmation' \ -p 'Confirmation' \
-mesg 'Are you Sure?' \ -mesg 'Are you Sure?' \
-theme ${dir}/style.rasi -theme ${dir}/style.rasi
} }
# Ask for confirmation # Ask for confirmation
confirm_exit() { confirm_exit() {
echo -e "$yes\n$no" | confirm_cmd echo -e "$yes\n$no" | confirm_cmd
} }
# Pass variables to rofi dmenu # Pass variables to rofi dmenu
run_rofi() { run_rofi() {
echo -e "$lock\n$suspend\n$logout\n$reboot\n$shutdown" | rofi_cmd echo -e "$lock\n$suspend\n$logout\n$reboot\n$shutdown" | rofi_cmd
} }
# Execute Command # Execute Command
run_cmd() { run_cmd() {
selected="$(confirm_exit)" selected="$(confirm_exit)"
if [[ "$selected" == "$yes" ]]; then if [[ "$selected" == "$yes" ]]; then
if [[ $1 == '--shutdown' ]]; then if [[ $1 == '--shutdown' ]]; then
systemctl poweroff systemctl poweroff
elif [[ $1 == '--reboot' ]]; then elif [[ $1 == '--reboot' ]]; then
systemctl reboot systemctl reboot
elif [[ $1 == '--suspend' ]]; then elif [[ $1 == '--suspend' ]]; then
mpc -q pause mpc -q pause
amixer set Master mute amixer set Master mute
systemctl suspend systemctl suspend
elif [[ $1 == '--logout' ]]; then elif [[ $1 == '--logout' ]]; then
if [[ "$DESKTOP_SESSION" == 'openbox' ]]; then if [[ "$DESKTOP_SESSION" == 'openbox' ]]; then
openbox --exit openbox --exit
elif [[ "$DESKTOP_SESSION" == 'bspwm' ]]; then elif [[ "$DESKTOP_SESSION" == 'bspwm' ]]; then
bspc quit bspc quit
elif [[ "$DESKTOP_SESSION" == 'i3' ]]; then elif [[ "$DESKTOP_SESSION" == 'i3' ]]; then
i3-msg exit i3-msg exit
elif [[ "$DESKTOP_SESSION" == 'plasma' ]]; then elif [[ "$DESKTOP_SESSION" == 'plasma' ]]; then
qdbus org.kde.ksmserver /KSMServer logout 0 0 0 qdbus org.kde.ksmserver /KSMServer logout 0 0 0
elif [[ "$DESKTOP_SESSION" == 'plasma' ]]; then elif [[ "$DESKTOP_SESSION" == 'plasma' ]]; then
qdbus org.kde.ksmserver /KSMServer logout 0 0 0 qdbus org.kde.ksmserver /KSMServer logout 0 0 0
elif command -v hyprctl &>/dev/null; then elif [[ "$DESKTOP_SESSION" == 'hyprland-uwsm' ]]; then
hyprctl dispatch exit hyprctl dispatch exit
fi elif [[ "$DESKTOP_SESSION" == 'hyprland' ]]; then
fi hyprctl dispatch exit
else fi
exit 0 fi
fi else
exit 0
fi
} }
# Actions # Actions
chosen="$(run_rofi)" chosen="$(run_rofi)"
case ${chosen} in case ${chosen} in
$shutdown) $shutdown)
run_cmd --shutdown run_cmd --shutdown
;; ;;
$reboot) $reboot)
run_cmd --reboot run_cmd --reboot
;; ;;
$lock) $lock)
if [[ -x '/usr/bin/betterlockscreen' ]]; then loginctl lock-session
betterlockscreen -l # if [[ -x '/usr/bin/betterlockscreen' ]]; then
elif [[ -x '/usr/bin/i3lock' ]]; then # betterlockscreen -l
i3lock # elif [[ -x '/usr/bin/i3lock' ]]; then
elif command -v hyprlock &>/dev/null; then # i3lock
hyprlock # elif command -v hyprlock &>/dev/null; then
fi # hyprlock
;; # elif command -v swaylock &>/dev/null; then
$suspend) # swaylock
run_cmd --suspend # fi
;; ;;
$logout) $suspend)
run_cmd --logout run_cmd --suspend
;; ;;
$logout)
run_cmd --logout
;;
esac esac

21
home-manager/features/sway.nix
View File

@@ -1,21 +1,12 @@
{ {
config, config,
lib, lib,
pkgs,
... ...
}: }:
{ {
imports = [ imports = [
./swaync.nix ./swaync.nix
]; ./swaylock.nix
home.packages = with pkgs; [
hyprlock # lock screen
# swayidle # lock on idle
# swayosd # volume pop-up
# swaynotificationcenter # notifications
# hyprpolkitagent # Privilege managent
# hyprshot # Screenshot utility
]; ];
services.swayosd = { services.swayosd = {
@@ -23,16 +14,6 @@
topMargin = 0.7; topMargin = 0.7;
}; };
services.swayidle = {
enable = true;
events = [
{
event = "before-sleep";
command = "hyprlock";
}
];
};
# Enable sway config generation for home.pointerCursor # Enable sway config generation for home.pointerCursor
home.pointerCursor.sway.enable = true; home.pointerCursor.sway.enable = true;

23
home-manager/features/swaylock.nix Normal file
View File

@@ -0,0 +1,23 @@
{ pkgs, ... }:
{
programs.swaylock = {
enable = true;
package = pkgs.swaylock-effects;
settings = {
clock = true;
indicator = true;
effect-pixelate = 10;
};
};
home.file.".config/swaylock/swaylock.sh" = {
executable = true;
text = ''
#!/bin/env bash
image=`fd . ~/Pictures/Wallpaper --type f | sort -R | tail -1`
swaylock --image "$image"
'';
};
}

7
system/hosts/vega/drew.nix
View File

@@ -32,13 +32,6 @@
userEmail = "periodic@blazestar.net"; userEmail = "periodic@blazestar.net";
}; };
# TODO: Hyprlock is not working correctly on this system and is showing the
# desktop but the screen is still locked. Disabling it for now.
services.hypridle.settings.general = {
lock_cmd = lib.mkForce "";
before_sleep_cmd = lib.mkForce "";
};
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
# Set up eww here because it's based on the monitor configuration # Set up eww here because it's based on the monitor configuration
# Eww is idempotent, so it's fine to just run it on every reload to make sure things are open # Eww is idempotent, so it's fine to just run it on every reload to make sure things are open