emacs/.config/emacs/Emacs.org

@@ -4,6 +4,7 @@
 #+property: header-args:emacs-lisp :tangle ./init.el :mkdirp
 
 * Basic Settings
+
 ** UI
 #+begin_src emacs-lisp
   (setq inhibit-startup-message t)
@@ -17,6 +18,7 @@
   (setq default-frame-alist '((undecorated . t)))
   (scroll-bar-mode -1)
 #+end_src
+
 ** Backups
 #+begin_src emacs-lisp
   (defvar wball/backup-directory (concat user-emacs-directory "backups"))
@@ -29,7 +31,9 @@
         delete-old-versions t
         auto-save-default t)
 #+end_src
+
 * Packages
+
 ** Straight.el
 #+begin_src emacs-lisp
   (defvar bootstrap-version)
@@ -45,6 +49,7 @@
         (eval-print-last-sexp)))
     (load bootstrap-file nil 'nomessage))
 #+end_src
+
 ** use-package
 #+begin_src emacs-lisp
   (straight-use-package 'use-package)
@@ -56,6 +61,7 @@
   (setq use-package-always-ensure t)
   (setq use-package-verbose t)
 #+end_src
+
 ** Automatic updates
 #+begin_src emacs-lisp
   (use-package auto-package-update
@@ -67,16 +73,20 @@
     (auto-package-update-maybe)
     (auto-package-update-at-time "09:00"))
 #+end_src
+
 * UI
+
 ** Icons
 #+begin_src emacs-lisp
   (use-package all-the-icons)
 #+end_src
+
 ** Rainbow delimiters
 #+begin_src emacs-lisp
   (use-package rainbow-delimiters
     :hook (prog-mode . rainbow-delimiters-mode))
 #+end_src
+
 ** Fonts
 #+begin_src emacs-lisp
   (use-package fontaine
@@ -100,6 +110,7 @@
              :variable-pitch-family "Inter")))
     (fontaine-set-preset 'regular))
 #+end_src
+
 ** Ligatures
 #+begin_src emacs-lisp
   (use-package ligature
@@ -121,6 +132,7 @@
                                          "\\\\" "://"))
     (global-ligature-mode t))
 #+end_src
+
 ** Which key
 #+begin_src emacs-lisp
   (use-package which-key
@@ -130,6 +142,7 @@
     (which-key-mode)
     (setq which-key-idle-delay 0.3))
 #+end_src
+
 ** Theme
 *** Catppuccin
 #+begin_src emacs-lisp
@@ -138,18 +151,21 @@
     (load-theme 'catppuccin :no-confirm))
 #+end_src
 * Completion
+
 ** Vertico
 #+begin_src emacs-lisp
   (use-package vertico
     :init (vertico-mode)
     :custom (vertico-cycle t))
 #+end_src
+
 ** Savehist
 #+begin_src emacs-lisp
   (use-package savehist
     :straight (:type built-in)
     :init (savehist-mode))
 #+end_src
+
 ** Orderless
 #+begin_src emacs-lisp
   (use-package orderless
@@ -158,6 +174,7 @@
           completion-category-defaults nil
           completion-category-overrides '((file (styles partial-completion)))))
 #+end_src
+
 ** Corfu
 #+begin_src emacs-lisp
   (use-package corfu
@@ -169,6 +186,7 @@
     (global-corfu-mode)
     (setq tab-always-indent 'complete))
 #+end_src
+
 ** Cape
 #+begin_src emacs-lisp
   (use-package cape
@@ -177,12 +195,14 @@
     (add-to-list 'completion-at-point-functions #'cape-file)
     (add-to-list 'completion-at-point-functions #'cape-history))
 #+end_src
+
 ** Marginalia
 #+begin_src emacs-lisp
   (use-package marginalia
     :after vertico
     :init (marginalia-mode))
 #+end_src
+
 ** Consult
 #+begin_src emacs-lisp
   (use-package consult
@@ -259,36 +279,70 @@
 
     (setq consult-narrow-key "<"))
 #+end_src
+
+* Lsp
+#+begin_src emacs-lisp
+  (use-package lsp-mode
+    :bind-keymap ("C-;" . lsp-command-map)
+    :init
+    (setq lsp-keymap-prefix "C-;")
+    :hook (lsp-mode . lsp-enable-which-key-integration)
+    :custom
+    (lsp-semantic-tokens-enable t)
+    (lsp-keep-workspace-alive nil)
+    (lsp-signature-doc-lines 5))
+
+  (use-package lsp-ui
+    :after lsp-mode)
+#+end_src
+
 * Languages
 ** Agda
 #+begin_src emacs-lisp
  (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 idris2-mode
     :straight (:type git
-  		   :host github
+                   :host github
-  		   :repo "idris-community/idris2-mode"))
+                   :repo "idris-community/idris2-mode"))
+    ;; :hook ((idris2-mode . lsp))
+    ;; :custom
+    ;; (idris2-semantic-source-highlighting nil)
+    ;; :config
+    ;; (add-to-list 'lsp-language-id-configuration '(idris-mode . "idris2"))
+
+    ;; (lsp-register-client
+    ;;  (make-lsp-client
+    ;;   :new-connection (lsp-stdio-connection "idris2-lsp")
+    ;;   :major-modes '(idris2-mode)
+    ;;   :server-id 'idris2-lsp)))
 #+end_src
-** Sage
+** Haskell
 #+begin_src emacs-lisp
-  (use-package sage-shell-mode
+  (use-package haskell-mode)
-    :hook
+
-    (sage-shell-mode . eldoc-mode)
+  (use-package lsp-haskell
-    (sage-shell:sage-mode . eldoc-mode)
+    :after lsp-mode
-    (sage-shell-after-prompt . sage-shell-view-mode)
+    :hook (haskell-mode . lsp))
-    :custom
+#+end_src
-    (sage-shell-view-default-resolution 250)
+** PG
-    :config
+#+begin_src emacs-lisp
-    (sage-shell:define-alias))
+  (use-package proof-general)
+#+end_src
+** Lean
+#+begin_src emacs-lisp
+  (use-package lean4-mode
+    :commands lean4-mode
+    :straight (lean4-mode :type git :host github
+                          :repo "leanprover-community/lean4-mode"
+                          :files ("*.el" "data")))
 #+end_src
 * Latex
+
 ** Auctex
 #+begin_src emacs-lisp
   (use-package tex-site
@@ -313,6 +367,7 @@
        (output-pdf "Zathura")
        (output-html "xdg-open"))))
 #+end_src
+
 ** CDLatex
 #+begin_src emacs-lisp
   (use-package cdlatex
@@ -321,6 +376,7 @@
     :custom
     (cdlatex-math-symbol-prefix ?\;))
 #+end_src
+
 ** Yasnippet and laas
 #+begin_src emacs-lisp
   (use-package yasnippet
@@ -378,6 +434,7 @@
              (yas-expand-snippet "_{$1}$0"))))
 #+end_src
 * Org Mode
+
 ** Org itself
 #+begin_src emacs-lisp
   (use-package org
@@ -413,12 +470,14 @@
     :hook (org-mode . visual-line-mode)
     (org-mode . flyspell-mode))
 #+end_src
+
 ** Prettify
 #+begin_src emacs-lisp
   (use-package org-modern
     :hook ((org-mode . org-modern-mode)
            (org-agenda-finalize . org-modern-agenda)))
 #+end_src
+
 ** Citeproc
 #+begin_src emacs-lisp
   (use-package org-ref)
@@ -427,18 +486,21 @@
   (require 'oc-natbib)
   (require 'oc-biblatex)
 #+end_src
+
 ** Org fragtog
 Once [[https://abode.karthinks.com/org-latex-preview/][the improvements to =org-latex-preview= get merged]], this will be unnecessary. For now, however, this really comes in handy.
 #+begin_src emacs-lisp
   (use-package org-fragtog
     :hook (org-mode . org-fragtog-mode))
 #+end_src
+
 * Pdfs
 ** Pdf tools
 #+begin_src emacs-lisp
   (use-package pdf-tools)
 #+end_src
 * Terminals/Shells
+
 ** Eshell
 #+begin_src emacs-lisp
   (defun wball/configure-eshell ()
@@ -459,15 +521,18 @@ Once [[https://abode.karthinks.com/org-latex-preview/][the improvements to =org-
     (with-eval-after-load 'esh-opt
       (setq eshell-destroy-buffer-when-process-dies t)))
 
+  (defun eshell/clear (&rest args)
+    (apply #'eshell/clear-scrollback args))
+
   (defalias 'ff 'find-file)
   (defalias 'fo 'find-file-other-window)
-  (defalias 'clear 'clear-scrollback)
 
   (use-package exec-path-from-shell
     :config
     (when (daemonp)
       (exec-path-from-shell-initialize)))
 #+end_src
+
 ** Dired
 #+begin_src emacs-lisp
   (use-package dired

zsh/.config/zsh/.zprofile

@@ -12,7 +12,7 @@ export XDG_DATA_HOME="$HOME/.local/share"
 export EDITOR=nvim
 export VISUAL=nvim
 export TERM=xterm-256color
-export BROWSER=librewolf
+export BROWSER=firefox
 
 # Wayland settings
 export MOZ_ENABLE_WAYLAND=1