diff --git a/bindings.el b/bindings.el index b35e280..e892e25 100644 --- a/bindings.el +++ b/bindings.el @@ -387,13 +387,13 @@ "C-S-a" #'mark-whole-buffer "C-z" #'undo "C-S-Z" #'undo-redo + "C-S-E" #'+vertico/embark-export-write "C-w" #'kill-buffer "C-f" #'+default/search-buffer "C-g" #'vertico-repeat "C-s" #'save-buffer "C-;" #'comment-dwim "C-/" #'comment-line - "C-q" #'kill-emacs "C-M-" #'next-window-any-frame "C-M-" #'previous-window-any-frame "C-" #'backward-paragraph @@ -589,7 +589,7 @@ "O" #'meow-to-block "p" #'meow-yank "q" #'meow-quit - "Q" #'meow-goto-line + ;; "Q" #'meow-goto-line "r" #'meow-replace "R" #'meow-swap-grab "s" #'meow-kill @@ -600,7 +600,7 @@ "w" #'meow-mark-word "W" #'meow-mark-symbol "x" #'meow-line - "X" #'meow-goto-line + "X" #'consult-goto-line "y" #'meow-save "Y" #'meow-sync-grab "z" #'meow-pop-selection diff --git a/config.el b/config.el index 9bdb4de..9c674b4 100644 --- a/config.el +++ b/config.el @@ -12,10 +12,23 @@ ;; accept. For example: (setq doom-font (font-spec :family "JetBrains Mono" :size 19)) (setq fancy-splash-image (concat doom-user-dir "splash.png")) -(setq doom-theme 'doom-monokai-pro) +;; (setq doom-theme 'doom-monokai-pro) +(setq doom-theme 'doom-one) +;; (setq doom-theme 'doom-tomorrow-night-bright) +;; (doom-themes-treemacs-config) + (setq +doom-dashboard-pwd-policy nil) +;; Must be used *after* the theme is loaded +(custom-set-faces + '(default ((t (:background "#111111")))) + '(hl-line ((t (:background "#222222")))) + ;; '(solair-default-face ((t (:background "#111111")))) + '(cursor ((t (:background "#FCFCFA" :foreground "black")))) + '(line-number ((t (:foreground "#424242")))) + '(mu4e-highlight-face ((t (:inherit nil :background "gray26" :foreground "gray85"))))) + ;; This determines the style of line numbers in effect. If set to `nil', line ;; numbers are disabled. For relative line numbers, set this to `relative'. (setq display-line-numbers-type 'relative) @@ -37,6 +50,11 @@ (setq org-directory "~/Documents/Obsidian/Primary") (use-package! kbd-mode :defer t) +(use-package! kdl-mode) + +(use-package! direnv + :config + (direnv-mode)) ;; Modeline ;; - add current workspace name @@ -53,7 +71,7 @@ (t (call-interactively #'yas-insert-snippet)))) ;; set default frame size on launch -(setq default-frame-alist '( (left . 0) (top . 0) (height . 48) (width . 160))) +;; (setq default-frame-alist '( (left . 0) (top . 0) (height . 48) (width . 160))) ;; some global settings ;; (setq tab-always-indent t) ; don't autocomplete with tab diff --git a/custom.el b/custom.el index bc5bacb..545b223 100644 --- a/custom.el +++ b/custom.el @@ -10,24 +10,24 @@ '(tool-bar-mode nil) '(warning-suppress-log-types '((lsp-mode) (lsp-mode) (lsp-mode) (defvaralias))) '(warning-suppress-types '((lsp-mode) (lsp-mode) (defvaralias)))) -(custom-set-faces +(custom-set-faces) ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. - '(cursor ((t (:background "#FCFCFA" :foreground "black")))) - '(line-number ((t (:foreground "#424242")))) - '(mu4e-highlight-face ((t (:inherit nil :background "gray26" :foreground "gray85"))))) - ;; custom-set-faces was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - - ;; custom-set-faces was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - + ;; '(cursor ((t (:background "#FCFCFA" :foreground "black")))) + ;; '(line-number ((t (:foreground "#424242")))) + ;; '(mu4e-highlight-face ((t (:inherit nil :background "gray26" :foreground "gray85"))))) + ;; custom-set-faces was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + + ;; custom-set-faces was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. diff --git a/modules/private/meow/config.el b/modules/private/meow/config.el index 55aa5ed..38f434b 100644 --- a/modules/private/meow/config.el +++ b/modules/private/meow/config.el @@ -33,6 +33,7 @@ :demand t :config (meow/setup-qwerty) + (setq meow-use-clipboard t) (map! :map meow-normal-state-keymap doom-leader-key doom-leader-map) (map! :map meow-motion-state-keymap diff --git a/mu4e-config.el b/mu4e-config.el index 550ff04..f229168 100644 --- a/mu4e-config.el +++ b/mu4e-config.el @@ -1,6 +1,5 @@ ;; mu4e -(add-load-path! "~/.nix-profile/share/emacs/site-lisp/mu4e") -(setf mu4e-mu-version "1.12.7") +(setf mu4e-mu-version "1.12.8") (set-email-account! "admin@studyoftime.org" '((mu4e-sent-folder . "/admin@studyoftime.org/Sent") @@ -150,7 +149,7 @@ (setq mu4e-bookmarks nil) - (setq sendmail-program "/home/emenel/.nix-profile/bin/msmtp" + (setq sendmail-program "/etc/profiles/per-user/emenel/bin/msmtp" send-mail-function 'smtpmail-send-it message-sendmail-f-is-evil t message-sendmail-extra-arguments '("--read-envelope-from") diff --git a/packages.el b/packages.el index fad7e41..b8e087f 100644 --- a/packages.el +++ b/packages.el @@ -26,10 +26,18 @@ ;;(unpin! mu4e) -(package! gpastel) +(package! direnv) +(package! gpastel) +(package! magit-annex) (package! bookmark-in-project) +(package! kdl-mode + :recipe (:type git + :host github + :repo "bobuk/kdl-mode" + :files (:defaults "*.el"))) + (package! meow-vterm :recipe (:type git :host github