feat: hyprland is back

emacs/doom.d/config.el

@@ -32,7 +32,8 @@
 ;; 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-dracula)
+(setq doom-theme 'catppuccin)
+(setq catppuccin-flavor 'macchiato)
 
 ;; 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'.
@@ -45,36 +46,31 @@
 (add-hook 'prog-mode-hook #'rainbow-delimiters-mode)
 
 (setq elfeed-feeds '(("https://lobste.rs/rss" tech)
-                     ("https://news.ycombinator.com/rss" tech)))
+  ("https://news.ycombinator.com/rss" tech)))
 
-;; Whenever you reconfigure a package, make sure to wrap your config in an
-;; `after!' block, otherwise Doom's defaults may override your settings. E.g.
-;;
-;;   (after! PACKAGE
-;;     (setq x y))
-;;
-;; The exceptions to this rule:
-;;
-;;   - Setting file/directory variables (like `org-directory')
-;;   - Setting variables which explicitly tell you to set them before their
-;;     package is loaded (see 'C-h v VARIABLE' to look up their documentation).
-;;   - Setting doom variables (which start with 'doom-' or '+').
-;;
-;; Here are some additional functions/macros that will help you configure Doom.
-;;
-;; - `load!' for loading external *.el files relative to this one
-;; - `use-package!' for configuring packages
-;; - `after!' for running code after a package has loaded
-;; - `add-load-path!' for adding directories to the `load-path', relative to
-;;   this file. Emacs searches the `load-path' when you load packages with
-;;   `require' or `use-package'.
-;; - `map!' for binding new keys
-;;
-;; To get information about any of these functions/macros, move the cursor over
-;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k').
-;; This will open documentation for it, including demos of how they are used.
-;; Alternatively, use `C-h o' to look up a symbol (functions, variables, faces,
-;; etc).
-;;
-;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how
-;; they are implemented.
+(add-hook 'clojure-mode #'paredit-mode)
+(add-hook 'emacs-lisp-mode #'paredit-mode)
+
+(after! paredit
+  (define-key paredit-mode-map (kbd "C-<left>") nil)
+  (define-key paredit-mode-map (kbd "C-<right>") nil)
+
+  (map! :nvi
+
+        :desc "Forward barf"
+        "M-<left>" #'paredit-forward-barf-sexp
+
+        :desc "Forward slurp"
+        "M-<right>" #'paredit-forward-slurp-sexp
+
+        :desc "Backward slurp"
+        "M-S-<left>" #'paredit-backward-slurp-sexp
+
+        :desc "Backward barf"
+        "M-S-<right>" #'paredit-backward-barf-sexp
+
+        :desc "Backward"
+        "C-c <left>" #'paredit-backward
+
+        :desc "Forward"
+        "C-c <right>" #'paredit-forward))

emacs/doom.d/init.el

@@ -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
@@ -119,7 +119,7 @@
        ;;agda              ; types of types of types of types...
        ;;beancount         ; mind the GAAP
        ;;(cc +lsp)         ; C > C++ == 1
-       clojure           ; java with a lisp
+       (clojure +lsp)          ; java with a lisp
        ;;common-lisp       ; if you've seen one lisp, you've seen them all
        ;;coq               ; proofs-as-programs
        ;;crystal           ; ruby at the speed of c
@@ -157,7 +157,7 @@
        ;;nim               ; python + lisp at the speed of c
        (nix +lsp)          ; I hereby declare "nix geht mehr!"
        ;;ocaml             ; an objective camel
-       org               ; organize your plain life in plain text
+       (org +roam2)               ; organize your plain life in plain text
        ;;php               ; perl's insecure younger brother
        ;;plantuml          ; diagrams for confusing people more
        ;;graphviz          ; diagrams for confusing yourself even more

emacs/home.nix

@@ -1,8 +1,15 @@
 { config, pkgs, ... }: {
   programs.doom-emacs = {
     enable = true;
+    emacs = pkgs.emacs-pgtk;
     doomDir = ./doom.d;
     doomLocalDir = "${config.home.homeDirectory}/.local/share/nix-doom";
-    extraPackages = epkgs: [ epkgs.treesit-grammars.with-all-grammars epkgs.rainbow-delimiters pkgs.ispell ];
+    extraPackages = epkgs: with epkgs; [
+      catppuccin-theme
+      treesit-grammars.with-all-grammars
+      rainbow-delimiters
+      pkgs.ispell
+      pkgs.clojure-lsp
+    ];
   };
 }