Merge branch wayland with itself to fix mismatch caused by codeberg ddos

This commit is contained in:
Andrew Scott 2024-01-14 12:45:07 -05:00
commit 2c0b6f0451
Signed by: a
GPG key ID: 7CD5A5977E4931C1
4 changed files with 57 additions and 9 deletions

View file

@ -78,6 +78,17 @@
(add-hook 'after-init-hook #'elpaca-process-queues) (add-hook 'after-init-hook #'elpaca-process-queues)
(elpaca `(,@elpaca-order)) (elpaca `(,@elpaca-order))
;; Unload seq before elpaca build - also see `use-package' declaration for seq below
;; https://github.com/progfolio/elpaca/issues/216#issuecomment-1868444883
(defun +elpaca-unload-seq (e)
(and (featurep 'seq) (unload-feature 'seq t))
(elpaca--continue-build e))
(defun +elpaca-seq-build-steps ()
(append (butlast (if (file-exists-p (expand-file-name "seq" elpaca-builds-directory))
elpaca--pre-built-steps elpaca-build-steps))
(list '+elpaca-unload-seq 'elpaca--activate-package)))
;; use-package ;; use-package
(elpaca elpaca-use-package (elpaca elpaca-use-package
(elpaca-use-package-mode) (elpaca-use-package-mode)
@ -231,6 +242,10 @@
(setq save-place-file (concat xdg_cache_home "places")) (setq save-place-file (concat xdg_cache_home "places"))
(save-place-mode)) (save-place-mode))
(use-package seq
; Unload seq before elpaca build
:elpaca `(seq :build ,(+elpaca-seq-build-steps)))
(use-package simple (use-package simple
:elpaca nil :elpaca nil
:config :config
@ -708,7 +723,12 @@
;; Zig ;; Zig
(use-package zig-mode (use-package zig-mode
:commands (zig-mode) :commands (zig-mode)
:config (setq-local fill-column 100)) :config
(defun zig-compile ()
(interactive)
(save-buffer)
(zig--run-cmd "build"))
(setq-local fill-column 100))
;;; File format/markup support ;;; File format/markup support
(use-package markdown-mode (use-package markdown-mode

View file

@ -197,6 +197,11 @@ do
riverctl map "$mode" None XF86AudioRaiseVolume spawn 'pactl set-sink-volume @DEFAULT_SINK@ +2%' riverctl map "$mode" None XF86AudioRaiseVolume spawn 'pactl set-sink-volume @DEFAULT_SINK@ +2%'
riverctl map "$mode" None XF86AudioMicMute spawn 'pactl set-source-mute @DEFAULT_SOURCE@ toggle' riverctl map "$mode" None XF86AudioMicMute spawn 'pactl set-source-mute @DEFAULT_SOURCE@ toggle'
# Media
riverctl map "$mode" None XF86AudioPrev spawn ''
riverctl map "$mode" None XF86AudioPlay spawn ''
riverctl map "$mode" None XF86AudioNext spawn ''
# Backlight # Backlight
riverctl map $mode None XF86MonBrightnessDown spawn 'xbacklight -dec 5' riverctl map $mode None XF86MonBrightnessDown spawn 'xbacklight -dec 5'
riverctl map $mode None XF86MonBrightnessUp spawn 'xbacklight -inc 5' riverctl map $mode None XF86MonBrightnessUp spawn 'xbacklight -inc 5'
@ -249,7 +254,7 @@ riverctl map-switch normal lid close 'waylock-launcher'
riverctl focus-output DP-1 riverctl focus-output DP-1
{{- end }} {{- end }}
# -app-id and title -"foo" start floating # Start floating
riverctl rule-add -app-id 'Bitwarden' float riverctl rule-add -app-id 'Bitwarden' float
riverctl rule-add -app-id 'Blueman-manager' float riverctl rule-add -app-id 'Blueman-manager' float
riverctl rule-add -app-id 'connman-gtk' float riverctl rule-add -app-id 'connman-gtk' float
@ -259,10 +264,7 @@ riverctl rule-add -app-id 'mousepad' float
riverctl rule-add -app-id 'com.nextcloud.dextopclient.Nextcloud' float riverctl rule-add -app-id 'com.nextcloud.dextopclient.Nextcloud' float
riverctl rule-add -app-id 'vlc' float riverctl rule-add -app-id 'vlc' float
# -app-id "bar" and any title use client-side decorations # Layout generator
riverctl rule-add -app-id 'emacs' csd
# Default layout generator
riverctl default-layout rivertile riverctl default-layout rivertile
rivertile -view-padding 4 -outer-padding 4 -main-ratio .55 & rivertile -view-padding 4 -outer-padding 4 -main-ratio .55 &

View file

@ -12,13 +12,13 @@
} }
{ {
"label" : "logout", "label" : "logout",
"action" : "${HOME}/.local/bin/river-logout", "action" : "${HOME}/.local/bin/river-exit logout",
"text" : "Logout", "text" : "Logout",
"keybind" : "e" "keybind" : "e"
} }
{ {
"label" : "shutdown", "label" : "shutdown",
"action" : "loginctl poweroff", "action" : "${HOME}/.local/bin/river-exit poweroff",
"text" : "Shutdown", "text" : "Shutdown",
"keybind" : "s" "keybind" : "s"
} }
@ -30,7 +30,7 @@
} }
{ {
"label" : "reboot", "label" : "reboot",
"action" : "loginctl reboot", "action" : "${HOME}/.local/bin/river-exit reboot",
"text" : "Reboot", "text" : "Reboot",
"keybind" : "r" "keybind" : "r"
} }

View file

@ -0,0 +1,26 @@
#!/bin/sh
river=$(ps -C river | awk '/river/')
if [ -z "$river" ]; then
echo "error: $0: River is not running"
exit 1
elif [ $# -ne 1 ]; then
echo "Usage: river-exit [command]"
echo "Commands: logout, poweroff, or reboot"
exit 1
fi
if [ "$1" = "logout" ]; then
riverctl spawn 'reset'
riverctl exit
elif [ "$1" = "poweroff" ]; then
riverctl spawn 'reset'
loginctl poweroff
elif [ "$1" = "reboot" ]; then
riverctl spawn 'reset'
loginctl reboot
else
echo "error: $0: unexpected argument"
exit 1
fi