Some general changes

2024-10-01 16:21:08 +01:00
parent 092bd235b6
commit e3e37f3fab
6 changed files with 208 additions and 177 deletions
--- a/Emacs/.config/emacs/.config/eshell/aliases
+++ b/Emacs/.config/emacs/.config/eshell/aliases
@@ -2,7 +2,8 @@ alias asc async-shell-command $1
 alias ss sudo-switch
 alias pr project-root
 alias gt goto
-alias d dired-other-window $1
+alias d dired .
+alias dd dired-other-window .
 alias clear clear-scrollback
 alias gs magit-status
 alias ff find-file $1
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/org-mode/no-tangle
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/org-mode/no-tangle
@@ -3,5 +3,5 @@
 # key: <no-tangle
 # --
 :PROPERTIES:
-:header-args:emacs-lisp: :tangle no
+:header-args:emacs-lisp: :tangle no :results none
 :END:
--- a/Emacs/.config/emacs/config.org
+++ b/Emacs/.config/emacs/config.org
@@ -419,17 +419,15 @@ the first character of the evil state capitalised"
  (better-mode-line/setup-mode-line))
 #+end_src
 ** Fringes
-Turning off borders in my window manager was a good idea, so turn off
-the borders for Emacs, so called fringes.  However, some things like
-[[info:emacs#Compilation Mode][Compilation Mode]] do require fringes
-to provide arrows.  So I use a minimal fringe style (exactly 1 pixel
-on either side of the window) to ensure I get those.
+Turning off borders in my window manager was a good idea, so I should
+adjust the borders for Emacs, so called fringes.  However, some things
+like [[info:emacs#Compilation Mode][Compilation Mode]] do require
+fringes to provide arrows on the left side of the window.  Hence I
+provide a minimal fringe style with only 10 pixels on the left
+provided.

 #+begin_src emacs-lisp
-(use-package fringe
-  :demand t
-  :config
-  (set-fringe-style (cons 1 1)))
+(fringe-mode (cons 10 0))
 #+end_src
 ** Mouse
 Who uses a mouse? This disables the use of GUI dialogues for stuff.
@@ -574,10 +572,15 @@ set of examples on how to use general.

 #+begin_src emacs-lisp
 (use-package emacs
+  :init
+  ;; this is for `duplicate-dwim'
+  (setq duplicate-line-final-position -1)
  :general
  ("C-x d" #'delete-frame)

  (nmmap
+    :keymaps 'override
+    "M-o" #'duplicate-dwim
    "M-;" #'eval-expression
    "g="  #'align-regexp
    "C--" #'text-scale-decrease
@@ -595,6 +598,7 @@ set of examples on how to use general.
    "h"   '(help-command :which-key "Help"))

  (mode-leader
+    "t" (proc (interactive) (+oreo/load-theme))
    "T" #'+oreo/switch-theme)

  (code-leader
@@ -691,7 +695,8 @@ Setup the evil package, with some opinionated keybindings:
        evil-move-beyond-eol t
        evil-want-abbrev-expand-on-insert-exit t
        evil-undo-system #'undo-tree
-        evil-want-minibuffer t)
+        evil-want-minibuffer t
+        evil-move-cursor-back nil)
  :config
  (evil-mode))
 #+end_src
@@ -891,8 +896,9 @@ around.
    :states '(normal insert)
    :keymaps 'minibuffer-local-map
    "<backtab>" #'switch-to-completions
-    "C-j" #'next-line-or-history-element
-    "C-k" #'previous-line-or-history-element))
+    "C-M-j"     #'exit-minibuffer
+    "C-j"       #'next-line-or-history-element
+    "C-k"       #'previous-line-or-history-element))
 #+end_src
 **** Save minibuffer history
 Save any minibuffer usage in a history file, which allows reuse in
@@ -913,6 +919,7 @@ later instances.
    :state '(normal insert)
    :keymaps '(icomplete-fido-mode-map icomplete-minibuffer-map)
    "<backtab>" #'switch-to-completions
+    "C-M-j"     #'exit-minibuffer
    "M-j"       #'icomplete-forward-completions
    "M-k"       #'icomplete-backward-completions
    "RET"       #'icomplete-force-complete-and-exit
@@ -980,10 +987,11 @@ just setup some evil binds for company.
  (eshell-mode-hook . company-mode)
  :general
  (imap
+    :keymaps 'company-mode-map
    "C-SPC" #'company-complete
-    "C-@" #'company-complete
-    "M-j" #'company-select-next
-    "M-k" #'company-select-previous))
+    "C-@"   #'company-complete
+    "M-j"   #'company-select-next
+    "M-k"   #'company-select-previous))
 #+end_src
 ** Pretty symbols
 Prettify symbols mode allows users to declare "symbols" that replace
@@ -1051,12 +1059,11 @@ effectively.
 #+begin_src emacs-lisp
 (use-package tab-bar
  :defer t
+  :hook (after-init-hook . tab-bar-mode)
  :init
  (setq tab-bar-close-button-show nil
-        tab-bar-format '(tab-bar-format-history tab-bar-format-tabs tab-bar-separator))
-  :config
-  (setq tab-bar-show 1)
-  (tab-bar-mode)
+        tab-bar-format '(tab-bar-format-history tab-bar-format-tabs tab-bar-separator)
+        tab-bar-show 1)
  :general
  (tab-leader
    "R" #'tab-rename
@@ -1069,9 +1076,7 @@ effectively.
    "l" #'tab-move
    "n" #'tab-new
    "r" #'tab-switch
-    "w" #'tab-window-detach)
-  (mode-leader
-    "t" #'toggle-tab-bar-mode-from-frame))
+    "w" #'tab-window-detach))
 #+end_src
 ** Auto typing
 Snippets are a pretty nice way of automatically inserting code.  Emacs
@@ -1209,6 +1214,7 @@ everything myself.

 #+begin_src emacs-lisp
 (use-package transient
+  :defer t
  :straight (:host github :repo "magit/transient" :tag "v0.7.5"))

 (use-package magit
@@ -1316,7 +1322,10 @@ Recentf provides a method of keeping track of recently opened files.
 #+begin_src emacs-lisp
 (use-package recentf
  :defer t
-  :hook (emacs-startup-hook . recentf-mode))
+  :hook (emacs-startup-hook . recentf-mode)
+  :general
+  (file-leader
+    "r" #'recentf))
 #+end_src
 ** Avy
 Setup avy with leader.  As I use ~avy-goto-char-timer~ a lot, use the
@@ -1586,9 +1595,10 @@ directories particularly efficiently.
  :defer t
  :load-path "elisp/"
  :general
+  (search-leader
+    "a" #'+search/search-all)
  (file-leader
-    "p" #'+search/find-file
-    "S" #'+search/search-all))
+    "p" #'+search/find-file))
 #+end_src
 ** Separedit
 Edit anything anywhere all at once!
@@ -1990,6 +2000,9 @@ them.
        eshell-cd-on-directory t
        eshell-cd-shows-directory nil
        eshell-highlight-prompt nil)
+  (defun +eshell/good-clear ()
+    (interactive)
+    (eshell/clear))
  (add-hook
   'eshell-mode-hook
   (proc
@@ -2000,12 +2013,14 @@ them.
    (general-def
      :states '(normal insert)
      :keymaps 'eshell-mode-map
+      "M-j" #'eshell-next-prompt
+      "M-k" #'eshell-previous-prompt
      "C-j" #'eshell-next-matching-input-from-input
-      "C-k" #'eshell-previous-matching-input-from-input)
+      "C-k" #'eshell-previous-matching-input-from-input
+      "M-c" #'+eshell/good-clear)
    (local-leader
      :keymaps 'eshell-mode-map
-      "c" (proc (interactive) (eshell/clear)
-                (recenter))
+      "c" #'+eshell/good-clear
      "k" #'eshell-kill-process))))
 #+end_src
 *** Eshell prompt
@@ -2025,7 +2040,7 @@ internals, just standard old Emacs packages.
  :load-path "elisp/"
  :config
  (defun +eshell/banner-message ()
-    (concat (shell-command-to-string "cowfortune") "\n"))
+    (concat (shell-command-to-string "fortune") "\n"))
  (setq eshell-prompt-regexp (format "^%s" +eshell-prompt/user-prompt)
        eshell-prompt-function #'+eshell-prompt/make-prompt
        eshell-banner-message '(+eshell/banner-message)))
@@ -2043,7 +2058,7 @@ if I loaded this ~:after~ eshell then the first instance has no
 knowledge of the new additions.
 #+begin_src emacs-lisp
 (use-package eshell-additions
-  :defer t
+  :demand t
  :load-path "elisp/"
  :general
  (shell-leader
@@ -2177,7 +2192,7 @@ Core proced config, just a few bindings and evil collection setup.
   (display-buffer-at-bottom)
   (window-height . 0.25))
  :init
-  (setq proced-auto-update-interval 0.5)
+  (setq proced-auto-update-interval 5)
  :config
  (with-eval-after-load "evil-collection"
    (evil-collection-proced-setup)))
@@ -2212,7 +2227,7 @@ back in, I can just do it within Emacs.  Pretty nifty, right?
  :display
  ("*Calculator*"
   (display-buffer-at-bottom)
-   (window-height . 0.18))
+   (window-height . 0.2))
  :general
  (app-leader
    "c" #'calc-dispatch)
@@ -2328,8 +2343,8 @@ into text-mode.
  :general
  (nmmap
    :keymaps 'text-mode-map
-    (kbd "M-C") #'flyspell-correct-word-before-point
-    (kbd "M-c") #'flyspell-auto-correct-word)
+    "M-C" #'flyspell-correct-word-before-point
+    "M-c" #'flyspell-auto-correct-word)
  (mode-leader
    "s" #'flyspell-mode))
 #+end_src
@@ -2525,13 +2540,12 @@ to be set.
    "r" #'eglot-rename
    "R" #'eglot-reconnect)
  :init
-  (setq eglot-stay-out-of '(flymake)
+  (setq eglot-auto-shutdown t
+        eglot-stay-out-of '(flymake)
        eglot-ignored-server-capabilities '(:documentHighlightProvider
                                            :documentOnTypeFormattingProvider
                                            :inlayHintProvider))
-  (add-to-list 'safe-local-variable-values '(eval eglot-ensure))
-  :config
-  (add-to-list 'eglot-server-programs '((c++-mode c-mode) "clangd")))
+  (add-to-list 'safe-local-variable-values '(eval eglot-ensure)))
 #+end_src
 *** Flycheck-Eglot
 By default Eglot uses the integrated flymake package for error
@@ -2665,7 +2679,7 @@ like [[*Eglot][Eglot]].
  ("\\*xref\\*"
   (display-buffer-at-bottom)
   (inhibit-duplicate-buffer . t)
-   (window-height . 0.25))
+   (window-height . 0.3))
  :general
  (code-leader
    "t" '(nil :which-key "Tags"))
@@ -2679,7 +2693,8 @@ like [[*Eglot][Eglot]].
    "RET" #'xref-goto-xref
    "J" #'xref-next-line
    "K" #'xref-prev-line
-    "g" #'xref-revert-buffer
+    "r" #'xref-query-replace-in-results
+    "gr" #'xref-revert-buffer
    "q" #'quit-window))
 #+end_src
 ** Project.el
@@ -2696,7 +2711,7 @@ quickly generate them in C/C++ projects.
  :defer t
  :general
  (:keymaps 'project-prefix-map
-   "R" #'+project/generate-tags)
+   "r" #'+project/generate-tags)
  :config
  (defun +project/generate-tags ()
    (interactive)
@@ -2808,7 +2823,7 @@ I'm not very bothered.
        org-adapt-indentation nil
        org-indent-mode nil
        org-startup-indented nil
-        org-startup-folded 'content
+        org-startup-folded 'showeverything
        org-startup-with-latex-preview nil
        org-imenu-depth 10
        org-src-window-setup 'current-window
@@ -2873,7 +2888,6 @@ Emacs was very helpful here.
        org-fontify-quote-and-verse-blocks t
        org-fontify-whole-heading-line t
        org-footnote-auto-label t
-        org-goto-interface 'outline
        org-hide-emphasis-markers nil
        org-hide-leading-stars t
        org-image-actual-width nil
@@ -2918,8 +2932,12 @@ write the code.
  (with-eval-after-load "consult"
    (general-def
      :keymaps 'org-mode-map
-      [remap imenu] #'consult-outline))
+      [remap consult-imenu] #'consult-outline))
  :general
+  (local-leader
+    :state '(normal motion)
+    :keymaps 'org-src-mode-map
+    "o" #'org-edit-src-exit)
  (file-leader
    "l" #'org-store-link
    "i" #'org-insert-last-stored-link)
@@ -3305,7 +3323,8 @@ Tons of stuff, namely:
  (c-mode-hook   . auto-fill-mode)
  (c++-mode-hook . auto-fill-mode)
  :general
-  (:keymaps '(c-mode-map c++-mode-map)
+  (:keymaps '(c-mode-map
+              c++-mode-map)
   :states '(normal motion visual)
   "(" #'c-beginning-of-statement
   ")" #'c-end-of-statement
@@ -3614,12 +3633,10 @@ will run in the REPL.  Even easier than making your own buffer.
  :hook
  (haskell-mode-hook . haskell-indentation-mode)
  (haskell-mode-hook . interactive-haskell-mode)
-  :init
-  (setq haskell-interactive-prompt "[λ] "
-        haskell-interactive-prompt-cont "{λ} "
-        haskell-interactive-popup-errors nil
-        haskell-stylish-on-save t
-        haskell-process-type 'auto)
+  :display
+  ("\\*haskell.**\\*"
+   (display-buffer-at-bottom)
+   (window-height . 0.3))
  :general
  (shell-leader
    "h" #'haskell-interactive-bring)
@@ -3637,10 +3654,12 @@ will run in the REPL.  Even easier than making your own buffer.
    :keymaps 'haskell-interactive-mode-map
    "M-k" #'haskell-interactive-mode-history-previous
    "M-j" #'haskell-interactive-mode-history-next)
-  :display
-  ("\\*haskell.**\\*"
-   (display-buffer-at-bottom)
-   (window-height . 0.3))
+  :init
+  (setq haskell-interactive-prompt "[λ] "
+        haskell-interactive-prompt-cont "{λ} "
+        haskell-interactive-popup-errors nil
+        haskell-stylish-on-save t
+        haskell-process-type 'auto)
  :config
  (load (concat user-emacs-directory "elisp/haskell-multiedit.el")))
 #+end_src
@@ -3653,22 +3672,33 @@ source code blocks.
 #+begin_src emacs-lisp
 (use-package python
  :defer t
+  :general
+  (nmmap
+    :keymaps 'python-mode-map
+    "C-M-x" #'python-shell-send-defun)
+  (local-leader
+    :keymaps 'python-mode-map
+    "c" #'python-check)
+  (local-leader
+    :keymaps 'python-mode-map
+    :infix "e"
+    "e" #'python-shell-send-statement
+    "r" #'python-shell-send-region
+    "f" #'python-shell-send-buffer)
  :pretty
  (python-mode-hook
   ("None"   . "Ø")
   ("list"   . "ℓ")
   ("List"   . "ℓ")
   ("str"    . "𝕊")
-   ("True"   . "⊨")
-   ("False"  . "⊭")
   ("!"      . "¬")
-   ("&&"     . "∧")
-   ("||"     . "∨")
   ("for"    . "∀")
   ("print"  . "φ")
   ("lambda" . "λ")
-   ("return" . "⟼")
-   ("yield"  . "⟻"))
+   ("reduce" . "↓")
+   ("map"    . "→")
+   ("return" . "≡")
+   ("yield"  . "≈"))
  :init
  (setq python-indent-offset 4)
  :config
@@ -3690,13 +3720,14 @@ Setup for python shell, including a toggle option
  :display
  ("\\*Python\\*"
   (display-buffer-at-bottom)
-   (window-height . 0.25)))
+   (window-height . 0.3)))
 #+end_src
 ** YAML
 YAML is a data language which is useful for config files.

 #+begin_src emacs-lisp
 (use-package yaml-mode
+  :defer t
  :straight t)
 #+end_src
 ** HTML/CSS/JS
@@ -3719,6 +3750,7 @@ Emmet for super speed code writing.
 #+begin_src emacs-lisp
 (use-package emmet-mode
  :straight t
+  :defer t
  :hook (web-mode-hook . emmet-mode)
  :general
  (imap
@@ -3740,7 +3772,6 @@ An auto-insert for HTML buffers, which just adds some nice stuff.
 <html lang=''>
  <head>
    <meta charset='utf-8'>
-    <meta http-equiv='x-ua-compatible' content='ie=edge'>
    <title>"(read-string "Enter title: ") | """</title>
    <meta name='description' content='" (read-string "Enter description: ") | "" "'>
    <meta name='author' content='"user-full-name"'/>
@@ -3748,17 +3779,8 @@ An auto-insert for HTML buffers, which just adds some nice stuff.

    <link rel='apple-touch-icon' href='/apple-touch-icon.png'>
    <link rel='shortcut icon' href='/favicon.ico'/>
-    <!-- Place favicon.ico in the root directory -->
-
  </head>
  <body>
-    <!--[if lt IE 8]>
-      <p class='browserupgrade'>
-      You are using an <strong>outdated</strong> browser. Please
-      <a href='http://browsehappy.com/'>upgrade your browser</a> to improve
-      your experience.
-      </p>
-    <![endif]-->
 "
   _
   "     </body>
@@ -3770,15 +3792,15 @@ eglot.

 #+begin_src emacs-lisp
 (use-package js
+  :defer t
  :mode ("\\.js" . js-mode)
-  :hook
-  (js-mode-hook . auto-fill-mode)
+  :hook (js-mode-hook . auto-fill-mode)
  :init
  (setq js-indent-level 2))
 #+end_src
 *** Typescript
 A language that adds a build step to JavaScript projects for "static"
-typing.  It's nice because it adds nice auto completion.
+typing.  It's nice because it adds good auto completion.

 #+begin_src emacs-lisp
 (use-package typescript-mode
--- a/Emacs/.config/emacs/elisp/personal-solarized-theme.el
+++ b/Emacs/.config/emacs/elisp/personal-solarized-theme.el
@@ -80,14 +80,22 @@
 '(org-hide ((t (:foreground "black"))))
 '(org-quote ((t (:slant italic))))
 '(org-verbatim ((t (:foreground "red3"))))
- '(outline-1 ((t (:inherit default :foreground "#db5823"))))
- '(outline-2 ((t (:inherit default :foreground "#93a61a"))))
- '(outline-3 ((t (:inherit default :foreground "#3c98e0"))))
- '(outline-4 ((t (:inherit default :foreground "#c49619"))))
- '(outline-5 ((t (:inherit default :foreground "#3cafa5"))))
- '(outline-6 ((t (:inherit default :foreground "#93a61a"))))
- '(outline-7 ((t (:inherit default :foreground "#ec423a"))))
- '(outline-8 ((t (:inherit default :foreground "#3c98e0"))))
+ '(outline-1 ((t (:inherit default :height 1.3
+                  :foreground "#db5823"))))
+ '(outline-2 ((t (:inherit default :height 1.2
+                  :foreground "#93a61a"))))
+ '(outline-3 ((t (:inherit default :height 1.1
+                  :foreground "#3c98e0"))))
+ '(outline-4 ((t (:inherit default :height 1.05
+                  :foreground "#c49619"))))
+ '(outline-5 ((t (:inherit default :height 1.02
+                  :foreground "#3cafa5"))))
+ '(outline-6 ((t (:inherit default :height 1.02
+                  :foreground "#93a61a"))))
+ '(outline-7 ((t (:inherit default :height 1.02
+                  :foreground "#ec423a"))))
+ '(outline-8 ((t (:inherit default :height 1.02
+                  :foreground "#3c98e0"))))
 '(outline-minor-0 ((t (:extend t :weight bold :background "#01323d"))))
 '(outline-minor-1 ((t (:extend t :inherit (outline-minor-0 outline-1) :background "#1e9d310d32a3"))))
 '(pdf-isearch-batch ((t (:foreground "black" :background "white"))))
--- a/Emacs/.config/emacs/straight/versions/default.el
+++ b/Emacs/.config/emacs/straight/versions/default.el
@@ -1,89 +1,89 @@
-(("Emacs-wgrep" . "3132abd3750b8c87cbcf6942db952acfab5edccd")
- ("ace-link" . "06ab398df85e81d1dc763b3210732dd26cba60a1")
- ("ace-window" . "77115afc1b0b9f633084cf7479c767988106c196")
- ("aggressive-indent-mode" . "a437a45868f94b77362c6b913c5ee8e67b273c42")
- ("all-the-icons.el" . "f491f39c21336d354e85bdb4cca281e0a0c2f880")
- ("amx" . "5b3aa1aae84f4a225cb8d26ab79a32f97693f023")
- ("annalist.el" . "134fa3f0fb91a636a1c005c483516d4b64905a6d")
- ("avy" . "be612110cb116a38b8603df367942e2bb3d9bdbe")
- ("company-mode" . "7c24dc8668af5aea8a5d07aeceda5fac7a2a85b5")
- ("compat" . "9428a64eb8a579f35d57bc4d4cdb6c5cf10806c1")
- ("dash.el" . "6db80c711ce947f6c6fa11e5c2257fff2c79d139")
- ("devdocs.el" . "c14d1306648d3ae09ee3a3b3f45592334943cfeb")
- ("dired-rsync" . "5bcb851f3bf9c4f7c07299fcc25be7c408a68cda")
- ("drag-stuff.el" . "6d06d846cd37c052d79acd0f372c13006aa7e7c8")
- ("edit-indirect" . "82a28d8a85277cfe453af464603ea330eae41c05")
- ("eglot" . "3ba5d50af4263797d19c3c21f6a290247c9a9571")
- ("el-get" . "e1a3e59d800984ed7ef10469232b59b60244ae90")
- ("eldoc" . "a2aaed2b7c70c1f28dd212fe2f4304ce89c338d7")
- ("elisp-refs" . "bf3cca8f74065b1b31036f461e3a093b162311bd")
- ("emacs-htmlize" . "dd27bc3f26efd728f2b1f01f9e4ac4f61f2ffbf9")
- ("emacs-lorem-ipsum" . "4e87a899868e908a7a9e1812831d76c8d072f885")
- ("emacs-powerthesaurus" . "4b97797cf789aaba411c61a85fe23474ebc5bedc")
- ("emacs-which-key" . "df6b0cb8449812e7fb200bc852107fa7eb708496")
- ("emacsmirror-mirror" . "b20802083e80d055c67092d145c604b40d87023b")
- ("emmet-mode" . "322d3bb112fced57d63b44863357f7a0b7eee1e3")
- ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6")
- ("eshell-syntax-highlighting" . "fa1d368452ebd11727d267076ae568b892fa9cb9")
- ("evil" . "60ba716bf500ca21cdf5a8f83101449a1cbe3413")
- ("evil-collection" . "1ad283f5b7ac9320ac3d41bccfc71a52f714563a")
- ("evil-commentary" . "c5945f28ce47644c828aac1f5f6ec335478d17fb")
- ("evil-mc" . "cff3374bfe1b7b1932743425d7fc5d4ab66d747e")
- ("evil-numbers" . "7a1b62afc12da2b582bf84d722e7b10ca8b97065")
- ("evil-org-mode" . "b1f309726b1326e1a103742524ec331789f2bf94")
- ("evil-surround" . "8fad8540c490d94a820004f227552ca08e3e3857")
- ("external-completion" . "d717c138623aeecc8e0a0312e0576e98604c43f2")
- ("f.el" . "19e1da061e759b05e8c480b426287a063ca39484")
- ("fd-dired" . "458464771bb220b6eb87ccfd4c985c436e57dc7e")
- ("flycheck" . "773c3eb31ebeb6bb2f9f57d28177882ca7073df0")
- ("flycheck-eglot" . "114e1315aaf0dc3196da67da426bbe2b46384fe2")
- ("flymake" . "6950c8099e3ee7cafc701b1f86797b2a1b466067")
- ("general.el" . "833dea2c4a60e06fcd552b653dfc8960935c9fb4")
- ("gnu-elpa-mirror" . "b97c2f4f9fd0f451f2e32f3d14ebada0715dabf4")
- ("goto-chg" . "278cd3e6d5107693aa2bb33189ca503f22f227d0")
- ("haskell-mode" . "3e146c1a89db257bb75c7b33fa2a5a1a85aabd51")
- ("helpful" . "c57ff0d284b50ff430fe1f13fd48deaa0d1a910e")
- ("hl-todo" . "0faf8569b67f5b23891416d9e7a67e3843338f2a")
- ("hydra" . "317e1de33086637579a7aeb60f77ed0405bf359b")
- ("jeison" . "19a51770f24eaa7b538c7be6a8a5c25d154b641f")
- ("jsonrpc" . "ba4275ef5bcbfceebd7049c5669dec9edabcb1fc")
- ("let-alist" . "021fc10df2e44faba4728d849ee767cf890aa51a")
- ("magit" . "020aca7c9c4154dbc4a72acbd56165ecccea1bf1")
- ("melpa" . "ac25b9a1dfaaff1c683902670eb533bbe18e7db8")
- ("nhexl-mode" . "dec55097dc6938122e7886a89e64dd528b1ce55a")
- ("no-littering" . "fcfd51fbdf08469e6d1b59bc4bd2d75aa708c791")
- ("nongnu-elpa" . "14e9631cd2b81f66ed551b14d31811a75cc53a4b")
- ("notmuch" . "b6f144abe1f5aa3519240cf52f4cb9907fefcd0e")
- ("olivetti" . "a644ee9d24c7283435ce42e11498951e100608c9")
- ("orderless" . "6936fe46ef07df168a423f04efeda130b4e69753")
- ("org" . "a62f75c84120d76ac04f1f2839f96e226134132b")
- ("org-msg" . "055de4abf611c5d5e12c770fe149c1861b402817")
- ("org-reveal" . "f55c851bf6aeb1bb2a7f6cf0f2b7bd0e79c4a5a0")
- ("org-superstar-mode" . "54c81c27dde2a6dc461bb064e79a8b2089093a2e")
- ("pkg-info" . "76ba7415480687d05a4353b27fea2ae02b8d9d61")
- ("popup-el" . "545e258024f6e4a8b2a066a5442d9e0147a7ee03")
- ("project" . "6c41ad68edf1f44110abe478d17c36f57a517e66")
- ("queue" . "130c2d656cd5d7376552272fab9e50a7c37d0c4a")
- ("racket-mode" . "40ecb87f409a9ef9a4e58c1e51243cce948ab3d7")
- ("rainbow-delimiters" . "f40ece58df8b2f0fb6c8576b527755a552a5e763")
- ("rg.el" . "e9dc4ed342e0212d08fb82554dfd3c57fdfa5b1a")
- ("rust-mode" . "9c26dc1195ec05309ee15c014631fb9abd6cf5d2")
- ("s.el" . "dda84d38fffdaf0c9b12837b504b402af910d01d")
- ("separedit.el" . "bfd0902d771f9f0160e4f16a7b6e8c29ce3447fe")
- ("sly" . "df62abae73bd511885c9c7ec0ea7ea1469a00923")
- ("sly-asdf" . "6f9d751469bb82530db1673c22e7437ca6c95f45")
- ("smartparens" . "79a338db115f441cd47bb91e6f75816c5e78a772")
- ("straight.el" . "ff63b154bef1ef8d92c141bd189001bff74f6982")
- ("swiper" . "595d44264420d989e420351ea25b3c99528547c0")
- ("transient" . "ef6cb3852f1d02224fbe9b9695cfe2d0dedbc271")
- ("typescript.el" . "fc3a4f3b275e8cf6cf41aa0c9ef42e25ef908feb")
- ("undo-tree" . "16f4121032d09ef44b3d7d02c4d02c3c2f18041f")
- ("use-package" . "a6e856418d2ebd053b34e0ab2fda328abeba731c")
- ("use-package-hydra" . "8cd55a1128fbdf6327bb38a199d206225896d146")
- ("web-mode" . "57856ba64b9382811b35df0d9ab0a24aede0c1f0")
- ("with-editor" . "a4853781835346aabf083d2d9cb87f656d01ccac")
- ("xref" . "947a3778581e444d7e87a753517f413238ae9ae5")
- ("yaml-mode" . "13728b4b1b1bd33d3a754236a0f23e4c76d6ba91")
- ("yasnippet" . "5cbdbf0d2015540c59ed8ee0fcf4788effdf75b6")
- ("zone-matrix" . "3ab1b47f9c0ff92ec71f76f5e95cdea3a7b06870"))
+(("Emacs-wgrep"                 . "3132abd3750b8c87cbcf6942db952acfab5edccd")
+ ("ace-link"                    . "06ab398df85e81d1dc763b3210732dd26cba60a1")
+ ("ace-window"                  . "77115afc1b0b9f633084cf7479c767988106c196")
+ ("aggressive-indent-mode"      . "a437a45868f94b77362c6b913c5ee8e67b273c42")
+ ("all-the-icons.el"            . "f491f39c21336d354e85bdb4cca281e0a0c2f880")
+ ("amx"                         . "5b3aa1aae84f4a225cb8d26ab79a32f97693f023")
+ ("annalist.el"                 . "134fa3f0fb91a636a1c005c483516d4b64905a6d")
+ ("avy"                         . "be612110cb116a38b8603df367942e2bb3d9bdbe")
+ ("company-mode"                . "7c24dc8668af5aea8a5d07aeceda5fac7a2a85b5")
+ ("compat"                      . "9428a64eb8a579f35d57bc4d4cdb6c5cf10806c1")
+ ("dash.el"                     . "6db80c711ce947f6c6fa11e5c2257fff2c79d139")
+ ("devdocs.el"                  . "c14d1306648d3ae09ee3a3b3f45592334943cfeb")
+ ("dired-rsync"                 . "5bcb851f3bf9c4f7c07299fcc25be7c408a68cda")
+ ("drag-stuff.el"               . "6d06d846cd37c052d79acd0f372c13006aa7e7c8")
+ ("edit-indirect"               . "82a28d8a85277cfe453af464603ea330eae41c05")
+ ("eglot"                       . "3ba5d50af4263797d19c3c21f6a290247c9a9571")
+ ("el-get"                      . "e1a3e59d800984ed7ef10469232b59b60244ae90")
+ ("eldoc"                       . "a2aaed2b7c70c1f28dd212fe2f4304ce89c338d7")
+ ("elisp-refs"                  . "bf3cca8f74065b1b31036f461e3a093b162311bd")
+ ("emacs-htmlize"               . "dd27bc3f26efd728f2b1f01f9e4ac4f61f2ffbf9")
+ ("emacs-lorem-ipsum"           . "4e87a899868e908a7a9e1812831d76c8d072f885")
+ ("emacs-powerthesaurus"        . "4b97797cf789aaba411c61a85fe23474ebc5bedc")
+ ("emacs-which-key"             . "df6b0cb8449812e7fb200bc852107fa7eb708496")
+ ("emacsmirror-mirror"          . "b20802083e80d055c67092d145c604b40d87023b")
+ ("emmet-mode"                  . "322d3bb112fced57d63b44863357f7a0b7eee1e3")
+ ("epl"                         . "78ab7a85c08222cd15582a298a364774e3282ce6")
+ ("eshell-syntax-highlighting"  . "fa1d368452ebd11727d267076ae568b892fa9cb9")
+ ("evil"                        . "60ba716bf500ca21cdf5a8f83101449a1cbe3413")
+ ("evil-collection"             . "1ad283f5b7ac9320ac3d41bccfc71a52f714563a")
+ ("evil-commentary"             . "c5945f28ce47644c828aac1f5f6ec335478d17fb")
+ ("evil-mc"                     . "cff3374bfe1b7b1932743425d7fc5d4ab66d747e")
+ ("evil-numbers"                . "7a1b62afc12da2b582bf84d722e7b10ca8b97065")
+ ("evil-org-mode"               . "b1f309726b1326e1a103742524ec331789f2bf94")
+ ("evil-surround"               . "8fad8540c490d94a820004f227552ca08e3e3857")
+ ("external-completion"         . "d717c138623aeecc8e0a0312e0576e98604c43f2")
+ ("f.el"                        . "19e1da061e759b05e8c480b426287a063ca39484")
+ ("fd-dired"                    . "458464771bb220b6eb87ccfd4c985c436e57dc7e")
+ ("flycheck"                    . "773c3eb31ebeb6bb2f9f57d28177882ca7073df0")
+ ("flycheck-eglot"              . "114e1315aaf0dc3196da67da426bbe2b46384fe2")
+ ("flymake"                     . "6950c8099e3ee7cafc701b1f86797b2a1b466067")
+ ("general.el"                  . "833dea2c4a60e06fcd552b653dfc8960935c9fb4")
+ ("gnu-elpa-mirror"             . "b97c2f4f9fd0f451f2e32f3d14ebada0715dabf4")
+ ("goto-chg"                    . "278cd3e6d5107693aa2bb33189ca503f22f227d0")
+ ("haskell-mode"                . "3e146c1a89db257bb75c7b33fa2a5a1a85aabd51")
+ ("helpful"                     . "c57ff0d284b50ff430fe1f13fd48deaa0d1a910e")
+ ("hl-todo"                     . "0faf8569b67f5b23891416d9e7a67e3843338f2a")
+ ("hydra"                       . "317e1de33086637579a7aeb60f77ed0405bf359b")
+ ("jeison"                      . "19a51770f24eaa7b538c7be6a8a5c25d154b641f")
+ ("jsonrpc"                     . "ba4275ef5bcbfceebd7049c5669dec9edabcb1fc")
+ ("let-alist"                   . "021fc10df2e44faba4728d849ee767cf890aa51a")
+ ("magit"                       . "020aca7c9c4154dbc4a72acbd56165ecccea1bf1")
+ ("melpa"                       . "ac25b9a1dfaaff1c683902670eb533bbe18e7db8")
+ ("nhexl-mode"                  . "dec55097dc6938122e7886a89e64dd528b1ce55a")
+ ("no-littering"                . "fcfd51fbdf08469e6d1b59bc4bd2d75aa708c791")
+ ("nongnu-elpa"                 . "14e9631cd2b81f66ed551b14d31811a75cc53a4b")
+ ("notmuch"                     . "b6f144abe1f5aa3519240cf52f4cb9907fefcd0e")
+ ("olivetti"                    . "a644ee9d24c7283435ce42e11498951e100608c9")
+ ("orderless"                   . "6936fe46ef07df168a423f04efeda130b4e69753")
+ ("org"                         . "a62f75c84120d76ac04f1f2839f96e226134132b")
+ ("org-msg"                     . "055de4abf611c5d5e12c770fe149c1861b402817")
+ ("org-reveal"                  . "f55c851bf6aeb1bb2a7f6cf0f2b7bd0e79c4a5a0")
+ ("org-superstar-mode"          . "54c81c27dde2a6dc461bb064e79a8b2089093a2e")
+ ("pkg-info"                    . "76ba7415480687d05a4353b27fea2ae02b8d9d61")
+ ("popup-el"                    . "545e258024f6e4a8b2a066a5442d9e0147a7ee03")
+ ("project"                     . "6c41ad68edf1f44110abe478d17c36f57a517e66")
+ ("queue"                       . "130c2d656cd5d7376552272fab9e50a7c37d0c4a")
+ ("racket-mode"                 . "40ecb87f409a9ef9a4e58c1e51243cce948ab3d7")
+ ("rainbow-delimiters"          . "f40ece58df8b2f0fb6c8576b527755a552a5e763")
+ ("rg.el"                       . "e9dc4ed342e0212d08fb82554dfd3c57fdfa5b1a")
+ ("rust-mode"                   . "9c26dc1195ec05309ee15c014631fb9abd6cf5d2")
+ ("s.el"                        . "dda84d38fffdaf0c9b12837b504b402af910d01d")
+ ("separedit.el"                . "bfd0902d771f9f0160e4f16a7b6e8c29ce3447fe")
+ ("sly"                         . "df62abae73bd511885c9c7ec0ea7ea1469a00923")
+ ("sly-asdf"                    . "6f9d751469bb82530db1673c22e7437ca6c95f45")
+ ("smartparens"                 . "79a338db115f441cd47bb91e6f75816c5e78a772")
+ ("straight.el"                 . "ff63b154bef1ef8d92c141bd189001bff74f6982")
+ ("swiper"                      . "595d44264420d989e420351ea25b3c99528547c0")
+ ("transient"                   . "ef6cb3852f1d02224fbe9b9695cfe2d0dedbc271")
+ ("typescript.el"               . "fc3a4f3b275e8cf6cf41aa0c9ef42e25ef908feb")
+ ("undo-tree"                   . "16f4121032d09ef44b3d7d02c4d02c3c2f18041f")
+ ("use-package"                 . "a6e856418d2ebd053b34e0ab2fda328abeba731c")
+ ("use-package-hydra"           . "8cd55a1128fbdf6327bb38a199d206225896d146")
+ ("web-mode"                    . "57856ba64b9382811b35df0d9ab0a24aede0c1f0")
+ ("with-editor"                 . "a4853781835346aabf083d2d9cb87f656d01ccac")
+ ("xref"                        . "947a3778581e444d7e87a753517f413238ae9ae5")
+ ("yaml-mode"                   . "13728b4b1b1bd33d3a754236a0f23e4c76d6ba91")
+ ("yasnippet"                   . "5cbdbf0d2015540c59ed8ee0fcf4788effdf75b6")
+ ("zone-matrix"                 . "3ab1b47f9c0ff92ec71f76f5e95cdea3a7b06870"))
 :gamma
--- a/SXHkD/.config/sxhkd/sxhkdrc
+++ b/SXHkD/.config/sxhkd/sxhkdrc
@@ -14,9 +14,12 @@ super + Return
 super + a
  dmenu_run

-super + e
+super + w
  $HOME/.local/scripts/emoticons

+super + e
+  $HOME/.local/scripts/eselect;
+
 super + s
  notify-send -u low "Launching browser"; \
  xdg-open "https://duckduckgo.com"
@@ -34,9 +37,6 @@ super + z
  notify-send -u low "Launching zathura"; \
  zathura

-super + w
-  $HOME/.local/scripts/eselect;
-
 super + ctrl + l
  $HOME/.local/scripts/lock;