From 62e4b6f52f786a33eeb58824fe8211ab9bcd3561 Mon Sep 17 00:00:00 2001 From: Lucien Cartier-Tilet Date: Sat, 12 Sep 2020 00:38:11 +0200 Subject: [PATCH] [Bootstrap, Org files] Removed tangling of deprecated configurations This commit removes tangling of deprecated configurations in the bootstrap script. It also removes a dunst mention in the spacemacs.org file. --- .config/yadm/bootstrap | 18 ----------------- org/config/installation.org | 39 ++++++++++++++++--------------------- org/config/spacemacs.org | 2 +- 3 files changed, 18 insertions(+), 41 deletions(-) diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap index 9bdab5c..81f0381 100755 --- a/.config/yadm/bootstrap +++ b/.config/yadm/bootstrap @@ -108,12 +108,9 @@ mkdir -p $HOME/.config/emacs/private mkdir -p $HOME/.config/fish mkdir -p $HOME/.config/gtk-2.0 mkdir -p $HOME/.config/gtk-3.0 -mkdir -p $HOME/.config/i3 -mkdir -p $HOME/.config/nano mkdir -p $HOME/.config/ncmpcpp mkdir -p $HOME/.config/neofetch mkdir -p $HOME/.config/picom -mkdir -p $HOME/.config/polybar mkdir -p $HOME/.config/yadm mkdir -p $HOME/.local/bin mkdir -p $HOME/org/capture @@ -134,31 +131,16 @@ emacs -q --batch --eval '(require \'ob-tangle)' \ --eval '(setq org-confirm-babel-evaluate nil)' \ --eval '(org-babel-tangle-file "~/org/config/fish.org")' -printf '\n\n==== Tangling i3.org\n\n' && \ -emacs -q --batch --eval '(require \'ob-tangle)' \ ---eval '(setq org-confirm-babel-evaluate nil)' \ ---eval '(org-babel-tangle-file "~/org/config/i3.org")' - printf '\n\n==== Tangling index.org\n\n' && \ emacs -q --batch --eval '(require \'ob-tangle)' \ --eval '(setq org-confirm-babel-evaluate nil)' \ --eval '(org-babel-tangle-file "~/org/config/index.org")' -printf '\n\n==== Tangling nano.org\n\n' && \ -emacs -q --batch --eval '(require \'ob-tangle)' \ ---eval '(setq org-confirm-babel-evaluate nil)' \ ---eval '(org-babel-tangle-file "~/org/config/nano.org")' - printf '\n\n==== Tangling picom.org\n\n' && \ emacs -q --batch --eval '(require \'ob-tangle)' \ --eval '(setq org-confirm-babel-evaluate nil)' \ --eval '(org-babel-tangle-file "~/org/config/picom.org")' -printf '\n\n==== Tangling polybar.org\n\n' && \ -emacs -q --batch --eval '(require \'ob-tangle)' \ ---eval '(setq org-confirm-babel-evaluate nil)' \ ---eval '(org-babel-tangle-file "~/org/config/polybar.org")' - printf '\n\n==== Tangling rustfmt.org\n\n' && \ emacs -q --batch --eval '(require \'ob-tangle)' \ --eval '(setq org-confirm-babel-evaluate nil)' \ diff --git a/org/config/installation.org b/org/config/installation.org index 20bcc37..8c97c60 100644 --- a/org/config/installation.org +++ b/org/config/installation.org @@ -291,12 +291,9 @@ | $HOME/.config/fish | | $HOME/.config/gtk-2.0 | | $HOME/.config/gtk-3.0 | - | $HOME/.config/i3 | - | $HOME/.config/nano | | $HOME/.config/ncmpcpp | | $HOME/.config/neofetch | | $HOME/.config/picom | - | $HOME/.config/polybar | | $HOME/.config/yadm | | $HOME/.local/bin | | $HOME/org/capture | @@ -308,6 +305,22 @@ "\n") #+END_SRC + #+RESULTS[a95e25a5f3ac91b1f884b39dde38e3b51366b188]: gen-dirs-tangle + #+begin_example + mkdir -p $HOME/.config/awesome + mkdir -p $HOME/.config/awesome/theme + mkdir -p $HOME/.config/emacs/private + mkdir -p $HOME/.config/fish + mkdir -p $HOME/.config/gtk-2.0 + mkdir -p $HOME/.config/gtk-3.0 + mkdir -p $HOME/.config/ncmpcpp + mkdir -p $HOME/.config/neofetch + mkdir -p $HOME/.config/picom + mkdir -p $HOME/.config/yadm + mkdir -p $HOME/.local/bin + mkdir -p $HOME/org/capture + #+end_example + Our code to generate such directories looks like this: #+BEGIN_SRC fish :noweb yes <> @@ -321,11 +334,8 @@ | awesome.org | | bin.org | | fish.org | - | i3.org | | index.org | - | nano.org | | picom.org | - | polybar.org | | rustfmt.org | | spacemacs.org | | tmux.org | @@ -341,7 +351,7 @@ "\n") #+END_SRC - #+RESULTS[1c025aa6fca0a3251b995f0eaf6fa866cb2a8497]: generate-tangle + #+RESULTS[3f6418dc98ed415c34e76eb1f55f00763b1af202]: generate-tangle #+begin_example printf '\n\n==== Tangling awesome.org\n\n' && \ emacs -q --batch --eval '(require \'ob-tangle)' \ @@ -358,31 +368,16 @@ --eval '(setq org-confirm-babel-evaluate nil)' \ --eval '(org-babel-tangle-file "~/org/config/fish.org")' - printf '\n\n==== Tangling i3.org\n\n' && \ - emacs -q --batch --eval '(require \'ob-tangle)' \ - --eval '(setq org-confirm-babel-evaluate nil)' \ - --eval '(org-babel-tangle-file "~/org/config/i3.org")' - printf '\n\n==== Tangling index.org\n\n' && \ emacs -q --batch --eval '(require \'ob-tangle)' \ --eval '(setq org-confirm-babel-evaluate nil)' \ --eval '(org-babel-tangle-file "~/org/config/index.org")' - printf '\n\n==== Tangling nano.org\n\n' && \ - emacs -q --batch --eval '(require \'ob-tangle)' \ - --eval '(setq org-confirm-babel-evaluate nil)' \ - --eval '(org-babel-tangle-file "~/org/config/nano.org")' - printf '\n\n==== Tangling picom.org\n\n' && \ emacs -q --batch --eval '(require \'ob-tangle)' \ --eval '(setq org-confirm-babel-evaluate nil)' \ --eval '(org-babel-tangle-file "~/org/config/picom.org")' - printf '\n\n==== Tangling polybar.org\n\n' && \ - emacs -q --batch --eval '(require \'ob-tangle)' \ - --eval '(setq org-confirm-babel-evaluate nil)' \ - --eval '(org-babel-tangle-file "~/org/config/polybar.org")' - printf '\n\n==== Tangling rustfmt.org\n\n' && \ emacs -q --batch --eval '(require \'ob-tangle)' \ --eval '(setq org-confirm-babel-evaluate nil)' \ diff --git a/org/config/spacemacs.org b/org/config/spacemacs.org index 29ab0e7..7627a72 100644 --- a/org/config/spacemacs.org +++ b/org/config/spacemacs.org @@ -3213,7 +3213,7 @@ On new email arrival, Emacs can send the system a notification which will be handled as any other notification received by the system and will display the number of unread emails to the user; in my case, notifications are handled by - [[https://dunst-project.org/][dunst]] under i3, or AwesomeWM itself. + AwesomeWM. #+BEGIN_SRC emacs-lisp (setq mu4e-enable-notifications t mu4e-alert-email-notification-types '(count))