chris/emacs
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Wayland changes not perfect

Browse source
This commit is contained in:
Chris Cochrun 2021-04-20 09:51:20 -05:00
parent 0398122164
commit 20304a1406
2 changed files with 80 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
README.org
View file

@ -52,7 +52,7 @@ Let's create a message that will tell us how long it takes emacs to load in orde
(add-hook 'emacs-startup-hook #'chris/display-startup-time) (add-hook 'emacs-startup-hook #'chris/display-startup-time)
#+end_src #+end_src
Let's also set the =gc-cons-threshold= variable to a high setting for the remainder of our setup process to speed things up. Let's also set the =gc-cons-threshold= variable to a high setting for the remainder of our setup process to speed things up. This is no long done here but instead is done in the =early-init.el= file.
#+begin_src emacs-lisp :tangle no #+begin_src emacs-lisp :tangle no
(setq gc-cons-threshold 50000000) (setq gc-cons-threshold 50000000)
#+end_src #+end_src
@ -87,12 +87,20 @@ In order to have this config work on both my desktop with regular joe-schmoe mon
(set-face-attribute 'variable-pitch nil :font "Cantarell" (set-face-attribute 'variable-pitch nil :font "Cantarell"
:height (+ chris/default-font-size (/ chris/default-font-size 8)) :weight 'regular)) :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) (if (daemonp)
(add-hook 'after-make-frame-functions (add-hook 'after-make-frame-functions
(lambda (frame) (lambda (frame)
(with-selected-frame frame (with-selected-frame frame
(chris/set-font-faces)))) (chris/set-font-faces)
(chris/set-transparency))))
(chris/set-font-faces)) (chris/set-font-faces))
;; (chris/set-transparency))
#+end_src #+end_src
Then let's make sure line-numbers are relative and on. And let's turn on visual-line-mode globally. Then let's make sure line-numbers are relative and on. And let's turn on visual-line-mode globally.
@ -117,6 +125,11 @@ Let's also turn on =recentf-mode=.
#+begin_src emacs-lisp #+begin_src emacs-lisp
(recentf-mode +1) (recentf-mode +1)
#+end_src #+end_src
Finally this is not part of the UI but let's do this early and start the server so I can use emacsclient from my WM.
#+begin_src emacs-lisp
(server-start)
#+end_src
** Let's bootstrap straight.el ** Let's bootstrap straight.el
#+begin_src emacs-lisp #+begin_src emacs-lisp
(setq straight-fix-org t) (setq straight-fix-org t)
@ -310,7 +323,8 @@ This evil-collection package includes a lot of other evil based things.
(general-def 'minibuffer-local-map (general-def 'minibuffer-local-map
"C-v" 'evil-paste-after) "C-v" 'evil-paste-after)
(general-def 'normal (general-def 'normal
"gcc" 'comment-line)) "gcc" 'comment-line
"K" 'helpful-at-point))
#+end_src #+end_src
#+begin_src emacs-lisp #+begin_src emacs-lisp
@ -756,7 +770,7 @@ Part of this config includes some special capture templates for my work as a you
(setq org-capture-templates (setq org-capture-templates
'(("t" "Personal todo" entry '(("t" "Personal todo" entry
(file+headline "todo.org" "Inbox") (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 ("n" "Personal notes" entry
(file+headline "notes.org" "Inbox") (file+headline "notes.org" "Inbox")
"* %u %?\n%i\n%a" :prepend t) "* %u %?\n%i\n%a" :prepend t)
@ -791,7 +805,8 @@ Part of this config includes some special capture templates for my work as a you
"* %U %?\n %i\n %a" :heading "Notes" :prepend t) "* %U %?\n %i\n %a" :heading "Notes" :prepend t)
("oc" "Project changelog" entry #'+org-capture-central-project-changelog-file ("oc" "Project changelog" entry #'+org-capture-central-project-changelog-file
"* %U %?\n %i\n %a" :heading "Changelog" :prepend t)) "* %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-superstar-headline-bullets-list '("◉" "◈" "▸" "✬" "◎" "◇" "❉" "✙" "❖"))
(setq org-imenu-depth 4) (setq org-imenu-depth 4)
@ -814,7 +829,8 @@ Part of this config includes some special capture templates for my work as a you
"/home/chris/org/ministry_team.org" "/home/chris/org/ministry_team.org"
"/home/chris/org/todo.org" "/home/chris/org/todo.org"
"/home/chris/org/newsletter.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" ;; (add-to-list '("/home/chris/org/inbox.org"
;; "/home/chris/org/notes.org" ;; "/home/chris/org/notes.org"
;; "/home/chris/org/repetition.org" ;; "/home/chris/org/repetition.org"
@ -967,7 +983,7 @@ We also need to setup some capture templates to use some specific setups with my
:head "#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n- tags %^G\n\n* ") :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) ("l" "TFC Lesson" plain (function org-roam--capture-get-point)
(file ".templates/lessontemplate.org") (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"))) :head "#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n")))
(setq org-roam-dailies-capture-templates (setq org-roam-dailies-capture-templates
@ -1648,14 +1664,25 @@ I use transmission on a server to manage my torrents
(use-package transmission (use-package transmission
:commands (transmission) :commands (transmission)
:config :config
(setq transmission-host "192.168.1.7"
transmission-rpc-path "/transmission/rpc" (if (string-equal (system-name) "syl")
transmission-refresh-modes '(transmission-mode transmission-files-mode transmission-info-mode transmission-peers-mode)) (setq transmission-host "home.cochrun.xyz"
:general transmission-rpc-path "/transmission/rpc"
(chris/leader-keys transmission-refresh-modes '(transmission-mode
:states 'normal transmission-files-mode
:keymaps 'override transmission-info-mode
"ot" 'transmission)) 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))
#+end_src #+end_src
** Garbage Collection ** Garbage Collection

52
init.el
View file

@ -32,12 +32,20 @@
(set-face-attribute 'variable-pitch nil :font "Cantarell" (set-face-attribute 'variable-pitch nil :font "Cantarell"
:height (+ chris/default-font-size (/ chris/default-font-size 8)) :weight 'regular)) :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) (if (daemonp)
(add-hook 'after-make-frame-functions (add-hook 'after-make-frame-functions
(lambda (frame) (lambda (frame)
(with-selected-frame frame (with-selected-frame frame
(chris/set-font-faces)))) (chris/set-font-faces)
(chris/set-transparency))))
(chris/set-font-faces)) (chris/set-font-faces))
;; (chris/set-transparency))
(setq display-line-numbers-type 'relative) (setq display-line-numbers-type 'relative)
(global-display-line-numbers-mode +1) (global-display-line-numbers-mode +1)
@ -50,6 +58,8 @@
(recentf-mode +1) (recentf-mode +1)
(server-start)
(setq straight-fix-org t) (setq straight-fix-org t)
(defvar bootstrap-version) (defvar bootstrap-version)
(let ((bootstrap-file (let ((bootstrap-file
@ -205,7 +215,8 @@
(general-def 'minibuffer-local-map (general-def 'minibuffer-local-map
"C-v" 'evil-paste-after) "C-v" 'evil-paste-after)
(general-def 'normal (general-def 'normal
"gcc" 'comment-line)) "gcc" 'comment-line
"K" 'helpful-at-point))
(use-package evil-escape (use-package evil-escape
:after evil :after evil
@ -462,7 +473,7 @@ vertically."
(setq org-capture-templates (setq org-capture-templates
'(("t" "Personal todo" entry '(("t" "Personal todo" entry
(file+headline "todo.org" "Inbox") (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 ("n" "Personal notes" entry
(file+headline "notes.org" "Inbox") (file+headline "notes.org" "Inbox")
"* %u %?\n%i\n%a" :prepend t) "* %u %?\n%i\n%a" :prepend t)
@ -497,7 +508,8 @@ vertically."
"* %U %?\n %i\n %a" :heading "Notes" :prepend t) "* %U %?\n %i\n %a" :heading "Notes" :prepend t)
("oc" "Project changelog" entry #'+org-capture-central-project-changelog-file ("oc" "Project changelog" entry #'+org-capture-central-project-changelog-file
"* %U %?\n %i\n %a" :heading "Changelog" :prepend t)) "* %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-superstar-headline-bullets-list '("◉" "◈" "▸" "✬" "◎" "◇" "❉" "✙" "❖"))
(setq org-imenu-depth 4) (setq org-imenu-depth 4)
@ -520,7 +532,8 @@ vertically."
"/home/chris/org/ministry_team.org" "/home/chris/org/ministry_team.org"
"/home/chris/org/todo.org" "/home/chris/org/todo.org"
"/home/chris/org/newsletter.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" ;; (add-to-list '("/home/chris/org/inbox.org"
;; "/home/chris/org/notes.org" ;; "/home/chris/org/notes.org"
;; "/home/chris/org/repetition.org" ;; "/home/chris/org/repetition.org"
@ -650,7 +663,7 @@ vertically."
:head "#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n- tags %^G\n\n* ") :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) ("l" "TFC Lesson" plain (function org-roam--capture-get-point)
(file ".templates/lessontemplate.org") (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"))) :head "#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n")))
(setq org-roam-dailies-capture-templates (setq org-roam-dailies-capture-templates
@ -1265,14 +1278,25 @@ interfere with the default `bongo-playlist-buffer'."
(use-package transmission (use-package transmission
:commands (transmission) :commands (transmission)
:config :config
(setq transmission-host "192.168.1.7"
transmission-rpc-path "/transmission/rpc" (if (string-equal (system-name) "syl")
transmission-refresh-modes '(transmission-mode transmission-files-mode transmission-info-mode transmission-peers-mode)) (setq transmission-host "home.cochrun.xyz"
:general transmission-rpc-path "/transmission/rpc"
(chris/leader-keys transmission-refresh-modes '(transmission-mode
:states 'normal transmission-files-mode
:keymaps 'override transmission-info-mode
"ot" 'transmission)) 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))
(setq gc-cons-threshold 2000000) (setq gc-cons-threshold 2000000)
(setq garbage-collection-messages nil) (setq garbage-collection-messages nil)