From e45fbcdaa26b73c853ef867763e324de76002b9b Mon Sep 17 00:00:00 2001 From: Derek Taylor Date: Mon, 4 Sep 2023 11:47:25 -0500 Subject: [PATCH 1/2] Minor edits --- .config/bspwm/bspwmrc | 2 +- .config/emacs/config.el | 32 +++++++++++++++------- .config/emacs/config.org | 33 ++++++++++++++++------- .config/polybar/config.ini | 54 +++++++++++++++++++------------------- .config/xmonad/xmonad.hs | 2 +- 5 files changed, 74 insertions(+), 49 deletions(-) diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc index 05a1451..005a365 100755 --- a/.config/bspwm/bspwmrc +++ b/.config/bspwm/bspwmrc @@ -10,7 +10,7 @@ # https://github.com/baskerville/bspwm #### VARIABLES #### -COLORSCHEME="MonokaiPro" +COLORSCHEME="DoomOne" #### AUTOSTART #### sxhkd & diff --git a/.config/emacs/config.el b/.config/emacs/config.el index bca8f33..84109e2 100644 --- a/.config/emacs/config.el +++ b/.config/emacs/config.el @@ -109,16 +109,27 @@ evil-split-window-below t evil-undo-system 'undo-redo) ;; Adds vim-like C-r redo functionality (evil-mode)) - (use-package evil-collection - :after evil - :config - ;; Do not uncomment this unless you want to specify each and every mode - ;; that evil-collection should works with. The following line is here - ;; for documentation purposes in case you need it. - ;; (setq evil-collection-mode-list '(calendar dashboard dired ediff info magit ibuffer)) - (add-to-list 'evil-collection-mode-list 'help) ;; evilify help mode - (evil-collection-init)) - (use-package evil-tutor) + +(use-package evil-collection + :after evil + :config + ;; Do not uncomment this unless you want to specify each and every mode + ;; that evil-collection should works with. The following line is here + ;; for documentation purposes in case you need it. + ;; (setq evil-collection-mode-list '(calendar dashboard dired ediff info magit ibuffer)) + (add-to-list 'evil-collection-mode-list 'help) ;; evilify help mode + (evil-collection-init)) + +(use-package evil-tutor) + +;; Using RETURN to follow links in Org/Evil +;; Unmap keys in 'evil-maps if not done, (setq org-return-follows-link t) will not work +(with-eval-after-load 'evil-maps + (define-key evil-motion-state-map (kbd "SPC") nil) + (define-key evil-motion-state-map (kbd "RET") nil) + (define-key evil-motion-state-map (kbd "TAB") nil)) +;; Setting RETURN key in org-mode to follow links + (setq org-return-follows-link t) (use-package flycheck :ensure t @@ -312,6 +323,7 @@ (dt/leader-keys "o" '(:ignore t :wk "Open") "o d" '(dashboard-open :wk "Dashboard") + "o e" '(elfeed :wk "Elfeed RSS") "o f" '(make-frame :wk "Open buffer in new frame") "o F" '(select-frame-by-name :wk "Select frame by name")) diff --git a/.config/emacs/config.org b/.config/emacs/config.org index bd9acd8..84f6bb6 100644 --- a/.config/emacs/config.org +++ b/.config/emacs/config.org @@ -215,16 +215,28 @@ An RSS newsfeed reader for Emacs. Move through the articles with 'j/k'. Move t evil-split-window-below t evil-undo-system 'undo-redo) ;; Adds vim-like C-r redo functionality (evil-mode)) - (use-package evil-collection - :after evil - :config - ;; Do not uncomment this unless you want to specify each and every mode - ;; that evil-collection should works with. The following line is here - ;; for documentation purposes in case you need it. - ;; (setq evil-collection-mode-list '(calendar dashboard dired ediff info magit ibuffer)) - (add-to-list 'evil-collection-mode-list 'help) ;; evilify help mode - (evil-collection-init)) - (use-package evil-tutor) + +(use-package evil-collection + :after evil + :config + ;; Do not uncomment this unless you want to specify each and every mode + ;; that evil-collection should works with. The following line is here + ;; for documentation purposes in case you need it. + ;; (setq evil-collection-mode-list '(calendar dashboard dired ediff info magit ibuffer)) + (add-to-list 'evil-collection-mode-list 'help) ;; evilify help mode + (evil-collection-init)) + +(use-package evil-tutor) + +;; Using RETURN to follow links in Org/Evil +;; Unmap keys in 'evil-maps if not done, (setq org-return-follows-link t) will not work +(with-eval-after-load 'evil-maps + (define-key evil-motion-state-map (kbd "SPC") nil) + (define-key evil-motion-state-map (kbd "RET") nil) + (define-key evil-motion-state-map (kbd "TAB") nil)) +;; Setting RETURN key in org-mode to follow links + (setq org-return-follows-link t) + #+end_src * FLYCHECK @@ -439,6 +451,7 @@ You can use the bindings CTRL plus =/- for zooming in/out. You can also use CTR (dt/leader-keys "o" '(:ignore t :wk "Open") "o d" '(dashboard-open :wk "Dashboard") + "o e" '(elfeed :wk "Elfeed RSS") "o f" '(make-frame :wk "Open buffer in new frame") "o F" '(select-frame-by-name :wk "Select frame by name")) diff --git a/.config/polybar/config.ini b/.config/polybar/config.ini index 5e14b00..457eb4c 100644 --- a/.config/polybar/config.ini +++ b/.config/polybar/config.ini @@ -44,25 +44,25 @@ format-offset = ; 9. SolarizedLight ; 10. TomorrowNight -background = ${MonokaiPro.background} -foreground = ${MonokaiPro.foreground} -color0 = ${MonokaiPro.color0} -color1 = ${MonokaiPro.color1} -color2 = ${MonokaiPro.color2} -color3 = ${MonokaiPro.color3} -color4 = ${MonokaiPro.color4} -color5 = ${MonokaiPro.color5} -color6 = ${MonokaiPro.color6} -color7 = ${MonokaiPro.color7} -color8 = ${MonokaiPro.color8} -color9 = ${MonokaiPro.color9} -color10 = ${MonokaiPro.color10} -color11 = ${MonokaiPro.color11} -color12 = ${MonokaiPro.color12} -color13 = ${MonokaiPro.color13} -color14 = ${MonokaiPro.color14} -color15 = ${MonokaiPro.color15} -alert = ${MonokaiPro.color1} +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} [DoomOne] background = #dd282c34 @@ -280,8 +280,8 @@ fixed-center = true bottom = false separator = -background = ${MonokaiPro.background} -foreground = ${MonokaiPro.foreground} +background = ${DoomOne.background} +foreground = ${DoomOne.foreground} line-size = 2 line-color = #f00 @@ -346,8 +346,8 @@ height = 20 ;offset-x = 1% ;offset-y = 1% -background = ${MonokaiPro.background} -foreground = ${MonokaiPro.foreground} +background = ${DoomOne.background} +foreground = ${DoomOne.foreground} ; Background gradient (vertical steps) ; background-[0-9]+ = #aarrggbb @@ -435,8 +435,8 @@ fixed-center = true bottom = false separator = -background = ${MonokaiPro.background} -foreground = ${MonokaiPro.foreground} +background = ${DoomOne.background} +foreground = ${DoomOne.foreground} line-size = 2 line-color = #f00 @@ -501,8 +501,8 @@ fixed-center = true bottom = false separator = -background = ${MonokaiPro.background} -foreground = ${MonokaiPro.foreground} +background = ${DoomOne.background} +foreground = ${DoomOne.foreground} line-size = 2 line-color = #f00 diff --git a/.config/xmonad/xmonad.hs b/.config/xmonad/xmonad.hs index 9088d49..904fdf7 100644 --- a/.config/xmonad/xmonad.hs +++ b/.config/xmonad/xmonad.hs @@ -83,7 +83,7 @@ import XMonad.Util.SpawnOnce -- SolarizedDark -- SolarizedLight -- TomorrowNight -import Colors.MonokaiPro +import Colors.DoomOne myFont :: String myFont = "xft:SauceCodePro Nerd Font Mono:regular:size=9:antialias=true:hinting=true" From f304fa0381146b7c2841356d9076a54952e7d2dd Mon Sep 17 00:00:00 2001 From: Derek Taylor Date: Mon, 4 Sep 2023 14:37:31 -0500 Subject: [PATCH 2/2] Minor edits --- .config/emacs/config.org | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.config/emacs/config.org b/.config/emacs/config.org index 84f6bb6..6f75ec8 100644 --- a/.config/emacs/config.org +++ b/.config/emacs/config.org @@ -38,7 +38,7 @@ - [[#source-code-block-tag-expansion][Source Code Block Tag Expansion]] - [[#perspective][PERSPECTIVE]] - [[#projectile][PROJECTILE]] -- [[#rainbow-delimters][RAINBOW DELIMTERS]] +- [[#rainbow-delimiters][RAINBOW DELIMITERS]] - [[#rainbow-mode][RAINBOW MODE]] - [[#sane-defaults][SANE DEFAULTS]] - [[#shells-and-terminals][SHELLS AND TERMINALS]] @@ -740,7 +740,7 @@ Org-tempo is not a separate package but a module within org that can be enabled. (projectile-mode 1)) #+end_src -* RAINBOW DELIMTERS +* RAINBOW DELIMITERS Adding rainbow coloring to parentheses. #+begin_src emacs-lisp