Merge branch 'switching_back'

emacs/.config/emacs/Emacs.org

@@ -144,18 +144,22 @@
   ;;   :config
   ;;   (load-theme 'catppuccin :no-confirm))
 #+end_src
-*** Doom-themes
-#+begin_src emacs-lisp
-  (use-package doom-themes
-    :config
-    (load-theme 'doom-gruvbox t))
-#+end_src
 *** Solaire
 #+begin_src emacs-lisp
   (use-package solaire-mode
     :config
     (solaire-global-mode))
 #+end_src
+** Ultra Scroll
+#+begin_src emacs-lisp
+  (use-package ultra-scroll
+    :custom
+    (scroll-conservatively 3)
+    (scroll-margin 0)
+    :config
+    (ultra-scroll-mode 1))
+#+end_src
+=======
 * Functionality
 ** Navigation
 *** Ace-Window
@@ -665,19 +669,3 @@ I'm running into weird performance issues with =pdf-tools=. I think it has to do
      '(("Logic Arxiv" "https://rss.arxiv.org/rss/math.LO")
        ("Planet Emacslife" "https://planet.emacslife.com/atom.xml"))))
 #+end_src
-** Books
-#+begin_src emacs-lisp
-  (defun wball/books ()
-  "Recursively search and open books from ~/Nextcloud/Books/."
-  (interactive)
-  (let* ((books-dir (expand-file-name "~/Nextcloud/Books/"))
-         (files (directory-files-recursively books-dir "\\.pdf$\\|\\.epub$\\|\\.djvu$" nil))
-         (relative-files (mapcar (lambda (f)
-                                   (string-remove-prefix books-dir f))
-                                 files))
-         (choice (completing-read "Book: " relative-files nil t)))
-    (when choice
-      (find-file (concat books-dir choice)))))
-
-(global-set-key (kbd "C-c b") 'wball/books)
-#+end_src

nvim/.config/nvim/lua/options.lua

@@ -26,8 +26,6 @@ opt.linebreak = true
 opt.cursorline = true
 
 opt.foldmethod = 'marker'
--- opt.foldmethod = 'expr'
--- opt.foldexpr = 'nvim_treesitter#foldexpr()'
 
 vim.api.nvim_create_autocmd('TermOpen', {
     pattern = '*',

nvim/.config/nvim/lua/plugins/colors.lua

@@ -5,11 +5,15 @@ return {
         opts = {},
     },
     {
-        'ellisonleao/gruvbox.nvim',
+        'catppuccin/nvim',
+        name = 'catppuccin',
         priority = 1000,
         config = function()
-            vim.o.background = 'dark'
-            vim.cmd.colorscheme([[gruvbox]])
-        end,
+            require('catppuccin').setup({
+                flavour = "mocha",
+                transparent_background = true,
+            })
+            vim.cmd.colorscheme('catppuccin-nvim')
+        end
     }
 }

nvim/.config/nvim/lua/plugins/languages/rust.lua

@@ -1,7 +0,0 @@
-return {
-    {
-        'mrcjkb/rustaceanvim',
-        version = '^5',
-        lazy = false
-    }
-}

nvim/.config/nvim/lua/plugins/languages/sml.lua

@@ -1,34 +0,0 @@
-return {
-    {
-        'jez/vim-better-sml',
-        config = function()
-            vim.g.sml_smlnj_executable = 'smlnj'
-        end,
-        keys = {
-            {
-                '<leader>rs',
-                [[:SMLReplStart<CR>]],
-                desc = 'SML start repl',
-                ft = 'sml'
-            },
-            {
-                '<leader>rc',
-                [[:SMLReplClear<CR>]],
-                desc = 'SML clear repl',
-                ft = 'sml'
-            },
-            {
-                '<leader>rb',
-                [[:SMLReplBuild<CR>]],
-                desc = 'SML load current file/CM project in repl',
-                ft = 'sml'
-            },
-            {
-                '<leader>ro',
-                [[:SMLReplOpen<CR>]],
-                desc = 'SML open current structure in repl',
-                ft = 'sml'
-            },
-        }
-    }
-}

scripts/.local/bin/books.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 prefix=$HOME/Nextcloud/Books/
-dmenu="bemenu -p books --center --list 20 down --width-factor 0.5 --border 2 --bdr #fabd2f"
+dmenu="bemenu -p books --center --list 20 down --width-factor 0.5 --border 2 --bdr #f6c2e7"
 pdf=sioyek
 
 choice=$(find $prefix -type f | sed "s|$prefix||;s/_/ /g" | $dmenu)

scripts/.local/bin/papers.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 prefix=$HOME/Nextcloud/Papers/
-dmenu="bemenu -p papers --center --list 20 down --width-factor 0.5 --border 2 --bdr #fabd2f"
+dmenu="bemenu -p papers --center --list 20 down --width-factor 0.5 --border 2 --bdr #f6c2e7"
 pdf=sioyek
 
 choice=$(find $prefix -type f | sed "s|$prefix||;s/_/ /g" | $dmenu)

zsh/.config/zsh/.zshrc

@@ -23,7 +23,7 @@ setopt HIST_REDUCE_BLANKS
 setopt HIST_FIND_NO_DUPS
 
 # options
-setopt autocd auto_param_slash
+setopt auto_param_slash
 setopt interactive_comments
 
 # disable C-s
@@ -44,5 +44,11 @@ zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}'
 source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
 
-PROMPT="[%F{#83a598}%n %F{#b8bb26}%~%f] %F{#8ec07c}λ%f "
-RPROMPT="[%F{#d79921}%?%f]"
+# zoxide
+eval "$(zoxide init zsh)"
+
+# prompt
+# eval "$(starship init zsh)"
+
+PROMPT="[%F{#89b4fa}%n %F{#f5c2e7}%~%f] %F{#a6e3a1}λ%f "
+RPROMPT="[%F{#fab387}%?%f]"