Merge branch 'main' of git.sr.ht:~marcuskammer/emacs.d

bundle/bundle--package.el

@@ -278,7 +278,24 @@
   (erc-rename-buffers t)
   (erc-autojoin-channels-alist '(("libera.chat" "#emacs" "#commonlisp")))
   (erc-interpret-mirc-color t)
-  (erc-modules '(autojoin button completion fill irccontrols list match menu move-to-prompt netsplit networks noncommands notifications readonly ring stamp track truncate)))
+  (erc-modules '(autojoin
+                 button
+                 completion
+                 fill
+                 irccontrols
+                 list
+                 match
+                 menu
+                 move-to-prompt
+                 netsplit
+                 networks
+                 noncommands
+                 notifications
+                 readonly
+                 ring
+                 stamp
+                 track
+                 truncate)))
 
 (use-package erc-image
   :after erc
@@ -296,7 +313,9 @@
   :bind ("C-c j" . webjump)
   :custom
   (webjump-sites
-   (append '(("Wikipedia_de" . [simple-query "de.wikipedia.org" "https://de.wikipedia.org/wiki/" ""]))
+   (append '(("Wikipedia_de" . [simple-query
+                                "de.wikipedia.org"
+                                "https://de.wikipedia.org/wiki/" ""]))
            webjump-sample-sites)))
 
 (use-package plantuml-mode

bundle/custom_gnu.el

@@ -10,10 +10,11 @@
    [default default default italic underline success warning error])
  '(backup-directory-alist '(("." . "~/.backup_filez")))
  '(default-frame-alist
-    '((font . "Fira Code-12")
+    '((font . "Fira Code-11")
       (width . 90)
       (height . 64)
-      (alpha . 100)))
+      (alpha . 100)
+      (vertical-scroll-bars)))
  '(delete-selection-mode nil)
  '(diary-file "~/Documents/diary/diary")
  '(doom-modeline-height 33)
@@ -42,7 +43,7 @@
  '(org-plantuml-jar-path "~/.local/bin/plantuml.jar")
  '(package-enable-at-startup t)
  '(package-selected-packages
-   '(org-web-tools rust-mode shrface emojify erc-image slime-company company webpaste magit yaml-mode markdown-mode ace-window org-tree-slide rainbow-delimiters doom-themes doom-modeline powershell ox-reveal helpful slime web-mode ob-typescript ob-rust ob-http ob-go eglot go-mode typescript-mode projectile nov olivetti all-the-icons-ivy-rich all-the-icons-dired counsel use-package))
+   '(plantuml-mode org-web-tools rust-mode shrface emojify erc-image slime-company company webpaste magit yaml-mode markdown-mode ace-window org-tree-slide rainbow-delimiters doom-themes doom-modeline powershell ox-reveal helpful slime web-mode ob-typescript ob-rust ob-http ob-go eglot go-mode typescript-mode projectile nov olivetti all-the-icons-ivy-rich all-the-icons-dired counsel use-package))
  '(scroll-bar-mode nil)
  '(scroll-step 5)
  '(tab-bar-mode nil)

eww-bookmarks

@@ -1,5 +1,7 @@
 ;; Auto-generated file; don't edit
-((:url "https://sachachua.com/blog/" :title "Home :: Sacha Chua" :time "Thu Jun 10 15:12:50 2021")
+((:url "https://emacsredux.com/blog/2020/12/11/super-keybindings-for-magit/" :title "Super Keybindings for Magit | Emacs Redux" :time "Wed Jun 16 17:04:48 2021")
+ (:url "https://common-lisp.net/project/asdf/asdf/" :title "Top (ASDF Manual)" :time "Sat Jun 12 13:03:40 2021")
+ (:url "https://sachachua.com/blog/" :title "Home :: Sacha Chua" :time "Thu Jun 10 15:12:50 2021")
  (:url "https://www3.ntu.edu.sg/home/ehchua/programming/webprogramming/HTTP_Basics.html" :title "In Introduction to HTTP Basics" :time "Tue Jun  8 16:07:52 2021")
  (:url "https://doc.rust-lang.org/stable/book/" :title "The Rust Programming Language - The Rust Programming Language" :time "Mon Jun  7 18:56:46 2021")
  (:url "https://www.emacswiki.org/emacs/SiteMap" :title "EmacsWiki: Site Map" :time "Mon Jun  7 18:06:58 2021")