emacs: Minor keybinding & variable adjustments.

1 files changed, 60 insertions, 41 deletions

diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index b9bbd58..73d1346 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -174,10 +174,10 @@
 
 (global-set-key (kbd "M-s g") #'grep-find)
 (global-set-key (kbd "M-s M-o") #'thanos/occur)
-(global-set-key (kbd "M-s f") #'find-name-dired)
+(global-set-key (kbd "M-s M-f") #'find-name-dired)
 
-(setf browse-url-browser-function 'browse-url-generic
-      browse-url-generic-program "icecat"
+(setf browse-url-browser-function 'eww
+      browse-url-generic-program "librewolf"
       backup-directory-alist '((".*" . "~/.Trash"))
       sentence-end-double-space t
       default-input-method "bulgarian-phonetic"
@@ -189,19 +189,14 @@
   "Watch for changes in `current-input-method' & update `ispell-dictionary'."
   (when (eq operation 'set)
     (cond
-     ((string-equal new-value "greek-polytonic")
-      (setq ispell-dictionary "el_GR")
-      ;; Refresh flyspell
-      (flyspell-mode 0)
-      (flyspell-mode 1))
-     (t
-      (setq ispell-dictionary "en_US")
-      (flyspell-mode 0)
-      (flyspell-mode 1)))))
+     ((string= new-value "greek-polytonic")
+      (ispell-change-dictionary "el_GR")
+      (flyspell-mode))
+     (t (ispell-change-dictionary "en_US")))))
 
 (add-variable-watcher 'current-input-method 'thanos/watch-input-method)
 
-(setf calendar-date-style 'european)
+(setf calendar-date-style 'iso)
 
 (defun thanos/add-custom-keywords ()
   "Add custom warning keywords."
@@ -222,8 +217,8 @@
 (use-package org
   :ensure t
   :config
-  (setf org-directory "~/org/"
-	org-agenda-files (directory-files-recursively "~/org" ".*")
+  (setf org-directory "~/Documents"
+	org-agenda-files (directory-files-recursively "~/Documents/agenda" ".*")
 	org-default-notes-file (expand-file-name "notes.org" org-directory)
 	org-ellipsis " ▼"
 	org-log-done 'time
@@ -469,7 +464,7 @@
 	    ;; (bg-main "#191919") ;; 1337
 	    ;; (bg-main "#1d1f21") ;; tomorrow night
 	    ;; (bg-main "#151515") ;; jazz
-	    (bg-main "#0C0C0C") ;; random black
+	    ;; (bg-main "#0C0C0C") ;; random black
 	    ;; (bg-main "#1b1d1e") ;; Iosevka
 	    ;; (bg-main "#0D0E16") ;; Acario
 	    ;; (bg-main "#1c1e1f") ;; molokai
@@ -510,7 +505,7 @@
   (which-key-mode 1))
 
 ;; Python
-(add-to-list 'auto-mode-alist '("\\.py\\'" . python-ts-mode))
+(add-to-list 'auto-mode-alist '("\\.py\\'" . python-mode))
 
 ;; Lisp
 
@@ -598,7 +593,10 @@
   :bind (:map
 	 vc-prefix-map
 	 ("b d" . 'vc-git-delete-branch)
-	 ("p" . 'thanos/git-update-all-remotes))
+	 ("p" . 'thanos/git-update-all-remotes)
+	 ("R" . 'vc-git-reword-commit)
+	 :map vc-git-log-view-mode-map
+	 ("r" . 'vc-git-reset))
   :hook ((vc-git-log-edit-mode . flyspell-mode)))
 
 (use-package magit
@@ -872,7 +870,7 @@
 
   (use-package gnosis
     :load-path "~/Dev/emacs-lisp/gnosis"
-    :ensure t
+    :vc t
     :init (define-prefix-command 'thanos/gnosis-map)
     :config
     (setf gnosis-vc-auto-push t
@@ -894,6 +892,7 @@
 
   (use-package org-gnosis
     :load-path "~/Dev/emacs-lisp/org-gnosis"
+    :vc t
     :init
     (define-prefix-command 'thanos/notes-map)
     (define-prefix-command 'thanos/journal-map)
@@ -904,14 +903,15 @@
 			 (format "\n* Body stats\nweight:\n\n* Daily Notes\n\n* Goals\n%s"
 				 (org-gnosis-todos))))
 	    ("Empty" (lambda () "")))
-	  org-gnosis-show-tags t)
+	  org-gnosis-show-tags t
+	  ;; Create files as gpg
+	  org-gnosis-create-as-gpg t)
 
     (defun thanos/org-open-at-point ()
       "Open Org link at point in the same window, if possible."
       (interactive)
       (let ((org-link-frame-setup '((file . find-file))))
 	(org-open-at-point)))
-    
     :bind (("C-c n" . thanos/notes-map)
 	   ("C-c j" . thanos/journal-map)
 	   :map thanos/notes-map
@@ -923,27 +923,27 @@
 	   ("f" . org-gnosis-journal-find)
 	   ("i" . org-gnosis-journal-insert)
 	   :map org-mode-map
-	   ("C-c C-." . org-gnosis-insert-tag)
+	   ("C-c C-." . org-gnosis-insert-tags)
 	   ("C-c i" . org-id-get-create)
 	   ("C-c C-o" . thanos/org-open-at-point)))
 
-  (use-package org-gnosis-ui
-    :load-path "~/Dev/emacs-lisp/org-gnosis-ui/"
-    :after org-gnosis
-    :config
-    (setf org-gnosis-ui-custom-theme
-	  '((bg . "#1b1d1e")
-	    (bg-alt . "#282a36")
-	    (fg . "#ffffff")
-	    (fg-alt . "#c6daff")
-	    (red . "#ff5f5f")
-	    (orange . "#f1fa8c")
-	    (yellow . "#efef00")
-	    (green . "#44df44")
-	    (cyan . "#00eff0")
-	    (blue . "#338fff")
-	    (violet . "#9099d9") ;; indigo
-	    (magenta . "#ff66ff"))))
+  ;; (use-package org-gnosis-ui
+  ;;   :load-path "~/Dev/emacs-lisp/org-gnosis-ui/"
+  ;;   :after org-gnosis
+  ;;   :config
+  ;;   (setf org-gnosis-ui-custom-theme
+  ;; 	  '((bg . "#1b1d1e")
+  ;; 	    (bg-alt . "#282a36")
+  ;; 	    (fg . "#ffffff")
+  ;; 	    (fg-alt . "#c6daff")
+  ;; 	    (red . "#ff5f5f")
+  ;; 	    (orange . "#f1fa8c")
+  ;; 	    (yellow . "#efef00")
+  ;; 	    (green . "#44df44")
+  ;; 	    (cyan . "#00eff0")
+  ;; 	    (blue . "#338fff")
+  ;; 	    (violet . "#9099d9") ;; indigo
+  ;; 	    (magenta . "#ff66ff"))))
 
   (use-package pcmpl-tailscale
     :vc t
@@ -995,6 +995,7 @@
 	       ("https://annas-blog.org/rss.xml" anna piracy)
 	       ("http://localhost/?action=display&bridge=CssSelectorBridge&home_page=https%3A%2F%2Fwww.ethnos.gr%2Ftag%2F842%2Fellhnotoyrkika&url_selector=a.single-title&url_pattern=&content_selector=div.content-section&content_cleanup=div.article-related-posts%2C+div.ReadMore%2C+script&title_cleanup=&limit=&format=Atom" greek ethnos tk)
 	       ("https://planet.emacslife.com/atom.xml" emacs emacslife)
+	       ("https://sachachua.com/blog/feed/index.xml" sacha emacs)
 	       ("https://localmonero.co/static/rss/the-monero-standard/feed.xml" monero)
 	       ("https://devonzuegel.com/feed" devon)
 	       ("https://www.addtoany.com/add_to/feed?linkurl=http%3A%2F%2Fwww.thelancet.com%2Frssfeed%2Flancet_online.xml&type=feed&linkname=The%20Lancet%20Online%20First&linknote=" lancet med)
@@ -1321,8 +1322,9 @@ Create a temporary frame to execute BODY, which will then be deleted."
   "Set wallpaper."
   (interactive)
   (let ((wallpaper (format "%s%s" wallpapers-dir
-			   (completing-read "Choose wallpaper: "
-					    (directory-files wallpapers-dir nil "^[^.].*")))))
+			   (completing-read
+			    "Choose wallpaper: "
+			    (directory-files wallpapers-dir nil "^[^.].*")))))
     (thanos/wallpaper-set wallpaper)
     (setf wallpaper-current wallpaper)))
 
@@ -1438,5 +1440,22 @@ Create a temporary frame to execute BODY, which will then be deleted."
 (require 'server)
 (unless (server-running-p)
   (server-start))
+;;; GNUS ;;;
+;; (setq gnus-select-method '(nnnil nil))
+
+;; (setq gnus-secondary-select-methods
+;;       '((nnimap "master"
+;;                 (nnimap-address "imap.mailbox.org")
+;;                 (nnimap-server-port "imaps")
+;;                 (nnimap-stream ssl)
+;;                 (nnir-search-engine imap)
+;;                 ;; (nnmail-expiry-target "nnimap+home:[Gmail]/Trash")
+;;                 (nnmail-expiry-wait 'immediate)))
+;;       nnmail-split-methods 'nnmail-split-fancy
+;;       nnmail-split-fancy
+;;       '(("From" "[email protected]" "emacs-devel")
+;; 	"normal"))
+
+;; (add-hook 'gnus-group-mode-hook 'gnus-topic-mode)
 
 ;;; init.el ends here