2 Commits 0e0ecfc43b ... 038674e01c

Auteur SHA1 Bericht Datum
  Eiyeron Fulmincendii 038674e01c Finally got to make digraph's C-k map work on org. 4 jaren geleden
  Eiyeron Fulmincendii dc8bfbf557 Throw-in-everything commit. 4 jaren geleden
2 gewijzigde bestanden met toevoegingen van 59 en 16 verwijderingen
  1. 53 10
      config.org
  2. 6 6
      init.el

+ 53 - 10
config.org

@@ -77,7 +77,6 @@ Experimenting with that package. I might need to fork it in the future to add th
 #+begin_src emacs-lisp
 (package! pico8-mode :recipe (:host github :repo "Kaali/pico8-mode"))
 #+end_src
-* TODO Config variables to make stuff easily tweakable
 *** Powershell
 #+begin_src emacs-lisp
 (package! powershell.el :ignore (not (eq system-type 'windows-nt)) :recipe (:host github :repo "jschaf/powershell.el"))
@@ -99,6 +98,10 @@ What remains is adding a way to detect the needed executables in the PATH.
 #+begin_src emacs-lisp
 (package! org-fragtog)
 #+end_src
+*** Valign
+#+begin_src emacs-lisp
+(package! valign :recipe (:host github :repo "casouri/valign" :branch "master"))
+#+end_src
 * TODO Config variables to make stuff easily tweakable
 * Helper functions
 I had issues before dealing with specific patterns at configuration time. At
@@ -222,7 +225,7 @@ emacs, so I can't use Pragmata for the serif font. I'm currently having issues
 with ~fixed-pitch-serif~ as it doesn't properly load the ~doom-font~, so I am
 resorting to use a custom serif font, Iosevka Slab, from the Iosevka forge, my
 other favorite programming font. Actually, they blend well together, even if
-Iosevka Slab feels /ever so slightly/ too thick against Pramgata.
+Iosevka Slab feels /ever so slightly/ too thick against Pragmata.
 
 PragmataPro's ligatures have been enabled within ~init.el~ though the
 ~pretty-code~ layer and it's optional specialization for this font. No more
@@ -239,7 +242,7 @@ Gruvbox-light doesn't need a font as think as its dark alternative.
 ***  Extra ligatures
 #+begin_src emacs-lisp
 (after! ligatures
-  (setq +ligatures-extras-in-modes '(org-mode)))
+  (setq +ligatures-extras-in-modes '(org-mode rustic-mode)))
 #+end_src
 
 ** STRT Doom Modeline
@@ -306,7 +309,8 @@ update those variables.
 *** Org-Attach location
 Instead of having a global attachment dir, I'm going to use multiple folders as I have multiple org base folders
 #+begin_src emacs-lisp
-(setq org-attach-id-dir ".attach/")
+(after! org
+  (setq org-attach-id-dir ".attach/"))
 #+end_src
 ** Small visual tweaks
 Emacs 27 adds a face attribute that allows a line background to extend past the
@@ -322,14 +326,23 @@ disabling the line numbers.
   (custom-set-faces! '(org-block :extend t))
   (add-hook 'org-mode-hook (lambda () (setq-local display-line-numbers nil))))
 #+end_src
-** TODO Digraphs
-I kinda like this feature and want it back on C-k on Org. The current snippet is
-broken, I need to find the proper way to turn digraph input back on.
-#+begin_src emacs-lisp :tangle no
-(after! org
+** Digraphs
+I kinda like this feature and want it back on C-k on Org. Evil-org put its own
+mapping at this place so I have to hijack this key /after/ its configuration.
+#+begin_src emacs-lisp
+(after! evil-org
   (map! :map evil-org-mode-map
         :i "C-k" 'evil-insert-digraph))
 #+end_src
+
+** TODO Tables
+#+begin_src emacs-lisp
+(after! org
+  (custom-set-faces!
+    '(org-table :inherit fixed-pitch)
+    '(org-table-header :inherit fixed-pitch)
+    '(org-brain-wires :inherit fixed-pitch)))
+#+end_src
 ** TODO Todo lists
 I'd like to track when I finish tasks. I'm not feeling that adding a note each
 time I close an item might be the best thing as I'd get tired of the prompt
@@ -540,6 +553,17 @@ Yay $\LaTeX$!
   :config
   (add-hook 'org-mode-hook #'org-fragtog-mode))
 #+end_src
+** TODO valign
+[[https://github.com/casouri/valign][Valign]] is an org-mode plugin that overlays tables to draw them with
+non-character borders. Looks cleaner with it. Need to figure the boot and
+performance impact.
+#+begin_src emacs-lisp
+(use-package! valign
+  :after org
+  :config
+  (setq valign-fancy-bar t)
+  (add-hook 'org-mode-hook #'valign-mode))
+#+end_src
 * Pico-8
 Using that [[https://github.com/Kaali/pico8-mode][pico-8 mode]] for Emacs might be fun. It even includes an overlay to
 display the GFX and label as pictures in the code. Fancy!
@@ -562,8 +586,9 @@ space.
 
 ** Proper non-lua text color
 #+begin_src emacs-lisp
+(after! pico8-mode
 (custom-set-faces!
-  `(pico8--non-lua-overlay :weight light :foreground ,(doom-color 'base4)))
+  `(pico8--non-lua-overlay :weight light :foreground ,(doom-color 'base4))))
 #+end_src
 
 * Blog writing
@@ -816,6 +841,24 @@ keyboard. Let's add a mapping to quickly insert various kaomojis.
 I have further questions adressed to myself regarding the mental sanity behind
 such feature.
 ** TODO Pragmata's own characters
+* TODO Command line extension
+#+begin_src emacs-lisp
+    (defun command-line-ediff (switch)
+      (let ((file1 (pop command-line-args-left))
+            (file2 (pop command-line-args-left)))
+        (ediff file1 file2)))
+
+
+    (defun command-line-ediff-merge (switch)
+      (let ((file1 (pop command-line-args-left))
+            (file2 (pop command-line-args-left))
+            (ancestor (pop command-line-args-left)))
+        (ediff-merge-files-with-ancestor file1 file2 ancestor)))
+
+    (add-to-list 'command-switch-alist '("ediff" . command-line-ediff))
+    (add-to-list 'command-switch-alist '("ediff-merge" . command-line-ediff-merge))
+#+end_src
+
 * Unsorted Functions
 ** Search Everything with Everything
 [[https://www.voidtools.com/][Everything]] is a very useful tool for Windows that indexes all the available in

+ 6 - 6
init.el

@@ -45,7 +45,7 @@
 
        ;;tabs              ; an tab bar for Emacs
        treemacs          ; a project drawer, like neotree but cooler
-       unicode           ; extended unicode support for various languages
+       ;;unicode           ; extended unicode support for various languages
        vc-gutter         ; vcs diff in the fringe
        vi-tilde-fringe   ; fringe tildes to mark beyond EOB
        ;;window-select     ; visually switch windows
@@ -54,9 +54,9 @@
 
        :editor
        (evil +everywhere); come to the dark side, we have cookies
-       ;; file-templates    ; auto-snippets for empty files
+       file-templates    ; auto-snippets for empty files
        fold              ; (nigh) universal code folding
-       ;;(format +onsave)  ; automated prettiness
+       (format +onsave)  ; automated prettiness
        ;;god               ; run Emacs commands without modifier keys
        ;;lispy             ; vim for lisp, for people who don't like vim
        ;;multiple-cursors  ; editing in many places at once
@@ -94,7 +94,7 @@
        (eval +overlay)     ; run code, run (also, repls)
        ;;gist              ; interacting with github gists
        lookup              ; navigate your code and its documentation
-       ;;lsp
+       lsp
        ;;macos             ; MacOS-specific commands
        magit             ; a git porcelain for Emacs
        ;;make              ; run make tasks from Emacs
@@ -114,7 +114,7 @@
        ;;common-lisp       ; if you've seen one lisp, you've seen them all
        ;;coq               ; proofs-as-programs
        ;;crystal           ; ruby at the speed of c
-       csharp            ; unity, .NET, and mono shenanigans
+       ;; csharp            ; unity, .NET, and mono shenanigans
        data              ; config/data formats
        ;;(dart +flutter)   ; paint ui and not much else
        ;;elixir            ; erlang done right
@@ -163,7 +163,7 @@
        ;;rest              ; Emacs as a REST client
        ;;rst               ; ReST in peace
        ;;(ruby +rails)     ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
-       ;;rust              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
+       (rust +lsp)              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
        ;;scala             ; java, but good
        ;;scheme            ; a fully conniving family of lisps
        sh                ; she sells {ba,z,fi}sh shells on the C xor