Compare commits
No commits in common. "231f438b6ba98ba323ed79aeacac816de500ac40" and "aa4a80360fee59392a4e0ae88d252d336a97ce7d" have entirely different histories.
231f438b6b
...
aa4a80360f
7 changed files with 73 additions and 164 deletions
|
|
@ -122,7 +122,7 @@
|
|||
;; (require-theme 'modus-themes)
|
||||
;; (setq modus-themes-italic-constructs t
|
||||
;; modus-themes-bold-constructs t
|
||||
;; modus-themes-links '(no-underline background faint)
|
||||
;; modus-themes-links '(no-underline background faint)
|
||||
;; modus-themes-prompts '(bold intense)
|
||||
;; modus-themes-mode-line '(borderless accented moody)
|
||||
;; modus-themes-org-blocks 'gray-background
|
||||
|
|
@ -139,22 +139,10 @@
|
|||
#+end_src
|
||||
*** Catpuccin
|
||||
#+begin_src emacs-lisp
|
||||
;; (use-package catppuccin-theme
|
||||
;; :init (setq catppuccin-flavor 'mocha)
|
||||
;; :config
|
||||
;; (load-theme 'catppuccin :no-confirm))
|
||||
#+end_src
|
||||
*** Doom-themes
|
||||
#+begin_src emacs-lisp
|
||||
(use-package doom-themes
|
||||
:config
|
||||
(load-theme 'doom-gruvbox t))
|
||||
#+end_src
|
||||
*** Solaire
|
||||
#+begin_src emacs-lisp
|
||||
(use-package solaire-mode
|
||||
:config
|
||||
(solaire-global-mode))
|
||||
(use-package catppuccin-theme
|
||||
:init (setq catppuccin-flavor 'mocha)
|
||||
:config
|
||||
(load-theme 'catppuccin :no-confirm))
|
||||
#+end_src
|
||||
** Ultra Scroll
|
||||
#+begin_src emacs-lisp
|
||||
|
|
@ -181,19 +169,6 @@
|
|||
("M-g w" . avy-goto-word-1)
|
||||
("M-g W" . avy-goto-word-0)))
|
||||
#+end_src
|
||||
** Inhibit Mouse
|
||||
I find I accidentally click with the trackpad on my laptop not infrequently, and basically never use it otherwise, so I might as well get rid of it.
|
||||
#+begin_src emacs-lisp
|
||||
(use-package inhibit-mouse
|
||||
:custom
|
||||
(inhibit-mouse-adjust-mouse-highlight t)
|
||||
(inhibit-mouse-adjust-show-help-function t)
|
||||
:config
|
||||
(if (daemonp)
|
||||
(add-hook 'server-after-make-frame-hook #'inhibit-mouse-mode)
|
||||
(inhibit-mouse-mode 1)))
|
||||
#+end_src
|
||||
|
||||
* Completion
|
||||
** Vertico
|
||||
#+begin_src emacs-lisp
|
||||
|
|
@ -334,8 +309,8 @@ I find I accidentally click with the trackpad on my laptop not infrequently, and
|
|||
("C-c l R" . eglot-restart-process)
|
||||
("C-c l e" . eglot-errors-at-point))
|
||||
(:map flymake-mode-map
|
||||
("M-n" . flymake-goto-next-error)
|
||||
("M-p" . flymake-goto-prev-error)))
|
||||
("M-n" . flymake-goto-next-error)
|
||||
("M-p" . flymake-goto-prev-error)))
|
||||
#+end_src
|
||||
** eldoc-box
|
||||
#+begin_src emacs-lisp
|
||||
|
|
@ -374,10 +349,6 @@ I don't really use markdown ([[Org Mode]] is a strict improvement imo), but it's
|
|||
#+begin_src emacs-lisp
|
||||
(use-package haskell-mode)
|
||||
#+end_src
|
||||
** SML
|
||||
#+begin_src emacs-lisp
|
||||
(use-package sml-mode)
|
||||
#+end_src
|
||||
* Latex
|
||||
** Auctex
|
||||
#+begin_src emacs-lisp
|
||||
|
|
@ -534,13 +505,13 @@ I use [[https://abode.karthinks.com/org-latex-preview/][this]] fork of org-mode
|
|||
** toki pona support
|
||||
#+begin_src emacs-lisp
|
||||
(with-eval-after-load 'ox
|
||||
(add-to-list 'org-export-dictionary
|
||||
(add-to-list 'org-export-dictionary
|
||||
'("Footnotes" ("tok" :default "toki anpa")))
|
||||
(add-to-list 'org-export-dictionary
|
||||
(add-to-list 'org-export-dictionary
|
||||
'("Author" ("tok" :default "jan toki")))
|
||||
(add-to-list 'org-export-dictionary
|
||||
(add-to-list 'org-export-dictionary
|
||||
'("Table of Contents" ("tok" :default "ni li lon lipu ni::")))
|
||||
(add-to-list 'org-export-dictionary
|
||||
(add-to-list 'org-export-dictionary
|
||||
'("Created" ("tok" :default "mi pali e ni lon tenpo"))))
|
||||
#+end_src
|
||||
** Prettify
|
||||
|
|
@ -562,44 +533,44 @@ I use [[https://abode.karthinks.com/org-latex-preview/][this]] fork of org-mode
|
|||
:base-extension "org"
|
||||
:recursive t
|
||||
:publishing-function org-html-publish-to-html
|
||||
:author "William Ball"
|
||||
:language "en"
|
||||
:author "William Ball"
|
||||
:language "en"
|
||||
:auto-sitemap t
|
||||
:sitemap-filename "archive.org"
|
||||
:sitemap-title "Archive"
|
||||
:sitemap-style list
|
||||
:sitemap-sort-files anti-chronologically
|
||||
:sitemap-sort-files anti-chronologically
|
||||
:html-head "<link rel=\"stylesheet\" href=\"/static/style.css\" type=\"text/css\"/><link rel=\"icon\" href=\"static/favicon.ico\"/>"
|
||||
:html-preamble t
|
||||
:html-preamble-format (("en" "<div class=\"blog-header\"><a href=\"archive.html\">Post Archive</a></div>")
|
||||
("tok" "<div class=\"blog-header\"><a href=\"archive.html\">toki ante</a></div>"))
|
||||
)
|
||||
("org-pages"
|
||||
:base-directory "~/repos/blog/pages/"
|
||||
:publishing-directory "/ssh:server:~/blog/"
|
||||
:base-extension "org"
|
||||
:recursive t
|
||||
:publishing-function org-html-publish-to-html
|
||||
:author "William Ball"
|
||||
:language "en"
|
||||
:html-head "<link rel=\"stylesheet\" href=\"/static/style.css\" type=\"text/css\"/><link rel=\"icon\" href\"static/favicon.ico\"/>"
|
||||
)
|
||||
("org-static"
|
||||
:base-directory "~/repos/blog/static/"
|
||||
:publishing-directory "/ssh:server:~/blog/static/"
|
||||
:base-extension "ico\\|ttf\\|css"
|
||||
:publishing-function org-publish-attachment
|
||||
:recursive t
|
||||
)
|
||||
("org-media"
|
||||
:base-directory "~/repos/blog/media/"
|
||||
:publishing-directory "/ssh:server:~/blog/media/"
|
||||
:base-extension "png\\|svg\\|pdf\\|mp4\\|mp3\\|ogg"
|
||||
:publishing-function org-publish-attachment
|
||||
:recursive t
|
||||
)
|
||||
("org" :components ("org-posts" "org-static" "org-media" "org-pages"))
|
||||
))
|
||||
("org-pages"
|
||||
:base-directory "~/repos/blog/pages/"
|
||||
:publishing-directory "/ssh:server:~/blog/"
|
||||
:base-extension "org"
|
||||
:recursive t
|
||||
:publishing-function org-html-publish-to-html
|
||||
:author "William Ball"
|
||||
:language "en"
|
||||
:html-head "<link rel=\"stylesheet\" href=\"/static/style.css\" type=\"text/css\"/><link rel=\"icon\" href\"static/favicon.ico\"/>"
|
||||
)
|
||||
("org-static"
|
||||
:base-directory "~/repos/blog/static/"
|
||||
:publishing-directory "/ssh:server:~/blog/static/"
|
||||
:base-extension "ico\\|ttf\\|css"
|
||||
:publishing-function org-publish-attachment
|
||||
:recursive t
|
||||
)
|
||||
("org-media"
|
||||
:base-directory "~/repos/blog/media/"
|
||||
:publishing-directory "/ssh:server:~/blog/media/"
|
||||
:base-extension "png\\|svg\\|pdf\\|mp4\\|mp3\\|ogg"
|
||||
:publishing-function org-publish-attachment
|
||||
:recursive t
|
||||
)
|
||||
("org" :components ("org-posts" "org-static" "org-media" "org-pages"))
|
||||
))
|
||||
|
||||
(use-package htmlize)
|
||||
#+end_src
|
||||
|
|
@ -684,7 +655,7 @@ I'm running into weird performance issues with =pdf-tools=. I think it has to do
|
|||
(interactive)
|
||||
(let* ((books-dir (expand-file-name "~/Nextcloud/Books/"))
|
||||
(files (directory-files-recursively books-dir "\\.pdf$\\|\\.epub$\\|\\.djvu$" nil))
|
||||
(relative-files (mapcar (lambda (f)
|
||||
(relative-files (mapcar (lambda (f)
|
||||
(string-remove-prefix books-dir f))
|
||||
files))
|
||||
(choice (completing-read "Book: " relative-files nil t)))
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
host = localhost
|
||||
port = 6600
|
||||
music-dir = /home/wball/Nextcloud/Music
|
||||
text-topic = Music
|
||||
text-play = Playing <b>%t</b>\nby <i>%a</i>\nfrom <i>%A</i>
|
||||
text-pause = Paused <b>%t</b>\nby <i>%a</i>\nfrom <i>%A</i>
|
||||
text-stop = Stopped playback
|
||||
timeout = 5
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
music_directory "~/Nextcloud/Music"
|
||||
playlist_directory "~/Nextcloud/Music/Playlists"
|
||||
|
||||
auto_update "yes"
|
||||
restore_paused "yes"
|
||||
|
||||
audio_output {
|
||||
type "pipewire"
|
||||
name "PipeWire output"
|
||||
}
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
case "$1" in
|
||||
--connect)
|
||||
notify-send 'bluetooth' 'Connecting to Headphones'
|
||||
bluetoothctl connect "88:C9:E8:D7:60:85"
|
||||
;;
|
||||
--disconnect)
|
||||
notify-send 'bluetooth' 'Disconnecting Headphones'
|
||||
bluetoothctl disconnect "88:C9:E8:D7:60:85"
|
||||
;;
|
||||
*)
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
|
@ -21,15 +21,16 @@ riverctl map normal $mod+Shift Return spawn $term
|
|||
riverctl map normal $mod R span "bemenu-run -p launch"
|
||||
riverctl map normal $mod Semicolon spawn "bemenu-run -p launch"
|
||||
riverctl map normal $mod+Shift P spawn "$config/power_mode.sh"
|
||||
# riverctl map normal $mod+Shift P spawn "passmenu -p password"
|
||||
riverctl map normal $mod BracketRight spawn "$browser"
|
||||
riverctl map normal $mod T spawn "$email"
|
||||
riverctl map normal $mod Z spawn "$books"
|
||||
riverctl map normal $mod Y spawn "$papers"
|
||||
riverctl map normal $mod E spawn "$emacs"
|
||||
riverctl map normal $mod+ctrl O spawn "swaylock"
|
||||
riverctl map normal $mod B spawn "$config/bluetooth.sh --connect"
|
||||
riverctl map normal $mod+Shift B spawn "$config/bluetooth.sh --disconnect"
|
||||
riverctl map normal $mod+ctrl S spawn "$config/screenshot.sh clip"
|
||||
riverctl map normal $mod+Control O spawn "swaylock"
|
||||
riverctl map normal $mod B spawn "bluetoothctl connect 88:C9:E8:D7:60:85"
|
||||
riverctl map normal $mod+Shift B spawn "bluetoothctl disconnect 88:C9:E8:D7:60:85"
|
||||
riverctl map normal $mod+Control S spawn "$config/screenshot.sh clip"
|
||||
riverctl map normal $mod+Shift E spawn "$config/screenshot.sh menu"
|
||||
|
||||
# Close windows & exit wm
|
||||
|
|
@ -63,10 +64,10 @@ riverctl map normal $mod+Alt J move down 100
|
|||
riverctl map normal $mod+Alt K move up 100
|
||||
riverctl map normal $mod+Alt L move right 100
|
||||
|
||||
riverctl map normal $mod+Alt+ctrl H snap left
|
||||
riverctl map normal $mod+Alt+ctrl J snap down
|
||||
riverctl map normal $mod+Alt+ctrl K snap up
|
||||
riverctl map normal $mod+Alt+ctrl L snap right
|
||||
riverctl map normal $mod+Alt+Control H snap left
|
||||
riverctl map normal $mod+Alt+Control J snap down
|
||||
riverctl map normal $mod+Alt+Control K snap up
|
||||
riverctl map normal $mod+Alt+Control L snap right
|
||||
|
||||
riverctl map normal $mod+Alt+Shift H resize horizontal -100
|
||||
riverctl map normal $mod+Alt+Shift J resize vertical 100
|
||||
|
|
@ -84,8 +85,8 @@ do
|
|||
|
||||
riverctl map normal $mod $i set-focused-tags $tags
|
||||
riverctl map normal $mod+Shift $i set-view-tags $tags
|
||||
riverctl map normal $mod+ctrl $i toggle-focused-tags $tags
|
||||
riverctl map normal $mod+Shift+ctrl $i toggle-view-tags $tags
|
||||
riverctl map normal $mod+Control $i toggle-focused-tags $tags
|
||||
riverctl map normal $mod+Shift+Control $i toggle-view-tags $tags
|
||||
done
|
||||
|
||||
all_tags=$(((1 << 32) - 1))
|
||||
|
|
@ -97,10 +98,10 @@ riverctl map normal $mod Space toggle-float
|
|||
riverctl map normal $mod F toggle-fullscreen
|
||||
|
||||
# change layout orientation
|
||||
riverctl map normal $mod+ctrl K send-layout-cmd rivertile "main-location top"
|
||||
riverctl map normal $mod+ctrl L send-layout-cmd rivertile "main-location right"
|
||||
riverctl map normal $mod+ctrl J send-layout-cmd rivertile "main-location bottom"
|
||||
riverctl map normal $mod+ctrl H send-layout-cmd rivertile "main-location left"
|
||||
riverctl map normal $mod+Control K send-layout-cmd rivertile "main-location top"
|
||||
riverctl map normal $mod+Control L send-layout-cmd rivertile "main-location right"
|
||||
riverctl map normal $mod+Control J send-layout-cmd rivertile "main-location bottom"
|
||||
riverctl map normal $mod+Control H send-layout-cmd rivertile "main-location left"
|
||||
|
||||
# passthrough mode
|
||||
riverctl declare-mode passthrough
|
||||
|
|
@ -112,12 +113,12 @@ for mode in normal locked
|
|||
do
|
||||
riverctl map $mode None XF86Eject spawn 'eject -T'
|
||||
|
||||
riverctl map $mode None XF86AudioRaiseVolume spawn "$config/volume.sh up 0.02"
|
||||
riverctl map $mode None XF86AudioLowerVolume spawn "$config/volume.sh down 0.02"
|
||||
riverctl map $mode Shift XF86AudioRaiseVolume spawn "$config/volume.sh up 0.01"
|
||||
riverctl map $mode Shift XF86AudioLowerVolume spawn "$config/volume.sh down 0.01"
|
||||
riverctl map $mode ctrl XF86AudioRaiseVolume spawn "$config/volume.sh up 0.10"
|
||||
riverctl map $mode ctrl XF86AudioLowerVolume spawn "$config/volume.sh down 0.10"
|
||||
riverctl map $mode None XF86AudioRaiseVolume spawn "~/.config/river/volume.sh up 0.02"
|
||||
riverctl map $mode None XF86AudioLowerVolume spawn "~/.config/river/volume.sh down 0.02"
|
||||
riverctl map $mode Shift XF86AudioRaiseVolume spawn "~/.config/river/volume.sh up 0.01"
|
||||
riverctl map $mode Shift XF86AudioLowerVolume spawn "~/.config/river/volume.sh down 0.01"
|
||||
riverctl map $mode Control XF86AudioRaiseVolume spawn "~/.config/river/volume.sh up 0.10"
|
||||
riverctl map $mode Control XF86AudioLowerVolume spawn "~/.config/river/volume.sh down 0.10"
|
||||
riverctl map $mode None XF86AudioMute exec spawn "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
|
||||
|
||||
riverctl map $mode None XF86AudioMedia spawn 'playerctl play-pause'
|
||||
|
|
@ -130,7 +131,7 @@ do
|
|||
done
|
||||
|
||||
# "caffeine"
|
||||
riverctl map normal $mod+ctrl C spawn "$config/toggle_caffeine.sh"
|
||||
riverctl map normal $mod+Control C spawn "$HOME/.config/river/toggle_caffeine.sh"
|
||||
|
||||
# colors
|
||||
riverctl background-color 0x1e1e2e
|
||||
|
|
@ -165,18 +166,22 @@ riverctl float-filter-add app-id blueman-manager
|
|||
scratch_tag=$((1 << 20))
|
||||
riverctl map normal $mod Slash toggle-focused-tags $scratch_tag
|
||||
riverctl map normal $mod+Shift Slash set-view-tags $scratch_tag
|
||||
riverctl map normal $mod+ctrl Slash toggle-view-tags $scratch_tag
|
||||
riverctl map normal $mod+Control Slash toggle-view-tags $scratch_tag
|
||||
riverctl map normal $mod S spawn "$term_float"
|
||||
riverctl rule-add -app-id float float
|
||||
|
||||
# SSD (so GTK apps show border)
|
||||
riverctl rule-add -app-id firefox ssd
|
||||
riverctl rule-add -app-id librewolf ssd
|
||||
riverctl rule-add -app-id thunderbird ssd
|
||||
riverctl rule-add -app-id betterbird ssd
|
||||
riverctl rule-add -app-id emacs ssd
|
||||
riverctl rule-add -app-id gnucash ssd
|
||||
riverctl rule-add -app-id pcmanfm ssd
|
||||
riverctl rule-add -app-id steam ssd
|
||||
riverctl rule-add -app-id drracket ssd
|
||||
riverctl rule-add -app-id org.pwmt.zathura ssd
|
||||
riverctl rule-add -app-id org.gnome.Boxes ssd
|
||||
riverctl rule-add -app-id com.github.xournalpp.xournalpp ssd
|
||||
|
||||
# spawn stuff
|
||||
|
|
@ -202,18 +207,14 @@ emacs --daemon &
|
|||
nextcloud &
|
||||
|
||||
# pianobar
|
||||
# riverctl map normal $mod+Shift S spawn '~/.config/pianobar/change_station.sh'
|
||||
# riverctl map normal $mod P spawn 'echo "p" > ~/.config/pianobar/ctl'
|
||||
# riverctl map normal $mod N spawn 'echo "n" > ~/.config/pianobar/ctl'
|
||||
# riverctl map normal $mod C spawn '~/.config/pianobar/display_info.sh'
|
||||
riverctl map normal $mod P spawn 'mpc toggle'
|
||||
riverctl map normal $mod+Shift S spawn "$config/music_command.sh --playlist"
|
||||
riverctl map normal $mod+ctrl S spawn "$config/music_command.sh --song"
|
||||
riverctl map normal $mod N spawn 'mpc next'
|
||||
riverctl map normal $mod+Shift S spawn '~/.config/pianobar/change_station.sh'
|
||||
riverctl map normal $mod P spawn 'echo "p" > ~/.config/pianobar/ctl'
|
||||
riverctl map normal $mod C spawn '~/.config/pianobar/display_info.sh'
|
||||
riverctl map normal $mod N spawn 'echo "n" > ~/.config/pianobar/ctl'
|
||||
|
||||
# swayidle
|
||||
pgrep swayidle || swayidle -w \
|
||||
timeout 300 "$config/timeout.sh" \
|
||||
timeout 300 '$HOME/.config/river/timeout.sh' \
|
||||
before-sleep 'swaylock -f -c 000000' &
|
||||
|
||||
# gnome-keyring (needed for nextcloud to remember login)
|
||||
|
|
|
|||
|
|
@ -1,29 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
dmenu="bemenu -p playlist --center --list 20 down --width-factor 0.5 --border 2 --bdr #f6c2e7"
|
||||
|
||||
case "$1" in
|
||||
--playlist)
|
||||
choice=$(mpc lsplaylists | $dmenu)
|
||||
|
||||
if [[ -n $choice ]]; then
|
||||
mpc clear
|
||||
mpc load $choice
|
||||
mpc shuffle
|
||||
mpc next
|
||||
mpc play
|
||||
fi
|
||||
;;
|
||||
--song)
|
||||
choice=$(mpc listall | $dmenu)
|
||||
echo $choice
|
||||
|
||||
if [[ -n $choice ]]; then
|
||||
mpc add "$choice"
|
||||
mpc searchplay "$choice"
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
|
@ -10,7 +10,6 @@ export BEMENU_OPTS='--ignorecase --fb "#1e1e2e" --ff "#cdd6f4" --nb "#1e1e2e" --
|
|||
export XDG_CACHE_HOME="$HOME/.cache"
|
||||
export XDG_CONFIG_HOME="$HOME/.config"
|
||||
export XDG_DATA_HOME="$HOME/.local/share"
|
||||
export XDG_MUSIC_DIR="$HOME/Nextcloud/Music"
|
||||
|
||||
# General environment variables
|
||||
export EDITOR=nvim
|
||||
|
|
|
|||
Loading…
Reference in a new issue