aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--emacs/init.el15
-rwxr-xr-xriver/init72
2 files changed, 42 insertions, 45 deletions
diff --git a/emacs/init.el b/emacs/init.el
index 8221e85..f20a804 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -275,6 +275,8 @@ If the new path's directories does not exist, create them."
:hook
(org-mode . org-bullets-mode))
+(use-package org-contrib)
+
(setq org-directory "~/notas")
(setq org-agenda-files '("agenda.org"))
(setopt org-agenda-include-diary t)
@@ -625,12 +627,17 @@ apps are not started from a shell."
(powerline-default-theme))
(use-package yasnippet
- :commands (yas-global-mode)
- :config (setopt yasnippet-snippets-dir
- '((concat user-emacs-directory "snippets")
- (concat user-emacs-directory "straight/repos/yasnippet-snippets/snippets"))))
+ :hook
+ (prog-mode . yas-minor-mode)
+ :bind
+ (:map yas-minor-mode-map
+ ("TAB" . yas-expand))
+ :config
+ (setopt yas-maybe-expand t))
(use-package yasnippet-snippets
+ :straight
+ (yasnippet-snippets :type git :host github :repo "AndreaCrotti/yasnippet-snippets" :files ("*.el" "snippets"))
:after yasnippet)
(custom-set-variables
diff --git a/river/init b/river/init
index f498309..1c36d3c 100755
--- a/river/init
+++ b/river/init
@@ -4,12 +4,13 @@
riverctl spawn "kanshi"
riverctl spawn "waybar"
riverctl spawn "mako"
-riverctl spawn "$HOME/bin/,wallpaper"
+riverctl spawn "$HOME/.local/bin/,wallpaper"
riverctl spawn "wl-paste --type text --watch cliphist store"
riverctl spawn "wl-paste --type image --watch cliphist store"
riverctl spawn "swayidle -w \
- timeout 300 'swaylock -f -i ~/imagens/wallpapers/wall.png' \
- timeout 600 'wlopm --off \*;swaylock -F -i ~/imagens/wallpapers/wall.png' \
+ timeout 600 'swaylock -f -i ~/imagens/wallpapers/wall.png' \
+ timeout 900 'wlopm --off \*;swaylock -F -i ~/imagens/wallpapers/wall.png' \
+ timeout 1200 'loginctl suspend' \
resume 'wlopm --on \*' \
before-sleep 'swaylock -f -i ~/imagens/wallpapers/wall.png'"
@@ -20,15 +21,21 @@ riverctl background-color 0x101112
riverctl border-color-focused 0x799df6
riverctl border-color-unfocused 0xdfdfdf
-riverctl default-layout rivertile
-rivertile -view-padding 5 -outer-padding 20 -main-ratio 0.5 &
+# riverctl default-layout rivertile
+# rivertile -view-padding 10 -outer-padding 20 -main-ratio 0.5 &
-riverctl float-filter-add app-id float_term
+riverctl default-layout rivercarro
+rivercarro -no-smart-gaps -outer-gaps 20 -main-location monocle -main-ratio 0.5 &
+riverctl map normal Super Space send-layout-cmd rivercarro "main-location left"
+
+riverctl rule-add -app-id float_term float
+riverctl rule-add -app-id firefox tags $((1 << 3))
+riverctl rule-add -app-id io.github.celluloid_player.Celluloid tags $((1 << 1))
riverctl set-repeat 40 250
riverctl set-cursor-warp on-output-change
-riverctl xcursor-theme capitaine-cursors-light 40
+riverctl xcursor-theme capitaine-cursors-light
riverctl input pointer-1267-228-Elan_Touchpad natural-scroll enabled
riverctl input pointer-1267-228-Elan_Touchpad tap enabled
@@ -40,11 +47,11 @@ riverctl input pointer-1267-228-Elan_Touchpad pointer-accel 0.5
# janelas
riverctl map normal Super BackSpace close
-riverctl map normal Super J focus-view previous
-riverctl map normal Super K focus-view next
+riverctl map normal Super Up focus-view previous
+riverctl map normal Super Down focus-view next
-riverctl map normal Super+Shift J swap next
-riverctl map normal Super+Shift K swap previous
+riverctl map normal Super+Shift Up swap next
+riverctl map normal Super+Shift Down swap previous
riverctl map normal Super m zoom
@@ -61,27 +68,9 @@ riverctl map normal Super+Shift Comma send-to-output previous
riverctl map normal Super H send-layout-cmd rivertile "main-ratio -0.05"
riverctl map normal Super L send-layout-cmd rivertile "main-ratio +0.05"
-riverctl map normal Super+Shift H send-layout-cmd rivertile "main-count +1"
-riverctl map normal Super+Shift L send-layout-cmd rivertile "main-count -1"
-
# janelas flutuantes
riverctl map normal Super+Shift Space toggle-float
-riverctl map normal Super+Alt H move left 100
-riverctl map normal Super+Alt J move down 100
-riverctl map normal Super+Alt K move up 100
-riverctl map normal Super+Alt L move right 100
-
-riverctl map normal Super+Alt+Control H snap left
-riverctl map normal Super+Alt+Control J snap down
-riverctl map normal Super+Alt+Control K snap up
-riverctl map normal Super+Alt+Control L snap right
-
-riverctl map normal Super+Alt+Shift H resize horizontal -100
-riverctl map normal Super+Alt+Shift J resize vertical 100
-riverctl map normal Super+Alt+Shift K resize vertical -100
-riverctl map normal Super+Alt+Shift L resize horizontal 100
-
riverctl map-pointer normal Super BTN_LEFT move-view
riverctl map-pointer normal Super BTN_RIGHT resize-view
riverctl map-pointer normal Super BTN_MIDDLE toggle-float
@@ -124,16 +113,16 @@ riverctl map passthrough Super F11 enter-mode normal
# not have a modifier
for mode in normal locked
do
- # Control pulse audio volume with pamixer (https://github.com/cdemoulins/pamixer)
- riverctl map $mode None XF86AudioMute spawn 'pamixer --toggle-mute'
- riverctl map $mode None XF86AudioRaiseVolume spawn 'pamixer -i 5'
- riverctl map $mode None XF86AudioLowerVolume spawn 'pamixer -d 5'
- riverctl map $mode None XF86AudioMicMute spawn 'pamixer --default-source --toggle-mute'
+ # Control pipewire volume
+ riverctl map $mode None XF86AudioMute spawn 'wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle'
+ riverctl map $mode None XF86AudioRaiseVolume spawn 'wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.05+'
+ riverctl map $mode None XF86AudioLowerVolume spawn 'wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.05-'
+ riverctl map $mode None XF86AudioMicMute spawn 'wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle'
- riverctl map $mode Shift F1 spawn 'pamixer --toggle-mute'
- riverctl map $mode Shift F2 spawn 'pamixer -d 5'
- riverctl map $mode Shift F3 spawn 'pamixer -i 5'
- riverctl map $mode Shift F4 spawn 'pamixer --default-source --toggle-mute'
+ riverctl map $mode Shift F1 spawn 'wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle'
+ riverctl map $mode Shift F2 spawn 'wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.05+'
+ riverctl map $mode Shift F3 spawn 'wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.05-'
+ riverctl map $mode Shift F4 spawn 'wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle'
# Control MPRIS aware media players with playerctl (https://github.com/altdesktop/playerctl)
riverctl map $mode None XF86AudioStop spawn 'playerctl stop'
@@ -154,8 +143,7 @@ do
done
# aplicativos
-riverctl map normal Super Return spawn 'foot tmux new -A -s shell'
-riverctl map normal Super+Control Return spawn 'foot tmux new -A -s padrao'
+riverctl map normal Super Return spawn 'foot tmux new -A -s padrao'
riverctl map normal Super+Shift Return spawn 'foot -a float_term'
riverctl map normal Super D spawn 'fuzzel'
@@ -173,4 +161,6 @@ riverctl map normal Super+Alt G spawn 'swaylock -f -i ~/imagens/wallpapers/wall.
riverctl map normal None Print spawn 'slurp | grim -g -'
riverctl map normal Shift Print spawn 'slurp | grim -g -'
-riverctl map normal None Print spawn 'slurp | grim -g -'
+riverctl map normal Alt Print spawn 'slurp | grim -g -'
+
+exec dbus-update-activation-environment DISPLAY I3SOCK SWAYSOCK WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=river