From 8bc39556d688edd92b6e49d8569982a76c156f29 Mon Sep 17 00:00:00 2001
From: xeruf <27jf@pm.me>
Date: Tue, 11 Jan 2022 02:54:46 +0100
Subject: [PATCH] config: remove some personal doom stuff

---
 .config/Stretchly/config.json    |  3 ++-
 .config/doom/config.el           | 28 +++++++---------------------
 .config/doom/user.el##default    |  6 ++++++
 .config/doom/user.el##user.janek | 21 +++++++++++++++++++++
 .config/topgrade.toml            |  2 +-
 README.org                       | 14 +++++++++-----
 6 files changed, 46 insertions(+), 28 deletions(-)
 create mode 100644 .config/doom/user.el##default
 create mode 100644 .config/doom/user.el##user.janek

diff --git a/.config/Stretchly/config.json b/.config/Stretchly/config.json
index acf99d8..8e61267 100644
--- a/.config/Stretchly/config.json
+++ b/.config/Stretchly/config.json
@@ -451,5 +451,6 @@
 	"pauseBreaksShortcut": "",
 	"resumeBreaksShortcut": "",
 	"screen": "primary",
-	"timeToBreakInTray": false
+	"timeToBreakInTray": false,
+	"currentTimeInBreaks": false
 }
\ No newline at end of file
diff --git a/.config/doom/config.el b/.config/doom/config.el
index 91f1a4f..fb4b616 100644
--- a/.config/doom/config.el
+++ b/.config/doom/config.el
@@ -1,10 +1,5 @@
 ;;; $DOOMDIR/config.el -*- lexical-binding: t; -*-
 
-;; Some functionality uses this to identify you, e.g. GPG configuration, email
-;; clients, file templates and snippets.
-(setq user-full-name "Janek"
-      user-mail-address "27jf@pm.me")
-
 ;;;; VISUALS
 
 ;; Doom exposes five (optional) variables for controlling fonts in Doom. Here
@@ -171,27 +166,15 @@ Version 2019-11-04 2021-02-16"
 
 (defvar user-data-dir (if (file-exists-p "~/data/") "~/data" "/home/data") "Location of the main user data")
 
+(load! "./user.el" nil t)
 (load! "./local.el" nil t)
 
 (setq backup-directory-alist (list (cons "." (concat doom-cache-dir "backup/")))
       custom-emacs-data-dir (expand-file-name "data" doom-private-dir))
 
-(let ((box (expand-file-name "2-standards/box/" user-data-dir)))
-  (if (file-exists-p box)
-      (setq org-directory box))
-  (if (and org-directory (file-exists-p org-directory))
-      (setq default-directory org-directory
-            org-roam-directory org-directory
-            org-agenda-files (directory-files-recursively org-directory "\\`[^.]*\\'" 't)))
-  )
-
-(use-package! recentf
-  :config
-    (add-to-list 'recentf-exclude "writing\\/tug")
-    (add-to-list 'recentf-exclude "\\.\\(sync\\|stversions\\|stfolder\\)")
-    (add-to-list 'recentf-list (expand-file-name "4-incubator/downloads/" user-data-dir))
-    ;(setq recentf-keep '(recentf-keep-default-predicate file-remote-p))
-  )
+(if (and org-directory (file-exists-p org-directory))
+    (setq default-directory org-directory
+          org-agenda-files (directory-files-recursively org-directory "\\`[^.]*\\'" 't)))
 
 (use-package! projectile
   :init
@@ -222,6 +205,7 @@ Version 2019-11-04 2021-02-16"
         "e" 'org-export-dispatch-custom-date
         "E" 'org-export-repeat
         "\\" 'org-ctrl-c-ctrl-c
+        :desc "Save and Export" "be" '(lambda () (interactive) (basic-save-buffer) (org-export-repeat))
         :localleader
         "C" 'org-clock-in
         "j" 'org-insert-heading
@@ -237,6 +221,7 @@ Version 2019-11-04 2021-02-16"
         "ra" 'org-change-tag-in-region
         "lk" 'counsel-org-link
         "gR" 'org-mode-restart
+        ";"  'comment-line
         :desc "Set ID property" "lI" '(lambda () (interactive) (org-set-property "ID" nil))
         :desc "Set Roam Aliases" "la" '(lambda () (interactive) (org-set-property "ROAM_ALIASES" nil))
         :desc "Add tag" "mt" 'org-roam-tag-add
@@ -623,6 +608,7 @@ Version 2019-11-04 2021-02-16"
 (use-package! plantuml-mode ; Diagrams
   :defer t
   :config
+    ; TODO plantuml file template
     (setq plantuml-executable-path "nostderr"
           plantuml-executable-args '("plantuml" "-headless")
           plantuml-default-exec-mode 'jar
diff --git a/.config/doom/user.el##default b/.config/doom/user.el##default
new file mode 100644
index 0000000..a393d54
--- /dev/null
+++ b/.config/doom/user.el##default
@@ -0,0 +1,6 @@
+;;; user.el -*- lexical-binding: t; -*-
+
+;; Some functionality uses this to identify you,
+;; e.g. GPG configuration, email clients, file templates and snippets.
+(setq user-full-name ""
+      user-mail-address "")
diff --git a/.config/doom/user.el##user.janek b/.config/doom/user.el##user.janek
new file mode 100644
index 0000000..c428210
--- /dev/null
+++ b/.config/doom/user.el##user.janek
@@ -0,0 +1,21 @@
+;;; user.el -*- lexical-binding: t; -*-
+
+;; Some functionality uses this to identify you,
+;; e.g. GPG configuration, email clients, file templates and snippets.
+(setq user-full-name "Janek"
+      user-mail-address "27jf@pm.me")
+
+(let ((box (expand-file-name "2-standards/box/" user-data-dir)))
+  (if (file-exists-p box)
+      (setq org-directory box
+            org-roam-directory org-directory
+            ))
+  )
+
+(use-package! recentf
+  :config
+    (add-to-list 'recentf-exclude "writing\\/tug")
+    (add-to-list 'recentf-exclude "\\.\\(sync\\|stversions\\|stfolder\\)")
+    (add-to-list 'recentf-list (expand-file-name "4-incubator/downloads/" user-data-dir))
+    ;(setq recentf-keep '(recentf-keep-default-predicate file-remote-p))
+  )
diff --git a/.config/topgrade.toml b/.config/topgrade.toml
index 3107e2b..5d2d241 100644
--- a/.config/topgrade.toml
+++ b/.config/topgrade.toml
@@ -64,7 +64,7 @@ arguments = "--rebase --autostash"
 
 [linux]
 # Arguments to pass yay when updating packages
-#yay_arguments = "--nodevel"
+yay_arguments = "--nodiffmenu"
 #trizen_arguments = "--devel"
 #enable_tlmgr = true
 #emerge_sync_flags = "-q"
diff --git a/README.org b/README.org
index e0daebf..fbf1a2c 100644
--- a/README.org
+++ b/README.org
@@ -41,8 +41,6 @@ and configuration for ~less~ and ~fzf~.
 - multitools :: ffmpeg imagemagick pandoc
 - music :: mpd mpc ncmpc vlc phonon-qt5-vlc mpdris2
   : mkdir -p ~/.local/state/mpd && systemctl --user enable --now mpd mpDris2
-- music management :: puddletag beets picard ffmpegthumbnailer sox
-  : sudo npm install -g bpm
 #+begin_src sh YAY for AUR
 git clone https://aur.archlinux.org/yay.git /tmp/yay
 cd /tmp/yay
@@ -62,9 +60,12 @@ makepkg -si
   : pip install beautifulsoup4
 - experiments :: kakoune
 ** Graphical
+- office :: libreoffice-fresh
+- fonts :: fontpreview noto-fonts noto-fonts-emoji ttf-dejavu adobe-source-code-pro-fonts texlive-myriadpro-git
 - video :: vlc obs-studio kdenlive
+- music management :: puddletag beets picard ffmpegthumbnailer sox
+  : sudo npm install -g bpm
 - music production :: lilypond lilypond-docs timidity++ chordpro-git musescore mixxx-beta-git
-- office :: libreoffice-fresh emacs emacs-pdf-tools-git texlive-core texlive-latexextra context-bin
 - communication :: zulip-desktop-bin ferdi-bin
 - hacking :: etcher-bin
 - health :: stretchly-xeruf-git redshift acpilight light
@@ -73,10 +74,13 @@ makepkg -si
 *** Desktop
 - xorg :: xorg-xserver xorg-xkill xorg-setxkbmap xorg-xinit xterm xclip xprintidle light
 - wayland :: sway azote
-- kde :: plasma-desktop plasma-nm spectacle breeze systemsettings konsole ktorrent dolphin kdeplasma-addons kinfocenter partitionmanager kdeconnect kwallet-pam kwalletmanager ksshaskpass okular bluedevil
+- kde :: okular spectacle
+- kde desktop :: plasma-desktop plasma-nm breeze systemsettings ktorrent dolphin kdeplasma-addons kinfocenter partitionmanager kdeconnect kwallet-pam kwalletmanager ksshaskpass bluedevil
 *** Emacs
+emacs emacs-pdf-tools-git
+texlive-core texlive-latexextra texlive-mode-doc
+context-bin
 : git clone --depth 1 https://github.com/hlissner/doom-emacs ${XDG_CONFIG_HOME:-$HOME/.config}/emacs && ${XDG_CONFIG_HOME:-$HOME/.config}/emacs/bin/doom -y install
-: yay -Sy
 - mail :: offlineimap mu
 *** [[id:firefox][Firefox]] Addons
 **** Password management