From 17ddda1f508d27bf7bc37a6d82483a3db3ba5b4e Mon Sep 17 00:00:00 2001 From: Jake Pullen Date: Thu, 23 Jul 2026 13:58:12 +0100 Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A7=B9=20Changed=20to=20ssh=20ke?= =?UTF-8?q?y=20signing=20with=20new=20ssh=20key?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- git/gitconfig | 4 +++- hypr/hypridle.conf | 27 +++++++++------------------ hypr/hypridle.conf.bak.1778426181 | 28 ++++++++++++++++++++++++++++ hypr/input.conf | 2 +- hypr/monitors.conf | 15 --------------- 5 files changed, 41 insertions(+), 35 deletions(-) create mode 100644 hypr/hypridle.conf.bak.1778426181 delete mode 100644 hypr/monitors.conf diff --git a/git/gitconfig b/git/gitconfig index 5fc521d..b5114fe 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -1,7 +1,7 @@ [user] email = hello@jake-is.me name = Jake Pullen - signingkey = 5CBC649FBEF851A6 + signingkey = /home/jake/.ssh/id_ed25519.pub [commit] template = ~/.config/git/template @@ -84,3 +84,5 @@ [safe] directory = /mnt/nas/hosted_git/DnD.git directory = /mnt/nas/hosted_git/dungeon_masters_vault.git +[gpg] + format = ssh diff --git a/hypr/hypridle.conf b/hypr/hypridle.conf index 122af7d..08b27ef 100644 --- a/hypr/hypridle.conf +++ b/hypr/hypridle.conf @@ -1,28 +1,19 @@ general { lock_cmd = omarchy-system-lock # lock screen and 1password - before_sleep_cmd = loginctl lock-session # lock before suspend. - after_sleep_cmd = sleep 1 && hyprctl dispatch dpms on # delay for PAM readiness, then turn on display. + before_sleep_cmd = OMARCHY_LOCK_ONLY=true omarchy-system-lock # lock before suspend without scheduling display off. + after_sleep_cmd = sleep 1 && omarchy-system-wake # delay for PAM readiness, then turn on display. inhibit_sleep = 3 # wait until screen is locked } +# Start screensaver after 2.5 minutes listener { - timeout = 150 # 2.5min - on-timeout = pidof hyprlock || omarchy-launch-screensaver # start screensaver (if we haven't locked already) + timeout = 150 + on-timeout = pidof hyprlock || omarchy-launch-screensaver } +# Lock system after 5 minutes (screensaver resets idle timer, so have to just do half + 2s margin) listener { - timeout = 300 # 5min - on-timeout = loginctl lock-session # lock screen when timeout has passed -} - -listener { - timeout = 330 # 5.5min - on-timeout = brightnessctl -sd '*::kbd_backlight' set 0 # save state and turn off keyboard backlight - on-resume = brightnessctl -rd '*::kbd_backlight' # restore keyboard backlight -} - -listener { - timeout = 600 # 10min - on-timeout = hyprctl dispatch dpms off # screen off when timeout has passed - on-resume = hyprctl dispatch dpms on && brightnessctl -r # screen on when activity is detected + timeout = 152 + on-timeout = omarchy-system-lock + on-resume = omarchy-system-wake } diff --git a/hypr/hypridle.conf.bak.1778426181 b/hypr/hypridle.conf.bak.1778426181 new file mode 100644 index 0000000..122af7d --- /dev/null +++ b/hypr/hypridle.conf.bak.1778426181 @@ -0,0 +1,28 @@ +general { + lock_cmd = omarchy-system-lock # lock screen and 1password + before_sleep_cmd = loginctl lock-session # lock before suspend. + after_sleep_cmd = sleep 1 && hyprctl dispatch dpms on # delay for PAM readiness, then turn on display. + inhibit_sleep = 3 # wait until screen is locked +} + +listener { + timeout = 150 # 2.5min + on-timeout = pidof hyprlock || omarchy-launch-screensaver # start screensaver (if we haven't locked already) +} + +listener { + timeout = 300 # 5min + on-timeout = loginctl lock-session # lock screen when timeout has passed +} + +listener { + timeout = 330 # 5.5min + on-timeout = brightnessctl -sd '*::kbd_backlight' set 0 # save state and turn off keyboard backlight + on-resume = brightnessctl -rd '*::kbd_backlight' # restore keyboard backlight +} + +listener { + timeout = 600 # 10min + on-timeout = hyprctl dispatch dpms off # screen off when timeout has passed + on-resume = hyprctl dispatch dpms on && brightnessctl -r # screen on when activity is detected +} diff --git a/hypr/input.conf b/hypr/input.conf index 2174205..bb5beb3 100644 --- a/hypr/input.conf +++ b/hypr/input.conf @@ -42,7 +42,7 @@ input { } # Scroll nicely in the terminal -windowrule = match:class (Alacritty|kitty), scroll_touchpad 1.5 +windowrule = match:class (Alacritty|kitty|foot), scroll_touchpad 1.5 windowrule = match:class com.mitchellh.ghostty, scroll_touchpad 0.2 # Enable touchpad gestures for changing workspaces diff --git a/hypr/monitors.conf b/hypr/monitors.conf deleted file mode 100644 index 076b523..0000000 --- a/hypr/monitors.conf +++ /dev/null @@ -1,15 +0,0 @@ -# See https://wiki.hyprland.org/Configuring/Monitors/ -# List current monitors and resolutions possible: hyprctl monitors -# Format: monitor = [port], resolution, position, scale - -env = GDK_SCALE,1 -# monitor = , preferred, auto, 1 -monitor = DP-4, 3840x2160@60, 0x0, 1 -monitor = DP-1, 2560x2880@60, 3840x0, 1 - -# Portrait/rotated secondary monitor (transform: 1 = 90°, 3 = 270°) -# monitor = DP-2, preferred, auto, 1, transform, 1 - -# Example for Framework 13 w/ 6K XDR Apple display -# monitor = DP-5, 6016x3384@60, auto, 2 -# monitor = eDP-1, 2880x1920@120, auto, 2