From home

diff --git a/.bash_completion b/.bash_completion
index f1906fce93b507970c189f927f183c846a155e0f..2ac14aa1e50cbad2ec75471bd976ff78b86ff278 100644 (file)
--- a/.bash_completion
+++ b/.bash_completion
@@ -1,3 +1,5 @@
+#[ -f /etc/bash_completion ] && . /etc/bash_completion
+
 # Add tab completion for `githome` by marking it as an alias for `git`
 _completion_loader git 2> /dev/null
 if type _git &>/dev/null; then

diff --git a/.bashrc b/.bashrc
index 5822c3363ad0526409c3b25af404fcfad80f7dd5..675210b2f29a531dcf6172e1315e89850f845ade 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -58,7 +58,6 @@ HISTSIZE=
 HISTFILE=~/.bash_history.local
 
 # completion, aliases, and local settings
-[ -f /etc/bash_completion ] && . /etc/bash_completion
 [ -f ~/.bash_completion ] && . ~/.bash_completion
 [ -f ~/.bash_aliases ] && . ~/.bash_aliases
 [ -f ~/.bashrc.local ] && . ~/.bashrc.local

diff --git a/.config/mimeapps.list b/.config/mimeapps.list
index f738f84eb7d042fed079aea8275c15050b90a1e2..b1352b9484856e26f24b18a52daa25d7588883b9 100644 (file)
--- a/.config/mimeapps.list
+++ b/.config/mimeapps.list
@@ -1,8 +1,8 @@
 [Default Applications]
 text/plain=code.desktop
-text/html=userapp-Firefox-0UV8TZ.desktop
-x-scheme-handler/http=userapp-Firefox-0UV8TZ.desktop
-x-scheme-handler/https=userapp-Firefox-0UV8TZ.desktop
+text/html=firefox-esr.desktop
+x-scheme-handler/http=firefox-esr.desktop
+x-scheme-handler/https=firefox-esr.desktop
 x-scheme-handler/about=brave.desktop
 x-scheme-handler/unknown=brave.desktop
 video/x-ogm+ogg=vlc.desktop
@@ -118,15 +118,23 @@ audio/x-it=vlc.desktop
 audio/x-mod=vlc.desktop
 audio/x-s3m=vlc.desktop
 audio/x-xm=vlc.desktop
-x-scheme-handler/ftp=userapp-Firefox-0UV8TZ.desktop
-x-scheme-handler/chrome=userapp-Firefox-0UV8TZ.desktop
-application/x-extension-htm=userapp-Firefox-0UV8TZ.desktop
-application/x-extension-html=userapp-Firefox-0UV8TZ.desktop
-application/x-extension-shtml=userapp-Firefox-0UV8TZ.desktop
-application/xhtml+xml=userapp-Firefox-0UV8TZ.desktop
-application/x-extension-xhtml=userapp-Firefox-0UV8TZ.desktop
-application/x-extension-xht=userapp-Firefox-0UV8TZ.desktop
-x-scheme-handler/mailto=org.gnome.Evolution.desktop
+x-scheme-handler/ftp=firefox-esr.desktop
+x-scheme-handler/chrome=firefox-esr.desktop
+application/x-extension-htm=firefox-esr.desktop
+application/x-extension-html=firefox-esr.desktop
+application/x-extension-shtml=firefox-esr.desktop
+application/xhtml+xml=firefox-esr.desktop
+application/x-extension-xhtml=firefox-esr.desktop
+application/x-extension-xht=firefox-esr.desktop
+x-scheme-handler/mailto=userapp-Thunderbird-KO33J0.desktop
+message/rfc822=userapp-Thunderbird-KO33J0.desktop
+text/calendar=thunderbird.desktop
+x-scheme-handler/news=userapp-Thunderbird-54Z8N0.desktop
+x-scheme-handler/snews=userapp-Thunderbird-54Z8N0.desktop
+x-scheme-handler/nntp=userapp-Thunderbird-54Z8N0.desktop
+x-scheme-handler/feed=userapp-Thunderbird-E8J9N0.desktop
+application/rss+xml=userapp-Thunderbird-E8J9N0.desktop
+application/x-extension-rss=userapp-Thunderbird-E8J9N0.desktop
 
 [Added Associations]
 video/ogg=vlc.desktop;
@@ -241,26 +249,35 @@ audio/x-mod=vlc.desktop;
 audio/x-s3m=vlc.desktop;
 audio/x-xm=vlc.desktop;
 application/x-mimearchive=gvim.desktop;
-x-scheme-handler/http=firefox.desktop;userapp-Firefox-0UV8TZ.desktop;
-x-scheme-handler/https=firefox.desktop;userapp-Firefox-0UV8TZ.desktop;
-text/html=code-url-handler.desktop;firefox.desktop;userapp-Firefox-0UV8TZ.desktop;
+x-scheme-handler/http=firefox.desktop;userapp-Firefox-0UV8TZ.desktop;thunderbird.desktop;firefox-esr.desktop;
+x-scheme-handler/https=firefox.desktop;userapp-Firefox-0UV8TZ.desktop;thunderbird.desktop;firefox-esr.desktop;
+text/html=code-url-handler.desktop;firefox.desktop;userapp-Firefox-0UV8TZ.desktop;thunderbird.desktop;firefox-esr.desktop;
 x-scheme-handler/sms=org.gnome.Shell.Extensions.GSConnect.desktop;
 inode/directory=meld.desktop;
 application/javascript=gvim.desktop;
-x-scheme-handler/mailto=gnome-gmail.desktop;org.gnome.Evolution.desktop;
+x-scheme-handler/mailto=gnome-gmail.desktop;org.gnome.Evolution.desktop;userapp-Thunderbird-KO33J0.desktop;
 text/markdown=gvim.desktop;
-x-scheme-handler/ftp=userapp-Firefox-0UV8TZ.desktop;
-x-scheme-handler/chrome=userapp-Firefox-0UV8TZ.desktop;
-application/x-extension-htm=userapp-Firefox-0UV8TZ.desktop;
-application/x-extension-html=userapp-Firefox-0UV8TZ.desktop;
-application/x-extension-shtml=userapp-Firefox-0UV8TZ.desktop;
-application/xhtml+xml=userapp-Firefox-0UV8TZ.desktop;
-application/x-extension-xhtml=userapp-Firefox-0UV8TZ.desktop;
-application/x-extension-xht=userapp-Firefox-0UV8TZ.desktop;
+x-scheme-handler/ftp=userapp-Firefox-0UV8TZ.desktop;thunderbird.desktop;firefox-esr.desktop;
+x-scheme-handler/chrome=userapp-Firefox-0UV8TZ.desktop;thunderbird.desktop;firefox-esr.desktop;
+application/x-extension-htm=userapp-Firefox-0UV8TZ.desktop;thunderbird.desktop;firefox-esr.desktop;
+application/x-extension-html=userapp-Firefox-0UV8TZ.desktop;thunderbird.desktop;firefox-esr.desktop;
+application/x-extension-shtml=userapp-Firefox-0UV8TZ.desktop;thunderbird.desktop;firefox-esr.desktop;
+application/xhtml+xml=userapp-Firefox-0UV8TZ.desktop;thunderbird.desktop;firefox-esr.desktop;
+application/x-extension-xhtml=userapp-Firefox-0UV8TZ.desktop;thunderbird.desktop;firefox-esr.desktop;
+application/x-extension-xht=userapp-Firefox-0UV8TZ.desktop;thunderbird.desktop;firefox-esr.desktop;
 application/x-debian-package=gdebi.desktop;
 application/x-cd-image=gnome-disk-image-writer.desktop;gnome-disk-image-mounter.desktop;
-text/plain=code.desktop;
+text/plain=gvim.desktop;code.desktop;
 application/zip=org.gnome.FileRoller.desktop;
 application/pgp-keys=org.kde.kgpg.desktop;org.gnome.Evolution.desktop;
 x-scheme-handler/tel=org.gnome.Shell.Extensions.GSConnect.desktop;
 application/x-shellscript=gvim.desktop;
+message/rfc822=userapp-Thunderbird-KO33J0.desktop;
+application/x-sharedlib=gvim.desktop;
+text/calendar=thunderbird.desktop;
+x-scheme-handler/news=userapp-Thunderbird-54Z8N0.desktop;
+x-scheme-handler/snews=userapp-Thunderbird-54Z8N0.desktop;
+x-scheme-handler/nntp=userapp-Thunderbird-54Z8N0.desktop;
+x-scheme-handler/feed=userapp-Thunderbird-E8J9N0.desktop;
+application/rss+xml=userapp-Thunderbird-E8J9N0.desktop;
+application/x-extension-rss=userapp-Thunderbird-E8J9N0.desktop;

diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs
index 3351f737c41f775b55724efc3ede34c0484c77c9..a7872188a673e0d62398afeb9438f73aaac449cc 100644 (file)
--- a/.config/user-dirs.dirs
+++ b/.config/user-dirs.dirs
@@ -8,9 +8,9 @@
 XDG_CONFIG_HOME="HOME/.config"
 XDG_DESKTOP_DIR="$HOME/Desktop"
 XDG_DOWNLOAD_DIR="$HOME/Downloads"
-XDG_TEMPLATES_DIR="$HOME/Nextcloud/Templates"
-XDG_PUBLICSHARE_DIR="$HOME/Nextcloud/Public"
-XDG_DOCUMENTS_DIR="$HOME/Nextcloud/Documents"
-XDG_MUSIC_DIR="$HOME/Nextcloud/Music"
-XDG_PICTURES_DIR="$HOME/Nextcloud/Pictures"
-XDG_VIDEOS_DIR="$HOME/Nextcloud/Videos"
+XDG_TEMPLATES_DIR="$HOME/Templates"
+XDG_PUBLICSHARE_DIR="$HOME/Public"
+XDG_DOCUMENTS_DIR="$HOME/Documents"
+XDG_MUSIC_DIR="$HOME/Music"
+XDG_PICTURES_DIR="$HOME/Pictures"
+XDG_VIDEOS_DIR="$HOME/Videos"

diff --git a/.gitconfig b/.gitconfig
index 66a7eff21e3bffef3d6af20e70eda71c1a28e6d1..3e053bdfb6dbc7c36edcfd5a0b7db94b8e8c5ea7 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -21,7 +21,7 @@
        default = simple
        recurseSubmodules = check
 [diff]
-       tool = bc
+       tool = vimdiff
        submodule = log
 [merge]
        tool = bc