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

bundle/bundle--news.el

@@ -48,6 +48,7 @@
    ;; lisp / clojure / emacs feeds
    '(;("http://planet.sbcl.org/rss20.xml" sbcl lisp)
      ("https://planet.lisp.org/rss20.xml" planet lisp)
+     ("https://emacsconf.org/index.atom" emacs lisp conference)
      ("https://jameshunt.us/feeds/main" lisp blog)
      ("https://xenodium.com/rss.xml" emacs blog)
      ("http://atomized.org/rss.xml" lisp emacs blog)

bundle/bundle--package.el

@@ -297,16 +297,25 @@
   :init (which-key-mode))
 
 (use-package ssh-config-mode
-  :ensure t
   :mode ("/sshd_config\\'" . ssh-config-mode)
   :config
   (add-hook 'ssh-config-mode-hook 'turn-on-font-lock))
 
 (use-package nginx-mode
-  :ensure t
   :mode ("/nginx/.*\\'" . nginx-mode))
 
 (use-package dashboard
-  :ensure t
   :config
   (dashboard-setup-startup-hook))
+
+(use-package flymake-json)
+
+(use-package json-mode
+  :ensure nil
+  :hook (json-mode . flymake-json-load))
+
+(use-package json-navigator
+  :after json-mode)
+
+(use-package jq-format
+  :after json-mode)

bundle/custom_win32_EVG03435NB.el

@@ -21,6 +21,7 @@
  '(doom-modeline-env-version nil)
  '(flycheck-color-mode-line-face-to-color 'mode-line-buffer-id)
  '(frame-background-mode 'dark)
+ '(gptel-use-curl nil)
  '(hl-todo-keyword-faces
    '(("TODO" . "#dc752f")
      ("NEXT" . "#dc752f")
@@ -48,7 +49,7 @@
    '(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 "~/OneDrive - Siemens AG/org/")
  '(package-selected-packages
-   '(dashboard ob-restclient restclient which-key auctex ace-window jabber js2-mode gptel elpher plantuml-mode htmlize hyperbole typescript-mode markdown-mode csv-mode yaml-mode magit nim-mode kotlin-mode nano-theme mastodon mpv ob-http powershell ox-reveal org-web-tools org-tree-slide org-roam elfeed erc-image go-translate simple-httpd slime racket-mode web-mode go-mode eglot nov shrface smartparens emojify olivetti rainbow-delimiters helpful doom-modeline doom-themes all-the-icons-dired all-the-icons))
+   '(jq-format json-navigator flymake-json dashboard ob-restclient restclient which-key auctex ace-window jabber js2-mode gptel elpher plantuml-mode htmlize hyperbole typescript-mode markdown-mode csv-mode yaml-mode magit nim-mode kotlin-mode nano-theme mastodon mpv ob-http powershell ox-reveal org-web-tools org-tree-slide org-roam elfeed erc-image go-translate simple-httpd slime racket-mode web-mode go-mode eglot nov shrface smartparens emojify olivetti rainbow-delimiters helpful doom-modeline doom-themes all-the-icons-dired all-the-icons))
  '(reb-re-syntax 'string)
  '(ring-bell-function 'ignore)
  '(scroll-step 5)