pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Add aggressive-indent package, ensure mu4e-org

Browse source 
Remove perspective

Reorganise modeline section of config slightly, re-enable doom-modeline-mu4e
This commit is contained in:
Evie Litherland-Smith 2023-11-17 14:48:04 +00:00
parent ae7a199ee6
commit 0a66876391
3 changed files with 99 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
home/emacs/default.nix
View file

@ -37,6 +37,7 @@
direnv direnv
goto-chg goto-chg
rainbow-delimiters rainbow-delimiters
aggressive-indent
nix-mode nix-mode
anaconda-mode anaconda-mode
rust-mode rust-mode

92
home/emacs/init.el
View file

@ -104,8 +104,6 @@
(tool-bar-mode -1) (tool-bar-mode -1)
(scroll-bar-mode -1) (scroll-bar-mode -1)
(tab-bar-mode -1) (tab-bar-mode -1)
(line-number-mode +1)
(column-number-mode +1)
(global-display-line-numbers-mode -1) (global-display-line-numbers-mode -1)
(global-prettify-symbols-mode +1) (global-prettify-symbols-mode +1)
(global-visual-line-mode +1) (global-visual-line-mode +1)
@ -233,11 +231,14 @@
;; per mode with `ligature-mode'. ;; per mode with `ligature-mode'.
(global-ligature-mode t)) (global-ligature-mode t))
;; Doom-Modeline (line-number-mode +1)
(column-number-mode +1)
(size-indication-mode +1)
(display-time-mode -1)
(display-battery-mode -1)
(setq doom-modeline-icon t (setq doom-modeline-icon t
doom-modeline-mu4e nil ;; Use mu4e own formatting doom-modeline-mu4e t)
doom-modeline-persp-name nil
doom-modeline-persp-icon nil)
(use-package doom-modeline (use-package doom-modeline
:ensure t :ensure t
:config :config
@ -430,12 +431,6 @@
(project-find-dir "Find directory") (project-find-dir "Find directory")
(project-eshell "Eshell"))) (project-eshell "Eshell")))
(use-package perspective
:ensure t
:demand t
:bind (("C-c p p" . persp-switch)
("C-c p r" . persp-rename)))
(setq magit-define-global-key-bindings nil (setq magit-define-global-key-bindings nil
magit-clone-default-directory "~/Projects/" magit-clone-default-directory "~/Projects/"
magit-commit-show-diff nil magit-commit-show-diff nil
@ -550,6 +545,10 @@
:config :config
(add-to-list 'completion-at-point-functions #'yasnippet-capf)) (add-to-list 'completion-at-point-functions #'yasnippet-capf))
(use-package aggressive-indent
:ensure t
:hook prog-mode)
(unless (package-installed-p 'kbd-mode) (unless (package-installed-p 'kbd-mode)
(package-vc-install (package-vc-install
'(kbd-mode . (:url "https://github.com/kmonad/kbd-mode")))) '(kbd-mode . (:url "https://github.com/kmonad/kbd-mode"))))
@ -601,41 +600,42 @@
(:maildir "/Outlook/Inbox/" :key ?w))) (:maildir "/Outlook/Inbox/" :key ?w)))
(use-package mu4e (use-package mu4e
:after vertico
:bind (("C-c o m" . mu4e)) :bind (("C-c o m" . mu4e))
:config (setq mu4e-contexts :config
(list (require 'mu4e-org)
(make-mu4e-context (setq mu4e-contexts
:name "Xenia" (list
:vars '((user-mail-address . "evie@xenia.me.uk") (make-mu4e-context
(mu4e-sent-folder . "/Proton/Sent") :name "Xenia"
(mu4e-drafts-folder . "/Proton/Drafts") :vars '((user-mail-address . "evie@xenia.me.uk")
(mu4e-trash-folder . "/Proton/Trash") (mu4e-sent-folder . "/Proton/Sent")
(mu4e-refile-folder . "/Proton/Archive"))) (mu4e-drafts-folder . "/Proton/Drafts")
(make-mu4e-context (mu4e-trash-folder . "/Proton/Trash")
:name "Proton" (mu4e-refile-folder . "/Proton/Archive")))
:match-func (lambda (msg) (when msg (string-prefix-p "/Proton" (mu4e-message-field msg :maildir)))) (make-mu4e-context
:vars '((user-mail-address . "e.litherlandsmith@proton.me") :name "Proton"
(mu4e-sent-folder . "/Proton/Sent") :match-func (lambda (msg) (when msg (string-prefix-p "/Proton" (mu4e-message-field msg :maildir))))
(mu4e-drafts-folder . "/Proton/Drafts") :vars '((user-mail-address . "e.litherlandsmith@proton.me")
(mu4e-trash-folder . "/Proton/Trash") (mu4e-sent-folder . "/Proton/Sent")
(mu4e-refile-folder . "/Proton/Archive"))) (mu4e-drafts-folder . "/Proton/Drafts")
(make-mu4e-context (mu4e-trash-folder . "/Proton/Trash")
:name "iCloud" (mu4e-refile-folder . "/Proton/Archive")))
:match-func (lambda (msg) (when msg (string-prefix-p "/iCloud" (mu4e-message-field msg :maildir)))) (make-mu4e-context
:vars '((user-mail-address . "e.litherlandsmith@icloud.com") :name "iCloud"
(mu4e-sent-folder . "/iCloud/Sent Messages") :match-func (lambda (msg) (when msg (string-prefix-p "/iCloud" (mu4e-message-field msg :maildir))))
(mu4e-drafts-folder . "/iCloud/Drafts") :vars '((user-mail-address . "e.litherlandsmith@icloud.com")
(mu4e-trash-folder . "/iCloud/Deleted Messages") (mu4e-sent-folder . "/iCloud/Sent Messages")
(mu4e-refile-folder . "/iCloud/Archive"))) (mu4e-drafts-folder . "/iCloud/Drafts")
(make-mu4e-context (mu4e-trash-folder . "/iCloud/Deleted Messages")
:name "Work" (mu4e-refile-folder . "/iCloud/Archive")))
:match-func (lambda (msg) (when msg (string-prefix-p "/Outlook" (mu4e-message-field msg :maildir)))) (make-mu4e-context
:vars '((user-mail-address . "evie.litherland-smith@ukaea.uk") :name "Work"
(mu4e-sent-folder . "/Outlook/Sent") :match-func (lambda (msg) (when msg (string-prefix-p "/Outlook" (mu4e-message-field msg :maildir))))
(mu4e-drafts-folder . "/Outlook/Drafts") :vars '((user-mail-address . "evie.litherland-smith@ukaea.uk")
(mu4e-trash-folder . "/Outlook/Trash") (mu4e-sent-folder . "/Outlook/Sent")
(mu4e-refile-folder . "/Outlook/Archive")))))) (mu4e-drafts-folder . "/Outlook/Drafts")
(mu4e-trash-folder . "/Outlook/Trash")
(mu4e-refile-folder . "/Outlook/Archive"))))))
(use-package mu4e-alert (use-package mu4e-alert
:after mu4e :after mu4e

101
home/emacs/init.org
View file

@ -132,8 +132,6 @@
(tool-bar-mode -1) (tool-bar-mode -1)
(scroll-bar-mode -1) (scroll-bar-mode -1)
(tab-bar-mode -1) (tab-bar-mode -1)
(line-number-mode +1)
(column-number-mode +1)
(global-display-line-numbers-mode -1) (global-display-line-numbers-mode -1)
(global-prettify-symbols-mode +1) (global-prettify-symbols-mode +1)
(global-visual-line-mode +1) (global-visual-line-mode +1)
@ -270,11 +268,17 @@
** Modeline ** Modeline
#+begin_src emacs-lisp #+begin_src emacs-lisp
;; Doom-Modeline (line-number-mode +1)
(column-number-mode +1)
(size-indication-mode +1)
(display-time-mode -1)
(display-battery-mode -1)
#+end_src
*** Doom Modeline
#+begin_src emacs-lisp
(setq doom-modeline-icon t (setq doom-modeline-icon t
doom-modeline-mu4e nil ;; Use mu4e own formatting doom-modeline-mu4e t)
doom-modeline-persp-name nil
doom-modeline-persp-icon nil)
(use-package doom-modeline (use-package doom-modeline
:ensure t :ensure t
:config :config
@ -508,15 +512,6 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
(project-find-dir "Find directory") (project-find-dir "Find directory")
(project-eshell "Eshell"))) (project-eshell "Eshell")))
#+END_SRC #+END_SRC
*** Perspective
#+begin_src emacs-lisp
(use-package perspective
:ensure t
:demand t
:bind (("C-c p p" . persp-switch)
("C-c p r" . persp-rename)))
#+end_src
** Version control ** Version control
*** Magit *** Magit
#+begin_src emacs-lisp #+begin_src emacs-lisp
@ -654,6 +649,13 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
:config :config
(add-to-list 'completion-at-point-functions #'yasnippet-capf)) (add-to-list 'completion-at-point-functions #'yasnippet-capf))
#+end_src #+end_src
** Aggressive Indent
#+begin_src emacs-lisp
(use-package aggressive-indent
:ensure t
:hook prog-mode)
#+end_src
** Language-specific settings ** Language-specific settings
*** kmonad *** kmonad
#+begin_src emacs-lisp #+begin_src emacs-lisp
@ -711,41 +713,42 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
(:maildir "/Outlook/Inbox/" :key ?w))) (:maildir "/Outlook/Inbox/" :key ?w)))
(use-package mu4e (use-package mu4e
:after vertico
:bind (("C-c o m" . mu4e)) :bind (("C-c o m" . mu4e))
:config (setq mu4e-contexts :config
(list (require 'mu4e-org)
(make-mu4e-context (setq mu4e-contexts
:name "Xenia" (list
:vars '((user-mail-address . "evie@xenia.me.uk") (make-mu4e-context
(mu4e-sent-folder . "/Proton/Sent") :name "Xenia"
(mu4e-drafts-folder . "/Proton/Drafts") :vars '((user-mail-address . "evie@xenia.me.uk")
(mu4e-trash-folder . "/Proton/Trash") (mu4e-sent-folder . "/Proton/Sent")
(mu4e-refile-folder . "/Proton/Archive"))) (mu4e-drafts-folder . "/Proton/Drafts")
(make-mu4e-context (mu4e-trash-folder . "/Proton/Trash")
:name "Proton" (mu4e-refile-folder . "/Proton/Archive")))
:match-func (lambda (msg) (when msg (string-prefix-p "/Proton" (mu4e-message-field msg :maildir)))) (make-mu4e-context
:vars '((user-mail-address . "e.litherlandsmith@proton.me") :name "Proton"
(mu4e-sent-folder . "/Proton/Sent") :match-func (lambda (msg) (when msg (string-prefix-p "/Proton" (mu4e-message-field msg :maildir))))
(mu4e-drafts-folder . "/Proton/Drafts") :vars '((user-mail-address . "e.litherlandsmith@proton.me")
(mu4e-trash-folder . "/Proton/Trash") (mu4e-sent-folder . "/Proton/Sent")
(mu4e-refile-folder . "/Proton/Archive"))) (mu4e-drafts-folder . "/Proton/Drafts")
(make-mu4e-context (mu4e-trash-folder . "/Proton/Trash")
:name "iCloud" (mu4e-refile-folder . "/Proton/Archive")))
:match-func (lambda (msg) (when msg (string-prefix-p "/iCloud" (mu4e-message-field msg :maildir)))) (make-mu4e-context
:vars '((user-mail-address . "e.litherlandsmith@icloud.com") :name "iCloud"
(mu4e-sent-folder . "/iCloud/Sent Messages") :match-func (lambda (msg) (when msg (string-prefix-p "/iCloud" (mu4e-message-field msg :maildir))))
(mu4e-drafts-folder . "/iCloud/Drafts") :vars '((user-mail-address . "e.litherlandsmith@icloud.com")
(mu4e-trash-folder . "/iCloud/Deleted Messages") (mu4e-sent-folder . "/iCloud/Sent Messages")
(mu4e-refile-folder . "/iCloud/Archive"))) (mu4e-drafts-folder . "/iCloud/Drafts")
(make-mu4e-context (mu4e-trash-folder . "/iCloud/Deleted Messages")
:name "Work" (mu4e-refile-folder . "/iCloud/Archive")))
:match-func (lambda (msg) (when msg (string-prefix-p "/Outlook" (mu4e-message-field msg :maildir)))) (make-mu4e-context
:vars '((user-mail-address . "evie.litherland-smith@ukaea.uk") :name "Work"
(mu4e-sent-folder . "/Outlook/Sent") :match-func (lambda (msg) (when msg (string-prefix-p "/Outlook" (mu4e-message-field msg :maildir))))
(mu4e-drafts-folder . "/Outlook/Drafts") :vars '((user-mail-address . "evie.litherland-smith@ukaea.uk")
(mu4e-trash-folder . "/Outlook/Trash") (mu4e-sent-folder . "/Outlook/Sent")
(mu4e-refile-folder . "/Outlook/Archive")))))) (mu4e-drafts-folder . "/Outlook/Drafts")
(mu4e-trash-folder . "/Outlook/Trash")
(mu4e-refile-folder . "/Outlook/Archive"))))))
(use-package mu4e-alert (use-package mu4e-alert
:after mu4e :after mu4e