From 2c900ca526e0a3228aa00bb48b02fae9a019def7 Mon Sep 17 00:00:00 2001 From: Derek Taylor Date: Mon, 21 Apr 2025 20:03:33 -0500 Subject: [PATCH] Minor edits. --- .config/emacs/config.el | 16 ++--- .config/emacs/config.org | 3 +- .config/emacs/scripts/elpaca-setup.el | 2 +- .local/bin/dtos-colorscheme | 100 ++++++-------------------- 4 files changed, 31 insertions(+), 90 deletions(-) diff --git a/.config/emacs/config.el b/.config/emacs/config.el index bd7ee80..9703240 100644 --- a/.config/emacs/config.el +++ b/.config/emacs/config.el @@ -576,14 +576,14 @@ (eval-after-load 'org-indent '(diminish 'org-indent-mode)) -(custom-set-faces - '(org-level-1 ((t (:inherit outline-1 :height 1.7)))) - '(org-level-2 ((t (:inherit outline-2 :height 1.6)))) - '(org-level-3 ((t (:inherit outline-3 :height 1.5)))) - '(org-level-4 ((t (:inherit outline-4 :height 1.4)))) - '(org-level-5 ((t (:inherit outline-5 :height 1.3)))) - '(org-level-6 ((t (:inherit outline-5 :height 1.2)))) - '(org-level-7 ((t (:inherit outline-5 :height 1.1))))) + (custom-set-faces + '(org-level-1 ((t (:inherit outline-1 :height 1.7)))) + '(org-level-2 ((t (:inherit outline-2 :height 1.6)))) + '(org-level-3 ((t (:inherit outline-3 :height 1.5)))) + '(org-level-4 ((t (:inherit outline-4 :height 1.4)))) + '(org-level-5 ((t (:inherit outline-5 :height 1.3)))) + '(org-level-6 ((t (:inherit outline-5 :height 1.2)))) + '(org-level-7 ((t (:inherit outline-5 :height 1.1))))) (require 'org-tempo) diff --git a/.config/emacs/config.org b/.config/emacs/config.org index 25dfe24..0c0c50b 100644 --- a/.config/emacs/config.org +++ b/.config/emacs/config.org @@ -388,7 +388,8 @@ Defining the various fonts that Emacs will use. #+end_src ** Zooming In/Out -You can use the bindings CTRL plus =/- for zooming in/out. You can also use CTRL plus the mouse wheel for zooming in/out. +You can use the bindings CTRL plus =/- for zooming in/out. You can also use CTRL plus the +mouse wheel for zooming in/out. #+begin_src emacs-lisp (global-set-key (kbd "C-=") 'text-scale-increase) diff --git a/.config/emacs/scripts/elpaca-setup.el b/.config/emacs/scripts/elpaca-setup.el index 3066abc..6c5e8af 100644 --- a/.config/emacs/scripts/elpaca-setup.el +++ b/.config/emacs/scripts/elpaca-setup.el @@ -1,7 +1,7 @@ ;;; Code: -(defvar elpaca-installer-version 0.10) +(defvar elpaca-installer-version 0.11) (defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory)) (defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory)) (defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory)) diff --git a/.local/bin/dtos-colorscheme b/.local/bin/dtos-colorscheme index 94db930..a7c036c 100755 --- a/.local/bin/dtos-colorscheme +++ b/.local/bin/dtos-colorscheme @@ -15,74 +15,74 @@ set -euo pipefail # shellcheck disable=SC1091 source "$HOME/.config/dmscripts/config" -options=("DoomOne" -"Dracula" -"GruvboxDark" -"MonokaiPro" -"Nord" -"OceanicNext" -"Palenight" -"SolarizedDark" -"SolarizedLight" -"TomorrowNight") +options=("doom-one" + "dracula" + "gruvbox-dark" + "monokai-pro" + "nord" + "oceanic-next" + "palenight" + "solarized-dark" + "solarized-light" + "tomorrow-night") choice=$(printf '%s\n' "${options[@]}" | ${DMENU} 'Choose color scheme:' "${@}") -if [[ $choice = "DoomOne" ]]; then +if [[ $choice = "doom-one" ]]; then ## EMACS ## sed -i "s/load-theme '.*/load-theme 'doom-one t)/g" "$HOME"/.config/emacs/config.org || echo "Cannot find config.org." emacsclient -e "(load-theme 'doom-one t)" || echo "Emacsclient not running." ## ALACRITTY ## sed -i "s/^colors: .*/colors: \*$choice/g" "$HOME"/.config/alacritty/alacritty.yml || echo "Error setting Alacritty colors" -elif [[ $choice = "Dracula" ]]; then +elif [[ $choice = "dracula" ]]; then ## EMACS ## sed -i "s/load-theme '.*/load-theme 'doom-dracula t)/g" "$HOME"/.config/emacs/config.org || echo "Cannot find config.org." emacsclient -e "(load-theme 'doom-dracula t)" || echo "Emacsclient not running." ## ALACRITTY ## sed -i "s/^colors: .*/colors: \*$choice/g" "$HOME"/.config/alacritty/alacritty.yml || echo "Error setting Alacritty colors" -elif [[ $choice = "GruvboxDark" ]]; then +elif [[ $choice = "gruvbox-dark" ]]; then ## EMACS ## sed -i "s/load-theme '.*/load-theme 'doom-gruvbox t)/g" "$HOME"/.config/emacs/config.org || echo "Cannot find config.org." emacsclient -e "(load-theme 'doom-gruvbox t)" || echo "Emacsclient not running." ## ALACRITTY ## sed -i "s/^colors: .*/colors: \*$choice/g" "$HOME"/.config/alacritty/alacritty.yml || echo "Error setting Alacritty colors" -elif [[ $choice = "MonokaiPro" ]]; then +elif [[ $choice = "monokai-pro" ]]; then ## EMACS ## sed -i "s/load-theme '.*/load-theme 'doom-monokai-pro t)/g" "$HOME"/.config/emacs/config.org || echo "Cannot find config.org." emacsclient -e "(load-theme 'doom-monokai-pro t)" || echo "Emacsclient not running." ## ALACRITTY ## sed -i "s/^colors: .*/colors: \*$choice/g" "$HOME"/.config/alacritty/alacritty.yml || echo "Error setting Alacritty colors" -elif [[ $choice = "Nord" ]]; then +elif [[ $choice = "nord" ]]; then ## EMACS ## sed -i "s/load-theme '.*/load-theme 'doom-nord t)/g" "$HOME"/.config/emacs/config.org || echo "Cannot find config.org." emacsclient -e "(load-theme 'doom-nord t)" || echo "Emacsclient not running." ## ALACRITTY ## sed -i "s/^colors: .*/colors: \*$choice/g" "$HOME"/.config/alacritty/alacritty.yml || echo "Error setting Alacritty colors" -elif [[ $choice = "OceanicNext" ]]; then +elif [[ $choice = "oceanic-next" ]]; then ## EMACS ## sed -i "s/load-theme '.*/load-theme 'doom-oceanic-next t)/g" "$HOME"/.config/emacs/config.org || echo "Cannot find config.org." emacsclient -e "(load-theme 'doom-oceanic-next t)" || echo "Emacsclient not running." ## ALACRITTY ## sed -i "s/^colors: .*/colors: \*$choice/g" "$HOME"/.config/alacritty/alacritty.yml || echo "Error setting Alacritty colors" -elif [[ $choice = "Palenight" ]]; then +elif [[ $choice = "palenight" ]]; then ## EMACS ## sed -i "s/load-theme '.*/load-theme 'doom-palenight t)/g" "$HOME"/.config/emacs/config.org || echo "Cannot find config.org." emacsclient -e "(load-theme 'doom-palenight t)" || echo "Emacsclient not running." ## ALACRITTY ## sed -i "s/^colors: .*/colors: \*$choice/g" "$HOME"/.config/alacritty/alacritty.yml || echo "Error setting Alacritty colors" -elif [[ $choice = "SolarizedDark" ]]; then +elif [[ $choice = "solarized-dark" ]]; then ## EMACS ## sed -i "s/load-theme '.*/load-theme 'doom-solarized-dark t)/g" "$HOME"/.config/emacs/config.org || echo "Cannot find config.org." emacsclient -e "(load-theme 'doom-solarized-dark t)" || echo "Emacsclient not running." ## ALACRITTY ## sed -i "s/^colors: .*/colors: \*$choice/g" "$HOME"/.config/alacritty/alacritty.yml || echo "Error setting Alacritty colors" -elif [[ $choice = "SolarizedLight" ]]; then +elif [[ $choice = "solarized-light" ]]; then ## EMACS ## sed -i "s/load-theme '.*/load-theme 'doom-solarized-light t)/g" "$HOME"/.config/emacs/config.org || echo "Cannot find config.org." emacsclient -e "(load-theme 'doom-solarized-light t)" || echo "Emacsclient not running." ## ALACRITTY ## sed -i "s/^colors: .*/colors: \*$choice/g" "$HOME"/.config/alacritty/alacritty.yml || echo "Error setting Alacritty colors" -elif [[ $choice = "TomorrowNight" ]]; then +elif [[ $choice = "tomorrow-night" ]]; then ## EMACS ## sed -i "s/load-theme '.*/load-theme 'doom-tomorrow-night t)/g" "$HOME"/.config/emacs/config.org || echo "Cannot find config.org." emacsclient -e "(load-theme 'doom-tomorrow-night t)" || echo "Emacsclient not running." @@ -96,64 +96,4 @@ if [ "$choice" ]; then sed -i "s/^colors=colors.*/colors = colors.$choice/g" "$HOME"/.config/qtile/config.py || echo "Cannot find colors=colors." sed -i "s/^COLORSCHEME=.*/COLORSCHEME=$choice/g" "$HOME"/.config/qtile/autostart.sh || echo "Cannot find COLORSCHEME." qtile cmd-obj -o cmd -f restart && $HOME/.config/qtile/autostart.sh || echo "Qtile not running" - - ## XMONAD ## - sed -i "s/import Colors.*/import Colors.$choice/g" "$HOME"/.config/xmonad/README.org || echo "Cannot modify README.org" - sed -i "s/import Colors.*/import Colors.$choice/g" "$HOME"/.config/xmonad/xmonad.hs || echo "Cannot modify xmonad.hs" - xmonad --restart || echo "Xmonad not running" - - ## AWESOME ## - sed -i "s/^local colorscheme = .*/local colorscheme = \"$choice\"/g" "$HOME"/.config/awesome/README.org || echo "Cannot find awesome README.org" - sed -i "s/^local colorscheme = .*/local colorscheme = \"$choice\"/g" "$HOME"/.config/awesome/rc.lua || echo "Cannot find awesome rc.lua" - echo 'awesome.restart()' | awesome-client || echo "Awesome not running" - - ## BSPWM ## - sed -i "s/^COLORSCHEME=.*/COLORSCHEME=\"$choice\"/g" "$HOME"/.config/bspwm/bspwmrc || echo "Cannot find bspwmrc" - bspc wm -r || echo "Bswpm not running" - - ## POLYBAR (Do not remove the spacing in these sed commands!!!) - sed -i -e "s/^background .*background/background = \${$choice.background/g" \ - -e "s/^foreground .*foreground/foreground = \${$choice.foreground/g" \ - -e "s/color0 .*color0/color0 = \${$choice.color0/g" \ - -e "s/color1 .*color1/color1 = \${$choice.color1/g" \ - -e "s/color2 .*color2/color2 = \${$choice.color2/g" \ - -e "s/color3 .*color3/color3 = \${$choice.color3/g" \ - -e "s/color4 .*color4/color4 = \${$choice.color4/g" \ - -e "s/color5 .*color5/color5 = \${$choice.color5/g" \ - -e "s/color6 .*color6/color6 = \${$choice.color6/g" \ - -e "s/color7 .*color7/color7 = \${$choice.color7/g" \ - -e "s/color8 .*color8/color8 = \${$choice.color8/g" \ - -e "s/color9 .*color9/color9 = \${$choice.color9/g" \ - -e "s/color10.*color10/color10 = \${$choice.color10/g" \ - sed -i "s/load-theme \'.*/load-theme \'$choice t)/g" "$HOME"/.config/emacs/config.org || echo "Cannot find config.org." \ - -e "s/color11.*color11/color11 = \${$choice.color11/g" \ - -e "s/color12.*color12/color12 = \${$choice.color12/g" \ - -e "s/color13.*color13/color13 = \${$choice.color13/g" \ - -e "s/color14.*color14/color14 = \${$choice.color14/g" \ - -e "s/color15.*color15/color15 = \${$choice.color15/g" \ - -e "s/^alert.*/alert = \${$choice.color1}/g" "$HOME"/.config/polybar/README.org || echo "Cannot find polybar README.org" - - sed -i -e "s/^background .*background/background = \${$choice.background/g" \ - -e "s/^foreground .*foreground/foreground = \${$choice.foreground/g" \ - -e "s/color0 .*color0/color0 = \${$choice.color0/g" \ - -e "s/color1 .*color1/color1 = \${$choice.color1/g" \ - -e "s/color2 .*color2/color2 = \${$choice.color2/g" \ - -e "s/color3 .*color3/color3 = \${$choice.color3/g" \ - -e "s/color4 .*color4/color4 = \${$choice.color4/g" \ - -e "s/color5 .*color5/color5 = \${$choice.color5/g" \ - -e "s/color6 .*color6/color6 = \${$choice.color6/g" \ - -e "s/color7 .*color7/color7 = \${$choice.color7/g" \ - -e "s/color8 .*color8/color8 = \${$choice.color8/g" \ - -e "s/color9 .*color9/color9 = \${$choice.color9/g" \ - -e "s/color10.*color10/color10 = \${$choice.color10/g" \ - -e "s/color11.*color11/color11 = \${$choice.color11/g" \ - -e "s/color12.*color12/color12 = \${$choice.color12/g" \ - -e "s/color13.*color13/color13 = \${$choice.color13/g" \ - -e "s/color14.*color14/color14 = \${$choice.color14/g" \ - -e "s/color15.*color15/color15 = \${$choice.color15/g" \ - -e "s/^alert.*/alert = \${$choice.color1}/g" "$HOME"/.config/polybar/config.ini || echo cannot find polybar config.ini - -# What to do if we just escape without choosing anything. -else - echo "Program terminated." && exit 0 fi