aboutsummaryrefslogtreecommitdiff
path: root/emacs/.emacs.d/init
diff options
context:
space:
mode:
Diffstat (limited to 'emacs/.emacs.d/init')
-rw-r--r--emacs/.emacs.d/init/ycp-basic.el2
-rw-r--r--emacs/.emacs.d/init/ycp-buffer.el6
-rw-r--r--emacs/.emacs.d/init/ycp-client.el3
-rw-r--r--emacs/.emacs.d/init/ycp-emms.el7
-rw-r--r--emacs/.emacs.d/init/ycp-gnus.el4
-rw-r--r--emacs/.emacs.d/init/ycp-markup.el24
-rw-r--r--emacs/.emacs.d/init/ycp-org.el3
-rw-r--r--emacs/.emacs.d/init/ycp-prog.el1
-rw-r--r--emacs/.emacs.d/init/ycp-reading.el2
-rw-r--r--emacs/.emacs.d/init/ycp-theme.el3
-rw-r--r--emacs/.emacs.d/init/ycp-web.el15
11 files changed, 58 insertions, 12 deletions
diff --git a/emacs/.emacs.d/init/ycp-basic.el b/emacs/.emacs.d/init/ycp-basic.el
index cb097e7..313004f 100644
--- a/emacs/.emacs.d/init/ycp-basic.el
+++ b/emacs/.emacs.d/init/ycp-basic.el
@@ -62,7 +62,7 @@
(my-package my-utils
(:delay 5)
(my-setq-from-local my-audio-incoming-dir my-video-incoming-dir
- my-document-incoming-dir)
+ my-music-incoming-dir my-document-incoming-dir)
(my-setq-from-local my-copy-file-targets)
(my-keybind global-map
"C-c <f2>" #'my-rename-file-and-buffer
diff --git a/emacs/.emacs.d/init/ycp-buffer.el b/emacs/.emacs.d/init/ycp-buffer.el
index 944a45e..6a560ea 100644
--- a/emacs/.emacs.d/init/ycp-buffer.el
+++ b/emacs/.emacs.d/init/ycp-buffer.el
@@ -50,7 +50,7 @@
(my-configure
(:delay 15)
(my-keybind ctl-x-x-map
- "f" #'follow-mode ; override `font-lock-update'
+ ;; "f" #'follow-mode ; override `font-lock-update'
"r" #'rename-uniquely
"l" #'visual-line-mode)
@@ -98,6 +98,9 @@
(my-package follow
(:delay 15)
+ (require 'my-buffer)
+ ;; Disable follow mode
+ (my-override follow-mode)
;; TODO: update this to adapt to number of windows
(my-keybind follow-mode-map
"C-v" #'follow-scroll-up
@@ -121,6 +124,7 @@
"r" #'next-buffer
"d" nil
"u" nil
+ "." nil
"w" #'kill-ring-save
"i" #'view-mode)
(my-keybind global-map "C-`" #'view-mode))
diff --git a/emacs/.emacs.d/init/ycp-client.el b/emacs/.emacs.d/init/ycp-client.el
index d35898c..16447fd 100644
--- a/emacs/.emacs.d/init/ycp-client.el
+++ b/emacs/.emacs.d/init/ycp-client.el
@@ -91,7 +91,8 @@
(:delay 60)
(require 'my-utils)
(setq my-ytdl-audio-download-dir my-audio-incoming-dir
- my-ytdl-video-download-dir my-video-incoming-dir))
+ my-ytdl-video-download-dir my-video-incoming-dir
+ my-ytdl-music-download-dir my-music-incoming-dir))
(my-package my-media-segment
(:delay 60))
diff --git a/emacs/.emacs.d/init/ycp-emms.el b/emacs/.emacs.d/init/ycp-emms.el
index 2b52b17..e49209f 100644
--- a/emacs/.emacs.d/init/ycp-emms.el
+++ b/emacs/.emacs.d/init/ycp-emms.el
@@ -34,6 +34,7 @@
(emms-all)
(setq emms-playing-time-resume-from-last-played t)
(add-to-list 'emms-info-functions 'emms-info-ytdl)
+ (add-to-list 'emms-info-functions 'my-emms-info-ffprobe)
;; emms-info-native is not very useful
(delete 'emms-info-native emms-info-functions)
(setq emms-source-file-default-directory (locate-user-emacs-file "emms"))
@@ -46,6 +47,7 @@
(setq emms-source-file-directory-tree-function
'emms-source-file-directory-tree-find)
(setq emms-info-ytdl-using-torsocks t)
+ (setq emms-info-auto-update nil)
(add-hook 'emms-playlist-mode-hook #'hl-line-mode)
(add-hook 'emms-metaplaylist-mode-hook #'hl-line-mode)
)
@@ -92,12 +94,17 @@
'my-emms-output-current-track-to-i3bar-file)
(add-hook 'emms-player-finished-hook 'my-emms-score-up-playing)
(add-hook 'emms-player-started-hook 'my-emms-score-up-chosen-bonus)
+ (add-hook 'emms-player-started-hook 'my-emms-playlist-maybe-mark-bounds)
+ (add-hook 'emms-player-started-hook 'my-emms-maybe-get-duration-for-current-track)
(setq emms-player-next-function 'my-emms-next-track-or-random-group)
(setq emms-players-preference-f 'my-emms-players-preference)
(my-keybind dired-mode-map "e" #'my-dired-add-to-emms)
(my-override emms-track-simple-description)
(my-emms-add-all)
(my-timer emms-save-scores-timer nil 900 'emms-score-save-hash)
+ (my-override emms-mode-line-playlist-current)
+ (my-override emms-score-show-playing)
+ ;; (my-override emms-playing-time-mode-line)
)
(provide 'ycp-emms)
diff --git a/emacs/.emacs.d/init/ycp-gnus.el b/emacs/.emacs.d/init/ycp-gnus.el
index 9e89ee9..7275363 100644
--- a/emacs/.emacs.d/init/ycp-gnus.el
+++ b/emacs/.emacs.d/init/ycp-gnus.el
@@ -94,7 +94,7 @@
(my-keybind global-map
"C-c n i" #'my-gnus-open-inbox
"C-c n n" #'my-gnus-start
- "C-c n u" #'gnus-group-get-new-news)
+ "C-c n u" #'my-gnus-group-refresh)
(my-server-timer my-gnus-new-news-timer nil 300
'my-gnus-group-get-new-news-quietly)
;; https://superuser.com/questions/519685/gnus-get-rid-of-mail-and-news-folders
@@ -147,6 +147,8 @@
(my-package gnus-group
(require 'my-gnus)
(my-keybind gnus-group-mode-map
+ "g" #'my-gnus-group-refresh
+ "i" #'my-gnus-open-inbox
"n" #'next-line
"p" #'previous-line
"m" #'my-gnus-group-compose
diff --git a/emacs/.emacs.d/init/ycp-markup.el b/emacs/.emacs.d/init/ycp-markup.el
index c90dc6a..68b5459 100644
--- a/emacs/.emacs.d/init/ycp-markup.el
+++ b/emacs/.emacs.d/init/ycp-markup.el
@@ -71,7 +71,7 @@
(my-package wiki
(my-keybind wiki-mode-map
"C-'" #'my-wiki-grok-wikipedia)
- (my-setq-from-local wiki-sites)
+ (my-setq-from-local wiki-sites wiki-local-dir)
(wiki-define-site-commands)
(add-to-list 'browse-url-handlers
`(wiki-engine-entry-url-p
@@ -105,7 +105,8 @@
;; No fill, so it requires visual line mode to look nice
(setq nov-text-width t)
(add-hook 'nov-mode-hook 'visual-line-mode)
- (add-hook 'nov-mode-hook 'follow-mode)
+ ;; interfering with dbus
+ ;; (add-hook 'nov-mode-hook 'follow-mode)
(add-hook 'nov-mode-hook (lambda ()
(setq line-spacing .1)))
(add-hook 'nov-post-html-render-hook 'my-nov-set-margins)
@@ -114,8 +115,16 @@
(my-override nov-scroll-up)
(my-keybind nov-mode-map
"Q" #'my-nov-copy-buffer-file-with-staging
- "i" #'imenu)
+ "i" #'imenu
+ "f" #'nov-scroll-up
+ "b" #'nov-scroll-down
+ "F" #'my-nov-skim-forward
+ "B" #'my-nov-skim-backward)
(add-to-list 'nov-shr-rendering-functions '(span . my-nov-render-span))
+ (add-to-list 'nov-shr-rendering-functions '(ol . my-nov-render-ol))
+ (add-hook 'nov-mode-hook
+ (lambda ()
+ (add-hook 'post-command-hook #'my-nov-update-mode-line nil t)))
)
;;; json-mode
@@ -126,5 +135,14 @@
(add-hook 'json-mode-hook 'my-json-setup-hook)
)
+(my-package mhtml-mode
+ (my-keybind mhtml-mode-map
+ "C-c C-v" #'my-html-render))
+
+(my-package my-markup
+ (:delay 15)
+ (add-to-list 'auto-mode-alist '("\\.html\\'" . htmlv-mode))
+ )
+
(provide 'ycp-markup)
;;; ycp-markup.el ends here
diff --git a/emacs/.emacs.d/init/ycp-org.el b/emacs/.emacs.d/init/ycp-org.el
index 3770f2e..77f720d 100644
--- a/emacs/.emacs.d/init/ycp-org.el
+++ b/emacs/.emacs.d/init/ycp-org.el
@@ -306,6 +306,7 @@
(setq org-clock-idle-time 15)
(setq org-clock-mode-line-total 'auto)
(setq org-clock-persist 'history)
+ (setq org-clock-continuously t)
(org-clock-persistence-insinuate))
(my-package org-refile
@@ -375,7 +376,7 @@
("i" . my-org-append-subheading)
("^" . org-sort)
("w" . org-refile)
- ("a" . org-archive-subtree-default-with-confirmation)
+ ("a" . org-archive-subtree-default)
("@" . org-mark-subtree)
("#" . org-toggle-comment)
("Clock Commands")
diff --git a/emacs/.emacs.d/init/ycp-prog.el b/emacs/.emacs.d/init/ycp-prog.el
index 6584491..f74e339 100644
--- a/emacs/.emacs.d/init/ycp-prog.el
+++ b/emacs/.emacs.d/init/ycp-prog.el
@@ -210,6 +210,7 @@
(my-package my-prog
(:delay 10)
(my-keybind global-map "C-c 8" #'my-set-tab-width-to-8)
+ (my-keybind prog-mode-map "C-c M-w" 'my-copy-with-func)
(add-hook 'c-mode-hook 'my-c-set-compile-command)
(define-key c-mode-map (kbd "C-c s") 'my-c-switch-between-header-and-source)
(define-key c++-mode-map (kbd "C-c s")
diff --git a/emacs/.emacs.d/init/ycp-reading.el b/emacs/.emacs.d/init/ycp-reading.el
index 477aa5d..5c0284e 100644
--- a/emacs/.emacs.d/init/ycp-reading.el
+++ b/emacs/.emacs.d/init/ycp-reading.el
@@ -27,7 +27,7 @@
;;; Code:
(my-package belf
- (my-setq-from-local belf-dir)
+ (my-setq-from-local belf-dir belf-locate-dirs)
(add-hook 'find-file-hook 'belf-recent-add-current)
(blink-cursor-mode 0))
diff --git a/emacs/.emacs.d/init/ycp-theme.el b/emacs/.emacs.d/init/ycp-theme.el
index 2b58ba3..c6721ed 100644
--- a/emacs/.emacs.d/init/ycp-theme.el
+++ b/emacs/.emacs.d/init/ycp-theme.el
@@ -41,8 +41,7 @@
'normal :weight 'normal :height 150 :width 'normal)
(set-face-attribute 'fixed-pitch nil :family "Ubuntu Mono" :foundry "DAMA"
:slant 'normal :weight 'normal :height 150 :width 'normal)
-(set-face-attribute 'variable-pitch nil :family "Ubuntu" :foundry "DAMA"
- :slant 'normal :weight 'normal :height 150 :width 'normal)
+(set-face-attribute 'variable-pitch nil :family "Ubuntu" :foundry "DAMA")
(provide 'ycp-theme)
;;; ycp-theme.el ends here
diff --git a/emacs/.emacs.d/init/ycp-web.el b/emacs/.emacs.d/init/ycp-web.el
index 6e939f8..89099d9 100644
--- a/emacs/.emacs.d/init/ycp-web.el
+++ b/emacs/.emacs.d/init/ycp-web.el
@@ -97,6 +97,7 @@
"nitter.tinfoil-hat.net"))
(setq my-invidious-hosts
'("yewtu.be"
+ "inv.nadeko.net"
"invidious.io.lol"
"invidious.slipfox.xyz"
"invidious.drgns.space"
@@ -187,6 +188,7 @@
(my-override hnreader--print-frontpage-item)
(my-override hnreader--print-comments)
(my-override hnreader--get-title)
+ (my-setq-from-local my-hnreader-save-dir)
(require 'my-web)
(add-to-list 'browse-url-handlers
`(my-hacker-news-url-p
@@ -252,6 +254,7 @@
(my-package my-web
(:delay 60)
+ (my-setq-from-local my-webpage-incoming-dir)
(my-keybind eww-mode-map
"N" #'my-eww-next-path
"P" #'my-eww-prev-path
@@ -260,6 +263,7 @@
"b" #'my-eww-switch-by-title)
(my-keybind global-map "\C-c\C-o" #'my-browse-url-at-point)
(my-setq-from-local my-newscorp-au-amp-nk)
+ (my-setq-from-local my-tor-browser-bin)
(add-to-list 'browse-url-handlers
`(my-newscorp-au-url-p
. ,(lambda (url &rest _) (my-open-newscorp-au url))))
@@ -338,6 +342,7 @@
(my-package fediorg
(:delay 60)
+ (my-setq-from-local fediorg-dir)
(require 'my-web)
(add-to-list 'browse-url-handlers
`(fediorg-post-url-p
@@ -387,18 +392,26 @@
exitter-oauth-consumer-key exitter-oauth-consumer-secret
exitter-access-token exitter-username exitter-password exitter-email
exitter-oauth-token exitter-oauth-token-secret exitter-oauth-token-ctime)
+ (my-setq-from-local exitter-dir)
(setq exitter-debug nil)
(add-to-list 'browse-url-handlers
`(exitter-post-url-p
- . ,(lambda (url &rest _) (exitter-open-post url))))
+ . ,(lambda (url arg) (exitter-open-post url arg))))
)
(my-package reddio
(:delay 60)
+ (my-setq-from-local reddio-dir)
(add-to-list 'browse-url-handlers
`(reddio-reddit-url-p
. ,(lambda (url &rest _) (reddio-open-url url))))
)
+(my-package ttrss
+ (:delay 60)
+ (my-setq-from-local ttrss-address ttrss-user ttrss-password)
+ (require 'my-ttrss)
+ (my-setq-from-local my-ttrss-dir))
+
(provide 'ycp-web)
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-18 16:26:00 +0000