Update emacs settings

emacs/.emacs

@@ -291,8 +291,7 @@
   :defer
   :custom
   (tags-revert-without-query t)
-  :config
-  (setq tags-add-tables nil))
+  (tags-add-tables t))
 
 
 ;; Xresource based styles

emacs/.emacs.d/lisp/erc-settings.el

@@ -34,6 +34,10 @@
    erc-auto-discard-away t
    erc-input-line-position -2
 
+   ;; todo
+   ;; scroll-preserve-screen-position t
+   ;; scroll-conservatively 0
+
    ;;Kill buffers for channels after /part
    ;;erc-kill-buffer-on-part t
 

emacs/.emacs.d/lisp/extra.el

@@ -119,27 +119,11 @@
     (remote-term (format "ssh-%s" host) "ssh" (format "%s" host))))
 
 
-
-
 (use-package alert
   :defer
   :ensure t)
 
 
-(use-package org-gcal
-  :ensure t
-  :defer
-  :commands (org-gcal-fetch org-gcal-sync)
-  ;; :custom
-  ;; (org-gcal-auto-archive t)
-  :config
-  (setq org-gcal-client-id (auth-source-pass-get "user" "developers.google.com/org-gcal")
-        org-gcal-file-alist '(("creichert07@gmail.com" . "~/org/cal.org"))
-        org-gcal-client-secret (auth-source-pass-get 'secret "developers.google.com/org-gcal")))
-
-
-
-
 (use-package noflet
   :defer
   :ensure t)
@@ -160,19 +144,6 @@
   (pdf-tools-install))
 
 
-
-(use-package org-gcal
-  :ensure t
-  :commands (org-gcal-fetch org-gcal-sync)
-  :defer
-  :config
-  (use-package auth-source-pass :ensure t :demand)
-  (setq org-gcal-client-id (auth-source-pass-get "user" "developers.google.com/org-gcal")
-        org-gcal-file-alist '(("creichert07@gmail.com" . "~/org/cal.org"))
-        org-gcal-client-secret (auth-source-pass-get 'secret "developers.google.com/org-gcal")))
-
-
-
 (use-package yasnippet
   :defer
   :ensure t

emacs/.emacs.d/lisp/git-settings.el

@@ -53,6 +53,8 @@
   :ensure t
   :hook (magit-mode . magit-gh-pulls-mode)
   :init
+  (use-package magit-popup
+    :ensure t)
   (setq magit-gh-pulls-pull-detail-limit 30)
   (setq magit-gh-pulls-status-documentation t))
 

emacs/.emacs.d/lisp/haskell-settings.el

@@ -114,7 +114,7 @@
   (add-to-list 'haskell-font-lock-quasi-quote-modes '("yamlQQ" . yaml-mode))
   (add-to-list 'haskell-font-lock-quasi-quote-modes '("js"     . web-mode))
   (add-to-list 'haskell-process-args-stack-ghci "--ghci-options=-O0")
-  (add-to-list 'haskell-process-args-stack-ghci "--ghci-options=-fshow-loaded-modules")
+  ;;(add-to-list 'haskell-process-args-stack-ghci "--ghci-options=-fshow-loaded-modules")
 
   (use-package evil :ensure t :demand)
   (evil-set-initial-state 'haskell-presentation-mode 'emacs)

emacs/.emacs.d/lisp/org-settings.el

@@ -8,8 +8,7 @@
          ([f6]   . org-capture)
          ([f7]   . org-todo-list)
          ([f8]   . org-agenda)
-         ([C-f8] . org-agenda-kill-all-agenda-buffers)
-         )
+         ([C-f8] . org-agenda-kill-all-agenda-buffers))
   :config
 
   (evil-define-key 'normal org-mode-map (kbd "TAB") #'org-cycle)
@@ -53,8 +52,8 @@
 
 
 (use-package org-agenda
-  :after (org)
   :hook
+  (( org-agenda-mode            . turn-on-auto-revert-mode ))
   (( org-capture-after-finalize . org-save-all-org-buffers ))
   (( org-capture-prepare-finalize . org-save-all-org-buffers ))
   (( org-agenda-after-show . xref-pulse-momentarily ))
@@ -67,6 +66,7 @@
   :init
   (use-package xref :demand)
   (setq org-agenda-todo-ignore-scheduled 'future
+        org-agenda-show-future-repeats nil
         org-agenda-window-setup 'current-window
         org-agenda-files '("~/org/")
         org-agenda-diary-file "~/org/journal.org"
@@ -80,7 +80,6 @@
   ;; (setq org-stuck-projects
   ;;       '("+LEVEL=2/-DONE" ("TODO" "NEXT" "NEXTACTION") nil "CATEGORY=\"cal\""))
 
-
   ;; Project-based commands
 
   (add-to-list 'org-agenda-custom-commands
@@ -123,21 +122,29 @@
                  "Today + Inbox"
                  ((agenda "" ((org-agenda-span 'day)))
                   (tags-todo "CATEGORY=\"inbox\"&LEVEL=2"
-
                              ))
                  ))
   )
 
 
 
 (use-package org-checklist
-  :ensure org-plus-contrib
-  :after (org))
-
+  :ensure org-plus-contrib)
 
 (use-package org-depend
-  :ensure org-plus-contrib
-  :after (org))
+  :ensure org-plus-contrib)
 
+(use-package org-tempo
+  :ensure org-plus-contrib)
+
+(use-package org-gcal
+  :ensure t
+  :commands (org-gcal-fetch org-gcal-sync)
+  :defer
+  :config
+  (use-package auth-source-pass :ensure t :demand)
+  (setq org-gcal-client-id (auth-source-pass-get "user" "developers.google.com/org-gcal")
+        org-gcal-file-alist '(("creichert07@gmail.com" . "~/org/cal.org"))
+        org-gcal-client-secret (auth-source-pass-get 'secret "developers.google.com/org-gcal")))
 
 (provide 'org-settings)

emacs/.gnus

@@ -88,9 +88,14 @@
          :map gnus-summary-mode-map
          ("D"     . gnus-summary-delete-article)
          ("C-c k" . gnus-article-receive-epg-keys)
+         :map gnus-group-mode-map
+         ("j" . gnus-browse-next-group)
          :map gnus-article-mode-map
          ("C-c k" . gnus-article-receive-epg-keys))
   :config
+
+  (setq gnus-group-sort-function 'gnus-group-sort-by-rank)
+
   ;;(setq gnus-check-new-newsgroups nil)
   (setq gnus-interactive-exit nil
         gnus-completing-read 'gnus-ido-completing-read
@@ -137,8 +142,8 @@
         ;; This setting configures how to handle subscribing groups that match
         ;; gnus-auto-subscribed-categories (defaults mail backends, not news).
         ;; gnus-subscribe-interactively implies hierarchical subscription.
-        gnus-subscribe-options-newsgroup-method 'gnus-subscribe-interactively
-        gnus-subscribe-hierarchical-interactive t
+        ;;gnus-subscribe-options-newsgroup-method 'gnus-subscribe-interactively
+        ;;gnus-subscribe-hierarchical-interactive t
         gnus-topic-display-empty-topics nil
 
         ;; This controls subscriptions for backends that don't match
@@ -401,19 +406,18 @@
 (use-package gnus-icalendar
   :demand
   :config
-  (use-package org :demand)
-  (use-package org-agenda :demand)
-  (use-package org-element :demand)
+  (use-package org         :demand :ensure org)
+  (use-package org-agenda  :demand :ensure org)
+  (use-package org-element :demand :ensure org)
   (setq gnus-icalendar-org-capture-file "~/org/cal.org")
   (setq gnus-icalendar-org-capture-headline '("Calendar"))
   (gnus-icalendar-setup)
   (gnus-icalendar-org-setup))
 
 
 (use-package org-mime
-  :after (org)
   :demand
-  :ensure t
+  :ensure org-plus-contrib
   :config
   (setq org-mime-export-options
         '(:section-numbers nil