From 81edbe00f05c318a89a65abf4dd51495f2f126cc Mon Sep 17 00:00:00 2001 From: Phil Bajsicki Date: Wed, 18 Sep 2024 22:20:29 +0200 Subject: [PATCH] Update 2024.09.18 22:20:27 CEST --- .config/doom/README.org | 15 ++++++++++++++- .config/doom/config.el | 10 +++++++++- .config/fish/README.org | 2 +- .config/fish/config.fish | 2 +- .config/fish/fish_variables | 2 +- .config/xmonad/README.org | 6 +++--- .config/xmonad/xmonad.hs | 4 +--- 7 files changed, 30 insertions(+), 11 deletions(-) diff --git a/.config/doom/README.org b/.config/doom/README.org index cea04b1..8bb2235 100644 --- a/.config/doom/README.org +++ b/.config/doom/README.org @@ -22,7 +22,7 @@ A lot of these are swiped from [[https://gitlab.com/dwt1/configuring-emacs/][DT' #+begin_src emacs-lisp :tangle config.el ;; must be set before `org` is loaded (setq org-directory "~/enc/org/") -(setq org-agenda-files (directory-files-recursively "~/enc/org/" ".org$")) +(setq org-agenda-files (directory-files-recursively "~/enc/org/" ".org$"))1 (setq global-auto-revert-mode t) (setq auth-sources '("~/.authinfo")) @@ -839,6 +839,19 @@ This results in a list that gets added to the Org-mode buffer similar to: - Org links had: snow3 - File links: DarkSeaGreen, wheat2 - Web links: DeepSkyBlue +*** org-crypt +#+begin_src emacs-lisp :tangle config.el +(require 'org-crypt) +(require 'epa-file) +(epa-file-enable) +(org-crypt-use-before-save-magic) +(setq org-tags-exclude-from-inheritance (quote ("crypt"))) +(setq org-crypt-key "phil@bajsicki.com") +(setenv "GPG_AGENT_INFO" nil) +#+end_src + +#+RESULTS: + *** org-edna https://www.nongnu.org/org-edna-el/ #+begin_src emacs-lisp :tangle config.el diff --git a/.config/doom/config.el b/.config/doom/config.el index 2f2725f..7942a7a 100644 --- a/.config/doom/config.el +++ b/.config/doom/config.el @@ -2,7 +2,7 @@ ;; must be set before `org` is loaded (setq org-directory "~/enc/org/") -(setq org-agenda-files (directory-files-recursively "~/enc/org/" ".org$")) +(setq org-agenda-files (directory-files-recursively "~/enc/org/" ".org$"))1 (setq global-auto-revert-mode t) (setq auth-sources '("~/.authinfo")) @@ -470,6 +470,14 @@ and the contents of the files below the headlines." (my-set-linkcolors) ;; set colors when loading +(require 'org-crypt) +(require 'epa-file) +(epa-file-enable) +(org-crypt-use-before-save-magic) +(setq org-tags-exclude-from-inheritance (quote ("crypt"))) +(setq org-crypt-key "phil@bajsicki.com") +(setenv "GPG_AGENT_INFO" nil) + (add-to-list 'load-path "/usr/share/emacs/site-lisp/mu4e/") diff --git a/.config/fish/README.org b/.config/fish/README.org index edbe6e7..5515275 100644 --- a/.config/fish/README.org +++ b/.config/fish/README.org @@ -9,7 +9,7 @@ This is the fish config I use. It's largely a copy of [[https://gitlab.com/dwt1] First line removes the path; second line sets it. Without the first line, your path gets massive and fish becomes very slow. #+begin_src fish set -e fish_user_paths -set -U fish_user_paths $HOME/apps/bin $HOME/.local/bin $HOME/Applications $HOME/.cabal/bin $HOME/.ghcup/bin $HOME/.deno/bin $fish_user_paths +set -U fish_user_paths $HOME/apps/bin $HOME/.local/bin $HOME/Applications $HOME/.cabal/bin $HOME/.ghcup/bin $HOME/.deno/bin $fish_user_paths $HOME/.cargo/bin set -U EDITOR emacsclient -c --alternate-editor='' set -Ux PASSWORD_STORE_DIR $HOME/enc/keys/pass/ diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 25a1f7f..3a8173e 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -1,5 +1,5 @@ set -e fish_user_paths -set -U fish_user_paths $HOME/apps/bin $HOME/.local/bin $HOME/Applications $HOME/.cabal/bin $HOME/.ghcup/bin $HOME/.deno/bin $fish_user_paths +set -U fish_user_paths $HOME/apps/bin $HOME/.local/bin $HOME/Applications $HOME/.cabal/bin $HOME/.ghcup/bin $HOME/.deno/bin $fish_user_paths $HOME/.cargo/bin set -U EDITOR emacsclient -c --alternate-editor='' set -Ux PASSWORD_STORE_DIR $HOME/enc/keys/pass/ diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index 2f5f795..479da98 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -37,4 +37,4 @@ SETUVAR fish_pager_color_description:B3A06D\x1eyellow\x1e\x2di SETUVAR fish_pager_color_prefix:cyan\x1e\x2d\x2dbold\x1e\x2d\x2dunderline SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan SETUVAR fish_pager_color_selected_background:\x2dr -SETUVAR fish_user_paths:/home/phil/apps/bin\x1e/home/phil/\x2elocal/bin\x1e/home/phil/Applications\x1e/home/phil/\x2ecabal/bin\x1e/home/phil/\x2eghcup/bin\x1e/home/phil/\x2edeno/bin +SETUVAR fish_user_paths:/home/phil/apps/bin\x1e/home/phil/\x2elocal/bin\x1e/home/phil/Applications\x1e/home/phil/\x2ecabal/bin\x1e/home/phil/\x2eghcup/bin\x1e/home/phil/\x2edeno/bin\x1e/home/phil/\x2ecargo/bin diff --git a/.config/xmonad/README.org b/.config/xmonad/README.org index 9e314b6..7de122e 100644 --- a/.config/xmonad/README.org +++ b/.config/xmonad/README.org @@ -295,9 +295,9 @@ I like looking back on the way I spend my time every once in a while. Local time spawnOnce "aw-watcher-window" spawnOnce "poetry run aw-watcher-spotify" #+end_src -***** Emacs +***** [disabled] Emacs Emacs daemon for emacsclient. -#+begin_src haskell +#+begin_src haskell :tangle no spawnOnce "/usr/bin/emacs --daemon" #+end_src ***** Xscreensaver @@ -563,7 +563,7 @@ Notes: I use a ZSA Moonlander so a lot of the 4-5 key sequences are actually jus #+end_src *** Some common keybinds: #+begin_src haskell - , ("M-e", spawn "emacsclient -c -a 'emacs'") + , ("M-e", spawn "emacsclient --altername-editor='emacs'") , ("M-", spawn "alacritty") , ("M-S-", spawn "feh --recursive --randomize --bg-fill /mnt/ext1/media/Images/Wallpapers/*") , ("M-", spawn "dm-maim") diff --git a/.config/xmonad/xmonad.hs b/.config/xmonad/xmonad.hs index 2c13024..7cc7618 100644 --- a/.config/xmonad/xmonad.hs +++ b/.config/xmonad/xmonad.hs @@ -153,8 +153,6 @@ myStartupHook = do spawnOnce "aw-watcher-window" spawnOnce "poetry run aw-watcher-spotify" - spawnOnce "/usr/bin/emacs --daemon" - spawnOnce "xscreensaver" @@ -335,7 +333,7 @@ main = do , ("M-S-C-M1-q", killAll) , ("M-d", spawn "rofi -show drun") - , ("M-e", spawn "emacsclient -c -a 'emacs'") + , ("M-e", spawn "emacsclient --altername-editor='emacs'") , ("M-", spawn "alacritty") , ("M-S-", spawn "feh --recursive --randomize --bg-fill /mnt/ext1/media/Images/Wallpapers/*") , ("M-", spawn "dm-maim")