[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.
[Emacs, mu4e] Change unread bookmark, add uni and emacs bookmark
2020-09-12 00:38:11 +02:00 · 2020-09-12 00:34:36 +02:00
3 changed files with 31 additions and 44 deletions
--- 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)' \
--- 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
     <<gen-dirs-tangle()>>
@ -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)' \
--- a/org/config/spacemacs.org
+++ b/org/config/spacemacs.org
@ -97,7 +97,7 @@
   | doom-themes         | some cool themes                                     |
   | edit-indirect       | edit region in separate buffer                       |
   | elcord              | rich integration of Emacs in Discord                 |
-   | helm-icons          | Integration between helm and treemacs icons          |
+   | helm-icons          | integration between helm and treemacs icons          |
   | kaolin-themes       | some cool themes                                     |
   | lsp-dart            | apparently, it isn’t included in the Dart layer      |
   | magit-gitflow       | integrate gitflow in Magit                           |
@ -3186,12 +3186,22 @@
   you get  with modern Email  client (and often you  don’t even get  them). All
   these bookmarks can  be accessed through a shortcut on  the main mu4e buffer,
   prefixed by ~b~. So, for instance,  my unread messages are  accessed through
- ~bu~.
+ ~bU~.
   #+BEGIN_SRC emacs-lisp
     (setq mu4e-bookmarks
           `(("maildir:/Inbox AND NOT flag:trashed" "Inbox" ?i)
+             (,(s-join " "
+                       '("maildir:/Inbox"
+                         "AND NOT flag:trashed"
+                         "AND f:/.*up8\.edu|.*univ-paris8.*/"))
+              "University" ?u)
+             (,(s-join " "
+                       '("maildir:/Inbox"
+                         "AND (list:ateliers-emacs.framalistes.org"
+                         "OR list:ateliers-paris.emacs-doctor.com)"))
+              "Emacs" ?e)
             ("maildir:/Sent" "Sent messages" ?s)
-             ("flag:unread AND NOT flag:trashed" "Unread messages" ?u)
+             ("flag:unread AND NOT flag:trashed" "Unread messages" ?U)
             ("date:today..now" "Today's messages" ?t)
             ("date:7d..now" "Last 7 days" ?w)
             ("date:1m..now" "Last month" ?m)
@ -3203,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))