Merge branch 'master' into arch-desktop

config/.bash_profile

@@ -18,11 +18,5 @@ test -r '/home/mikec/.opam/opam-init/init.sh' && . '/home/mikec/.opam/opam-init/
 if [ -z "$DISPLAY" ] && [ "$(tty)" = "/dev/tty1" ]; then
   exec river
 fi
-HOMEBREW_PREFIX=/opt/homebrew
-export PATH="/opt/homebrew/opt/llvm/bin:$PATH"
-export CPATH="$HOMEBREW_PREFIX/include:$CPATH"
-export LIBRARY_PATH="$HOMEBREW_PREFIX/lib:$LIBRARY_PATH"
-. "/Users/mikec/.local/share/bob/env/env.sh"
-
-test -e "${HOME}/.iterm2_shell_integration.bash" && source "${HOME}/.iterm2_shell_integration.bash"
 
+. "/home/mikec/.local/share/bob/env/env.sh"

config/.config/doom/config.el

@@ -23,7 +23,7 @@
 ;;
 ;; (setq doom-font (font-spec :family "Fira Code" :size 12 :weight 'semi-light)
 ;;      doom-variable-pitch-font (font-spec :family "Fira Sans" :size 13))
-(setq doom-font (font-spec :family "Iosevka Term SS12" :size 16))
+(setq doom-font (font-spec :family "Iosevka Term SS12" :size 18))
 ;;
 ;; If you or Emacs can't find your font, use 'M-x describe-font' to look them
 ;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to
@@ -33,7 +33,7 @@
 ;; There are two ways to load a theme. Both assume the theme is installed and
 ;; available. You can either set `doom-theme' or manually load a theme with the
 ;; `load-theme' function. This is the default:
-(setq doom-theme 'doom-one)
+;; (setq doom-theme 'doom-one)
 
 ;; 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'.
@@ -78,7 +78,7 @@
 
 ;; (setq! tab-always-indent nil)
 (after! corfu
-  (setq tab-always-indent nil))
+  (setq! tab-always-indent nil))
 ;; (map! :map corfu-map :i "TAB" nil)
 ;; (map! :map corfu-map "TAB" nil)
 ;; (map! :map corfu-map :i "S-TAB" nil)
@@ -93,7 +93,6 @@
 ;; (map! :map corfu-map :i "C-g" #'corfu-reset)
 ;; (setq +corfu-want-ret-to-confirm nil)
 
-
 (use-package! auto-dark
   :defer t
   :init

config/.config/doom/init.el

@@ -38,7 +38,7 @@
        indent-guides     ; highlighted indent columns
        ;;ligatures         ; ligatures and symbols to make your code pretty again
        ;;minimap           ; show a map of the code on the side
-       modeline          ; snazzy, Atom-inspired modeline, plus API
+       ;; modeline          ; snazzy, Atom-inspired modeline, plus API
        ;;nav-flash         ; blink cursor line after big motions
        ;;neotree           ; a project drawer, like NERDTree for vim
        ophints           ; highlight the region an operation acts on
@@ -46,15 +46,15 @@
        smooth-scroll     ; So smooth you won't believe it's not butter
        ;;tabs              ; a tab bar for Emacs
        ;;treemacs          ; a project drawer, like neotree but cooler
-       ;;unicode           ; extended unicode support for various languages
+       unicode           ; extended unicode support for various languages
        (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
-       ;;zen               ; distraction-free coding or writing
+       ;; 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
@@ -62,7 +62,7 @@
        ;;lispy             ; vim for lisp, for people who don't like vim
        multiple-cursors  ; editing in many places at once
        ;;objed             ; text object editing for the innocent
-       ;;parinfer          ; turn lisp into python, sort of
+       parinfer          ; turn lisp into python, sort of
        ;;rotate-text       ; cycle region at point between text candidates
        snippets          ; my elves. They type so I don't have to
        ;; (whitespace +guess +trim)  ; a butler for your whitespace
@@ -81,11 +81,11 @@
        eshell            ; the elisp shell that works everywhere
        ;;shell             ; simple shell REPL for Emacs
        ;;term              ; basic terminal emulator for Emacs
-       vterm             ; the best terminal emulation in Emacs
+       ;; vterm             ; the best terminal emulation in Emacs
 
        :checkers
        syntax              ; tasing you for every semicolon you forget
-       ;;(spell +flyspell) ; tasing you for misspelling mispelling
+       (spell +flyspell) ; tasing you for misspelling mispelling
        ;;grammar           ; tasing grammar mistake every you make
 
        :tools
@@ -100,8 +100,8 @@
        (eval +overlay)     ; run code, run (also, repls)
        (lookup +dictionary +offline)              ; navigate your code and its documentation
        ;;llm               ; when I said you needed friends, I didn't mean...
-       (lsp +lsp)          ; M-x vscode
-       magit               ; a git porcelain for Emacs
+       (lsp +eglot)          ; M-x vscode
+       (magit +forge)               ; a git porcelain for Emacs
        ;;make              ; run make tasks from Emacs
        ;;pass              ; password manager for nerds
        ;;pdf               ; pdf enhancements
@@ -120,7 +120,7 @@
        ;;beancount         ; mind the GAAP
        (cc +lsp +tree-sitter)         ; C > C++ == 1
        ;;clojure           ; java with a lisp
-       ;;common-lisp       ; if you've seen one lisp, you've seen them all
+       common-lisp       ; if you've seen one lisp, you've seen them all
        ;;coq               ; proofs-as-programs
        ;;crystal           ; ruby at the speed of c
        ;;csharp            ; unity, .NET, and mono shenanigans
@@ -153,7 +153,7 @@
        ;;lean              ; for folks with too much to prove
        ;;ledger            ; be audit you can be
        ;;lua               ; one-based indices? one-based indices
-       markdown          ; writing docs for people to ignore
+       (markdown +grip +tree-sitter)          ; writing docs for people to ignore
        ;;nim               ; python + lisp at the speed of c
        ;;nix               ; I hereby declare "nix geht mehr!"
        ;;ocaml             ; an objective camel
@@ -177,7 +177,7 @@
        ;;solidity          ; do you need a blockchain? No.
        (swift +lsp +tree-sitter); who asked for emoji variables?
        ;;terra             ; Earth and Moon in alignment for performance.
-       ;;web               ; the tubes
+       (web +lsp +tree-sitter)               ; the tubes
        ;;yaml              ; JSON, but readable
        (zig +lsp +tree-sitter)               ; C, but simpler
 

config/.config/kde.org/UserFeedback.org.kde.discover.conf

@@ -26,5 +26,5 @@ dataSourceCommonSettings\activeState=true
 dataSourceCommonSettings\activeState=true
 
 [UserFeedback]
-ApplicationStartCount=137
-ApplicationTime=622
+ApplicationStartCount=141
+ApplicationTime=705

config/.config/kde.org/UserFeedback.org.kde.dolphin.conf

@@ -26,5 +26,5 @@ dataSourceCommonSettings\activeState=true
 dataSourceCommonSettings\activeState=true
 
 [UserFeedback]
-ApplicationStartCount=3
-ApplicationTime=35142
+ApplicationStartCount=72
+ApplicationTime=68724

config/.config/kde.org/UserFeedback.org.kde.kmail.conf

@@ -23,5 +23,5 @@ dataSourceCommonSettings\activeState=true
 dataSourceCommonSettings\activeState=true
 
 [UserFeedback]
-ApplicationStartCount=1
-ApplicationTime=14
+ApplicationStartCount=18
+ApplicationTime=16794

config/.config/kde.org/UserFeedback.org.kde.kmail2.conf

@@ -1,2 +1,2 @@
 [UserFeedback]
-ApplicationStartCount=1
+ApplicationStartCount=18

config/.config/kde.org/UserFeedback.org.kde.plasmashell.conf

@@ -26,6 +26,6 @@ dataSourceCommonSettings\activeState=true
 dataSourceCommonSettings\activeState=true
 
 [UserFeedback]
-ApplicationStartCount=210
-ApplicationTime=2008695
+ApplicationStartCount=260
+ApplicationTime=2430104
 LastEncouragement=@DateTime(\0\0\0\x10\0\0\0\0\0\0%\x87}\x4\n\x84\xab\0)

config/.config/nvim/lua/config/set.lua

@@ -82,6 +82,6 @@ vim.lsp.config('lua_ls', {
 vim.lsp.config('tinymist', {
     settings = {
         exportPdf = "onType",
-    }
+    },
 })
 vim.diagnostic.config({ update_in_insert = true, float = true, virtual_lines = true})

config/.config/nvim/lua/plugins/filetypes.lua

@@ -49,5 +49,16 @@ return {
         version = "*", -- Pin Neorg to the latest stable release
         config = true,
     },
+
+    -- {
+    --     "Olical/conjure"
+    -- },
+
+    {
+        "vlime/vlime",
+        config = function(plugin)
+            vim.opt.rtp:append(plugin.dir .. '/vim/')
+        end
+    },
 }
 

config/.icons/default/index.theme

@@ -1,5 +1 @@
-# This file is written by nwg-look. Do not edit.
-[Icon Theme]
-Name=Default
-Comment=Default Cursor Theme
-Inherits=BreezeX-RosePineDawn-Linux
+