setup: install things to ~/.local instead of /usr

And some clean up

home/.config/doom/config.el

@@ -277,7 +277,8 @@
   (add-hook 'elpher-mode-hook 'elpher--init-hook))
 
 ;; mu4e
-(setq +mu4e-alert-bell-cmd nil)
+(setq +mu4e-alert-bell-cmd nil
+      +mu4e-mu4e-mail-path "~/Mail")
 (use-package! mu4e
   :commands mu4e mu4e-compose-new
   :config
@@ -288,10 +289,10 @@
         mu4e-index-cleanup nil
         mu4e-index-lazy-check t))
 (set-email-account! "Gmail"
-  '((mu4e-sent-folder       . "/[Gmail]/Sent Mail")
+  '((mu4e-sent-folder       . "/Gmail/[Gmail]/Sent Mail")
-    (mu4e-drafts-folder     . "/[Gmail]/Drafts")
+    (mu4e-drafts-folder     . "/Gmail/[Gmail]/Drafts")
-    (mu4e-trash-folder      . "/[Gmail]/Trash")
+    (mu4e-trash-folder      . "/Gmail/[Gmail]/Trash")
-    (mu4e-refile-folder     . "/[Gmail]/All Mail")
+    (mu4e-refile-folder     . "/Gmail/[Gmail]/All Mail")
     (smtpmail-smtp-user     . "example@gmail.com")
     (smtpmail-smtp-server   . "smtp.gmail.com")
     (smtpmail-smtp-service  . 465)
@@ -321,10 +322,10 @@
       :channels ("#river", "#voidlinux", "#xbps", "artix", "#emacs", "#gentoo", "#guix", "##otaku"))))
 
 ;; Cheatsheet
-(use-package! tldr
+;; (use-package! tldr
-  :commands tldr tldr-mode
+;;   :commands tldr tldr-mode
-  :config
+;;   :config
-  (setq tldr-directory-path "~/.local/share/tldr"))
+;;   (setq tldr-directory-path "~/.local/share/tldr"))
 
 ;; Keycast
 (use-package! keycast

home/.config/doom/packages.el

@@ -64,7 +64,7 @@
 (package! ivy-emms)
 (package! elfeed-goodies)
 (package! symon)
-(package! tldr)
+;;(package! tldr)
 (package! lice)
 (package! license-templates)
 (package! keycast)

home/.config/nvim/init.vim

@@ -36,7 +36,7 @@ source $HOME/.config/nvim/plug-config/rooter.vim
 source $HOME/.config/nvim/plug-config/spaceline.vim
 " source $HOME/.config/nvim/plug-config/startify.vim
 source $HOME/.config/nvim/plug-config/tablemode.vim
-source $HOME/.config/nvim/plug-config/tldr.vim
+" source $HOME/.config/nvim/plug-config/tldr.vim
 source $HOME/.config/nvim/plug-config/translate-shell.vim
 source $HOME/.config/nvim/plug-config/undo.vim
 source $HOME/.config/nvim/plug-config/vim-buffet.vim

home/.config/nvim/vim-plug/vim-plug.vim

@@ -123,7 +123,7 @@ Plug 'mbbill/undotree'
 Plug 'Asheq/close-buffers.vim'
 " Cheatsheet
 Plug 'dbeniamine/cheat.sh-vim'
-Plug 'wlemuel/vim-tldr'
+" Plug 'wlemuel/vim-tldr'
 "=================================================
 " Live-server for html
 Plug 'turbio/bracey.vim', { 'do': 'npm install --prefix server' }

home/.config/waybar/config

@@ -200,6 +200,7 @@
   "network": {
     "format-wifi": "  {essid}",
     "format-ethernet": " {bandwidthUpBits}  {bandwidthDownBits}",
+    // "format-ethernet": " {ifname}",
     "format-disconnected": "",
     "interval": 2,
     "tooltip": false

home/.config/waybar/config-generic

@@ -149,6 +149,7 @@
   "network": {
     "format-wifi": "  {essid}",
     "format-ethernet": " {bandwidthUpBits}  {bandwidthDownBits}",
+    // "format-ethernet": " {ifname}",
     "format-disconnected": "",
     "interval": 2,
     "tooltip": false

home/.local/bin/remount

@@ -1,4 +0,0 @@
-#!/bin/sh
-
-sudo mount -o remount,size=20G,noatime /tmp
-echo "Done. Please use 'df -h' to make sure folder size is increased."

home/.mbsyncrc

@@ -24,10 +24,10 @@ Inbox ~/Mail/Gmail/Inbox
 
 # Connections
 Channel gmail
-Master :gmail-remote:
+Far :gmail-remote:
-Slave :gmail-local:
+Near :gmail-local:
 Patterns ![Gmail]* "[Gmail]/Sent Mail" "[Gmail]/Starred" "[Gmail]/All Mail" "[Gmail]/Trash" "[Gmail]/Drafts" "[Gmail]/Spam" "INBOX"
-Create Slave
+Create Near
 Expunge Both
 SyncState *
 

setup/bsp-layout.sh

@@ -2,12 +2,6 @@
 
 git clone https://github.com/phenax/bsp-layout.git
 cd bsp-layout
-
+make PREFIX=$HOME/.local install
-if command -v doas >/dev/null
-then
-  doas -- make PREFIX=/usr install
-else
-  sudo make PREFIX=/usr install
-fi
 
 cd ..

setup/greenclip.sh

@@ -1,13 +1,8 @@
 #!/bin/sh
 
-echo "Version of greenclip: " | tr -d '\n' # 4.0
+echo "Version of greenclip: " | tr -d '\n' # 4.2
 read -r version
 
 curl -fLo greenclip https://github.com/erebe/greenclip/releases/download/${version}/greenclip
 chmod 755 greenclip
-if command -v doas >/dev/null
+mv -fv greenclip ~/.local/bin/greenclip
-then
-  doas -- mv -fv greenclip /usr/bin/greenclip
-else
-  sudo mv -fv greenclip /usr/bin/greenclip
-fi

setup/mpvpaper.sh

@@ -5,14 +5,8 @@
 git clone https://github.com/GhostNaN/mpvpaper
 
 cd mpvpaper
-meson build --prefix=/usr
+meson build --prefix=$HOME/.local
-
+ninja -C build install
-if command -v doas >/dev/null
-then
-  doas -- ninja -C build install
-else
-  sudo ninja -C build install
-fi
 
 cd ..
 

setup/nnn.sh

@@ -1,17 +1,10 @@
 #!/bin/sh -e
 
-# Needs musl-fts, ncurses
+# Needs musl-fts, ncurses-devel
 
 git clone https://github.com/FollieHiyuki/nnn.git
 cd nnn
 
-export LDLIBS=-lfts
+LDLIBS=-lfts make O_NERD=1 O_NOBATCH=1 O_GITSTATUS=1 PREFIX=$HOME/.local install
-
-if command -v doas >/dev/null
-then
-  doas -- make O_NERD=1 O_NOBATCH=1 O_GITSTATUS=1 PREFIX=/usr install
-else
-  sudo make O_NERD=1 O_NOBATCH=1 O_GITSTATUS=1 PREFIX=/usr install
-fi
 
 cd ..

setup/river.sh

@@ -8,11 +8,7 @@ echo "Initialize submodules"
 git submodule update --init --recursive
 
 echo "Install river"
-if command -v doas >/dev/null
+zig build -Drelease-safe -Dxwayland --prefix $HOME/.local install
-then
+rm -rv ~/.local/etc
-  doas -- zig build -Drelease-safe -Dxwayland --prefix /usr install
-else
-  sudo zig build -Drelease-safe -Dxwayland --prefix /usr install
-fi
 
 cd ..

setup/wayland-logout.sh

@@ -6,14 +6,7 @@ git clone https://github.com/soreau/wayland-logout.git
 cd wayland-logout
 
 echo "Build wayland-logout"
-meson build --prefix /usr
+meson build --prefix $HOME/.local
-
+ninja -C build install
-echo "Install wayland-logout"
-if command -v doas >/dev/null
-then
-  doas -- ninja -C build install
-else
-  sudo ninja -C build install
-fi
 
 cd ..

system/etc/profile.d/umask.sh

@@ -1 +1 @@
-umask 027
+umask 0027