From cd06b1fa87b655d2466367ddf0bfe2c8d7cf3586 Mon Sep 17 00:00:00 2001 From: Derek Taylor Date: Sun, 20 Aug 2023 16:24:41 -0500 Subject: [PATCH] Minor edits --- .config/emacs/config.el | 2 ++ .config/emacs/config.org | 9 +++++++ .config/polybar/README.org | 54 ++++++++++++++++++------------------- .local/bin/dtos-colorscheme | 53 +++++++++++++++++++++++++++++------- 4 files changed, 81 insertions(+), 37 deletions(-) diff --git a/.config/emacs/config.el b/.config/emacs/config.el index 8181694..97dc55d 100644 --- a/.config/emacs/config.el +++ b/.config/emacs/config.el @@ -11,6 +11,8 @@ (use-package all-the-icons-dired :hook (dired-mode . (lambda () (all-the-icons-dired-mode t)))) +(global-auto-revert-mode t) + (setq backup-directory-alist '((".*" . "~/.Trash"))) (use-package company diff --git a/.config/emacs/config.org b/.config/emacs/config.org index 4d04f81..2a474b2 100644 --- a/.config/emacs/config.org +++ b/.config/emacs/config.org @@ -9,6 +9,7 @@ - [[#adding-the-scripts-directory-to-path][Adding the scripts directory to path]] - [[#sourcing-the-scripts][Sourcing the scripts]] - [[#all-the-icons][ALL THE ICONS]] +- [[#auto-revert-mode][AUTO REVERT MODE]] - [[#backup][BACKUP]] - [[#company][COMPANY]] - [[#dashboard][DASHBOARD]] @@ -79,6 +80,14 @@ This is an icon set that can be used with dashboard, dired, ibuffer and other Em :hook (dired-mode . (lambda () (all-the-icons-dired-mode t)))) #+end_src +* AUTO REVERT MODE +By default, Emacs does not automatically show the changes in a file that has been edited in a different program. So if you have =file1= open in Emacs, and then also edit =file1= via the command line or another text editor, the Emacs buffer does not reflect those changes. The following line corrects this problem. + +#+begin_src emacs-lisp +(global-auto-revert-mode t) + +#+end_src + * BACKUP By default, Emacs creates automatic backups of files in their original directories, such "file.el" and the backup "file.el~". This leads to a lot of clutter, so let's tell Emacs to put all backups that it creates in the =TRASH= directory. diff --git a/.config/polybar/README.org b/.config/polybar/README.org index 195f72e..02ff92d 100644 --- a/.config/polybar/README.org +++ b/.config/polybar/README.org @@ -69,25 +69,25 @@ format-offset = ; 9. SolarizedLight ; 10. TomorrowNight -background = ${DoomOne.background} -foreground = ${DoomOne.foreground} -color0 = ${DoomOne.color0} -color1 = ${DoomOne.color1} -color2 = ${DoomOne.color2} -color3 = ${DoomOne.color3} -color4 = ${DoomOne.color4} -color5 = ${DoomOne.color5} -color6 = ${DoomOne.color6} -color7 = ${DoomOne.color7} -color8 = ${DoomOne.color8} -color9 = ${DoomOne.color9} -color10 = ${DoomOne.color10} -color11 = ${DoomOne.color11} -color12 = ${DoomOne.color12} -color13 = ${DoomOne.color13} -color14 = ${DoomOne.color14} -color15 = ${DoomOne.color15} -alert = ${DoomOne.color1} +background = ${GruvboxDark.background} +foreground = ${GruvboxDark.foreground} +color0 = ${GruvboxDark.color0} +color1 = ${GruvboxDark.color1} +color2 = ${GruvboxDark.color2} +color3 = ${GruvboxDark.color3} +color4 = ${GruvboxDark.color4} +color5 = ${GruvboxDark.color5} +color6 = ${GruvboxDark.color6} +color7 = ${GruvboxDark.color7} +color8 = ${GruvboxDark.color8} +color9 = ${GruvboxDark.color9} +color10 = ${GruvboxDark.color10} +color11 = ${GruvboxDark.color11} +color12 = ${GruvboxDark.color12} +color13 = ${GruvboxDark.color13} +color14 = ${GruvboxDark.color14} +color15 = ${GruvboxDark.color15} +alert = ${GruvboxDark.color1} [DoomOne] background = #282c34 @@ -305,8 +305,8 @@ fixed-center = true bottom = false separator = -background = ${DoomOne.background} -foreground = ${DoomOne.foreground} +background = ${GruvboxDark.background} +foreground = ${GruvboxDark.foreground} line-size = 2 line-color = #f00 @@ -371,8 +371,8 @@ height = 20 ;offset-x = 1% ;offset-y = 1% -background = ${DoomOne.background} -foreground = ${DoomOne.foreground} +background = ${GruvboxDark.background} +foreground = ${GruvboxDark.foreground} ; Background gradient (vertical steps) ; background-[0-9]+ = #aarrggbb @@ -460,8 +460,8 @@ fixed-center = true bottom = false separator = -background = ${DoomOne.background} -foreground = ${DoomOne.foreground} +background = ${GruvboxDark.background} +foreground = ${GruvboxDark.foreground} line-size = 2 line-color = #f00 @@ -526,8 +526,8 @@ fixed-center = true bottom = false separator = -background = ${DoomOne.background} -foreground = ${DoomOne.foreground} +background = ${GruvboxDark.background} +foreground = ${GruvboxDark.foreground} line-size = 2 line-color = #f00 diff --git a/.local/bin/dtos-colorscheme b/.local/bin/dtos-colorscheme index 4a08f98..4e34e64 100755 --- a/.local/bin/dtos-colorscheme +++ b/.local/bin/dtos-colorscheme @@ -29,6 +29,48 @@ options=("DoomOne" choice=$(printf '%s\n' "${options[@]}" | ${DMENU} 'Choose color scheme:' "${@}") if [ "$choice" ]; then + ## QTILE ## + sed -i "s/^colors = colors.*/colors = colors.$choice/g" "$HOME"/.config/qtile/config.py || echo "Cannot find colors = colors." + 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" + + ## ALACRITTY ## + sed -i "s/^colors: .*/colors: \*$choice/g" "$HOME"/.config/alacritty/alacritty.yml || echo "Error setting Alacritty colors" + + ## EMACS ## + if [[ $choice = "DoomOne" ]]; then + 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." + elif [[ $choice = "Dracula" ]]; then + 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." + elif [[ $choice = "GruvboxDark" ]]; then + 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." + elif [[ $choice = "MonokaiPro" ]]; then + 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." + elif [[ $choice = "Nord" ]]; then + 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." + elif [[ $choice = "OceanicNext" ]]; then + 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." + elif [[ $choice = "Palenight" ]]; then + 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." + elif [[ $choice = "SolarizedDark" ]]; then + 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." + elif [[ $choice = "SolarizedLight" ]]; then + 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." + elif [[ $choice = "TomorrowNight" ]]; then + 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." + fi + ## 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" @@ -43,16 +85,6 @@ if [ "$choice" ]; then sed -i "s/^COLORSCHEME=.*/COLORSCHEME=\"$choice\"/g" "$HOME"/.config/bspwm/bspwmrc || echo "Cannot find bspwmrc" bspc wm -r || echo "Bswpm not running" - ## QTILE ## - sed -i "s/^colors = colors.*/colors = colors.$choice/g" "$HOME"/.config/qtile/config.py || echo "Cannot find colors = colors." - 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" - - ## ALACRITTY ## - sed -i "s/^colors: .*/colors: \*$choice/g" "$HOME"/.config/alacritty/alacritty.yml || echo "Error setting Alacritty colors" - - ## 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" \ @@ -67,6 +99,7 @@ if [ "$choice" ]; then -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" \