Merge branch 'master' of gitlab.com:chriscochrun/dotemacs

This commit is contained in:
Chris Cochrun 2021-04-24 05:42:22 -05:00
commit c0046dabc4
2 changed files with 150 additions and 37 deletions

87
init.el
View file

@ -32,12 +32,20 @@
(set-face-attribute 'variable-pitch nil :font "Cantarell"
:height (+ chris/default-font-size (/ chris/default-font-size 8)) :weight 'regular))
(defun chris/set-transparency ()
"Set the frame to be transparent on Wayland compositors"
(if (string= x-display-name "wayland-0")
((set-frame-parameter (selected-frame) 'alpha '(90 . 90))
(add-to-list 'default-frame-alist '(alpha . (90 . 90))))))
(if (daemonp)
(add-hook 'after-make-frame-functions
(lambda (frame)
(with-selected-frame frame
(chris/set-font-faces))))
(chris/set-font-faces)
(chris/set-transparency)))
(chris/set-font-faces))
(chris/set-transparency))
(setq display-line-numbers-type 'relative)
(global-display-line-numbers-mode +1)
@ -63,6 +71,10 @@
(recentf-mode +1)
(server-start)
(add-to-list 'exec-path "/home/chris/scripts")
(setq straight-fix-org t)
(setq straight-check-for-modifications '(check-on-save find-when-checking))
(defvar bootstrap-version)
@ -219,7 +231,8 @@
(general-def 'minibuffer-local-map
"C-v" 'evil-paste-after)
(general-def 'normal
"gcc" 'comment-line))
"gcc" 'comment-line
"K" 'helpful-at-point))
(use-package evil-escape
:after evil
@ -431,8 +444,10 @@ vertically."
(defun chris/dired-open-xdg ()
"Open the file-at-point in the appropriate program"
(interactive)
(let ((file (ignore-errors (dired-get-file-for-visit))))
(browse-url-xdg-open (file-truename file))))
(let ((file (file-truename (ignore-errors (dired-get-file-for-visit)))))
(message file)
(call-process "xdg-open" nil 0 nil file)))
:general
(chris/leader-keys
:states 'normal
@ -458,10 +473,33 @@ vertically."
"h" 'dired-single-up-directory
"l" 'dired-single-buffer))
(use-package dired-rainbow
:after dired
:config
(defconst chris/dired-media-files-extensions
'("mp3" "mp4" "MP3" "MP4" "avi" "mpg" "flv" "ogg" "opus")
"Media files.")
(defconst chris/dired-image-files-extensions
'("png" "jpg" "PNG" "JPG" "jpeg" "JPEG" "gif" "GIF")
"image files")
(dired-rainbow-define html "#4e9a06" ("htm" "html" "xhtml"))
(dired-rainbow-define media "#f3f99d" chris/dired-media-files-extensions)
(dired-rainbow-define image "#5af78e" chris/dired-image-files-extensions)
(dired-rainbow-define log (:inherit default :italic t) ".*\\.log"))
(use-package diredfl
:after dired
:config (diredfl-global-mode +1))
(use-package dired-rsync
:after dired
:general
(general-def 'normal dired-mode-map
"C" 'dired-rsync))
(require 'tramp)
(add-to-list 'tramp-default-proxies-alist
'(nil "\\`root\\'" "/ssh:%h:"))
@ -507,7 +545,7 @@ vertically."
(setq org-capture-templates
'(("t" "Personal todo" entry
(file+headline "todo.org" "Inbox")
"* TODO %^{TODO name}\nSCHEDULED: %T\n%a\n%i%?" :prepend t)
(file ".templates/tasks.org") :prepend t)
("n" "Personal notes" entry
(file+headline "notes.org" "Inbox")
"* %u %?\n%i\n%a" :prepend t)
@ -542,7 +580,8 @@ vertically."
"* %U %?\n %i\n %a" :heading "Notes" :prepend t)
("oc" "Project changelog" entry #'+org-capture-central-project-changelog-file
"* %U %?\n %i\n %a" :heading "Changelog" :prepend t))
org-capture-use-agenda-date t)
org-capture-use-agenda-date t
org-agenda-timegrid-use-ampm t)
;;(setq org-superstar-headline-bullets-list '("◉" "◈" "▸" "✬" "◎" "◇" "❉" "✙" "❖"))
(setq org-imenu-depth 4)
@ -565,7 +604,8 @@ vertically."
"/home/chris/org/ministry_team.org"
"/home/chris/org/todo.org"
"/home/chris/org/newsletter.org"
"/home/chris/org/nvtfc_social_media.org"))
"/home/chris/org/nvtfc_social_media.org"
"/home/chris/org/lessons/"))
;; (add-to-list '("/home/chris/org/inbox.org"
;; "/home/chris/org/notes.org"
;; "/home/chris/org/repetition.org"
@ -698,7 +738,7 @@ vertically."
:head "#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n- tags %^G\n\n* ")
("l" "TFC Lesson" plain (function org-roam--capture-get-point)
(file ".templates/lessontemplate.org")
:file-name "${slug}"
:file-name "lessons/${slug}"
:head "#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n")))
(setq org-roam-dailies-capture-templates
@ -1163,6 +1203,8 @@ If on a:
(rename-buffer "*eshell-pop*")
(display-buffer-in-side-window pop-eshell '((side . bottom))))))
(setq eshell-banner-message "")
:general
(chris/leader-keys
:states 'normal
@ -1199,7 +1241,7 @@ If on a:
(use-package nov
:mode ("\\.epub\\'" . nov-mode)
:config
(add-hook 'nov-mode-hook 'olivetti-mode))
(add-hook 'nov-mode-hook 'visual-fill-column-mode))
(use-package elfeed
:commands (elfeed)
@ -1317,14 +1359,25 @@ interfere with the default `bongo-playlist-buffer'."
(use-package transmission
:commands (transmission)
:config
(setq transmission-host "192.168.1.7"
transmission-rpc-path "/transmission/rpc"
transmission-refresh-modes '(transmission-mode transmission-files-mode transmission-info-mode transmission-peers-mode))
:general
(chris/leader-keys
:states 'normal
:keymaps 'override
"ot" 'transmission))
(if (string-equal (system-name) "syl")
(setq transmission-host "home.cochrun.xyz"
transmission-rpc-path "/transmission/rpc"
transmission-refresh-modes '(transmission-mode
transmission-files-mode
transmission-info-mode
transmission-peers-mode))
(setq transmission-host "192.168.1.7"
transmission-rpc-path "/transmission/rpc"
transmission-refresh-modes '(transmission-mode
transmission-files-mode
transmission-info-mode
transmission-peers-mode)))
:general
(chris/leader-keys
:states 'normal
:keymaps 'override
"ot" 'transmission))
;; Reduce rendering/line scan work for Emacs by not rendering cursors or regions
;; in non-focused windows.