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

bundle/custom_win32_XPS8930.el

@@ -12,6 +12,8 @@
  '(org-modules
    '(ol-bbdb ol-bibtex ol-docview ol-eww ol-gnus ol-info ol-irc ol-mhe ol-rmail org-tempo ol-w3m))
  '(org-roam-directory "~/Documents/org/")
+ '(package-selected-packages
+   '(gnu-elpa-keyring-update yaml-mode which-key web-mode terraform-mode ssh-config-mode slime shrface rainbow-delimiters plantuml-mode paredit ox-reveal org-web-tools org-tree-slide org-roam olivetti ob-powershell ob-http nov nginx-mode mastodon markdown-mode magit js2-mode jabber htmlize helpful gptel go-translate gnuplot erc-image erc-hl-nicks emojify elfeed doom-themes dockerfile-mode docker dashboard csv-mode common-lisp-snippets calibredb auto-complete auctex all-the-icons-dired ace-window))
  '(ring-bell-function 'ignore)
  '(tetris-x-colors
    [[229 192 123]
@@ -21,3 +23,9 @@
     [152 195 121]
     [198 120 221]
     [86 182 194]]))
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ )

init.el

@@ -77,6 +77,7 @@
 
 (setq-default horizontal-scroll-bar nil)
 (setq-default vertical-scroll-bar nil)
+(scroll-bar-mode -1)
 
 (setq-default mouse-wheel-scroll-amount '(1 ((shift) . 1) ((meta)) ((control) . text-scale)))
 
@@ -208,6 +209,7 @@
         (font . "MonoLisa-11")
         (width . 85)
         (height . 50)
+        (vertical-scroll-bars)
         (and (eq system-type 'gnu/linux)
              (undecorated . t))))
 
@@ -230,8 +232,9 @@
 (use-package all-the-icons
   :commands all-the-icons-install-fonts
   :init
-  (unless (find-font (font-spec :name "all-the-icons"))
+  (when (display-graphic-p)
-    (all-the-icons-install-fonts t)))
+    (unless (find-font (font-spec :name "all-the-icons"))
+      (all-the-icons-install-fonts t))))
 
 (use-package all-the-icons-dired
   :after all-the-icons