Merge branch 'master' of https://github.com/cacharle/dotfiles

7 files changed, 49 insertions, 21 deletions

diff --git a/config/arduino15/arduino-cli.yaml b/config/arduino15/arduino-cli.yaml
new file mode 100644
index 0000000..3da02cd
--- /dev/null
+++ b/config/arduino15/arduino-cli.yaml
@@ -0,0 +1,6 @@
+# from: https://arduino.github.io/arduino-cli/0.34/configuration/
+directories:
+  data: "$XDG_DATA_DIR/arduino-cli/data"
+  downloads: "$XDG_DATA_DIR/arduino-cli/downloads"
+  user: "$XDG_DATA_DIR/arduino-cli/user"
+  builtin.libraries: "$XDG_DATA_DIR/arduino-cli/builtin_libraries"
diff --git a/config/dunst/dunstrc b/config/dunst/dunstrc
index 7ba2933..78bfa5f 100644
--- a/config/dunst/dunstrc
+++ b/config/dunst/dunstrc
@@ -61,7 +61,7 @@
 
     # Defines width in pixels of frame around the notification window.
     # Set to 0 to disable.
-    frame_width = 2
+    frame_width = 1
 
     # Defines color of the frame around the notification window.
     frame_color = "#aaaaaa"
diff --git a/config/fish/config.fish b/config/fish/config.fish
index 9825f58..fa2f40f 100644
--- a/config/fish/config.fish
+++ b/config/fish/config.fish
@@ -40,6 +40,8 @@ set -gx VIMINIT 'let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" | source $MYVIMRC'
 set -gx IPYTHONDIR "$XDG_CONFIG_HOME/ipython"
 set -gx JUPYTER_CONFIG_DIR "$XDG_CONFIG_HOME/jupyter"
 set -gx SCREENRC "$XDG_CONFIG_HOME/screen/screenrc"
+set -gx ANSIBLE_HOME "$XDG_CONFIG_HOME/ansible"
+set -gx ANSIBLE_CONFIG "$XDG_CONFIG_HOME/ansible.cfg"
 # data
 set -gx GNUPGHOME "$XDG_DATA_HOME/gnupg"
 set -gx GOPATH "$XDG_DATA_HOME/go"
@@ -49,13 +51,17 @@ set -gx JULIA_DEPOT_PATH "$XDG_DATA_HOME/julia:$JULIA_DEPOT_PATH"
 set -gx RLWRAP_HOME "$XDG_DATA_HOME/rlwrap"
 set -gx STARDICT_DATA_DIR "$XDG_DATA_HOME/stardict"  # put dictionaries in a 'dic' subdirectory
 set -gx VIRTUALFISH_HOME "$XDG_DATA_HOME/virtualfish"
+set -gx GNUPGHOME "$XDG_DATA_HOME/gnupg"
 # cache
 set -gx HISTFILE "$XDG_CACHE_HOME/zsh/history"
 set -gx LESSHISTFILE '-'  # no ~/.lesshst
 set -gx PYTHON_EGG_CACHE "$XDG_CACHE_HOME/python-eggs"
 set -gx BUNDLE_USER_CACHE "$XDG_CACHE_HOME/bundle"
+set -gx ANSIBLE_GALAXY_CACHE_DIR "$XDG_CACHE_HOME/ansible/galaxy_cache"
 # runtime
 set -gx XAUTHORITY "$XDG_RUNTIME_DIR/Xauthority"
+set -gx GHCUP_USE_XDG_DIRS 'true'
+set -gx STACK_XDG '1'
 
 # shellcheck disable SC2155
 # color in man (less pager)
@@ -104,6 +110,10 @@ if status is-interactive
     alias doas 'doas '     # same for doas
     alias info 'info --vi-keys'
     alias xclip 'xclip -selection clipboard'
+    alias mutt 'neomutt'
+    alias mbsync 'mbsync -c "$XDG_CONFIG_HOME/isync/mbsyncrc"'
+    alias arduino-cli='arduino-cli --config-file $XDG_CONFIG_HOME/arduino15/arduino-cli.yaml'
+	# alias nvidia-settings --config="$XDG_CONFIG_HOME"/nvidia/settings
 
     if [ "$(uname)" = 'Linux' ]
         alias ls='ls --color=auto -Fh'
@@ -116,7 +126,7 @@ if status is-interactive
     abbr lss 'ls -Ssh'
 
     # tree
-    alias tree 'tree -FCA'
+    alias tree 'tree -FC'
     abbr t 'tree'
     abbr ta 'tree -a'
     abbr t1 'tree -L 1'
diff --git a/config/git/config.linux b/config/git/config.linux
index f9bbcab..aea7fb1 100644
--- a/config/git/config.linux
+++ b/config/git/config.linux
@@ -31,3 +31,8 @@
     directory = *
 
 # vim:ft=gitconfig
+[filter "lfs"]
+	required = true
+	clean = git-lfs clean -- %f
+	smudge = git-lfs smudge -- %f
+	process = git-lfs filter-process
diff --git a/config/isync/mbsyncrc b/config/isync/mbsyncrc
index 649e823..883a251 100644
--- a/config/isync/mbsyncrc
+++ b/config/isync/mbsyncrc
@@ -6,8 +6,8 @@ SSLType IMAPS
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 
 MaildirStore cacharle-local
-Path ~/Mail/cacharle/
-Inbox ~/Mail/cacharle/INBOX
+Path ~/.mail/cacharle/
+Inbox ~/.mail/cacharle/INBOX
 Subfolders Verbatim
 
 Channel cacharle
diff --git a/config/mutt/muttrc b/config/mutt/muttrc
index 9eb04d8..2b31fc3 100644
--- a/config/mutt/muttrc
+++ b/config/mutt/muttrc
@@ -2,12 +2,24 @@
 # muttrc
 ###############################################################################
 
+# color shemes
+# source "$XDG_DATA_HOME/mutt/solarized/mutt-colors-solarized-dark-16.muttrc"  # solarized
+source "$XDG_DATA_HOME/mutt/gruvbox/colors-gruvbox-shuber.muttrc"  # gruvbox
+
 set from      = 'me@cacharle.xyz'  # address in new mail
 set realname  = 'Charles Cabergs'  # name in new mail
 
+# Password command to set it up
+# gpg -r xxx@xxx.xxx -e - <<EOF > $XDG_DATA_HOME/mutt/passwd.muttrc.gpg
+# set imap_passwd = "xxx"
+# set smtp_passwd = "xxx"
+# EOF
+# NOTE: this HAS to be declared BEFORE the `folder` option
+source "gpg -d $XDG_DATA_HOME/mutt/passwd.muttrc.gpg 2> /dev/null |"
+
 set smtp_url  = 'smtp://me@mail.cacharle.xyz:587'   # where to send
 set folder    = 'imaps://me@mail.cacharle.xyz:993'  # mails folder
-# set folder = "~/Mail/cacharle"
+# set folder = "~/.mail/cacharle"
 
 # view html with terminal browser in .mailcap
 auto_view text/html
@@ -20,7 +32,7 @@ set postponed = "+Drafts"
 
 mailboxes =INBOX =Sent =Send =Trash =Drafts
 
-set editor = 'vim'
+set editor = 'nvim'
 set sort = 'reverse-date'   # newest at the top
 
 set date_format = "%d/%m %I:%M"
@@ -50,18 +62,6 @@ set header_cache     = "$XDG_CACHE_HOME/mutt/cache/headers"
 set message_cachedir = "$XDG_CACHE_HOME/mutt/cache/bodies"
 set certificate_file = "$XDG_CACHE_HOME/mutt/certificates"
 
-# color shemes
-
-# source "$XDG_DATA_HOME/mutt/solarized/mutt-colors-solarized-dark-16.muttrc"  # solarized
-source "$XDG_DATA_HOME/mutt/gruvbox/colors-gruvbox-shuber.muttrc"  # gruvbox
-
-# password
-# command to set it up
-# gpg -r xxx@xxx.xxx -e - <<EOF > $XDG_DATA_HOME/mutt/passwd.muttrc.gpg
-# set imap_passwd = "xxx"
-# set smtp_passwd = "xxx"
-# EOF
-source "gpg -d $XDG_DATA_HOME/mutt/passwd.muttrc.gpg 2> /dev/null |"
 
 macro pager ,v |urlscan
 macro pager ,v |urlscan
diff --git a/config/xmonad/xmonad.hs b/config/xmonad/xmonad.hs
index a963905..3d3fbcf 100644
--- a/config/xmonad/xmonad.hs
+++ b/config/xmonad/xmonad.hs
@@ -5,7 +5,7 @@ import           System.Exit
 
 import           XMonad
 import           XMonad.Config.Desktop       (desktopConfig)
-import           XMonad.ManageHook           (composeAll, doFloat, className, (-->), (=?), (<+>))
+import           XMonad.ManageHook           (composeAll, willFloat, doFloat, doF, className, (-->), (=?), (<+>))
 
 -- Utilities
 import           XMonad.Util.Dmenu           (menuArgs)
@@ -24,6 +24,9 @@ import           XMonad.Layout.CenteredIfSingle (centeredIfSingle)
 import           XMonad.Hooks.InsertPosition (Focus (..), Position (..),
                                               insertPosition)
 import           XMonad.Hooks.WindowSwallowing
+import           XMonad.Hooks.ManageHelpers  (isDialog)
+
+import           XMonad.StackSet             (swapUp)
 
 -- TODO: no weird screen layout
 --       put 2 window in master next to each other and the rest in a stack as usual
@@ -62,11 +65,15 @@ layoutHook' = spacing' 4 $ centeredIfSingle (1/2) (95/100) (ThreeColMid 1 (3/100
           spacing' x             = spacingRaw True (Border x x x x) False (Border x x x x) True
 
 manageHook' = composeAll
-    [ className =? "Anki"  --> doFloat
+    [ insertPosition Below Newer  -- insert new window at the end of the current layout
+    , fmap not willFloat --> insertPosition Below Newer
+    , willFloat --> insertPosition Above Newer -- insert little pop up windows above all the rest
+    , className =? "Anki"  --> doFloat
     , className =? "Steam" --> doFloat
     , className =? "Gimp" --> doFloat
+    , className =? "OBS" --> doFloat
+    , isDialog --> doF swapUp
     ]
-    <+> insertPosition End Newer  -- insert new window at the end of the current layout
 
 keys' = [ ("<XF86AudioLowerVolume>",  spawn "pulseaudio-ctl down")
         , ("<XF86AudioRaiseVolume>",  spawn "pulseaudio-ctl up")