Parinfer time

emacs/emacs.nix

@@ -42,8 +42,6 @@
       git-gutter
       goto-chg
       keychain-environment
-      lispy
-      lispyville
       lsp-scheme
       magit
       magit-todos
@@ -59,9 +57,11 @@
       org-rainbow-tags
       org-roam
       org-roam-ui
+      parinfer-rust-mode
       pass
       password-store
       password-store-otp
+      plan9-theme
       rainbow-delimiters
       tempel
       tree-sitter

emacs/init.el

@@ -62,6 +62,7 @@
   (minibuffer-prompt-properties
    (read-only t cursor-intangible t face minibuffer-prompt))
   (tab-always-indent 'complete)
+  (indent-tabs-mode nil)
   (enable-recursive-minibuffers t)
   (enable-remote-dir-locals t)
   (global-hl-line-mode t)
@@ -175,7 +176,8 @@
   :config
   (with-eval-after-load 'eglot
     (setq completion-category-defaults nil))
-  (setq completion-styles '(orderless basic)
+  (setq completion-styles
+        '(orderless basic)
         completion-category-defaults nil
         completion-category-overrides '((file (styles partial-completion)))))
 
@@ -296,46 +298,57 @@
 
 ;;;; Lisp Navigation and Editing
 ;;;;; Basic
-(use-package lispy
+(use-package parinfer-rust-mode
   :custom
-  (lispy-close-quotes-at-end-p t)
+  (parinfer-rust-auto-download t)
-  (lispy-compat '("cider" "edebug" "magit-blame-mode"))
-  (lispy-visit-method #'consult-find)
-  (lispy-occur-backend #'consult-line)
   :hook
   emacs-lisp-mode
+  clojure-ts-mode
   scheme-mode
+  (parinfer-rust-mode . electric-pair-local-mode)
   :config
-  (evil-define-key 'insert 'prog-mode-map
+  (evil-define-key 'normal 'parinfer-rust-mode-map
-    "(" #'lispy-parens
+    (kbd "r") #'raise-sexp))
-    "{" #'lispy-braces
+;; (use-package lispy
-    "}" #'lispy-brackets
+;;   :custom
-    ")" #'lispy-right-nostring
+;;   (lispy-close-quotes-at-end-p t)
-    "\"" #'lispy-quotes
+;;   (lispy-compat '("cider" "edebug" "magit-blame-mode"))
-    (kbd "<DEL>") #'lispy-delete-backward
+;;   (lispy-visit-method #'consult-find)
-    ">" #'special-lispy-slurp
+;;   (lispy-occur-backend #'consult-line)
-    "<" #'special-lispy-barf
+;;   :hook
-    "c" #'special-lispy-clone
+;;   emacs-lisp-mode
-    "q" #'special-lispy-ace-paren
+;;   scheme-mode
-    "w" #'special-lispy-move-up
+;;   :config
-    "s" #'special-lispy-move-down
+;;   (evil-define-key 'insert 'clojure-ts-mode-map
-    "r" #'special-lispy-raise
+;;     "(" #'lispy-parens
-    "e" #'special-lispy-eval))
+;;     "{" #'lispy-braces
+;;     "}" #'lispy-brackets
+;;     ")" #'lispy-right-nostring
+;;     "\"" #'lispy-quotes
+;;     (kbd "<DEL>") #'lispy-delete-backward
+;;     ">" #'special-lispy-slurp
+;;     "<" #'special-lispy-barf
+;;     "c" #'special-lispy-clone
+;;     "q" #'special-lispy-ace-paren
+;;     "w" #'special-lispy-move-up
+;;     "s" #'special-lispy-move-down
+;;     "r" #'special-lispy-raise
+;;     "e" #'special-lispy-eval))
 
-(use-package lispyville
+;; (use-package lispyville
-  :bind
+;;   :bind
-  (:map evil-normal-state-map
+;;   (:map evil-normal-state-map
-	("<leader>," . 'lispyville-comment-or-uncomment)
+;;      ("<leader>," . 'lispyville-comment-or-uncomment)
-	("<leader>." . 'lispyville-comment-and-clone-dwim)
+;;      ("<leader>." . 'lispyville-comment-and-clone-dwim)
-	("<leader>ci" . 'lispyville-comment-or-uncomment-line))
+;;      ("<leader>ci" . 'lispyville-comment-or-uncomment-line))
-  :hook
+;;   :hook
-  (lispy-mode . lispyville-mode))
+;;   (lispy-mode . lispyville-mode))
 
 ;;;;; Visual Aid
-(use-package rainbow-delimiters
+;; (use-package rainbow-delimiters
-  :hook
+;;   :hook
-  emacs-lisp-mode
+;;   emacs-lisp-mode
-  scheme-mode)
+;;   scheme-mode)
 
 ;;;; Programming
 (use-package editorconfig
@@ -407,14 +420,12 @@
 
 ;;;;; Clojure
 (use-package clojure-ts-mode
-  :after (tree-sitter lispy)
+  :after tree-sitter
   :config
   (require 'sesman)
   (sesman-install-menu clojure-mode-map)
   :hook
-  ((clojure-ts-mode . lispy-mode)
+  ((clojure-ts-mode . eglot-ensure)
-   (clojure-ts-mode . eglot-ensure)
-   (clojure-ts-mode . rainbow-delimiters-mode)
    (clojure-ts-mode . (lambda ()
                         (setq-local sesman-system 'CIDER)))
    (clojure-ts-mode . (lambda ()
@@ -428,9 +439,6 @@
   ("\\.cljc\\'" . #'clojurec-ts-mode)
   ("\\.cljs\\'" . #'clojurescript-ts-mode)
   :init
-  (add-to-list 'lispy-clojure-modes 'clojure-ts-mode)
-  (add-to-list 'lispy-clojure-modes 'clojurec-ts-mode)
-  (add-to-list 'lispy-clojure-modes 'clojurescript-ts-mode)
   (add-to-list 'tree-sitter-major-mode-language-alist
                '(clojure-ts-mode . clojure))
   (add-to-list 'tree-sitter-major-mode-language-alist

home.nix

@@ -49,6 +49,8 @@ args@{ config, pkgs, hyprland, split-monitor-workspaces, flatpaks, ... }:
     perl538Packages.TermReadKey
     pinentry-qt
     pixman
+    plan9port
+    edwood
     podman-compose
     pwvucontrol
     qtpass