From 958974dc29c309c135b0f55ba2ac5d419af76a5c Mon Sep 17 00:00:00 2001 From: Aryadev Chavali Date: Thu, 11 Dec 2025 23:17:29 +0000 Subject: [PATCH] Minor adjustments --- Emacs/.config/emacs/config.org | 26 ++++++++++--------- Emacs/.config/emacs/elisp/better-mode-line.el | 7 ++--- Emacs/.config/emacs/elisp/eshell-additions.el | 5 ++-- NeoVim/.config/nvim/lazy-lock.json | 2 +- SXHkD/.config/sxhkd/sxhkdrc | 2 +- Scripts/.local/scripts/eselect | 10 +++---- Shell/.zshrc | 6 ++++- XServer/.xprofile | 3 +-- aspell/.aspell.en.pws | 3 ++- mpv/.config/mpv/input.conf | 1 + 10 files changed, 34 insertions(+), 31 deletions(-) diff --git a/Emacs/.config/emacs/config.org b/Emacs/.config/emacs/config.org index 23b8fe2..5f8b938 100644 --- a/Emacs/.config/emacs/config.org +++ b/Emacs/.config/emacs/config.org @@ -1567,6 +1567,7 @@ from the remote server. notmuch-hello-insert-alltags notmuch-hello-insert-recent-searches) notmuch-archive-tags '("-inbox" "-unread" "+archive") + notmuch-always-prompt-for-sender t message-auto-save-directory +mail/local-dir message-directory +mail/local-dir) :config @@ -3645,13 +3646,7 @@ book so it's useful to have some Emacs binds for it. "sr" #'racket-send-region "sd" #'racket-send-definition)) #+end_src -** WAIT Haskell -:PROPERTIES: -:header-args:emacs-lisp: :tangle no :results none -:END: -2025-02-15: Haskell is a fun language so I'll leave this configuration -for now. - +** Haskell Haskell is a static lazy functional programming language (what a mouthful). It's quite a beautiful language and really learning it will change the way you think about programming. However, my @@ -4064,11 +4059,14 @@ IDE I have used is as capable in aiding development as Emacs + Sly. (display-buffer-at-bottom) (window-height . 0.25)) ("\\*sly-mrepl" - (display-buffer-in-side-window) - (window-height . 0.25) - (side . bottom)) + (display-buffer-at-bottom) + (window-height . 0.25)) + ("\\*sly-description" + (display-buffer-at-bottom) + (window-height . 0.25)) :config (evil-set-initial-state 'sly-db-mode 'normal) + (evil-set-initial-state 'sly-desc-mode 'normal) (with-eval-after-load "org" (setq-default org-babel-lisp-eval-fn #'sly-eval)) (with-eval-after-load "company" @@ -4674,9 +4672,13 @@ itself. The only feature left is describing changes... :general (leader "u" #'undo-tree-visualize) - (mmap + (nmmap :keymaps 'undo-tree-visualizer-mode-map - "t" #'undo-tree-visualizer-toggle-timestamps) + "t" #'undo-tree-visualizer-toggle-timestamps + "j" #'undo-tree-visualize-redo + "k" #'undo-tree-visualize-undo + "l" #'undo-tree-visualize-switch-branch-right + "h" #'undo-tree-visualize-switch-branch-left) :init (setq undo-tree-auto-save-history t undo-tree-history-directory-alist backup-directory-alist) diff --git a/Emacs/.config/emacs/elisp/better-mode-line.el b/Emacs/.config/emacs/elisp/better-mode-line.el index 2776005..31281ee 100644 --- a/Emacs/.config/emacs/elisp/better-mode-line.el +++ b/Emacs/.config/emacs/elisp/better-mode-line.el @@ -47,16 +47,13 @@ extreme end to CENTRE-SEGMENT." (width (if (null (car margins)) win-width (+ (car margins) win-width (cdr margins))))) - (- (floor (/ width 2)) (floor (/ centre-size 2)) other-size))) + (floor (- (/ width 2) (/ centre-size 2) other-size)))) (defun bml/--generate-padding (segment) "Make padding string to separate center segment from SEGMENT." (let* ((segment-size (length (format-mode-line segment))) (padding-size (bml/--get-padding-size segment-size))) - (make-string (if (< padding-size bml/--minimum-padding) - bml/--minimum-padding - padding-size) - ?\s))) + (make-string (min padding-size bml/--minimum-padding) ?\s))) (defun bml/setup-mode-line () "Call this to setup the mode-line when: diff --git a/Emacs/.config/emacs/elisp/eshell-additions.el b/Emacs/.config/emacs/elisp/eshell-additions.el index 6089ff8..479a19b 100644 --- a/Emacs/.config/emacs/elisp/eshell-additions.el +++ b/Emacs/.config/emacs/elisp/eshell-additions.el @@ -77,11 +77,10 @@ Uses tramp to figure out if we're in sudo mode or not. " ;; +eshell/open and +eshell/at-cwd (defun +eshell/--current-instances () - (cl-loop for buffer being the buffers + (cl-loop for buffer in (buffer-list) if (with-current-buffer buffer (eq major-mode 'eshell-mode)) - collect - (cons (buffer-name buffer) buffer))) + collect (cons (buffer-name buffer) buffer))) (defun +eshell/--choose-instance () (let* ((current-instances (+eshell/--current-instances)) diff --git a/NeoVim/.config/nvim/lazy-lock.json b/NeoVim/.config/nvim/lazy-lock.json index f34a4a5..76468a7 100644 --- a/NeoVim/.config/nvim/lazy-lock.json +++ b/NeoVim/.config/nvim/lazy-lock.json @@ -2,6 +2,6 @@ "NeoSolarized": { "branch": "master", "commit": "b94b1a9ad51e2de015266f10fdc6e142f97bd617" }, "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "telescope.nvim": { "branch": "master", "commit": "3a12a853ebf21ec1cce9a92290e3013f8ae75f02" }, + "telescope.nvim": { "branch": "master", "commit": "e69b434b968a33815e2f02a5c7bd7b8dd4c7d4b2" }, "vim-tmux-navigator": { "branch": "master", "commit": "c45243dc1f32ac6bcf6068e5300f3b2b237e576a" } } diff --git a/SXHkD/.config/sxhkd/sxhkdrc b/SXHkD/.config/sxhkd/sxhkdrc index da51ba7..8eeaf7d 100644 --- a/SXHkD/.config/sxhkd/sxhkdrc +++ b/SXHkD/.config/sxhkd/sxhkdrc @@ -10,7 +10,7 @@ super + e $HOME/.local/scripts/eselect; super + E - notify-send -u low "Launching basic"; \ + notify-send -u low "Launching everything"; \ $HOME/.local/scripts/spawn_everything; super + s diff --git a/Scripts/.local/scripts/eselect b/Scripts/.local/scripts/eselect index 1969947..0d794a8 100755 --- a/Scripts/.local/scripts/eselect +++ b/Scripts/.local/scripts/eselect @@ -3,22 +3,22 @@ case "$(printf "new\nstop\nrestart\neshell\nmail" | dmenu -p "eserver: ")" in "restart") emacsclient --eval "(save-buffers-kill-emacs)" && \ - suctl restart emacs && \ + systemctl --user restart emacs && \ notify-send "eselect: Restarted server";; "stop") emacsclient --eval "(save-buffers-kill-emacs)" && \ - suctl stop emacs && \ + systemctl --user stop emacs && \ notify-send "eselect: Halted server";; "new") notify-send "eselect: Launching Emacs" && \ - suctl start emacs && \ + systemctl --user start emacs && \ emacsclient -c -a "emacs";; "eshell") notify-send "eselect: Launching Eshell" && \ - suctl start emacs && \ + systemctl --user start emacs && \ emacsclient -c -a "emacs" --eval "(progn (eshell) (delete-other-windows))";; "mail") notify-send "eselect: Launching notmuch" && \ - suctl start emacs && \ + systemctl --user start emacs && \ emacsclient -c -a "emacs" --eval "(progn (notmuch) (delete-other-windows))";; esac diff --git a/Shell/.zshrc b/Shell/.zshrc index ae3dadc..9d96e37 100644 --- a/Shell/.zshrc +++ b/Shell/.zshrc @@ -126,12 +126,16 @@ export NVM_DIR="$HOME/.nvm" export SDKMAN_DIR="/home/oreo/.sdkman" [[ -s "/home/oreo/.sdkman/bin/sdkman-init.sh" ]] && source "/home/oreo/.sdkman/bin/sdkman-init.sh" +## opam if command -v opam 2>&1 >/dev/null then eval $(opam env) fi -[ -f "/home/oreo/.ghcup/env" ] && . "/home/oreo/.ghcup/env" # ghcup-env +## pyenv export PYENV_ROOT="$HOME/.pyenv" [[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH" eval "$(pyenv init - zsh)" + +## ghcup +[ -f "/home/oreo/.ghcup/env" ] && . "/home/oreo/.ghcup/env" # ghcup-env diff --git a/XServer/.xprofile b/XServer/.xprofile index cb7ae98..d04341d 100644 --- a/XServer/.xprofile +++ b/XServer/.xprofile @@ -1,4 +1,3 @@ #!/usr/bin/env sh -setxkbmap gb -option shift:both_capslock -option caps:escape; -# xmodmap ~/.Xmodmap; +setxkbmap gb -option shift:both_capslock; [ -f ~/.Xresources ] && xrdb -merge -I$HOME ~/.Xresources; diff --git a/aspell/.aspell.en.pws b/aspell/.aspell.en.pws index 51e1dc0..9408e28 100644 --- a/aspell/.aspell.en.pws +++ b/aspell/.aspell.en.pws @@ -1,4 +1,4 @@ -personal_ws-1.1 en 189 +personal_ws-1.1 en 190 Architecting Aryadev Automorphism @@ -58,6 +58,7 @@ bijection bijections bijective bilinear +bitwise booleans bytecode cardinality diff --git a/mpv/.config/mpv/input.conf b/mpv/.config/mpv/input.conf index c9bc675..2e57f77 100644 --- a/mpv/.config/mpv/input.conf +++ b/mpv/.config/mpv/input.conf @@ -40,6 +40,7 @@ L seek 30 q quit-watch-later Q quit O script-binding osc/visibility # cycle OSC visibility between never, auto (mouse-move) and always +Ctrl+l cycle-values loop-file "inf" "no" #MBTN_LEFT ignore # don't do anything