emacs: fucking everythign bro

12 files changed, 78 insertions, 18 deletions

diff --git a/doom/.config/doom/+dashboard.el b/doom/.config/doom/+dashboard.el
index 0d7cf78..5962679 100644
--- a/doom/.config/doom/+dashboard.el
+++ b/doom/.config/doom/+dashboard.el
@@ -4,7 +4,8 @@
   '("Vi-Vi-Vi editor of the beast"
     "Welcome to Emacs"
     "M-x M-x"
-    "nnngh *humps* get pregnant!!!"))
+    "nnngh *humps* get pregnant!!!"
+    "tetris, a therapist, web browser, music player... oh and a text editor if youre into that."))
 (defun my/dashboard-random-message ()
   (nth (random (length dashboard-messages))
        dashboard-messages))
@@ -15,3 +16,4 @@
   (minimal-dashboard-buffer-name "*dash*")
   (minimal-dashboard-text #'my/dashboard-random-message)
   (minimal-dashboard-modeline-shown 1))
+(setq doom-fallback-buffer-name "*dash*")
diff --git a/doom/.config/doom/+eglot.el b/doom/.config/doom/+eglot.el
new file mode 100644
index 0000000..2f26d72
--- /dev/null
+++ b/doom/.config/doom/+eglot.el
@@ -0,0 +1,18 @@
+;;; $DOOMDIR/+eglot.el -*- lexical-binding: t; -*-
+;; TODO: make eglot work with HTML
+(use-package! eglot
+  :hook
+  (prog-mode     . eglot-ensure)
+  (markdown-mode . eglot-ensure))
+(after! eglot
+  (cl-defmethod eglot-register-capability
+    (server (method (eql workspace/didChangeWatchedFiles)) id &key watchers)
+    nil)
+  (add-to-list 'eglot-server-programs
+               '((markdown-mode)
+                 . ("zk" "lsp")))
+  (add-to-list 'eglot-server-programs
+               '((typescript-ts-mode javascript-mode)
+                 . ("oxlint" "--lsp"))))
+(setq eglot-sync-connect nil
+      eglot-connect-timeout 60)
diff --git a/doom/.config/doom/+flycheck.el b/doom/.config/doom/+flycheck.el
new file mode 100644
index 0000000..0b184b3
--- /dev/null
+++ b/doom/.config/doom/+flycheck.el
@@ -0,0 +1,21 @@
+;;; $DOOMDIR/+flycheck.el -*- lexical-binding: t; -*-
+;; TODO: fix linter not working (not popping up and stuff)
+(after! flycheck
+  (flycheck-define-checker htmlhint
+    "htmlhint for flycheck"
+    :command ("htmlhint" "--format" "unix" source)
+    :error-patterns
+    ((error
+      line-start
+      (file-name) ":" line ":" column ": "
+      (message) line-end))
+    :modes (web-mode))
+  (add-to-list 'flycheck-checkers 'htmlhint)
+  (flycheck-add-next-checker
+   'javascript-eslint
+   'javascript-oxlint)
+  (flycheck-add-next-checker
+   'html-tidy
+   'htmlhint)
+  (setq flycheck-check-syntax-automatically
+        '(save mode-enabled)))
diff --git a/doom/.config/doom/+format.el b/doom/.config/doom/+format.el
new file mode 100644
index 0000000..93d15c1
--- /dev/null
+++ b/doom/.config/doom/+format.el
@@ -0,0 +1,11 @@
+;;; $DOOMDIR/+format.el -*- lexical-binding: t; -*-
+
+(use-package! format-all
+  :commands format-all-mode
+  :hook (prog-mode . format-all-mode)
+  :config
+  (add-to-list 'format-all-mode-hook 'format-all-ensure-formatter))
+(with-eval-after-load 'format-all
+  (setq-default format-all-formatters
+                '(("HTML" (oxfmt "--config=.oxfmtrc.json"))
+                  ("CSS" (oxfmt "--config=.oxfmtrc.json")))))
diff --git a/doom/.config/doom/+git.el b/doom/.config/doom/+git.el
new file mode 100644
index 0000000..be9dc99
--- /dev/null
+++ b/doom/.config/doom/+git.el
@@ -0,0 +1,7 @@
+;;; $DOOMDIR/+git.el -*- lexical-binding: t; -*-
+(map!
+ :leader
+ :prefix "g m"
+ :desc "Describe" "c" #'majutsu-describe
+ :desc "New" "n" #'majutsu-new
+ :desc "Push" "p" #'majutsu-git-push)
diff --git a/doom/.config/doom/+jabber.el b/doom/.config/doom/+jabber.el
index 64c6e2a..3355070 100644
--- a/doom/.config/doom/+jabber.el
+++ b/doom/.config/doom/+jabber.el
@@ -8,8 +8,9 @@
 
 (map! :leader
       :prefix "j"
-      :desc "Jabber connect"     "c" #'jabber-connect-all
-      :desc "Jabber disconnect"  "q" #'jabber-disconnect
-      :desc "Jabber roster"      "r" #'jabber-roster
-      :desc "Jabber new chat"    "n" #'jabber-chat-with
-      :desc "Jabber set status"  "s" #'jabber-send-presence)
+      :desc "Connect"     "c" #'jabber-connect-all
+      :desc "Disconnect"  "q" #'jabber-disconnect
+      :desc "Roster"      "f" #'jabber-roster
+      :desc "Reply"       "r" #'jabber-chat-reply
+      :desc "New chat"    "n" #'jabber-chat-with
+      :desc "Set status"  "s" #'jabber-send-presence)
diff --git a/doom/.config/doom/+lang.el b/doom/.config/doom/+lang.el
index 1cbfe38..6ae23c5 100644
--- a/doom/.config/doom/+lang.el
+++ b/doom/.config/doom/+lang.el
@@ -1,11 +1,9 @@
 ;;; $DOOMDIR/+lang.el -*- lexical-binding: t; -*-
-(after! eglot
-  (cl-defmethod eglot-register-capability
-    (server (method (eql workspace/didChangeWatchedFiles)) id &key watchers)
-    nil))
-(setq eglot-sync-connect nil
-      eglot-connect-timeout 60)
+(load! "+eglot")
+(load! "+flycheck")
+(load! "+format")
 
+;; functions
 (defun my/hs-eval ()
   (interactive)
   (let* ((src (buffer-file-name))
diff --git a/doom/.config/doom/+lsp.el b/doom/.config/doom/+lsp.el
new file mode 100644
index 0000000..db08c7e
--- /dev/null
+++ b/doom/.config/doom/+lsp.el
@@ -0,0 +1,3 @@
+;;; $DOOMDIR/+lsp.el -*- lexical-binding: t; -*-
+(after! eglot
+  (setq eglot-autoshutdown t))
diff --git a/doom/.config/doom/config.el b/doom/.config/doom/config.el
index 1569f56..d339c72 100644
--- a/doom/.config/doom/config.el
+++ b/doom/.config/doom/config.el
@@ -9,3 +9,4 @@
 (load! "+emms")
 (load! "+zk")
 (load! "+term")
+(load! "+git")
diff --git a/doom/.config/doom/packages.el b/doom/.config/doom/packages.el
index 74fdb13..e9bffc7 100644
--- a/doom/.config/doom/packages.el
+++ b/doom/.config/doom/packages.el
@@ -14,3 +14,4 @@
 (package! exwm)
 (package! edwina)
 (package! minimal-dashboard)
+(package! format-all)
diff --git a/gram/.config/gram/keymap.jsonc b/gram/.config/gram/keymap.jsonc
index 47d5bf6..409c993 100644
--- a/gram/.config/gram/keymap.jsonc
+++ b/gram/.config/gram/keymap.jsonc
@@ -15,10 +15,7 @@
       "shift-y": ["vim::NextWordStart", { "ignore_punctuation": true }],
 
       "p": ["vim::PushFindForward", { "before": true, "multiline": false }],
-      "shift-p": [
-        "vim::PushFindBackward",
-        { "after": true, "multiline": false },
-      ],
+      "shift-p": ["vim::PushFindBackward", { "after": true, "multiline": false }],
       "b": "vim::RepeatFind",
       "shift-b": "vim::RepeatFindReversed",
       "k": "vim::MoveToNextMatch",
diff --git a/xmonad/.config/xmonad/stack.yaml b/xmonad/.config/xmonad/stack.yaml
index 3d3ad2a..195637a 100644
--- a/xmonad/.config/xmonad/stack.yaml
+++ b/xmonad/.config/xmonad/stack.yaml
@@ -30,8 +30,8 @@ snapshot:
 #   - auto-update
 #   - wai
 packages:
-- xmonad
-- xmonad-contrib
+  - xmonad
+  - xmonad-contrib
 # Dependency packages to be pulled from upstream that are not in the snapshot.
 # These entries can reference officially published versions as well as
 # forks / in-progress versions pinned to a git hash. For example: