From 06867d28d98f4c7b3e2fac7c7afa75577e49b66e Mon Sep 17 00:00:00 2001 From: William Ball Date: Sun, 27 Jul 2025 22:15:47 -0700 Subject: [PATCH] back to arch --- emacs/.config/emacs/Emacs.org | 94 ++++-------------------- nvim/.config/nvim/lua/plugins/colors.lua | 40 +++++----- zsh/.config/zsh/.zshrc | 4 +- 3 files changed, 37 insertions(+), 101 deletions(-) diff --git a/emacs/.config/emacs/Emacs.org b/emacs/.config/emacs/Emacs.org index 1565e2f..5bfb7cf 100644 --- a/emacs/.config/emacs/Emacs.org +++ b/emacs/.config/emacs/Emacs.org @@ -133,20 +133,15 @@ modus-themes-region '(bg-only no-extend))) ;; (load-theme 'modus-vivendi :no-confirm)) #+end_src -*** Doom Themes +*** Italic Comments #+begin_src emacs-lisp - (use-package doom-themes - :custom - (doom-themes-enable-bold t) - (doom-themes-enable-italic t) - :config - (load-theme 'doom-gruvbox t) - (doom-themes-visual-bell-config) - (doom-themes-org-config)) + (advice-add #'load-theme :after (lambda (&rest _) (set-face-italic 'font-lock-comment-face t))) #+end_src -*** Italic keywords +*** Catpuccin #+begin_src emacs-lisp - (advice-add #'load-theme :after (lambda (&rest _) (set-face-italic 'font-lock-keyword-face t))) + (use-package catppuccin-theme + :init (setq catppuccin-flavor 'mocha) + :hook (after-init . (lambda () (load-theme 'catppuccin :no-confirm)))) #+end_src ** Line Numbers #+begin_src emacs-lisp @@ -305,8 +300,8 @@ * Languages ** Agda #+begin_src emacs-lisp - (load-file (let ((coding-system-for-read 'utf-8)) - (shell-command-to-string "agda-mode locate"))) +; (load-file (let ((coding-system-for-read 'utf-8)) +; (shell-command-to-string "agda-mode locate"))) #+end_src ** PG #+begin_src emacs-lisp @@ -331,7 +326,11 @@ :hook (rust-mode-hook . eglot-ensure)) #+end_src - +** KDL +(For niri) +#+begin_src emacs-lisp + (use-package kdl-mode) +#+end_src * Latex ** Auctex #+begin_src emacs-lisp @@ -428,6 +427,7 @@ I'm using the fork as described [[https://abode.karthinks.com/org-latex-preview/][here]] in order to have much better LaTeX previews. This is eventually supposed to be merged into emacs proper, which would be nice. #+begin_src emacs-lisp (use-package org + :straight (:type built-in) :init (setq org-list-allow-alphabetical t) :custom @@ -472,8 +472,7 @@ I'm using the fork as described [[https://abode.karthinks.com/org-latex-preview/ ("C-c l" . org-store-link) ("C-c a" . org-agenda)) :hook (org-mode . visual-line-mode) - (org-mode . flyspell-mode) - (org-mode . org-latex-preview-auto-mode)) + (org-mode . flyspell-mode)) #+end_src ** Prettify #+begin_src emacs-lisp @@ -489,69 +488,6 @@ I'm using the fork as described [[https://abode.karthinks.com/org-latex-preview/ (require 'oc-natbib) (require 'oc-biblatex) #+end_src -** Org Roam -#+begin_src emacs-lisp - (use-package org-roam - :ensure t - :custom - (org-roam-directory (file-truename "~/Nextcloud/org/roam")) - (org-roam-completion-everywhere t) - :bind (("C-c n f" . org-roam-node-find) - ("C-c n i" . org-roam-node-insert) - ("C-c n c" . org-roam-capture)) - :config - (org-roam-setup) - - (setq org-roam-capture-templates - '(("d" "Definition" - plain "%?" - :target (file+head "%<%Y%m%d%H%M%S>-${slug}.org" - "#+title: ${title}\n#+filetags: :definition:%^{Additional tag (e.g. set_theory, model_theory, computability): }:\n") - :unnarrowed t) - ("c" "Chess" - plain "%?" - :target (file+head "%<%Y%m%d%H%M%S>-${slug}.org" - "#+title: ${title}\n#+filetags: :chess:%^{Additional tag (e.g. set_theory, model_theory, computability): }:\n") - :unnarrowed t) - ("t" "Theorem" - plain "%?" - :target (file+head "%<%Y%m%d%H%M%S>-${slug}.org" - "#+title: ${title}\n#+filetags: :theorem:%^{Additional tag (e.g. set_theory, model_theory, computability): }:\n") - :unnarrowed t)))) -#+end_src -#+begin_src emacs-lisp - (use-package consult-org-roam - :ensure t - :after org-roam - :init - (require 'consult-org-roam) - (consult-org-roam-mode 1) - :custom - (consult-org-roam-grep-func #'consult-ripgrep) - (consult-org-roam-buffer-narrow-key ?r) - (consult-org-roam-buffer-after-buffers t) - :config - (consult-customize - consult-org-roam-forward-links - :preview-key "M-.") - :bind - ("C-c n e" . consult-org-roam-file-find) - ("C-c n b" . consult-org-roam-backlinks) - ("C-c n B" . consult-org-roam-backlinks-recursive) - ("C-c n l" . consult-org-roam-forward-links) - ("C-c n r" . consult-org-roam-search)) -#+end_src -#+begin_src emacs-lisp - (use-package org-roam-ui - :straight - (:host github :repo "org-roam/org-roam-ui" :branch "main" :files ("*.el" "out")) - :after org-roam - :config - (setq org-roam-ui-sync-theme t - org-roam-ui-follow t - org-roam-ui-update-on-save t - org-roam-ui-open-on-start t)) -#+end_src ** Org Bloggy stuff #+begin_src emacs-lisp (defconst my-blog-org-dir "~/Documents/test/blog/org/") diff --git a/nvim/.config/nvim/lua/plugins/colors.lua b/nvim/.config/nvim/lua/plugins/colors.lua index 5afbf31..d468041 100644 --- a/nvim/.config/nvim/lua/plugins/colors.lua +++ b/nvim/.config/nvim/lua/plugins/colors.lua @@ -3,28 +3,28 @@ return { 'norcalli/nvim-colorizer.lua', config = true }, - -- { - -- 'catppuccin/nvim', - -- name = 'catppuccin', - -- priority = 1000, - -- config = function() - -- require('catppuccin').setup({ - -- transparent_background = true, - -- }) - -- vim.cmd.colorscheme([[catppuccin-mocha]]) - -- end - -- }, { - "Mofiqul/adwaita.nvim", - lazy = false, + 'catppuccin/nvim', + name = 'catppuccin', priority = 1000, - - -- configure and set on startup config = function() - vim.g.adwaita_darker = true -- for darker version - -- vim.g.adwaita_disable_cursorline = true -- to disable cursorline - vim.g.adwaita_transparent = true -- makes the background transparent - vim.cmd('colorscheme adwaita') + require('catppuccin').setup({ + transparent_background = true, + }) + vim.cmd.colorscheme([[catppuccin-mocha]]) end - } + }, + -- { + -- "Mofiqul/adwaita.nvim", + -- lazy = false, + -- priority = 1000, + -- + -- -- configure and set on startup + -- config = function() + -- vim.g.adwaita_darker = true -- for darker version + -- -- vim.g.adwaita_disable_cursorline = true -- to disable cursorline + -- vim.g.adwaita_transparent = true -- makes the background transparent + -- vim.cmd('colorscheme adwaita') + -- end + -- } } diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc index d8af4e2..444dda6 100644 --- a/zsh/.config/zsh/.zshrc +++ b/zsh/.config/zsh/.zshrc @@ -41,8 +41,8 @@ zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS} zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' # plugins -source /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh -source /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh +source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh +source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh # zoxide eval "$(zoxide init zsh)"