14 changed files with 378 additions and 209 deletions
--- a/emacs/.config/emacs/Emacs.org
+++ b/emacs/.config/emacs/Emacs.org
@ -14,7 +14,7 @@
  (setq visible-bell t)
  (setq frame-resize-pixelwise t)
  (fset 'yes-or-no-p 'y-or-n-p)
-  ;(setq default-frame-alist '((undecorated . t)))
+  (setq default-frame-alist '((undecorated . t)))
  (scroll-bar-mode -1)
 #+end_src
 ** Backups
@ -30,21 +30,62 @@
        auto-save-default t)
 #+end_src
 * Packages
-** MELPA
+** Elpaca
+Set up variables.
 #+begin_src emacs-lisp
-  (require 'package)
-  (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t)
-  (package-initialize)
+  (defvar elpaca-installer-version 0.11)
+  (defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
+  (defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
+  (defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))
+  (defvar elpaca-order '(elpaca :repo "https://github.com/progfolio/elpaca.git"
+                                :ref nil :depth 1 :inherit ignore
+                                :files (:defaults "elpaca-test.el" (:exclude "extensions"))
+                                :build (:not elpaca--activate-package)))
+#+end_src
+
+Bootstrap elpaca
+#+begin_src emacs-lisp
+  (let* ((repo  (expand-file-name "elpaca/" elpaca-repos-directory))
+         (build (expand-file-name "elpaca/" elpaca-builds-directory))
+         (order (cdr elpaca-order))
+         (default-directory repo))
+    (add-to-list 'load-path (if (file-exists-p build) build repo))
+    (unless (file-exists-p repo)
+      (make-directory repo t)
+      (when (<= emacs-major-version 28) (require 'subr-x))
+      (condition-case-unless-debug err
+          (if-let* ((buffer (pop-to-buffer-same-window "*elpaca-bootstrap*"))
+                    ((zerop (apply #'call-process `("git" nil ,buffer t "clone"
+                                                    ,@(when-let* ((depth (plist-get order :depth)))
+                                                        (list (format "--depth=%d" depth) "--no-single-branch"))
+                                                    ,(plist-get order :repo) ,repo))))
+                    ((zerop (call-process "git" nil buffer t "checkout"
+                                          (or (plist-get order :ref) "--"))))
+                    (emacs (concat invocation-directory invocation-name))
+                    ((zerop (call-process emacs nil buffer nil "-Q" "-L" "." "--batch"
+                                          "--eval" "(byte-recompile-directory \".\" 0 'force)")))
+                    ((require 'elpaca))
+                    ((elpaca-generate-autoloads "elpaca" repo)))
+              (progn (message "%s" (buffer-string)) (kill-buffer buffer))
+            (error "%s" (with-current-buffer buffer (buffer-string))))
+        ((error) (warn "%s" err) (delete-directory repo 'recursive))))
+    (unless (require 'elpaca-autoloads nil t)
+      (require 'elpaca)
+      (elpaca-generate-autoloads "elpaca" repo)
+      (let ((load-source-file-function nil)) (load "./elpaca-autoloads"))))
+  (add-hook 'after-init-hook #'elpaca-process-queues)
+  (elpaca `(,@elpaca-order))
+#+end_src
+
+Enable =use-package= integration
+#+begin_src emacs-lisp
+  (elpaca elpaca-use-package
+    (elpaca-use-package-mode))
 #+end_src
 ** use-package
 #+begin_src emacs-lisp
-  (require 'use-package-ensure)
  (setq use-package-always-ensure t)
 #+end_src
-** no-littering
-#+begin_src emacs-lisp
-  (use-package no-littering)
-#+end_src
 ** Set up path correctly
 #+begin_src emacs-lisp
  (use-package exec-path-from-shell
@ -65,9 +106,7 @@
 * UI
 ** Icons
 #+begin_src emacs-lisp
-  (use-package nerd-icons
-    :custom
-    (nerd-icons-font-family "AdwaitaMono Nerd Font"))
+  (use-package all-the-icons)
 #+end_src
 ** Rainbow delimiters
 #+begin_src emacs-lisp
@ -80,21 +119,21 @@
    :config
    (setq fontaine-presets
          '((regular
-             :default-height 140)
+             :default-height 130)
            (small
-             :default-height 90)
+             :default-height 80)
            (large
             :default-weight semilight
-             :default-height 160
+             :default-height 150
             :bold-weight extrabold)
            (extra-large
             :default-weight semilight
-             :default-height 190
+             :default-height 180
             :bold-weight extrabold)
            (t
-             :default-family "Adwaita Mono"
+             :default-family "Iosevka Nerd Font"
             :default-weight normal
-             :variable-pitch-family "Libertinus Serif")))
+             :variable-pitch-family "Inter")))
    (fontaine-set-preset 'regular))
 #+end_src
 ** Which key
@ -109,40 +148,49 @@
 ** Theme
 *** Modus Themes
 #+begin_src emacs-lisp
-  (use-package emacs
-    :ensure nil
-    :config
-    (require-theme 'modus-themes)
-    (setq modus-themes-italic-constructs t
-          modus-themes-bold-constructs t
-  	modus-themes-links '(no-underline background faint)
-          modus-themes-prompts '(bold intense)
-          modus-themes-mode-line '(borderless accented moody)
-          modus-themes-org-blocks 'gray-background
-          modus-themes-region '(bg-only no-extend))
-    (load-theme 'modus-operandi :no-confirm))
-#+end_src
-*** Autodark
-#+begin_src emacs-lisp
-  (use-package auto-dark
-    :ensure t
-    :custom
-    (auto-dark-themes '((modus-vivendi) (modus-operandi)))
-    :init (auto-dark-mode))
+  ;; (use-package emacs
+  ;;   :ensure nil
+  ;;   :config
+  ;;   (require-theme 'modus-themes)
+  ;;   (setq modus-themes-italic-constructs t
+  ;;         modus-themes-bold-constructs t
+  ;; 	modus-themes-links '(no-underline background faint)
+  ;;         modus-themes-prompts '(bold intense)
+  ;;         modus-themes-mode-line '(borderless accented moody)
+  ;;         modus-themes-org-blocks 'gray-background
+  ;;         modus-themes-region '(bg-only no-extend))
+  ;;   (load-theme 'modus-operandi :no-confirm))
 #+end_src
 *** Catpuccin
 #+begin_src emacs-lisp
-  ;; (use-package catppuccin-theme
-  ;;   :init (setq catppuccin-flavor 'mocha)
-  ;;   :config
-  ;;   (load-theme 'catppuccin :no-confirm))
+  (use-package catppuccin-theme
+    :init (setq catppuccin-flavor 'mocha)
+    :config
+    (load-theme 'catpuccin :no-confirm))
 #+end_src
-** Ultra Scroll
+
+*** Italic Comments
+#+begin_src emacs-lisp
+  (advice-add #'load-theme :after (lambda (&rest _) (set-face-italic 'font-lock-comment-face t)))
+#+end_src
+** Line Numbers
+#+begin_src emacs-lisp
+  (add-hook 'prog-mode-hook 'display-line-numbers-mode)
+#+end_src
+** Modeline
+#+begin_src emacs-lisp
+  (use-package doom-modeline
+    :init (doom-modeline-mode 1))
+#+end_src
+#+begin_src emacs-lisp
+  (use-package hide-mode-line)
+#+end_src
+** Smooth Scroll
 #+begin_src emacs-lisp
  (use-package ultra-scroll
-    :custom
-    (scroll-conservatively 3)
-    (scroll-margin 0)
+    :init
+    (setq scroll-conservatively 3
+          scroll-margin 0)
    :config
    (ultra-scroll-mode 1))
 #+end_src
@ -153,15 +201,6 @@
  (use-package ace-window
    :bind (("M-o" . ace-window)))
 #+end_src
-*** Avy
-#+begin_src emacs-lisp
-  (use-package avy
-    :bind
-    (("C-:" . avy-goto-char)
-     ("C-M-'" . avy-goto-char-2)
-     ("M-g w" . avy-goto-word-1)
-     ("M-g W" . avy-goto-word-0)))
-#+end_src
 * Completion
 ** Vertico
 #+begin_src emacs-lisp
@ -318,27 +357,57 @@ I don't really use markdown ([[Org Mode]] is a strict improvement imo), but it's
 * 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
  (use-package proof-general)
 #+end_src
+** Idris
+#+begin_src emacs-lisp
+  (use-package idris-mode
+    :custom
+    (idris-interpreter-path "idris2"))
+#+end_src
+
+#+begin_src emacs-lisp
+  (with-eval-after-load 'eglot
+    (add-to-list 'eglot-server-programs
+                 '(idris-mode . ("idris2-lsp"))))
+#+end_src
+
+** Haskell
+#+begin_src emacs-lisp
+  (use-package haskell-mode)
+#+end_src
+
+** Rust
+#+begin_src emacs-lisp
+  (use-package rust-mode
+    :hook
+    (rust-mode-hook . eglot-ensure))
+#+end_src
+** Zig
+#+begin_src emacs-lisp
+  (use-package zig-mode)
+#+end_src
+** C
+#+begin_src emacs-lisp
+  (use-package emacs
+    :ensure nil
+    :hook
+    (c-mode . electric-pair-mode)
+    :custom
+    (c-default-style '((java-mode . "java")
+  		     (awk-mode . "awk")
+  		     (other . "linux"))))
+#+end_src
 ** Perga
 #+begin_src emacs-lisp
  (use-package perga-mode
-    :vc (:url "https://forgejo.ballcloud.cc/wball/perga-mode.git"
-         :rev :latest))
+    :ensure (:repo "https://forgejo.ballcloud.cc/wball/perga-mode.git"))
 #+end_src
-** Scheme
-#+begin_src emacs-lisp
-  (use-package geiser)
-  (use-package geiser-chez
-    :custom
-    (geiser-chez-binary "chez"))
-#+end_src
-
 * Latex
 ** Auctex
 #+begin_src emacs-lisp
@ -356,7 +425,13 @@ I don't really use markdown ([[Org Mode]] is a strict improvement imo), but it's
    (TeX-master t)
    (reftex-plug-in-to-AUCTeX t)
    (preview-auto-cache-preamble t)
-    (preview-scale-function 0.50))
+    (preview-scale-function 0.50)
+    (TeX-view-program-selection
+     '(((output-dvi has-no-display-manager) "dvi2tty")
+       ((output-dvi style-pstricks) "dvips and gv")
+       (output-dvi "xdvi")
+       (output-pdf "zathura")
+       (output-html "xdg-open"))))
 #+end_src
 ** CDLatex
 #+begin_src emacs-lisp
@ -426,14 +501,14 @@ I don't really use markdown ([[Org Mode]] is a strict improvement imo), but it's
 #+end_src
 * Org Mode
 ** Org itself
-I use [[https://abode.karthinks.com/org-latex-preview/][this]] fork of org-mode in order to have amazing latex previews. /Make sure to follow the installation instructions!/ It's supposed to eventually be merged into org proper, which is very exciting. I'm already pretty dependent on this feature (the previews are just that good), so I'll have to use this until it gets merged, but that's fine with me.
 #+begin_src emacs-lisp
  (use-package org
-    :load-path "~/.config/emacs/elpa/org-mode/lisp"
+    :ensure `(org :repo "https://code.tecosaur.net/tec/org-mode.git/"
+                  :branch "dev")
+    :defer
    :init
    (setq org-list-allow-alphabetical t)
    :custom
-    (org-log-into-drawer t)
    (org-startup-indented t)
    (org-hide-emphasis-markers t)
    (org-startup-with-inline-images t)
@ -442,49 +517,23 @@ I use [[https://abode.karthinks.com/org-latex-preview/][this]] fork of org-mode
    (org-directory "~/Nextcloud/org")
    (org-cite-global-bibliography '("~/Nextcloud/library.bib"))
    (org-agenda-files `(,org-directory))
-    (org-todo-keywords
-     '((sequence "TODO" "VERIFY" "|" "DONE")))
    (org-default-notes-file (mapcar (lambda (x) (concat org-directory x))
                                    '("/todo.org" "/done.org")))
    (org-latex-preview-mode-display-live t)
    :config
-    (plist-put org-latex-preview-appearance-options
-               :page-width 0.8)
    (setq org-format-latex-options (plist-put org-format-latex-options :scale 0.6))
    (require 'ox-latex)
    (require 'ox-beamer)
-    (require 'org-tempo)
-    (add-to-list 'org-structure-template-alist '("el" . "src emacs-lisp"))
-    (add-to-list 'org-structure-template-alist '("ltx" . "export latex"))
-    (add-to-list 'org-structure-template-alist '("pf" . "proof"))
-    (add-to-list 'org-structure-template-alist '("thm" . "theorem"))
-    (add-to-list 'org-structure-template-alist '("def" . "definition"))
-    (add-to-list 'org-structure-template-alist '("lem" . "lemma"))
+    (add-to-list 'org-latex-classes '("myreport" "\\documentclass[11pt]{report}"
+                                      ("\\chapter{%s}" . "\\chapter*{%s}")
+                                      ("\\section{%s}" . "\\section*{%s}")
+                                      ("\\subsection{%s}" . "\\subsection*{%s}")
+                                      ("\\subsubsection{%s}" . "\\subsubsection*{%s}")))
    :hook
    (org-mode . visual-line-mode)
    (org-mode . flyspell-mode)
    (org-mode . org-latex-preview-mode))
 #+end_src
-** Org Noter
-#+begin_src emacs-lisp
-  (use-package djvu)
-  (use-package nov)
-  (use-package org-noter)
-#+end_src
-** Olivetti
-#+begin_src emacs-lisp
-  (use-package olivetti
-    :custom
-    (fill-column 80)
-    :hook
-    (org-mode . olivetti-mode))
-#+end_src
-** Mixed Pitch
-#+begin_src emacs-lisp
-  (use-package mixed-pitch
-    :hook
-    (org-mode . mixed-pitch-mode))
-#+end_src
 ** toki pona support
 #+begin_src emacs-lisp
  (with-eval-after-load 'ox
@ -512,7 +561,7 @@ I use [[https://abode.karthinks.com/org-latex-preview/][this]] fork of org-mode
  (setq org-publish-project-alist
        `(("org-posts"
           :base-directory "~/repos/blog/posts/"
-           :publishing-directory "/ssh:server:~/blog/"
+           :publishing-directory "/ssh:wball@ballcloud.cc:~/blog/"
           :base-extension "org"
           :recursive t
           :publishing-function org-html-publish-to-html
@ -530,7 +579,7 @@ I use [[https://abode.karthinks.com/org-latex-preview/][this]] fork of org-mode
           )
  	("org-pages"
  	 :base-directory "~/repos/blog/pages/"
-  	 :publishing-directory "/ssh:server:~/blog/"
+  	 :publishing-directory "/ssh:wball@ballcloud.cc:~/blog/"
  	 :base-extension "org"
  	 :recursive t
  	 :publishing-function org-html-publish-to-html
@ -540,14 +589,14 @@ I use [[https://abode.karthinks.com/org-latex-preview/][this]] fork of org-mode
  	 )
  	("org-static"
  	 :base-directory "~/repos/blog/static/"
-  	 :publishing-directory "/ssh:server:~/blog/static/"
+  	 :publishing-directory "/ssh:wball@ballcloud.cc:~/blog/static/"
  	 :base-extension "ico\\|ttf\\|css"
  	 :publishing-function org-publish-attachment
  	 :recursive t
  	 )
  	("org-media"
  	 :base-directory "~/repos/blog/media/"
-  	 :publishing-directory "/ssh:server:~/blog/media/"
+  	 :publishing-directory "/ssh:wball@ballcloud.cc:~/blog/media/"
  	 :base-extension "png\\|svg\\|pdf\\|mp4\\|mp3\\|ogg"
  	 :publishing-function org-publish-attachment
  	 :recursive t
@ -563,13 +612,8 @@ I use [[https://abode.karthinks.com/org-latex-preview/][this]] fork of org-mode
 #+end_src
 * Pdfs
 ** Pdf tools
-I'm running into weird performance issues with =pdf-tools=. I think it has to do with HiDPI. Pdfs are a little blurry without scaling set, but it's way better than without.
 #+begin_src emacs-lisp
-  (use-package pdf-tools
-    :custom
-    (pdf-view-use-scaling nil)
-    :config
-    (pdf-tools-install))
+  (use-package pdf-tools)
 #+end_src
 * Terminals/Shells
 ** Eshell
@ -595,9 +639,9 @@ I'm running into weird performance issues with =pdf-tools=. I think it has to do
  (defalias 'eshell/ff 'find-file)
  (defalias 'eshell/fo 'find-file-other-window)
 #+end_src
-** VTerm
+** eat
 #+begin_src emacs-lisp
-  (use-package vterm)
+  (use-package eat)
 #+end_src
 ** Dired
 #+begin_src emacs-lisp
@ -614,36 +658,5 @@ I'm running into weird performance issues with =pdf-tools=. I think it has to do
 * Misc
 ** magit
 #+begin_src emacs-lisp
-  (use-package transient
-    :ensure t)
-
-  (use-package magit
-    :after transient)
-#+end_src
-** Newsticker
-#+begin_src emacs-lisp
-  (use-package newsticker
-    :ensure nil
-    :custom
-    (newsticker-url-list-defaults nil)
-    (newsticker-url-list
-     '(("Logic Arxiv" "https://rss.arxiv.org/rss/math.LO")
-       ("Planet Emacslife" "https://planet.emacslife.com/atom.xml")
-       ("It's Foss News" "https://news.itsfoss.com/latest/rss"))))
-#+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)
+  (use-package magit)
 #+end_src
--- a/fish/.config/fish/fish_plugins
+++ b/fish/.config/fish/fish_plugins
@ -1,3 +1,4 @@
 jorgebucaran/fisher
 jethrokuan/z
 patrickf1/fzf.fish
+catppuccin/fish
--- a/fish/.config/fish/fish_variables
+++ b/fish/.config/fish/fish_variables
@ -1,7 +1,7 @@
 # This file contains fish universal variable definitions.
 # VERSION: 3.0
 SETUVAR --export FZF_DEFAULT_OPTS:\x2d\x2dcolor\x3dbg\x2b\x3a\x23313244\x2cbg\x3a\x231e1e2e\x2cspinner\x3a\x23f5e0dc\x2chl\x3a\x23f38ba8\x20\x2d\x2dcolor\x3dfg\x3a\x23cdd6f4\x2cheader\x3a\x23f38ba8\x2cinfo\x3a\x23cba6f7\x2cpointer\x3a\x23f5e0dc\x20\x2d\x2dcolor\x3dmarker\x3a\x23f5e0dc\x2cfg\x2b\x3a\x23cdd6f4\x2cprompt\x3a\x23cba6f7\x2chl\x2b\x3a\x23f38ba8
-SETUVAR --export GPG_TTY:/dev/pts/0
+SETUVAR --export GPG_TTY:not\x20a\x20tty
 SETUVAR --export SSH_AGENT_PID:786479
 SETUVAR --export SSH_AUTH_SOCK:/tmp/ssh\x2dXXXXXXkRTHwG/agent\x2e786475
 SETUVAR ZO_CMD:zo
@ -10,48 +10,49 @@ SETUVAR Z_DATA:/home/wball/\x2elocal/share/z/data
 SETUVAR Z_DATA_DIR:/home/wball/\x2elocal/share/z
 SETUVAR Z_EXCLUDE:\x5e/home/wball\x24
 SETUVAR __fish_initialized:3800
+SETUVAR _fisher_catppuccin_2F_fish_files:\x7e/\x2econfig/fish/themes/Catppuccin\x20Frappe\x2etheme\x1e\x7e/\x2econfig/fish/themes/Catppuccin\x20Latte\x2etheme\x1e\x7e/\x2econfig/fish/themes/Catppuccin\x20Macchiato\x2etheme\x1e\x7e/\x2econfig/fish/themes/Catppuccin\x20Mocha\x2etheme
 SETUVAR _fisher_jethrokuan_2F_z_files:\x7e/\x2econfig/fish/functions/__z\x2efish\x1e\x7e/\x2econfig/fish/functions/__z_add\x2efish\x1e\x7e/\x2econfig/fish/functions/__z_clean\x2efish\x1e\x7e/\x2econfig/fish/functions/__z_complete\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/z\x2efish
 SETUVAR _fisher_jorgebucaran_2F_fisher_files:\x7e/\x2econfig/fish/functions/fisher\x2efish\x1e\x7e/\x2econfig/fish/completions/fisher\x2efish
 SETUVAR _fisher_patrickf1_2F_fzf_2E_fish_files:\x7e/\x2econfig/fish/functions/_fzf_configure_bindings_help\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_extract_var_info\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_preview_changed_file\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_preview_file\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_report_diff_type\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_report_file_type\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_directory\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_git_log\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_git_status\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_history\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_processes\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_variables\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_wrapper\x2efish\x1e\x7e/\x2econfig/fish/functions/fzf_configure_bindings\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/fzf\x2efish\x1e\x7e/\x2econfig/fish/completions/fzf_configure_bindings\x2efish
-SETUVAR _fisher_plugins:jorgebucaran/fisher\x1ejethrokuan/z\x1epatrickf1/fzf\x2efish
+SETUVAR _fisher_plugins:jorgebucaran/fisher\x1ejethrokuan/z\x1epatrickf1/fzf\x2efish\x1ecatppuccin/fish
 SETUVAR _fisher_upgraded_to_4_4:\x1d
-SETUVAR fish_color_autosuggestion:brblack
-SETUVAR fish_color_cancel:\x2d\x2dreverse
-SETUVAR fish_color_command:normal
-SETUVAR fish_color_comment:red
-SETUVAR fish_color_cwd:green
+SETUVAR fish_color_autosuggestion:6c7086
+SETUVAR fish_color_cancel:f38ba8
+SETUVAR fish_color_command:89b4fa
+SETUVAR fish_color_comment:7f849c
+SETUVAR fish_color_cwd:f9e2af
 SETUVAR fish_color_cwd_root:red
-SETUVAR fish_color_end:green
-SETUVAR fish_color_error:brred
-SETUVAR fish_color_escape:brcyan
+SETUVAR fish_color_end:fab387
+SETUVAR fish_color_error:f38ba8
+SETUVAR fish_color_escape:eba0ac
 SETUVAR fish_color_gray:6c7086
 SETUVAR fish_color_history_current:\x2d\x2dbold
-SETUVAR fish_color_host:normal
-SETUVAR fish_color_host_remote:yellow
-SETUVAR fish_color_keyword:normal
+SETUVAR fish_color_host:89b4fa
+SETUVAR fish_color_host_remote:a6e3a1
+SETUVAR fish_color_keyword:f38ba8
 SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue
-SETUVAR fish_color_normal:normal
-SETUVAR fish_color_operator:brcyan
-SETUVAR fish_color_option:cyan
-SETUVAR fish_color_param:cyan
-SETUVAR fish_color_quote:yellow
-SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold
-SETUVAR fish_color_search_match:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
-SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
-SETUVAR fish_color_status:red
-SETUVAR fish_color_user:brgreen
-SETUVAR fish_color_valid_path:\x2d\x2dunderline\x3dsingle
+SETUVAR fish_color_normal:cdd6f4
+SETUVAR fish_color_operator:f5c2e7
+SETUVAR fish_color_option:a6e3a1
+SETUVAR fish_color_param:f2cdcd
+SETUVAR fish_color_quote:a6e3a1
+SETUVAR fish_color_redirection:f5c2e7
+SETUVAR fish_color_search_match:\x2d\x2dbackground\x3d313244
+SETUVAR fish_color_selection:\x2d\x2dbackground\x3d313244
+SETUVAR fish_color_status:f38ba8
+SETUVAR fish_color_user:94e2d5
+SETUVAR fish_color_valid_path:\x2d\x2dunderline
 SETUVAR fish_key_bindings:fish_hybrid_key_bindings
 SETUVAR fish_pager_color_background:\x1d
-SETUVAR fish_pager_color_completion:normal
-SETUVAR fish_pager_color_description:yellow\x1e\x2d\x2ditalics
-SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline\x3dsingle
-SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dcyan
+SETUVAR fish_pager_color_completion:cdd6f4
+SETUVAR fish_pager_color_description:6c7086
+SETUVAR fish_pager_color_prefix:f5c2e7
+SETUVAR fish_pager_color_progress:6c7086
 SETUVAR fish_pager_color_secondary_background:\x1d
 SETUVAR fish_pager_color_secondary_completion:\x1d
 SETUVAR fish_pager_color_secondary_description:\x1d
 SETUVAR fish_pager_color_secondary_prefix:\x1d
-SETUVAR fish_pager_color_selected_background:\x2d\x2dreverse
+SETUVAR fish_pager_color_selected_background:\x1d
 SETUVAR fish_pager_color_selected_completion:\x1d
 SETUVAR fish_pager_color_selected_description:\x1d
 SETUVAR fish_pager_color_selected_prefix:\x1d
--- a/fish/.config/fish/themes/Catppuccin
+++ b/fish/.config/fish/themes/Catppuccin
@ -0,0 +1,30 @@
+# name: 'Catppuccin Frappé'
+# url: 'https://github.com/catppuccin/fish'
+# preferred_background: 303446
+
+fish_color_normal c6d0f5
+fish_color_command 8caaee
+fish_color_param eebebe
+fish_color_keyword e78284
+fish_color_quote a6d189
+fish_color_redirection f4b8e4
+fish_color_end ef9f76
+fish_color_comment 838ba7
+fish_color_error e78284
+fish_color_gray 737994
+fish_color_selection --background=414559
+fish_color_search_match --background=414559
+fish_color_option a6d189
+fish_color_operator f4b8e4
+fish_color_escape ea999c
+fish_color_autosuggestion 737994
+fish_color_cancel e78284
+fish_color_cwd e5c890
+fish_color_user 81c8be
+fish_color_host 8caaee
+fish_color_host_remote a6d189
+fish_color_status e78284
+fish_pager_color_progress 737994
+fish_pager_color_prefix f4b8e4
+fish_pager_color_completion c6d0f5
+fish_pager_color_description 737994
--- a/fish/.config/fish/themes/Catppuccin
+++ b/fish/.config/fish/themes/Catppuccin
@ -0,0 +1,30 @@
+# name: 'Catppuccin Latte'
+# url: 'https://github.com/catppuccin/fish'
+# preferred_background: eff1f5
+
+fish_color_normal 4c4f69
+fish_color_command 1e66f5
+fish_color_param dd7878
+fish_color_keyword d20f39
+fish_color_quote 40a02b
+fish_color_redirection ea76cb
+fish_color_end fe640b
+fish_color_comment 8c8fa1
+fish_color_error d20f39
+fish_color_gray 9ca0b0
+fish_color_selection --background=ccd0da
+fish_color_search_match --background=ccd0da
+fish_color_option 40a02b
+fish_color_operator ea76cb
+fish_color_escape e64553
+fish_color_autosuggestion 9ca0b0
+fish_color_cancel d20f39
+fish_color_cwd df8e1d
+fish_color_user 179299
+fish_color_host 1e66f5
+fish_color_host_remote 40a02b
+fish_color_status d20f39
+fish_pager_color_progress 9ca0b0
+fish_pager_color_prefix ea76cb
+fish_pager_color_completion 4c4f69
+fish_pager_color_description 9ca0b0
--- a/fish/.config/fish/themes/Catppuccin
+++ b/fish/.config/fish/themes/Catppuccin
@ -0,0 +1,30 @@
+# name: 'Catppuccin Macchiato'
+# url: 'https://github.com/catppuccin/fish'
+# preferred_background: 24273a
+
+fish_color_normal cad3f5
+fish_color_command 8aadf4
+fish_color_param f0c6c6
+fish_color_keyword ed8796
+fish_color_quote a6da95
+fish_color_redirection f5bde6
+fish_color_end f5a97f
+fish_color_comment 8087a2
+fish_color_error ed8796
+fish_color_gray 6e738d
+fish_color_selection --background=363a4f
+fish_color_search_match --background=363a4f
+fish_color_option a6da95
+fish_color_operator f5bde6
+fish_color_escape ee99a0
+fish_color_autosuggestion 6e738d
+fish_color_cancel ed8796
+fish_color_cwd eed49f
+fish_color_user 8bd5ca
+fish_color_host 8aadf4
+fish_color_host_remote a6da95
+fish_color_status ed8796
+fish_pager_color_progress 6e738d
+fish_pager_color_prefix f5bde6
+fish_pager_color_completion cad3f5
+fish_pager_color_description 6e738d
--- a/fish/.config/fish/themes/Catppuccin
+++ b/fish/.config/fish/themes/Catppuccin
@ -0,0 +1,30 @@
+# name: 'Catppuccin Mocha'
+# url: 'https://github.com/catppuccin/fish'
+# preferred_background: 1e1e2e
+
+fish_color_normal cdd6f4
+fish_color_command 89b4fa
+fish_color_param f2cdcd
+fish_color_keyword f38ba8
+fish_color_quote a6e3a1
+fish_color_redirection f5c2e7
+fish_color_end fab387
+fish_color_comment 7f849c
+fish_color_error f38ba8
+fish_color_gray 6c7086
+fish_color_selection --background=313244
+fish_color_search_match --background=313244
+fish_color_option a6e3a1
+fish_color_operator f5c2e7
+fish_color_escape eba0ac
+fish_color_autosuggestion 6c7086
+fish_color_cancel f38ba8
+fish_color_cwd f9e2af
+fish_color_user 94e2d5
+fish_color_host 89b4fa
+fish_color_host_remote a6e3a1
+fish_color_status f38ba8
+fish_pager_color_progress 6c7086
+fish_pager_color_prefix f5c2e7
+fish_pager_color_completion cdd6f4
+fish_pager_color_description 6c7086
--- a/niri/.config/niri/bluetooth.sh
+++ b/niri/.config/niri/bluetooth.sh
@ -1,11 +0,0 @@
-#!/bin/sh
-
-address="88:C9:E8:D7:60:85"
-
-if [ $1 = "connect" ]; then
-    notify-send "Bluetooth" "Connecting to Headphones"
-    bluetoothctl connect $address
-else
-    notify-send "Bluetooth" "Disconnecting Headphones"
-    bluetoothctl disconnect $address
-fi
--- a/niri/.config/niri/config.kdl
+++ b/niri/.config/niri/config.kdl
@ -95,8 +95,8 @@ binds {
    Mod+Semicolon hotkey-overlay-title="Run an Application: bemenu" { spawn "bemenu-run"; }
    Mod+Ctrl+O hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock"; }

-    Mod+B { spawn "sh" "-c" "~/.config/niri/bluetooth.sh connect"; }
-    Mod+Shift+B { spawn "sh" "-c" "~/.config/niri/bluetooth.sh disconnect"; }
+    Mod+B { spawn "bluetoothctl" "connect" "88:C9:E8:D7:60:85"; }
+    Mod+Shift+B { spawn "bluetoothctl" "disconnect" "88:C9:E8:D7:60:85"; }

    Mod+E { spawn "emacsclient" "--create-frame" "-a" "emacs"; }

--- 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
+    -- }
 }
--- a/scripts/.local/bin/aur
+++ b/scripts/.local/bin/aur
@ -0,0 +1,3 @@
+#!/bin/sh
+
+git clone "https://aur.archlinux.org/$1.git"
--- a/scripts/.local/bin/books.sh
+++ b/scripts/.local/bin/books.sh
@ -0,0 +1,12 @@
+#!/bin/sh
+
+prefix=$HOME/Nextcloud/Books/
+# dmenu="pipemenu --title Books"
+# dmenu="fuzzel -d -p books -w 80"
+dmenu="bemenu -p books --center --list 20 down --width-factor 0.5 --border 2 --bdr #f6c2e7"
+pdf=zathura
+# pdf="flatpak run org.gnome.Papers"
+
+choice=$(find $prefix -type f | sed "s|$prefix||;s/_/ /g" | $dmenu)
+
+test -n "$choice" && $pdf $(echo $choice | sed "s/ /_/g;s|^|$prefix|") &
--- a/scripts/.local/bin/papers.sh
+++ b/scripts/.local/bin/papers.sh
@ -0,0 +1,12 @@
+#!/bin/sh
+
+prefix=$HOME/Nextcloud/Papers/
+# dmenu="pipemenu --title Books"
+# dmenu="fuzzel -d -p books -w 80"
+dmenu="bemenu -p papers --center --list 20 down --width-factor 0.5 --border 2 --bdr #f6c2e7"
+pdf=zathura
+# pdf="flatpak run org.gnome.Papers"
+
+choice=$(find $prefix -type f | sed "s|$prefix||;s/_/ /g" | $dmenu)
+
+test -n "$choice" && $pdf $(echo $choice | sed "s/ /_/g;s|^|$prefix|") &
--- a/scripts/.local/bin/pinentry-fuzzel
+++ b/scripts/.local/bin/pinentry-fuzzel
@ -0,0 +1,18 @@
+#!/bin/sh
+
+echo "OK Please go ahead"
+while read stdin; do
+	case $stdin in
+	GETPIN | getpin)
+		echo "D $(fuzzel --prompt-only "Passphrase: " --cache /dev/null --password --dmenu)"
+		echo "OK"
+		;;
+	BYE | bye)
+		echo "OK closing connection"
+		exit 0
+		;;
+	*)
+		echo "OK"
+		;;
+	esac
+done