mirror of
https://codeberg.org/andyscott/dotfiles.git
synced 2024-12-22 18:03:11 -05:00
Compare commits
No commits in common. "8bfa54e30d16b603a817d288587b10c6037a53e7" and "c5e5883a9a61a7e62b47160a0a99f32c2dc40a14" have entirely different histories.
8bfa54e30d
...
c5e5883a9a
4 changed files with 9 additions and 57 deletions
|
@ -78,17 +78,6 @@
|
|||
(add-hook 'after-init-hook #'elpaca-process-queues)
|
||||
(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
|
||||
(elpaca elpaca-use-package
|
||||
(elpaca-use-package-mode)
|
||||
|
@ -242,10 +231,6 @@
|
|||
(setq save-place-file (concat xdg_cache_home "places"))
|
||||
(save-place-mode))
|
||||
|
||||
(use-package seq
|
||||
; Unload seq before elpaca build
|
||||
:elpaca `(seq :build ,(+elpaca-seq-build-steps)))
|
||||
|
||||
(use-package simple
|
||||
:elpaca nil
|
||||
:config
|
||||
|
@ -723,12 +708,7 @@
|
|||
;; Zig
|
||||
(use-package zig-mode
|
||||
:commands (zig-mode)
|
||||
:config
|
||||
(defun zig-compile ()
|
||||
(interactive)
|
||||
(save-buffer)
|
||||
(zig--run-cmd "build"))
|
||||
(setq-local fill-column 100))
|
||||
:config (setq-local fill-column 100))
|
||||
|
||||
;;; File format/markup support
|
||||
(use-package markdown-mode
|
||||
|
|
|
@ -197,11 +197,6 @@ do
|
|||
riverctl map "$mode" None XF86AudioRaiseVolume spawn 'pactl set-sink-volume @DEFAULT_SINK@ +5%'
|
||||
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
|
||||
riverctl map $mode None XF86MonBrightnessDown spawn 'light -U 5'
|
||||
riverctl map $mode None XF86MonBrightnessUp spawn 'light -A 5'
|
||||
|
@ -254,7 +249,7 @@ riverctl map-switch normal lid close 'waylock-launcher'
|
|||
riverctl focus-output DP-1
|
||||
{{- end }}
|
||||
|
||||
# Start floating
|
||||
# -app-id and title -"foo" start floating
|
||||
riverctl rule-add -app-id 'Bitwarden' float
|
||||
riverctl rule-add -app-id 'Blueman-manager' float
|
||||
riverctl rule-add -app-id 'connman-gtk' float
|
||||
|
@ -264,7 +259,10 @@ riverctl rule-add -app-id 'mousepad' float
|
|||
riverctl rule-add -app-id 'com.nextcloud.dextopclient.Nextcloud' float
|
||||
riverctl rule-add -app-id 'vlc' float
|
||||
|
||||
# Layout generator
|
||||
# -app-id "bar" and any title use client-side decorations
|
||||
riverctl rule-add -app-id 'emacs' csd
|
||||
|
||||
# Default layout generator
|
||||
riverctl default-layout rivertile
|
||||
rivertile -view-padding 4 -outer-padding 4 -main-ratio .55 &
|
||||
|
||||
|
|
|
@ -12,13 +12,13 @@
|
|||
}
|
||||
{
|
||||
"label" : "logout",
|
||||
"action" : "${HOME}/.local/bin/river-exit logout",
|
||||
"action" : "${HOME}/.local/bin/river-logout",
|
||||
"text" : "Logout",
|
||||
"keybind" : "e"
|
||||
}
|
||||
{
|
||||
"label" : "shutdown",
|
||||
"action" : "${HOME}/.local/bin/river-exit poweroff",
|
||||
"action" : "loginctl poweroff",
|
||||
"text" : "Shutdown",
|
||||
"keybind" : "s"
|
||||
}
|
||||
|
@ -30,7 +30,7 @@
|
|||
}
|
||||
{
|
||||
"label" : "reboot",
|
||||
"action" : "${HOME}/.local/bin/river-exit reboot",
|
||||
"action" : "loginctl reboot",
|
||||
"text" : "Reboot",
|
||||
"keybind" : "r"
|
||||
}
|
||||
|
|
|
@ -1,26 +0,0 @@
|
|||
#!/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
|
Loading…
Reference in a new issue