From f9603880e0eb5746fbb9f86ca17f18c7a9ff7567 Mon Sep 17 00:00:00 2001 From: Michael Chalupiak Date: Tue, 8 Oct 2024 10:38:52 -0400 Subject: [PATCH] revert to vim binds --- .../.config/tinted-theming/tinty/config.toml | 5 +++ config/.doom.d/config.el | 38 +++++++++++++++++-- config/.doom.d/init.el | 8 ++-- config/.scripts/startup.sh | 1 + config/.theme.xresources | 26 ++++++++----- 5 files changed, 61 insertions(+), 17 deletions(-) diff --git a/config/.config/tinted-theming/tinty/config.toml b/config/.config/tinted-theming/tinty/config.toml index 59d8712..6c562b0 100644 --- a/config/.config/tinted-theming/tinty/config.toml +++ b/config/.config/tinted-theming/tinty/config.toml @@ -35,6 +35,11 @@ name = "tinted-xresources" themes-dir = "xresources" hook = "cp -f %f ~/.theme.xresources" +[[items]] +path = "https://github.com/aarowill/base16-alacritty" +name = "tinted-alacitty" +themes-dir = "colors" +hook = "cp -f %f ~/.config/alacritty/colors" #[[items]] #path = "https://github.com/kdrag0n/base16-kitty" #name = "tinted-kitty" diff --git a/config/.doom.d/config.el b/config/.doom.d/config.el index a315081..a8e4cf3 100644 --- a/config/.doom.d/config.el +++ b/config/.doom.d/config.el @@ -88,10 +88,11 @@ (setq mpc-browser-tags '(Artist Album|Playlist Title|File)) (add-hook 'mpc-mode-hook (lambda () - (keymap-local-set "M-p" 'windmove-up) - (keymap-local-set "M-n" 'windmove-down) - (keymap-local-set "M-b" 'windmove-left) - (keymap-local-set "M-f" 'windmove-right) + (keymap-local-set "C-k" 'windmove-up) + (keymap-local-set "C-j" 'windmove-down) + (keymap-local-set "C-h" 'windmove-left) + (keymap-local-set "C-l" 'windmove-right) + (keymap-local-set "C-q" 'mpc-quit) (keymap-local-set "a" (lambda () (interactive) (mpc-select) (mpc-playlist-add))) (keymap-local-set "D" (lambda () (interactive) (mpc-select) (mpc-playlist-delete))))) (add-hook 'mpc-songs-mode-hook @@ -111,6 +112,35 @@ message-sendmail-f-is-evil t message-sendmail-extra-arguments '("--read-envelope-from") message-send-mail-function #'message-send-mail-with-sendmail)) +(set-email-account! "mikec@mchalupiak.com" + '((mu4e-sent-folder . "/mikec@mchalupiak.com/Sent") + (mu4e-drafts-folder . "/mikec@mchalupiak.com/Drafts") + (mu4e-trash-folder . "/mikec@mchalupiak.com/Junk") + (mu4e-refile-folder . "/mikec@mchalupiak.com/INBOX")) + ;;(smtpmail-smtp-user . "foo@bar.com") + ;;(user-mail-address . "foo@bar.com") ;; only needed for mu < 1.4 + ;;(mu4e-compose-signature . "---\nYours truly\nThe Baz")) + t) +(set-email-account! "mikecchalupiak@outlook.com" + '((mu4e-sent-folder . "/mikecchalupiak@outlook.com/Sent") + (mu4e-drafts-folder . "/mikecchalupiak@outlook.com/Drafts") + (mu4e-trash-folder . "/mikecchalupiak@outlook.com/Junk") + (mu4e-refile-folder . "/mikecchalupiak@outlook.com/INBOX")) + ;;(smtpmail-smtp-user . "foo@bar.com") + ;;(user-mail-address . "foo@bar.com") ;; only needed for mu < 1.4 + ;;(mu4e-compose-signature . "---\nYours truly\nThe Baz")) + t) + +(set-email-account! "chalupmc@rose-hulman.edu" + '((mu4e-sent-folder . "/chalupmc@rose-hulman.edu/Sent") + (mu4e-drafts-folder . "/chalupmc@rose-hulman.edu/Drafts") + (mu4e-trash-folder . "/chalupmc@rose-hulman.edu/Junk") + (mu4e-refile-folder . "/chalupmc@rose-hulman.edu/INBOX")) + ;;(smtpmail-smtp-user . "foo@bar.com") + ;;(user-mail-address . "foo@bar.com") ;; only needed for mu < 1.4 + ;;(mu4e-compose-signature . "---\nYours truly\nThe Baz")) + t) +;;(setq +notmuch-sync-backend 'mbsync) (defun open-mpc () (interactive) (setq mpc-host (read-string "IP Address:")) diff --git a/config/.doom.d/init.el b/config/.doom.d/init.el index 0b1e6da..ee62802 100644 --- a/config/.doom.d/init.el +++ b/config/.doom.d/init.el @@ -23,7 +23,7 @@ :completion company ; the ultimate code completion backend ;;helm ; the *other* search engine for love and life - ;;ido ; the other *other* search engine... + n ;;ido ; the other *other* search engine... ;;ivy ; a search engine for love and life vertico ; the search engine of the future @@ -49,11 +49,11 @@ (vc-gutter +pretty) ; vcs diff in the fringe vi-tilde-fringe ; fringe tildes to mark beyond EOB ;;window-select ; visually switch windows - workspaces ; tab emulation, persistence & separate workspaces + ;;workspaces ; tab emulation, persistence & separate workspaces zen ; distraction-free coding or writing :editor - ;; (evil +everywhere); come to the dark side, we have cookies + (evil +everywhere); come to the dark side, we have cookies file-templates ; auto-snippets for empty files fold ; (nigh) universal code folding (format +onsave) ; automated prettiness @@ -179,7 +179,7 @@ :email (mu4e +org +mbsync) - ;;notmuch + ;;(notmuch +org) ;;(wanderlust +gmail) :app diff --git a/config/.scripts/startup.sh b/config/.scripts/startup.sh index d4937b6..5786cee 100755 --- a/config/.scripts/startup.sh +++ b/config/.scripts/startup.sh @@ -4,3 +4,4 @@ while true; do sleep 1 done & xss-lock -- slock & +##emacs --daemon & diff --git a/config/.theme.xresources b/config/.theme.xresources index 44ba1c5..716ad04 100644 --- a/config/.theme.xresources +++ b/config/.theme.xresources @@ -1,11 +1,10 @@ -! Base16 Gruvbox dark, hard +! base16 Gruvbox dark, hard ! Scheme author: Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox) ! Template author: Tinted Theming (https://github.com/tinted-theming) #define base00 #1d2021 #define base01 #3c3836 #define base02 #504945 -#define base03 #665c54 #define base04 #bdae93 #define base05 #d5c4a1 #define base06 #ebdbb2 @@ -36,11 +35,20 @@ *color6: base0C *color7: base05 -*color8: base03 -*color9: base09 -*color10: base01 -*color11: base02 -*color12: base04 -*color13: base06 -*color14: base0F +*color8: base02 +*color9: base08 +*color10: base0B +*color11: base0A +*color12: base0D +*color13: base0E +*color14: base0C *color15: base07 + +! Note: colors beyond 15 might not be loaded (e.g., xterm, urxvt), +! use 'shell' template to set these if necessary +*color16: base09 +*color17: base0F +*color18: base01 +*color19: base02 +*color20: base04 +*color21: base06