From a83e45df5e94ca4b1ba69468037f7548fab43595 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?= Date: Thu, 25 Apr 2019 22:54:51 +0200 Subject: [PATCH] Let my HOME alone 1/2 --- Xresources | 4 - bower | 1 - cargo | 1 - .../Xresources}/.gitignore | 0 {Xresources.d => config/Xresources}/configure | 0 config/Xresources/main | 4 + {Xresources.d => config/Xresources}/urxvt | 0 {Xresources.d => config/Xresources}/xft | 0 {Xresources.d => config/Xresources}/xterm | 0 config/autorandr/postswitch | 2 +- gdbinit => config/gdbinit | 0 gitconfig => config/git/config | 2 +- gitignore => config/git/gitignore | 0 config/git/gitk | 62 ++++++ iftoprc => config/iftoprc | 0 inputrc => config/inputrc | 0 config/pulse/.dfrecur | 0 config/pulse/client.conf | 2 + {scripts => config/scripts}/.gitignore | 0 {scripts => config/scripts}/arch-kexec | 0 {scripts => config/scripts}/archive | 0 {scripts => config/scripts}/beep | 0 {scripts => config/scripts}/changeColors | 0 {scripts => config/scripts}/cleandev | 0 .../scripts}/compressPictureMovies | 0 {scripts => config/scripts}/cudarun | 0 {scripts => config/scripts}/dafont | 0 {scripts => config/scripts}/debloc | 0 .../scripts}/docker-image-childs | 0 {scripts => config/scripts}/docker-rm | 0 {scripts => config/scripts}/dotfiles | 0 {scripts => config/scripts}/dummy | 0 {scripts => config/scripts}/emergency-clean | 0 {scripts => config/scripts}/gitCheckoutModes | 0 {scripts => config/scripts}/gitghost | 0 {scripts => config/scripts}/heavyPackages | 0 {scripts => config/scripts}/html2pdf | 0 {scripts => config/scripts}/install-arch | 0 {scripts => config/scripts}/install-prefs | 0 {scripts => config/scripts}/install-termux | 0 {scripts => config/scripts}/install-wsl | 0 {scripts => config/scripts}/logstasync | 0 {scripts => config/scripts}/lorem | 0 {scripts => config/scripts}/machines | 0 {scripts => config/scripts}/md2html | 0 {scripts => config/scripts}/mel | 4 +- {scripts => config/scripts}/melConf | 6 +- {scripts => config/scripts}/musiqueBof | 0 {scripts => config/scripts}/newestFile | 0 {scripts => config/scripts}/o | 0 {scripts => config/scripts}/oldestFile | 0 {scripts => config/scripts}/optimize | 0 {scripts => config/scripts}/package-lock.json | 0 {scripts => config/scripts}/package.json | 0 {scripts => config/scripts}/pdfpages | 0 {scripts => config/scripts}/pdfrename | 0 {scripts => config/scripts}/proxy | 0 {scripts => config/scripts}/pushToTalk | 0 {scripts => config/scripts}/pw | 0 {scripts => config/scripts}/rankmirrors | 0 {scripts => config/scripts}/remcrlf | 0 {scripts => config/scripts}/rep | 0 {scripts => config/scripts}/replayGain | 0 {scripts => config/scripts}/rmf | 0 {scripts => config/scripts}/rms | 0 {scripts => config/scripts}/sedrename | 0 .../scripts}/showKeyboardLayout | 0 {scripts => config/scripts}/syncthingRestore | 0 {scripts => config/scripts}/tagCreatorPhotos | 0 {scripts => config/scripts}/ter | 0 {scripts => config/scripts}/totask | 0 {scripts => config/scripts}/tracefiles | 0 {scripts => config/scripts}/transfer | 0 {scripts => config/scripts}/tunnel | 0 {scripts => config/scripts}/unziptree | 0 .../scripts}/updateCompressedMusic | 0 {scripts => config/scripts}/updatedate | 0 {scripts => config/scripts}/vidcmp | 0 config/shell/commonrc | 2 +- config/shell/shenv | 27 ++- config/shell/shrc | 18 ++ config/systemd/user/melfetch.service | 2 +- config/typescript | 199 ++++++++++++++++++ dmrc | 3 - face.icon | 1 - gem | 1 - gtkrc-2.0 | 19 -- icon | 1 - m2 | 1 - mplayer/config | 3 - npm | 1 - nv | 1 - xinitrc | 6 +- xprofile | 13 +- 94 files changed, 328 insertions(+), 58 deletions(-) delete mode 100644 Xresources delete mode 120000 bower delete mode 120000 cargo rename {Xresources.d => config/Xresources}/.gitignore (100%) rename {Xresources.d => config/Xresources}/configure (100%) create mode 100644 config/Xresources/main rename {Xresources.d => config/Xresources}/urxvt (100%) rename {Xresources.d => config/Xresources}/xft (100%) rename {Xresources.d => config/Xresources}/xterm (100%) rename gdbinit => config/gdbinit (100%) rename gitconfig => config/git/config (88%) rename gitignore => config/git/gitignore (100%) create mode 100644 config/git/gitk rename iftoprc => config/iftoprc (100%) rename inputrc => config/inputrc (100%) create mode 100644 config/pulse/.dfrecur create mode 100644 config/pulse/client.conf rename {scripts => config/scripts}/.gitignore (100%) rename {scripts => config/scripts}/arch-kexec (100%) rename {scripts => config/scripts}/archive (100%) rename {scripts => config/scripts}/beep (100%) rename {scripts => config/scripts}/changeColors (100%) rename {scripts => config/scripts}/cleandev (100%) rename {scripts => config/scripts}/compressPictureMovies (100%) rename {scripts => config/scripts}/cudarun (100%) rename {scripts => config/scripts}/dafont (100%) rename {scripts => config/scripts}/debloc (100%) rename {scripts => config/scripts}/docker-image-childs (100%) rename {scripts => config/scripts}/docker-rm (100%) rename {scripts => config/scripts}/dotfiles (100%) rename {scripts => config/scripts}/dummy (100%) rename {scripts => config/scripts}/emergency-clean (100%) rename {scripts => config/scripts}/gitCheckoutModes (100%) rename {scripts => config/scripts}/gitghost (100%) rename {scripts => config/scripts}/heavyPackages (100%) rename {scripts => config/scripts}/html2pdf (100%) rename {scripts => config/scripts}/install-arch (100%) rename {scripts => config/scripts}/install-prefs (100%) rename {scripts => config/scripts}/install-termux (100%) rename {scripts => config/scripts}/install-wsl (100%) rename {scripts => config/scripts}/logstasync (100%) rename {scripts => config/scripts}/lorem (100%) rename {scripts => config/scripts}/machines (100%) rename {scripts => config/scripts}/md2html (100%) rename {scripts => config/scripts}/mel (99%) rename {scripts => config/scripts}/melConf (97%) rename {scripts => config/scripts}/musiqueBof (100%) rename {scripts => config/scripts}/newestFile (100%) rename {scripts => config/scripts}/o (100%) rename {scripts => config/scripts}/oldestFile (100%) rename {scripts => config/scripts}/optimize (100%) rename {scripts => config/scripts}/package-lock.json (100%) rename {scripts => config/scripts}/package.json (100%) rename {scripts => config/scripts}/pdfpages (100%) rename {scripts => config/scripts}/pdfrename (100%) rename {scripts => config/scripts}/proxy (100%) rename {scripts => config/scripts}/pushToTalk (100%) rename {scripts => config/scripts}/pw (100%) rename {scripts => config/scripts}/rankmirrors (100%) rename {scripts => config/scripts}/remcrlf (100%) rename {scripts => config/scripts}/rep (100%) rename {scripts => config/scripts}/replayGain (100%) rename {scripts => config/scripts}/rmf (100%) rename {scripts => config/scripts}/rms (100%) rename {scripts => config/scripts}/sedrename (100%) rename {scripts => config/scripts}/showKeyboardLayout (100%) rename {scripts => config/scripts}/syncthingRestore (100%) rename {scripts => config/scripts}/tagCreatorPhotos (100%) rename {scripts => config/scripts}/ter (100%) rename {scripts => config/scripts}/totask (100%) rename {scripts => config/scripts}/tracefiles (100%) rename {scripts => config/scripts}/transfer (100%) rename {scripts => config/scripts}/tunnel (100%) rename {scripts => config/scripts}/unziptree (100%) rename {scripts => config/scripts}/updateCompressedMusic (100%) rename {scripts => config/scripts}/updatedate (100%) rename {scripts => config/scripts}/vidcmp (100%) create mode 100644 config/typescript delete mode 100644 dmrc delete mode 120000 face.icon delete mode 120000 gem delete mode 100644 gtkrc-2.0 delete mode 120000 icon delete mode 120000 m2 delete mode 100644 mplayer/config delete mode 120000 npm delete mode 120000 nv diff --git a/Xresources b/Xresources deleted file mode 100644 index 6a06d00..0000000 --- a/Xresources +++ /dev/null @@ -1,4 +0,0 @@ -#include ".Xresources.d/xft" -#include ".Xresources.d/theme" -#include ".Xresources.d/xterm" -#include ".Xresources.d/urxvt" diff --git a/bower b/bower deleted file mode 120000 index 2176c40..0000000 --- a/bower +++ /dev/null @@ -1 +0,0 @@ -.cache/bower \ No newline at end of file diff --git a/cargo b/cargo deleted file mode 120000 index b8adac1..0000000 --- a/cargo +++ /dev/null @@ -1 +0,0 @@ -.cache/cargo \ No newline at end of file diff --git a/Xresources.d/.gitignore b/config/Xresources/.gitignore similarity index 100% rename from Xresources.d/.gitignore rename to config/Xresources/.gitignore diff --git a/Xresources.d/configure b/config/Xresources/configure similarity index 100% rename from Xresources.d/configure rename to config/Xresources/configure diff --git a/config/Xresources/main b/config/Xresources/main new file mode 100644 index 0000000..7e8e091 --- /dev/null +++ b/config/Xresources/main @@ -0,0 +1,4 @@ +#include ".config/Xresources/xft" +#include ".config/Xresources/theme" +#include ".config/Xresources/xterm" +#include ".config/Xresources/urxvt" diff --git a/Xresources.d/urxvt b/config/Xresources/urxvt similarity index 100% rename from Xresources.d/urxvt rename to config/Xresources/urxvt diff --git a/Xresources.d/xft b/config/Xresources/xft similarity index 100% rename from Xresources.d/xft rename to config/Xresources/xft diff --git a/Xresources.d/xterm b/config/Xresources/xterm similarity index 100% rename from Xresources.d/xterm rename to config/Xresources/xterm diff --git a/config/autorandr/postswitch b/config/autorandr/postswitch index 28d08f5..145748f 100755 --- a/config/autorandr/postswitch +++ b/config/autorandr/postswitch @@ -22,5 +22,5 @@ if [ ! -e "$filepath" ]; then wget -c "$url" -O "$filepath" fi -feh --bg-fill "$filepath" +feh --no-fehbg --bg-fill "$filepath" diff --git a/gdbinit b/config/gdbinit similarity index 100% rename from gdbinit rename to config/gdbinit diff --git a/gitconfig b/config/git/config similarity index 88% rename from gitconfig rename to config/git/config index 1652cad..8f2350b 100644 --- a/gitconfig +++ b/config/git/config @@ -4,7 +4,7 @@ signingkey = D8A7ECA00A8CD3DD [core] editor = nvim - excludesfile = ~/.gitignore + excludesfile = ~/.config/git/gitignore [push] default = matching [alias] diff --git a/gitignore b/config/git/gitignore similarity index 100% rename from gitignore rename to config/git/gitignore diff --git a/config/git/gitk b/config/git/gitk new file mode 100644 index 0000000..80bfb1a --- /dev/null +++ b/config/git/gitk @@ -0,0 +1,62 @@ +set mainfont {sans 9} +set textfont {monospace 9} +set uifont {sans 9 bold} +set tabstop 8 +set findmergefiles 0 +set maxgraphpct 50 +set maxwidth 16 +set cmitmode patch +set wrapcomment none +set autoselect 1 +set autosellen 40 +set showneartags 1 +set maxrefs 20 +set visiblerefs {"master"} +set hideremotes 0 +set showlocalchanges 1 +set datetimeformat {%Y-%m-%d %H:%M:%S} +set limitdiffs 1 +set uicolor grey85 +set want_ttk 1 +set bgcolor white +set fgcolor black +set uifgcolor black +set uifgdisabledcolor #999 +set colors {"#00ff00" red blue magenta darkgrey brown orange} +set diffcolors {red "#00a000" blue} +set mergecolors {red blue "#00ff00" purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"} +set markbgcolor #e0e0ff +set diffcontext 3 +set selectbgcolor gray85 +set foundbgcolor yellow +set currentsearchhitbgcolor orange +set extdifftool meld +set perfile_attrs 0 +set headbgcolor #00ff00 +set headfgcolor black +set headoutlinecolor black +set remotebgcolor #ffddaa +set tagbgcolor yellow +set tagfgcolor black +set tagoutlinecolor black +set reflinecolor black +set filesepbgcolor #aaaaaa +set filesepfgcolor black +set linehoverbgcolor #ffff80 +set linehoverfgcolor black +set linehoveroutlinecolor black +set mainheadcirclecolor yellow +set workingfilescirclecolor red +set indexcirclecolor #00ff00 +set circlecolors {white blue gray blue blue} +set linkfgcolor blue +set circleoutlinecolor black +set geometry(main) 1920x1012+0+18 +set geometry(state) normal +set geometry(topwidth) 1920 +set geometry(topheight) 225 +set geometry(pwsash0) "480 1" +set geometry(pwsash1) "720 1" +set geometry(botwidth) 600 +set geometry(botheight) 782 +set permviews {} diff --git a/iftoprc b/config/iftoprc similarity index 100% rename from iftoprc rename to config/iftoprc diff --git a/inputrc b/config/inputrc similarity index 100% rename from inputrc rename to config/inputrc diff --git a/config/pulse/.dfrecur b/config/pulse/.dfrecur new file mode 100644 index 0000000..e69de29 diff --git a/config/pulse/client.conf b/config/pulse/client.conf new file mode 100644 index 0000000..20252aa --- /dev/null +++ b/config/pulse/client.conf @@ -0,0 +1,2 @@ +auth-cookie = .config/pulse/esd-auth-cookie +cookie-file = .config/pulse/pulse-cookie diff --git a/scripts/.gitignore b/config/scripts/.gitignore similarity index 100% rename from scripts/.gitignore rename to config/scripts/.gitignore diff --git a/scripts/arch-kexec b/config/scripts/arch-kexec similarity index 100% rename from scripts/arch-kexec rename to config/scripts/arch-kexec diff --git a/scripts/archive b/config/scripts/archive similarity index 100% rename from scripts/archive rename to config/scripts/archive diff --git a/scripts/beep b/config/scripts/beep similarity index 100% rename from scripts/beep rename to config/scripts/beep diff --git a/scripts/changeColors b/config/scripts/changeColors similarity index 100% rename from scripts/changeColors rename to config/scripts/changeColors diff --git a/scripts/cleandev b/config/scripts/cleandev similarity index 100% rename from scripts/cleandev rename to config/scripts/cleandev diff --git a/scripts/compressPictureMovies b/config/scripts/compressPictureMovies similarity index 100% rename from scripts/compressPictureMovies rename to config/scripts/compressPictureMovies diff --git a/scripts/cudarun b/config/scripts/cudarun similarity index 100% rename from scripts/cudarun rename to config/scripts/cudarun diff --git a/scripts/dafont b/config/scripts/dafont similarity index 100% rename from scripts/dafont rename to config/scripts/dafont diff --git a/scripts/debloc b/config/scripts/debloc similarity index 100% rename from scripts/debloc rename to config/scripts/debloc diff --git a/scripts/docker-image-childs b/config/scripts/docker-image-childs similarity index 100% rename from scripts/docker-image-childs rename to config/scripts/docker-image-childs diff --git a/scripts/docker-rm b/config/scripts/docker-rm similarity index 100% rename from scripts/docker-rm rename to config/scripts/docker-rm diff --git a/scripts/dotfiles b/config/scripts/dotfiles similarity index 100% rename from scripts/dotfiles rename to config/scripts/dotfiles diff --git a/scripts/dummy b/config/scripts/dummy similarity index 100% rename from scripts/dummy rename to config/scripts/dummy diff --git a/scripts/emergency-clean b/config/scripts/emergency-clean similarity index 100% rename from scripts/emergency-clean rename to config/scripts/emergency-clean diff --git a/scripts/gitCheckoutModes b/config/scripts/gitCheckoutModes similarity index 100% rename from scripts/gitCheckoutModes rename to config/scripts/gitCheckoutModes diff --git a/scripts/gitghost b/config/scripts/gitghost similarity index 100% rename from scripts/gitghost rename to config/scripts/gitghost diff --git a/scripts/heavyPackages b/config/scripts/heavyPackages similarity index 100% rename from scripts/heavyPackages rename to config/scripts/heavyPackages diff --git a/scripts/html2pdf b/config/scripts/html2pdf similarity index 100% rename from scripts/html2pdf rename to config/scripts/html2pdf diff --git a/scripts/install-arch b/config/scripts/install-arch similarity index 100% rename from scripts/install-arch rename to config/scripts/install-arch diff --git a/scripts/install-prefs b/config/scripts/install-prefs similarity index 100% rename from scripts/install-prefs rename to config/scripts/install-prefs diff --git a/scripts/install-termux b/config/scripts/install-termux similarity index 100% rename from scripts/install-termux rename to config/scripts/install-termux diff --git a/scripts/install-wsl b/config/scripts/install-wsl similarity index 100% rename from scripts/install-wsl rename to config/scripts/install-wsl diff --git a/scripts/logstasync b/config/scripts/logstasync similarity index 100% rename from scripts/logstasync rename to config/scripts/logstasync diff --git a/scripts/lorem b/config/scripts/lorem similarity index 100% rename from scripts/lorem rename to config/scripts/lorem diff --git a/scripts/machines b/config/scripts/machines similarity index 100% rename from scripts/machines rename to config/scripts/machines diff --git a/scripts/md2html b/config/scripts/md2html similarity index 100% rename from scripts/md2html rename to config/scripts/md2html diff --git a/scripts/mel b/config/scripts/mel similarity index 99% rename from scripts/mel rename to config/scripts/mel index db9e102..04ed91a 100755 --- a/scripts/mel +++ b/config/scripts/mel @@ -63,7 +63,7 @@ config = None def notmuch_new(): close_database() log.info("Indexing mails") - notmuchConfigPath = os.path.expanduser("~/.notmuchrc") # TODO Better + notmuchConfigPath = os.path.expanduser("~/.config/notmuch-config") # TODO Better cmd = ["notmuch", "--config", notmuchConfigPath, "new"] log.debug(" ".join(cmd)) subprocess.run(cmd) @@ -532,7 +532,7 @@ if __name__ == "__main__": def func_fetch(args): # Fetch mails log.info("Fetching mails") - mbsyncConfigPath = os.path.expanduser("~/.mbsyncrc") # TODO Better + mbsyncConfigPath = os.path.expanduser("~/.config/mbsyncrc") # TODO Better cmd = ["mbsync", "--config", mbsyncConfigPath, "--all"] subprocess.run(cmd) diff --git a/scripts/melConf b/config/scripts/melConf similarity index 97% rename from scripts/melConf rename to config/scripts/melConf index 2c171a8..3b78fee 100755 --- a/scripts/melConf +++ b/config/scripts/melConf @@ -183,7 +183,7 @@ for name, account in accounts.items(): secconf += "\nCertificateFile {certificate}".format(**account) imappassEscaped = account["imappass"].replace("\\", "\\\\") mbsyncStr += MBSYNC_ACCOUNT.format(**account, secconf=secconf, imappassEscaped=imappassEscaped) -mbsyncFilepath = os.path.join(os.path.expanduser('~'), '.mbsyncrc') +mbsyncFilepath = os.path.join(os.path.expanduser('~'), '.config/mel/mbsyncrc') with open(mbsyncFilepath, 'w') as f: f.write(mbsyncStr) @@ -208,7 +208,7 @@ tls on msmtpStr = MSMTP_BEGIN for name, account in accounts.items(): msmtpStr += MSMTP_ACCOUNT.format(**account) -mbsyncFilepath = os.path.join(os.path.expanduser('~'), '.msmtprc') +mbsyncFilepath = os.path.join(os.path.expanduser('~'), '.config/msmtp/config') with open(mbsyncFilepath, 'w') as f: f.write(msmtpStr) @@ -241,7 +241,7 @@ other_email = mails.copy() other_email.remove(general["main"]["from"]) other_email = ";".join(other_email) notmuchStr = NOTMUCH_BEGIN.format(**general, other_email=other_email) -mbsyncFilepath = os.path.join(os.path.expanduser('~'), '.notmuchrc') +mbsyncFilepath = os.path.join(os.path.expanduser('~'), '.config/notmuch-config') with open(mbsyncFilepath, 'w') as f: f.write(notmuchStr) diff --git a/scripts/musiqueBof b/config/scripts/musiqueBof similarity index 100% rename from scripts/musiqueBof rename to config/scripts/musiqueBof diff --git a/scripts/newestFile b/config/scripts/newestFile similarity index 100% rename from scripts/newestFile rename to config/scripts/newestFile diff --git a/scripts/o b/config/scripts/o similarity index 100% rename from scripts/o rename to config/scripts/o diff --git a/scripts/oldestFile b/config/scripts/oldestFile similarity index 100% rename from scripts/oldestFile rename to config/scripts/oldestFile diff --git a/scripts/optimize b/config/scripts/optimize similarity index 100% rename from scripts/optimize rename to config/scripts/optimize diff --git a/scripts/package-lock.json b/config/scripts/package-lock.json similarity index 100% rename from scripts/package-lock.json rename to config/scripts/package-lock.json diff --git a/scripts/package.json b/config/scripts/package.json similarity index 100% rename from scripts/package.json rename to config/scripts/package.json diff --git a/scripts/pdfpages b/config/scripts/pdfpages similarity index 100% rename from scripts/pdfpages rename to config/scripts/pdfpages diff --git a/scripts/pdfrename b/config/scripts/pdfrename similarity index 100% rename from scripts/pdfrename rename to config/scripts/pdfrename diff --git a/scripts/proxy b/config/scripts/proxy similarity index 100% rename from scripts/proxy rename to config/scripts/proxy diff --git a/scripts/pushToTalk b/config/scripts/pushToTalk similarity index 100% rename from scripts/pushToTalk rename to config/scripts/pushToTalk diff --git a/scripts/pw b/config/scripts/pw similarity index 100% rename from scripts/pw rename to config/scripts/pw diff --git a/scripts/rankmirrors b/config/scripts/rankmirrors similarity index 100% rename from scripts/rankmirrors rename to config/scripts/rankmirrors diff --git a/scripts/remcrlf b/config/scripts/remcrlf similarity index 100% rename from scripts/remcrlf rename to config/scripts/remcrlf diff --git a/scripts/rep b/config/scripts/rep similarity index 100% rename from scripts/rep rename to config/scripts/rep diff --git a/scripts/replayGain b/config/scripts/replayGain similarity index 100% rename from scripts/replayGain rename to config/scripts/replayGain diff --git a/scripts/rmf b/config/scripts/rmf similarity index 100% rename from scripts/rmf rename to config/scripts/rmf diff --git a/scripts/rms b/config/scripts/rms similarity index 100% rename from scripts/rms rename to config/scripts/rms diff --git a/scripts/sedrename b/config/scripts/sedrename similarity index 100% rename from scripts/sedrename rename to config/scripts/sedrename diff --git a/scripts/showKeyboardLayout b/config/scripts/showKeyboardLayout similarity index 100% rename from scripts/showKeyboardLayout rename to config/scripts/showKeyboardLayout diff --git a/scripts/syncthingRestore b/config/scripts/syncthingRestore similarity index 100% rename from scripts/syncthingRestore rename to config/scripts/syncthingRestore diff --git a/scripts/tagCreatorPhotos b/config/scripts/tagCreatorPhotos similarity index 100% rename from scripts/tagCreatorPhotos rename to config/scripts/tagCreatorPhotos diff --git a/scripts/ter b/config/scripts/ter similarity index 100% rename from scripts/ter rename to config/scripts/ter diff --git a/scripts/totask b/config/scripts/totask similarity index 100% rename from scripts/totask rename to config/scripts/totask diff --git a/scripts/tracefiles b/config/scripts/tracefiles similarity index 100% rename from scripts/tracefiles rename to config/scripts/tracefiles diff --git a/scripts/transfer b/config/scripts/transfer similarity index 100% rename from scripts/transfer rename to config/scripts/transfer diff --git a/scripts/tunnel b/config/scripts/tunnel similarity index 100% rename from scripts/tunnel rename to config/scripts/tunnel diff --git a/scripts/unziptree b/config/scripts/unziptree similarity index 100% rename from scripts/unziptree rename to config/scripts/unziptree diff --git a/scripts/updateCompressedMusic b/config/scripts/updateCompressedMusic similarity index 100% rename from scripts/updateCompressedMusic rename to config/scripts/updateCompressedMusic diff --git a/scripts/updatedate b/config/scripts/updatedate similarity index 100% rename from scripts/updatedate rename to config/scripts/updatedate diff --git a/scripts/vidcmp b/config/scripts/vidcmp similarity index 100% rename from scripts/vidcmp rename to config/scripts/vidcmp diff --git a/config/shell/commonrc b/config/shell/commonrc index 5ec15d4..ef0f6f5 100644 --- a/config/shell/commonrc +++ b/config/shell/commonrc @@ -29,4 +29,4 @@ FZF_COMPLETION_OPTS="${FZF_CTRL_T_OPTS}" ## FUNCTIONS ## MISC -trysource ~/.gscripts/gprofile +trysource ~/.config/gscripts/gprofile diff --git a/config/shell/shenv b/config/shell/shenv index 8b7b805..ae056f3 100644 --- a/config/shell/shenv +++ b/config/shell/shenv @@ -13,13 +13,34 @@ export BROWSER=firefox # Program-specific [ -z "$SSH_AUTH_SOCK" ] && [ -x "$(command -v ssh-agent)" ] && eval "$(ssh-agent -s)" -export GOPATH=$HOME/.cache/go -# export JAVA_FONTS=/usr/share/fonts/TTF + +direnv() { # environment variable name, path + export "$1"="$2" + mkdir -p "$2" +} + +export JAVA_FONTS=/usr/share/fonts/TTF # 2019-04-25 Attempt to remove .java/fonts remove if it didn't work # export ANDROID_HOME=/opt/android-sdk # export ARDUINO=/usr/share/arduino # export ARDUINO_DIR=$ARDUINO # export ARDMK_VENDOR=archlinux-arduino +direnv GOPATH "$HOME/.cache/go" +direnv CARGOHOME "$HOME/.cache/cargo" # There are config in there that we can version if one want +direnv CCACHE_BASEDIR "$HOME/.cache/ccache" +export CCACHE_CONFIGPATH="$HOME/.config/ccache.conf" +direnv GNUPGHOME "$HOME/.config/gnupg" +export INPUTRC="$HOME/.config/inputrc" +export LESSHISTFILE="$HOME/.cache/lesshst" +direnv MONO_GAC_PREFIX "$HOME/.cache/mono" +export NODE_REPL_HISTORY="$HOME/.cache/node_repl_history" +direnv npm_config_cache "$HOME/.cache/npm" +direnv PARALLEL_HOME "$HOME/.cache/parallel" + + +# For programs that think $HOME is a reasonable place to put their junk +direnv JUNKHOME "$HOME/.cache/junkhome" + # Path # Function stolen from Arch Linux /etc/profile @@ -40,7 +61,7 @@ appendpath() { appendpath '/usr/lib/ccache/bin' appendpath "${GOPATH}/bin" appendpath "$HOME/.local/bin" -appendpath "$HOME/.scripts" +appendpath "$HOME/.config/scripts" # If running on termux, load those extra scripts [ -d /data/data/com.termux/ ] && ( diff --git a/config/shell/shrc b/config/shell/shrc index cf4ba75..0f65deb 100644 --- a/config/shell/shrc +++ b/config/shell/shrc @@ -35,6 +35,24 @@ alias n='urxvtc &' alias x='startx; logout' alias nx='nvidia-xrun; logout' +# For programs that think $HOME is a reasonable place to put their junk +alias adb='HOME=$JUNKHOME adb' +alias audacity='HOME=$JUNKHOME audacity' +alias binwalk='HOME=$JUNKHOME binwalk' # Should use .config according to the GitHub code though +alias cabal='HOME=$JUNKHOME cabal' # TODO May have options but last time I tried it it crashed +alias cmake='HOME=$JUNKHOME cmake' +alias ddd='HOME=$JUNKHOME ddd' +alias ghidra='HOME=$JUNKHOME ghidra' +alias itch='HOME=$JUNKHOME itch' +# TODO Maybe we can do something about node-gyp + +alias bower='bower --config.storage.packages=~/.cache/bower/packages --config.storage.registry=~/.cache/bower/registry --config.storage.links=~/.cache/bower/links' +alias gdb='gdb -x $HOME/.config/gdbinit' +alias iftop='iftop -c $HOME/.config/iftoprc' +alias lmms='lmms --config $HOME/.config/lmmsrc.xml' + +# TODO ruby's gem when I find a use for it + # FUNCTIONS trysource() { if [ -f "$1" ] diff --git a/config/systemd/user/melfetch.service b/config/systemd/user/melfetch.service index fb05ad3..a7dbb7b 100644 --- a/config/systemd/user/melfetch.service +++ b/config/systemd/user/melfetch.service @@ -3,4 +3,4 @@ Description=Meh mail client new mail fetcher [Service] Type=oneshot -ExecStart=/home/geoffrey/.scripts/mel fetch +ExecStart=/home/geoffrey/.config/scripts/mel fetch diff --git a/config/typescript b/config/typescript new file mode 100644 index 0000000..5c4c5cc --- /dev/null +++ b/config/typescript @@ -0,0 +1,199 @@ +Script started on 2019-04-25 21:52:12+02:00 [TERM="rxvt-unicode-256color" TTY="/dev/pts/8" COLUMNS="191" LINES="54"] +]4;0;rgb:27/28/22\]4;1;rgb:f9/26/72\]4;2;rgb:a6/e2/2e\]4;3;rgb:f4/bf/75\]4;4;rgb:66/d9/ef\]4;5;rgb:ae/81/ff\]4;6;rgb:a1/ef/e4\]4;7;rgb:f8/f8/f2\]4;8;rgb:75/71/5e\]4;9;rgb:f9/26/72\]4;10;rgb:a6/e2/2e\]4;11;rgb:f4/bf/75\]4;12;rgb:66/d9/ef\]4;13;rgb:ae/81/ff\]4;14;rgb:a1/ef/e4\]4;15;rgb:f9/f8/f5\]4;16;rgb:fd/97/1f\]4;17;rgb:cc/66/33\]4;18;rgb:38/38/30\]4;19;rgb:49/48/3e\]4;20;rgb:a5/9f/85\]4;21;rgb:f5/f4/f1\]10;rgb:f8/f8/f2\]11;rgb:27/28/22\]708;rgb:27/28/22\]12;7\%  geoffrey  curacao  config  master  78✎  8+    1.67  [6 q[?2004hlala .matlab/steam/  sc    crscripts/scripts/[2 q[?2004l +totale 319K +drwxr-xr-x 2 geoffrey geoffrey 62 2019-04-24 07:25:17 . +drwxr-xr-x 22 geoffrey geoffrey 35 2019-04-25 21:52:12 .. +-rwxr-xr-x 1 geoffrey geoffrey 6,1K 2018-10-06 10:31:18 archive +-rwxr-xr-x 1 geoffrey geoffrey 126 2018-10-06 10:31:18 arch-kexec +-rwxr-xr-x 1 geoffrey geoffrey 97 2019-04-14 19:40:55 beep +-rwxr-xr-x 1 geoffrey geoffrey 2,1K 2019-04-12 23:58:54 changeColors +-rwxr-xr-x 1 geoffrey geoffrey 462 2018-10-06 10:31:18 cleandev +-rwxr-xr-x 1 geoffrey geoffrey 7,2K 2018-10-06 10:31:18 compressPictureMovies +-rwxr-xr-x 1 geoffrey geoffrey 309 2018-10-06 10:31:18 cudarun +-rwxr-xr-x 1 geoffrey geoffrey 232 2018-10-06 10:31:18 dafont +-rwxr-xr-x 1 geoffrey geoffrey 14K 2018-10-06 10:31:18 debloc +-rwxr-xr-x 1 geoffrey geoffrey 248 2018-10-06 10:31:18 docker-image-childs +-rwxr-xr-x 1 geoffrey geoffrey 127 2018-10-06 10:31:18 docker-rm +-rwxr-xr-x 1 geoffrey geoffrey 6,9K 2018-10-06 10:31:18 dotfiles +-rwxr-xr-x 1 geoffrey geoffrey 309 2019-04-24 07:25:17 dummy +-rwxr-xr-x 1 geoffrey geoffrey 284 2018-10-06 10:31:18 emergency-clean +-rwxr-xr-x 1 geoffrey geoffrey 277 2018-10-27 10:14:28 gitCheckoutModes +-rwxr-xr-x 1 geoffrey geoffrey 1,4K 2018-10-06 10:31:18 gitghost +-rw-r--r-- 1 geoffrey geoffrey 17 2018-10-06 10:31:18 .gitignore +-rwxr-xr-x 1 geoffrey geoffrey 245 2018-10-06 10:31:18 heavyPackages +-rwxr-xr-x 1 geoffrey geoffrey 1,3K 2018-10-06 10:31:18 html2pdf +-rwxr-xr-x 1 geoffrey geoffrey 2,6K 2018-10-06 10:51:09 install-arch +-rwxr-xr-x 1 geoffrey geoffrey 7,8K 2019-02-23 12:47:23 install-prefs +-rwxr-xr-x 1 geoffrey geoffrey 943 2018-10-06 10:31:18 install-termux +-rwxr-xr-x 1 geoffrey geoffrey 412 2018-10-06 10:31:18 install-wsl +-rwxr-xr-x 1 geoffrey geoffrey 229 2018-11-06 23:46:34 logstasync +-rwxr-xr-x 1 geoffrey geoffrey 2,2K 2018-10-06 10:31:18 lorem +-rwxr-xr-x 1 geoffrey geoffrey 14K 2019-04-22 18:42:25 machines +-rwxr-xr-x 1 geoffrey geoffrey 4,1K 2018-10-06 10:31:18 md2html +-rwxr-xr-x 1 geoffrey geoffrey 19K 2019-01-09 07:31:54 mel +-rwxr-xr-x 1 geoffrey geoffrey 8,2K 2018-10-17 14:03:15 melConf +-rwxr-xr-x 1 geoffrey geoffrey 1012 2018-10-06 10:31:18 musiqueBof +-rwxr-xr-x 1 geoffrey geoffrey 71 2018-10-06 10:31:18 newestFile +-rwxr-xr-x 1 geoffrey geoffrey 1,7K 2018-11-14 13:16:34 o +-rwxr-xr-x 1 geoffrey geoffrey 71 2018-10-06 10:31:18 oldestFile +-rwxr-xr-x 1 geoffrey geoffrey 3,9K 2019-01-12 12:52:48 optimize +-rw-r--r-- 1 geoffrey geoffrey 558 2018-10-06 10:31:18 package.json +-rw-r--r-- 1 geoffrey geoffrey 45K 2018-10-06 10:31:18 package-lock.json +-rwxr-xr-x 1 geoffrey geoffrey 175 2018-10-30 13:23:15 pdfpages +-rwxr-xr-x 1 geoffrey geoffrey 1,1K 2018-10-06 10:31:18 pdfrename +-rwxr-xr-x 1 geoffrey geoffrey 2,3K 2018-10-06 10:31:18 proxy +-rwxr-xr-x 1 geoffrey geoffrey 2,3K 2018-11-07 19:17:02 pushToTalk +-rwxr-xr-x 1 geoffrey geoffrey 312 2018-12-15 15:08:25 pw +-rwxr-xr-x 1 geoffrey geoffrey 130 2018-10-10 08:14:35 rankmirrors +-rwxr-xr-x 1 geoffrey geoffrey 170 2018-10-06 10:31:18 remcrlf +-rwxr-xr-x 1 geoffrey geoffrey 410 2018-10-06 10:31:18 rep +-rwxr-xr-x 1 geoffrey geoffrey 1,9K 2018-11-01 17:47:31 replayGain +-rwxr-xr-x 1 geoffrey geoffrey 563 2018-11-17 10:50:26 rmf +-rwxr-xr-x 1 geoffrey geoffrey 61 2018-10-06 10:31:18 rms +-rwxr-xr-x 1 geoffrey geoffrey 695 2018-10-06 10:31:18 sedrename +-rwxr-xr-x 1 geoffrey geoffrey 206 2018-10-11 23:28:40 showKeyboardLayout +-rwxr-xr-x 1 geoffrey geoffrey 486 2018-10-18 21:13:10 syncthingRestore +-rwxr-xr-x 1 geoffrey geoffrey 431 2018-10-06 10:31:18 tagCreatorPhotos +-rwxr-xr-x 1 geoffrey geoffrey 1,6K 2019-03-20 22:12:02 ter +-rwxr-xr-x 1 geoffrey geoffrey 415 2018-12-05 14:47:41 totask +-rwxr-xr-x 1 geoffrey geoffrey 45 2019-04-12 22:38:27 tracefiles +-rwxr-xr-x 1 geoffrey geoffrey 486 2018-10-06 10:31:18 transfer +-rwxr-xr-x 1 geoffrey geoffrey 614 2018-11-24 13:41:52 tunnel +-rwxr-xr-x 1 geoffrey geoffrey 890 2018-12-10 17:02:32 unziptree +-rwxr-xr-x 1 geoffrey geoffrey 4,3K 2019-01-12 21:04:37 updateCompressedMusic +-rwxr-xr-x 1 geoffrey geoffrey 66 2018-10-06 10:31:18 updatedate +-rwxr-xr-x 1 geoffrey geoffrey 288 2018-10-06 10:31:18 vidcmp +%  geoffrey  curacao  config  master  78✎  8+    47ms 867µs  1.71  [6 q[?2004hcd config/cd shell/ scripts/crscripts/scripts/[2 q[?2004l +%  geoffrey  curacao  scripts  master  78✎  8+    36ms 195µs  1.71  [6 q[?2004h./a.out./[?2004l +%  geoffrey  curacao  scripts  master  78✎  8+    SIGINT  1.71  [6 q[?2004hvi .config/systemd/user/melfetch.servicevi c                                    .config/systemd/user/melfetch.serviced                                    dodo +docker-image-childs* docker-rm* dotfiles*  vi do  SIGINT  1.71  [?2004l +%  geoffrey  curacao  scripts  master  78✎  8+    SIGINT  1.69  [6 q[?2004h./a.out././downloadLastCSV.pydoot               ./dotfiles ./dotfiles iinnssttaalll[2 q[?2004l +[ERROR] /home/geoffrey/.config/llpp.conf already exists, but is not a symbolic link +[ERROR] /home/geoffrey/.config/user-dirs.dirs already exists, but is not a symbolic link +%  geoffrey  curacao  scripts  master  78✎  8+    627ms 368µs  1.67  [6 q[?2004hcd scripts/cd ~/.config/~//..ccoon~/.config/~/.config/ssccr~/.config/scripts/~/.config/scripts/[2 q[?2004l +%  geoffrey  curacao  scripts  master  78✎  8+    38ms 269µs  1.67  [6 q[?2004hla scripts/la         [2 q[?2004l +totale 319K +drwxr-xr-x 2 geoffrey geoffrey 62 2019-04-24 07:25:17 . +drwxr-xr-x 22 geoffrey geoffrey 35 2019-04-25 21:52:12 .. +-rwxr-xr-x 1 geoffrey geoffrey 6,1K 2018-10-06 10:31:18 archive +-rwxr-xr-x 1 geoffrey geoffrey 126 2018-10-06 10:31:18 arch-kexec +-rwxr-xr-x 1 geoffrey geoffrey 97 2019-04-14 19:40:55 beep +-rwxr-xr-x 1 geoffrey geoffrey 2,1K 2019-04-12 23:58:54 changeColors +-rwxr-xr-x 1 geoffrey geoffrey 462 2018-10-06 10:31:18 cleandev +-rwxr-xr-x 1 geoffrey geoffrey 7,2K 2018-10-06 10:31:18 compressPictureMovies +-rwxr-xr-x 1 geoffrey geoffrey 309 2018-10-06 10:31:18 cudarun +-rwxr-xr-x 1 geoffrey geoffrey 232 2018-10-06 10:31:18 dafont +-rwxr-xr-x 1 geoffrey geoffrey 14K 2018-10-06 10:31:18 debloc +-rwxr-xr-x 1 geoffrey geoffrey 248 2018-10-06 10:31:18 docker-image-childs +-rwxr-xr-x 1 geoffrey geoffrey 127 2018-10-06 10:31:18 docker-rm +-rwxr-xr-x 1 geoffrey geoffrey 6,9K 2018-10-06 10:31:18 dotfiles +-rwxr-xr-x 1 geoffrey geoffrey 309 2019-04-24 07:25:17 dummy +-rwxr-xr-x 1 geoffrey geoffrey 284 2018-10-06 10:31:18 emergency-clean +-rwxr-xr-x 1 geoffrey geoffrey 277 2018-10-27 10:14:28 gitCheckoutModes +-rwxr-xr-x 1 geoffrey geoffrey 1,4K 2018-10-06 10:31:18 gitghost +-rw-r--r-- 1 geoffrey geoffrey 17 2018-10-06 10:31:18 .gitignore +-rwxr-xr-x 1 geoffrey geoffrey 245 2018-10-06 10:31:18 heavyPackages +-rwxr-xr-x 1 geoffrey geoffrey 1,3K 2018-10-06 10:31:18 html2pdf +-rwxr-xr-x 1 geoffrey geoffrey 2,6K 2018-10-06 10:51:09 install-arch +-rwxr-xr-x 1 geoffrey geoffrey 7,8K 2019-02-23 12:47:23 install-prefs +-rwxr-xr-x 1 geoffrey geoffrey 943 2018-10-06 10:31:18 install-termux +-rwxr-xr-x 1 geoffrey geoffrey 412 2018-10-06 10:31:18 install-wsl +-rwxr-xr-x 1 geoffrey geoffrey 229 2018-11-06 23:46:34 logstasync +-rwxr-xr-x 1 geoffrey geoffrey 2,2K 2018-10-06 10:31:18 lorem +-rwxr-xr-x 1 geoffrey geoffrey 14K 2019-04-22 18:42:25 machines +-rwxr-xr-x 1 geoffrey geoffrey 4,1K 2018-10-06 10:31:18 md2html +-rwxr-xr-x 1 geoffrey geoffrey 19K 2019-01-09 07:31:54 mel +-rwxr-xr-x 1 geoffrey geoffrey 8,2K 2018-10-17 14:03:15 melConf +-rwxr-xr-x 1 geoffrey geoffrey 1012 2018-10-06 10:31:18 musiqueBof +-rwxr-xr-x 1 geoffrey geoffrey 71 2018-10-06 10:31:18 newestFile +-rwxr-xr-x 1 geoffrey geoffrey 1,7K 2018-11-14 13:16:34 o +-rwxr-xr-x 1 geoffrey geoffrey 71 2018-10-06 10:31:18 oldestFile +-rwxr-xr-x 1 geoffrey geoffrey 3,9K 2019-01-12 12:52:48 optimize +-rw-r--r-- 1 geoffrey geoffrey 558 2018-10-06 10:31:18 package.json +-rw-r--r-- 1 geoffrey geoffrey 45K 2018-10-06 10:31:18 package-lock.json +-rwxr-xr-x 1 geoffrey geoffrey 175 2018-10-30 13:23:15 pdfpages +-rwxr-xr-x 1 geoffrey geoffrey 1,1K 2018-10-06 10:31:18 pdfrename +-rwxr-xr-x 1 geoffrey geoffrey 2,3K 2018-10-06 10:31:18 proxy +-rwxr-xr-x 1 geoffrey geoffrey 2,3K 2018-11-07 19:17:02 pushToTalk +-rwxr-xr-x 1 geoffrey geoffrey 312 2018-12-15 15:08:25 pw +-rwxr-xr-x 1 geoffrey geoffrey 130 2018-10-10 08:14:35 rankmirrors +-rwxr-xr-x 1 geoffrey geoffrey 170 2018-10-06 10:31:18 remcrlf +-rwxr-xr-x 1 geoffrey geoffrey 410 2018-10-06 10:31:18 rep +-rwxr-xr-x 1 geoffrey geoffrey 1,9K 2018-11-01 17:47:31 replayGain +-rwxr-xr-x 1 geoffrey geoffrey 563 2018-11-17 10:50:26 rmf +-rwxr-xr-x 1 geoffrey geoffrey 61 2018-10-06 10:31:18 rms +-rwxr-xr-x 1 geoffrey geoffrey 695 2018-10-06 10:31:18 sedrename +-rwxr-xr-x 1 geoffrey geoffrey 206 2018-10-11 23:28:40 showKeyboardLayout +-rwxr-xr-x 1 geoffrey geoffrey 486 2018-10-18 21:13:10 syncthingRestore +-rwxr-xr-x 1 geoffrey geoffrey 431 2018-10-06 10:31:18 tagCreatorPhotos +-rwxr-xr-x 1 geoffrey geoffrey 1,6K 2019-03-20 22:12:02 ter +-rwxr-xr-x 1 geoffrey geoffrey 415 2018-12-05 14:47:41 totask +-rwxr-xr-x 1 geoffrey geoffrey 45 2019-04-12 22:38:27 tracefiles +-rwxr-xr-x 1 geoffrey geoffrey 486 2018-10-06 10:31:18 transfer +-rwxr-xr-x 1 geoffrey geoffrey 614 2018-11-24 13:41:52 tunnel +-rwxr-xr-x 1 geoffrey geoffrey 890 2018-12-10 17:02:32 unziptree +-rwxr-xr-x 1 geoffrey geoffrey 4,3K 2019-01-12 21:04:37 updateCompressedMusic +-rwxr-xr-x 1 geoffrey geoffrey 66 2018-10-06 10:31:18 updatedate +-rwxr-xr-x 1 geoffrey geoffrey 288 2018-10-06 10:31:18 vidcmp +%  geoffrey  curacao  scripts  master  78✎  8+    18ms 501µs  1.65  [6 q[?2004hvi .config/systemd/user/melfetch.servicevi machines                             me      melmel[2 q[?2004l +[?1049h=[?2004h(B[?25h[?25l]112[2 q]112[2 q[?25h[?25l[?1004h]777;focus;on[?25h[?25l[?25h[?25l(B mel (B(B (B(B buffers +(B1 (B#!/usr/bin/env python3 +(B 1 (B +(B 2 (B"(B"" +(B 3 (BM(Beh mail client +(B 4 (BA(B dumb Python scripts that leverages notmuch, mbsync, and msmtp +(B 5 (Bt(Bo become a fully-functional extremly-opinonated mail client. +(B 6 (B"(B"" +(B 7 (B +(B 8 #(B (BTODO(B Features +(B 9 (B (B (B# (BTODO(B Implement initial command set +(B 10 (B (B (B# (BTODO(B Lockfiles for write operations on mail files (mbsync, tags→maildir operations) +(B 11 (B (B (B# (BTODO(B OPTI Lockfile per account and process everything in parallel (if implemented, this +(B 12 (B (B (B# should be optional since while it may speed up the mail fetching process, its multi-threading +(B 13 (B (B (B# nature would cause a lot of cache flushes and be not very efficient on battery) +(B 14 (B (B (B# (BTODO(B Handle true character width +(B 15 (B (B (B# (BTODO(B IMAP IDLE watches? +(B 16 (B (B (B# (BTODO(B GPG +(B 17 #(B (BTODO(B (only then) Refactor +(B 18 (B (B (B# (BTODO(B OOP-based +(B 19 (B (B (B# (BTODO(B Merge file with melConf +(B 20 (B +(B 21 #(B DEBUG Small perf profiler +(B 22 (Bi(Bmport(B time +(B 23 (Bp(Berf_dict = (Bdict(B() +(B 24 (Bp(Berf_last = time.perf_counter() +(B 25 (Bd(Bef(B (Bperfstep(B(name): +(B 26 (B (B t = time.perf_counter() +(B 27 (B (B (Bglobal(B perf_last +(B 28 (B (B (Bglobal(B perf_dict +(B 29 (B (B diff = t - perf_last +(B 30 (B (B (Bif(B name (Bnot(B (Bin(B perf_dict: +(B 31 (B (B perf_dict[name] = (B0 +(B 32 (B (B perf_dict[name] += diff +(B 33 (B (B perf_last = time.perf_counter() +(B 34 (B +(B 35 (B +(B 36 (Bi(Bmport(B notmuch +(B 37 (Bi(Bmport(B logging +(B 38 (Bi(Bmport(B coloredlogs +(B 39 (Bi(Bmport(B colorama +(B 40 (Bi(Bmport(B datetime +(B 41 (Bi(Bmport(B os +(B 42 (Bi(Bmport(B progressbar +(B 43 (Bi(Bmport(B argparse +(B 44 (Bi(Bmport(B configparser +(B 45 (Bi(Bmport(B base64 +(B 46 (Bi(Bmport(B shutil +(B 47 (Bi(Bmport(B argparse +(B 48 (Bi(Bmport(B xdg.BaseDirectory +(B 49 (Bi(Bmport(B sys +(B 50 (Bi(Bmport(B subprocess[?25h[?25l(B (BNORMAL(B (B(B(B mel (B(B python (B(B utf-8[unix] (B(B 0% (B☰ 1/608 (B : 1 (B(B]2;mel (~/.dotfiles/config/scripts) - NVIM[?25h[?25l[?25h[?25l(B/[?25h[?25l /(BCOMMAND(B (B(B(B mel]112[2 q[?25h[?25l(Bm[?25h[?25l (B 3 #21 +(B4 (BM(Beh (Bm(B1 (BA(B du(Bm(Bb Python scripts that leverages not(Bm(Buch, (Bm(Bbsync, and (Bm(Bs(Bm(B2 (Bt(Bo beco(Bm(Be a fully-functional extre(Bm(Bly-opinonated (Bm(B3456 (B (B (B# (BTODO(B I(Bm(Bple(Bm(Bent initial co(Bmm(B 7 (B (B (B# (BTODO(B Lockfiles for write operations on (Bm(Bail files ((Bm(Bbsync, tags→(Bm(B 8 (B (B (B# (BTODO(B OPTI Lockfile per account and process everything in parallel (if i(Bm(Bple(Bm(B 9 (B (B (B# should be optional since while it (Bm(Bay speed up the (Bm(Bail fetching process, its (Bm(B012 (B (B (B# (BTODO(B I(BM(B3456 (B (B (B# (BTODO(B (BM(Berge file with (Bm(B1718 #(B DEBUG S(Bm(B19 (Bi(Bm(Bport(B ti(Bm(B01 (Bp(Berf_last = ti(Bm(B2 (Bd(Bef(B (Bperfstep(B(na(Bm(B3 (B (B t = ti(Bm(B45627 (B (B (Bif(B na(Bm(B28 (B (B perf_dict[na(Bm(B29 (B (B perf_dict[na(Bm(B0 (B (B perf_last = ti(Bm(B123 (Bi(Bm(Bport(B not(Bm(B4 (Bi(Bm(B5 (Bi(Bm(B6 (Bi(Bm(Bport(B colora(Bm(B37 (Bi(Bm(Bport(B dateti(Bm(B38 (Bi(Bm(B39 (Bi(Bm(B0 (Bi(Bm(B1 (Bi(Bm(B2 (Bi(Bm(B3 (Bi(Bm(B4 (Bi(Bm(B5 (Bi(Bm(B6 (Bi(Bm(B47 (Bi(Bm(B4[?25h[?25l(Bb[?25h[?25l(B4 (B#!/u(Bs3 (B (B (B2 (B"""(B (B +(B 1 (BMeh (Bm +(B5 (BA du(Bmb(B Python scripts that leverages notmuch, (Bmb(Bsync, and msm(B1 (Bto b(Be(Bcome a fully-functional extremly-opinonated m(B2 (B"""(B (B (B3 (B (B (B4 (B#(B5 (B (B#(B (BTODO(B Implement initial comm(B6 (B (B#(B (BTODO(B Lockfiles for write operations on mail files ((Bmb(Bsync, tags→m(B7 (B (B#(B (BTODO(B OPTI Lockfile per account and process everything in parallel (if implem(B8 (B (B#(B should be optional since while it may speed up the mail fetching process, its m(B 9 (B (B#0 (B (B#1 (B (B#(B (BTODO(B IM(B2 (B (B#3 (B#(B4 (B (B#5 (B (B#(B (BTODO(B Merge file with m(B6 (B (B (B7 (B# DE(BB(BUG Sm(B8 (Bimpo(Br(Bt(B tim(B19 (Bperf(B_(B0 (Bperf(B_(Blast = tim(B1 (Bdef(B (Bp(Berfstep(B(nam(B2 (B (Bt(B = tim(B3 (B (Bg(B4 (B (Bg(B5 (B (Bd(B6 (B (Bi(Bf(B nam(B7 (B (B (B perf_dict[nam(B8 (B (Bp(Berf_dict[nam(B29 (B (Bp(Berf_last = tim(B0 (B (B (B1 (B (B (B2 (Bimpo(Br(Bt(B notm(B3 (Bimpo(Br(B4 (Bimpo(Br(B5 (Bimpo(Br(Bt(B coloram(B6 (Bimpo(Br(Bt(B datetim(B7 (Bimpo(Br(B8 (Bimpo(Br(B39 (Bimpo(Br(B0 (Bimpo(Br(B1 (Bimpo(Br(B2 (Bimpo(Br(B3 (Bimpo(Br(B4 (Bimpo(Br(B5 (Bimpo(Br(B6 (Bimpo(Br(B5/608 (B : 5[?25h[?25l(Bs[?25h[?25l(Bsr/bin/env python3(B (B (B (B (B (B (Bmail client(B (B (Bmb Python scripts that leverages notmuch, (Bmbs(Become a fully-functional extremly-opinonat(Be(B (B (B (B  (B# (BTODO(B Implement initial command set(B (B (B# (BTODO(B Lockfiles for write operations on m(Ba(Bil files ((Bmbs(B# (BTODO(B OPTI Lockfile per account and proce(Bs(B# should be optional since while it may sp(Be(B# nature would cause a lot of cache flushe(Bs(B# (BTODO(B Handle true character width(B (B (B# (BTODO(B IMAP IDLE watches?(B (B (B# (BTODO(B GPG(B (B  (B# (BTODO(B OOP-based(B (B (B# (BTODO(B Merge file with melConf(B (B (B (B (BBUG Small perf profiler(B (B (Brt(B time (B (B_dict = (Bdict(B() (B (B_last = time.perf_counter() (B (Bperfstep(B(name): (B (Bt = time.perf_counter() (B (Bglobal(B perf_last (B (Bglobal(B perf_dict (B (Bdiff = t - perf_last (B (Bif(B name (Bnot(B (Bin(B perf_dict: (B (B perf_dict[name] = (B0(B (B (Bperf_dict[name] += diff (B (Bperf_last = time.perf_counter() (B (B (B (B (B (Brt(B notmuch (B (Brt(B logging (B (Brt(B coloredlogs (B (Brt(B colorama (B (Brt(B datetime (B (Brt(B os (B (Brt(B progressbar (B (Brt(B argparse (B (Brt(B configparser (B (Brt(B base64 (B (Brt(B shutil (B (Brt(B argparse (B (Brt(B xdg.BaseDirectory (B (Brt(B sys (B (Brt(B subprocess (B (B47[?25h[?25l(By[?25h[?25l(By(By[?25h[?25l(Bn[?25h[?25l(Bn(Bn[?25h[?25l(Bc[?25h[?25l(Bc(Bc[?25h[?25l [?25h[?25l]112[2 q[?25h[?25lmbsync(BNORMAL(B (B(B(B mel [?25h[?25l(Bn[?25h[?25l [?25h[?25l(B10 (B#!/usr/bin/env python3(B (B (B9 (B (B (B8 (B"""(B (B (B7 (BMeh mail client(B (B +(B 6 (BA dumb Python scripts that leverages notmuch, (Bmbsync(B, and(B (B5 (Bto become a fully-functional extremly-opinonated mail cli(Be(B4 (B"""(B (B (B (B (B2 (B# (BTODO(B Features(B (B (B1 (B (B# (BTODO(B Implement initial command set(B (B +(B11 (B (B# (BTODO(B Lockfiles for write operations on ma(B1 (B (B# (BTODO(B OPTI Lockfile per account and process everythi(Bn2 (B (B# should be optional since while it may speed up the (Bm3 (B (B# nature would cause a lot of cache flushes and be no(Bt 4 (B (B# (BTODO(B Handle true character width(B (B (B 5 (B (B# (BTODO(B IMAP IDLE watches?(B (B (B 6 (B (B# (BTODO(B GPG(B (B (B 7 (B# (BTODO(B (only then) Refactor(B (B (B 8 (B (B# (BTODO(B OOP-based(B (B (B 9 (B (B# (BTODO(B Merge file with melConf(B (B (B0 (B (B (B1 (B# DEBUG Small perf profiler(B (B (B2 (Bimport(B time (B (B3 (Bperf_dict = (Bdict(B() (B (B14 (Bperf_last = time.perf_counter() (B (B15 (Bdef(B (Bperfstep(B(name): (B (B16 (B t = time.perf_counter() (B (B17 (B (Bglobal(B perf_last (B (B18 (B (Bglobal(B perf_dict (B (B19 (B diff = t - perf_last (B (B0 (B (Bif(B name (Bnot(B (Bin(B perf_dict: (B (B1 (B perf_dict[name] = (B0(B (B (B2 (B perf_dict[name] += diff (B (B3 (B perf_last = time.perf_counter() (B (B24 (B (B (B25 (B (B (B26 (Bimport(B notmuch (B (B27 (Bimport(B logging (B (B28 (Bimport(B coloredlogs (B (B29 (Bimport(B colorama (B (B0 (Bimport(B datetime (B (B1 (Bimport(B os (B (B2 (Bimport(B progressbar (B (B3 (Bimport(B argparse (B (B34 (Bimport(B configparser (B (B35 (Bimport(B base64 (B (B36 (Bimport(B shutil (B (B37 (Bimport(B argparse (B (B38 (Bimport(B xdg.BaseDirectory (B (B39 (Bimport(B sys (B (B0 (Bimport(B subprocess (B (B1% (B☰ 11/608 (B : 58[?25h[?25l(Bn[?25h[?25l [?25h[?25l(B25 (B (B# move de(Bs(Bt msg...(B(B24 (B (B## Read m(Be(Bssage(B(B23 (B (B (B(B22 (B (B (B(B21 (B (B# read ms(Bg(B [--html] [--plain] [--browser](B(B20 (B (Bdef(B (Bfunc_(Br(Bead(B(args):(B19 (B apply(B_(Bmsgs_input(args.message, read_msg)(B18 (B parserRea(Bd(B = subparsers.add_parser((B"read"(B, (Bhelp(B=(B"Read message"(B)(B17 (B parserRea(Bd(B.add_argument((B'message'(B, nargs=(B1(B, (Bhelp(B=(B"Messages"(B)(B16 (B parserRea(Bd(B.set_defaults(func=func_read) +(B 15 (B (B (B(B14 (B (B (B(B13 (B (B# attach (Bm(Bsg [id] [--save] (list if no id, xdg-open else)(B(B12 (B (B## Redact(Bi(Bon(B(B11 (B (B# new acc(Bo(Bunt(B(B10 (B (B# reply m(Bs(Bg [--all](B(B9 (B (B## Folder(B (Bmanagement(B(B8 (B (B# tree [f(Bo(Blder](B(B7 (B (B# mkdir f(Bo(Blder(B(B6 (B (B# rmdir f(Bo(Blder (prevent if folder isn't empty (mail/subfolder))(B 5 (B (B# (yeah t(Bh(Bat should do)(B(B 4 (B (B## Meta(B (B (B(B 3 (B (B# setup ((Bi(Bnteractive thing maybe)(B(B 2 (B (B (B(B 1 (B (B (B +(B531 (B (B# fetch ((Bmbsync(B, notmuch new, retag, notify; called by greater gods)(B 1 (B (Bdef(B (Bfunc_(Bf(Betch(B(args):(B 2 (B (B# Fet(Bc(Bh mails(B(B 3 (B log.i(Bn(Bfo((B"Fetching mails"(B)(B 4 (B (Bmbsync(BConfigPath = os.path.expanduser((B"~/.(Bmbsync(Brc"(B) (B# (BTODO(B Better(B 5 (B cmd =(B (B[(B"(Bmbsync(B"(B, (B"--config"(B, (Bmbsync(BConfigPath, (B"--all"(B](B 6 (B subpr(Bo(Bcess.run(cmd)(B 7 (B (B (B(B 8 (B (B# Ind(Be(Bx new mails(B(B 9 (B notmu(Bc(Bh_new()(B10 (B (B (B(B11 (B (B# Not(Bi(Bfy(B(B12 (B notif(By(B_all()(B13 (B (B (B(B14 (B (B# Tag(B (Bnew mails(B(B15 (B apply(BM(Bsgs((B'tag:unprocessed'(B, retag_msg, showProgress=(BTrue(B, write=(BTrue(B)(B16 (B (B (B(B17 (B parserFet(Bc(Bh = subparsers.add_parser((B"fetch"(B, (Bhelp(B=(B"Fetch mail, tag them, and run notifications"(B)(B18 (B parserFet(Bc(Bh.set_defaults(func=func_fetch)(B19 (B (B (B(B20 (B (B (B(B21 (B (B## Debug(B (B (B(B22 (B (B# debug ((Bv(Barious)(B(B23 (B (Bdef(B (Bfunc_(Be(Bxpose(B(args):(B24 (B (B# And(B (Bleave the door open(B(B25 (B (Bdef(B (Be(Bx(Bpose_msg(B(a):(B(B func_read()  python (B(B utf-8[unix] (B(B 87% (B☰ 531/608 (B : 14[?25h[?25l(Bn[?25h[?25l [?25h[?25l(B9 (B (B# mo(Bv(Be des(B8 (B (B## R(Be(Bad me(B7 (B (B (B(B6 (B (B (B(B5 (B (B# re(Ba(Bd msg(B4 (B (Bdef(B (Bf(Bunc_r(B23 (B (Ba(Bpply_(B22 (B pars(Be(BrRead(B21 (B pars(Be(BrRead(B20 (B pars(Be(BrRead(B9 (B (B (B(B8 (B (B (B(B7 (B (B# at(Bt(Bach m(B6 (B (B## R(Be(Bdacti(B5 (B (B# ne(Bw(B acco(B4 (B (B# re(Bp(Bly ms(B13 (B (B## F(Bo(Blder (B12 (B (B# tr(Be(Be [fo(B11 (B (B# mk(Bd(Bir fo(B10 (B (B# rm(Bd(Bir fo(B9 (B (B# (y(Be(Bah th(B8 (B (B## M(Be(Bta(B (B7 (B (B# se(Bt(Bup (i(B6 (B (B (B(B5 (B (B (B +(B 4 (B (B# fe(Bt3 (B (Bdef(B (Bf(Bunc_f(B#(B Fetc(B1 (B (Bl(Bog.in +(B535 (B1 (B (Bc(Bmd = (B2 (B (Bs(Bubpro(B3 (B (B (B(B4 (B (B#(B Inde(B5 (B (Bn(Botmuc(B 6 (B (B (B(B 7 (B (B#(B Noti(B 8 (B (Bn(Botify(B 9 (B (B (B(B0 (B (B#(B Tag (B1 (B (Ba(BpplyM(B2 (B (B (B(B3 (B pars(Be(BrFetc(B4 (B pars(Be(BrFetc(B5 (B (B (B(B16 (B (B (B(B17 (B (B## D(Be(Bbug(B (B18 (B (B# de(Bb(Bug (v(B19 (B (Bdef(B (Bf(Bunc_e(B0 (B (B#(B And (B1 (B (Bd(Bef(B (Bex(B(B func_fetch()  python (B(B utf-8[unix] (B(B 87% (B☰ 535/608 (B : 9[?25h[?25l(BE[?25h[?25l (Bve dest msg...(B (B (Bead message(B (B (B (B (B (B (Bad msg [--html](B (Bfunc_read(B(args)(B:(Bapply_msgs_inpu(Bt(BerRead = subpar(Bs(BerRead.add_argu(Bm(BerRead.set_defa(Bu(B (B (B (B (Btach msg [id] [(B-(Bedaction(B (B (Bw account(B (B (Bply msg [--all](B (Bolder managemen(Bt(Bee [folder](B (B (Bdir folder(B (B (Bdir folder (pre(Bv(Beah that should(B (Beta(B (B (Btup (interactiv(Be(B (B (B (B (Btch ((Bmbsync(B, no(Bt(Bfunc_fetch(B(args(B)(B# Fetch mails(B (B (Blog.info((B"Fetch(Bi(Bcmd = [(B"(Bmbsync(B"(B,(Bsubprocess.run((Bc(B (B (B# Index new mai(Bl(Bnotmuch_new() (B (B (B (B# Notify(B (B (Bnotify_all() (B (B (B (B# Tag new mails(B (BapplyMsgs((B'tag:(Bu(B (B (BerFetch = subpa(Br(BerFetch.set_def(Ba(B (B (B (B (Bebug(B (B (Bbug (various)(B (B (Bfunc_expose(B(arg(Bs(B# And leave the(B (Bdef(B (Bexpose_msg(B((Ba(B24[?25h[?25l(BE[?25h[?25l  (B (B (B (B (B (B (B (B [(B-(B: (B (Bt((Ba(Bse(Br(Bme(Bn(Bul(Bt(B (B (B (B (B--(Bs(B (B (B (B (B (B (Bt(B (B (B (B (B (B (Bve(Bn(B d(Bo(B (B (Be (Bt(B (B (B (B (Btm(Bu(B):(B (B (B (Bin(Bg(B, (B"(Bcm(Bd(B (B (Bls(B (B (B (B (B (B (B (B (B (B (B (B (B (Bun(Bp(B (B (Brs(Be(Bau(Bl(B (B (B (B (B (B (B (B (Bs)(B:(B d(Bo(Ba)(B:(B6[?25h[?25l(BE[?25h[?25l  (B (B (B (B (B (B (B (B--plain] [--browser](B (B (B (B (Bargs.message, read_msg) (B (Brs.add_parser((B"read"(B, (Bhelp(B=(B"Read m(Be(Bnt((B'message'(B, nargs=(B1(B, (Bhelp(B=(B"Messa(Bg(Bts(func=func_read) (B (B (B (B (B (Bsave] (list if no id, xdg-open els(Be(B (B (B (B (B (B (B (B (B (B (B (B (Bnt if folder isn't empty (mail/sub(Bf(Bo)(B (B (B (B (Bthing maybe)(B (B (B (B (B (B (Buch new, retag, notify; called by (Bg(B (B (B (B (Bg mails"(B) (B (B((B"~/.(Bmbsync(Brc"(B)(B"--config"(B, (Bmbsync(BConfigPath, (B"--a(Bl(Bd) (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (Bprocessed'(B, retag_msg, showProgres(Bs(B (B (Bers.add_parser((B"fetch"(B, (Bhelp(B=(B"Fetc(Bh(Blts(func=func_fetch) (B (B (B (B (B (B (B (B (B (B: (B (Boor open(B (B (B: (B (B60[?25h[?25l(Bb[?25h[?25l (B (B (B (B (B (B (B (B (B (B (B (B (B (B (Bm(Be(Ba(Bg(B (B (B (B (B (B (Bs(Be(B (B (B (B (B (B (B (B (B (B (B (B (Bb(Bf(B (B (B (B (B (B (B (B (B (B (B (Bg(B (B (B (B (B (B ((B"~/.(Bmbsync(Brc"(B)(Ba(Bl(B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (Bs(Bs(B (B (Bc(Bh(B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B59[?25h[?25l(Bb[?25h[?25l (B (B(B (B(B (B(B (B(B (B(B (B(B (B(Bp(B=(B"Read m(Bl(Bp(B=(B"Messa(B (B(B (B(B (B(B-(Bopen els(B (B(B (B(B (B(B (B(B (B(B (B(B((Bmail/sub(B (B(B (B(B (B(B (B(B (B(Ba(Blled by (B (B(B (B(B (B(Ba(Bth, (B"--a(B (B(B (B(B (B(B (B(B (B(B (B(B (B(B (B(B (B(Bo(BwProgres(B (B(Be(Blp(B=(B"Fetc(B (B(B (B(B (B(B (B(B (B(B (B(B (B(B (B(B1[?25h[?25l(Bi[?25h[?25l ]112[6 q[?25h[?25l (B (BINSERT(B (B(B(B mel (B(B func_fetch()  python (B(B utf-8[unix] (B(B 87% (B☰ 535/608 (B : 51 (B[?25h[?25l(B mel+ (B(B (B (B (B (B (B (B (B (B (B (B (B (B (B (Bp(B=(Bl(Bp(B (B (B (B (B (B (B-(Bo(B (B (B (B (B (B (B (B (B (B (B (B (B((Bm(B (B (B (B (B (B (B (B (B (B (Ba(Bl(B (B (B (B (B (B (Bc(Bmbsync(Brc"(B) (B# (BTODO(B Better(Ba(Bt(B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (Bo(Bw(B (B (Be(Bl(B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B[+] (B(B func_fetch()  python (B(B utf-8[unix] (B(B 87% (B☰ 535/608 (B : 52]2;mel + (~/.dotfiles/config/scripts) - NVIM[?25h[?25l[?25h[?25l(B (B (B (B (B (B (B (B (B (B (B (B (B (B (B=(B"(Bp(B=(B (B (B (B (B (B (Bo(Bp(B (B (B (B (B (B (B (B (B (B (B (B (Bm(Ba(B (B (B (B (B (B (B (B (B (B (Bl(Bl(B (B (B (B (B (B (Bo(Bmbsync(Brc"(B) (B# (BTODO(B Better(Bt(Bh(B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (Bw(BP(B (B (Bl(Bp(B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B3[?25h[?25l(B (B (B (B (B (B (B (B (B (B (B (B (B (B (B"(BR(B=(B"(B (B (B (B (B (B (Bp(Be(B (B (B (B (B (B (B (B (B (B (B (B (Ba(Bi(B (B (B (B (B (B (B (B (B (B (Bl(Be(B (B (B (B (B (B (Bn(Bmbsync(Brc"(B) (B# (BTODO(B Better(Bh(B,(B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (BP(Br(B (B (Bp(B=(B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B4[?25h[?25l(B (B (B (B (B (B (B (B (B (B (B (B (B (B (BR(Be(B"(BM(B (B (B (B (B (B (Be(Bn(B (B (B (B (B (B (B (B (B (B (B (B (Bi(Bl(B (B (B (B (B (B (B (B (B (B (Be(Bd(B (B (B (B (B (B (Bf(Bmbsync(Brc"(B) (B# (BTODO(B Better(B,(B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (Br(Bo(B (B (B=(B"(B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B5[?25h[?25l(B (B (B (B (B (B (B (B (B (B (B (B (B (B (Be(Ba(BM(Be(B (B (B (B (B (B (Bn(B (B (B (B (B (B (B (B (B (B (B (B (B (Bl(B/(B (B (B (B (B (B (B (B (B (B (Bd(B (B (B (B (B (B (B (Bi(Bmbsync(Brc"(B) (B# (BTODO(B Better(B (B"(B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (Bo(Bg(B (B (B"(BF(B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B6[?25h[?25l(B (B (B (B (B (B (B (B (B (B (B (B (B (B (Ba(Bd(Be(Bs(B (B (B (B (B (B (B (Be(B (B (B (B (B (B (B (B (B (B (B (B (B/(Bs(B (B (B (B (B (B (B (B (B (B (B (Bb(B (B (B (B (B (B (Bg(Bmbsync(Brc"(B) (B# (BTODO(B Better(B"(B-(B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (Bg(Br(B (B (BF(Be(B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B (B7[?25h[?25l(B (B (B (B (B (B (B (B (B (B (B (B (B (B (Bd(B (Bs(Bs(B (B (B (B (B (B (Be(Bl(B (B (B (B (B (B (B (B (B (B (B (B (Bs(Bu(B (B (B (B (B (B (B (B (B (B (Bb(By(B (B (B (B (B (B (B/(Bmbsync(Brc"(B) (B# (BTODO(B Better(B-(B-(B (B[48;5;1 \ No newline at end of file diff --git a/dmrc b/dmrc deleted file mode 100644 index f34186b..0000000 --- a/dmrc +++ /dev/null @@ -1,3 +0,0 @@ -[Desktop] -Language=fr_FR.utf8 -Session=i3 diff --git a/face.icon b/face.icon deleted file mode 120000 index 1310f56..0000000 --- a/face.icon +++ /dev/null @@ -1 +0,0 @@ -.face \ No newline at end of file diff --git a/gem b/gem deleted file mode 120000 index 23390de..0000000 --- a/gem +++ /dev/null @@ -1 +0,0 @@ -.cache/gem \ No newline at end of file diff --git a/gtkrc-2.0 b/gtkrc-2.0 deleted file mode 100644 index c016edc..0000000 --- a/gtkrc-2.0 +++ /dev/null @@ -1,19 +0,0 @@ -# DO NOT EDIT! This file will be overwritten by LXAppearance. -# Any customization should be done in ~/.gtkrc-2.0.mine instead. - -include "/home/geoffrey/.gtkrc-2.0.mine" -gtk-theme-name="Greenbird" -gtk-icon-theme-name="Faenza-Green" -gtk-font-name="Sans 10" -gtk-cursor-theme-name="Menda-Cursor" -gtk-cursor-theme-size=0 -gtk-toolbar-style=GTK_TOOLBAR_BOTH -gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR -gtk-button-images=1 -gtk-menu-images=1 -gtk-enable-event-sounds=1 -gtk-enable-input-feedback-sounds=1 -gtk-xft-antialias=1 -gtk-xft-hinting=1 -gtk-xft-hintstyle="hintslight" -gtk-xft-rgba="rgb" diff --git a/icon b/icon deleted file mode 120000 index 1310f56..0000000 --- a/icon +++ /dev/null @@ -1 +0,0 @@ -.face \ No newline at end of file diff --git a/m2 b/m2 deleted file mode 120000 index 6897d10..0000000 --- a/m2 +++ /dev/null @@ -1 +0,0 @@ -.cache/m2 \ No newline at end of file diff --git a/mplayer/config b/mplayer/config deleted file mode 100644 index 21cf775..0000000 --- a/mplayer/config +++ /dev/null @@ -1,3 +0,0 @@ -# Write your default config options here! - - diff --git a/npm b/npm deleted file mode 120000 index 47f1d63..0000000 --- a/npm +++ /dev/null @@ -1 +0,0 @@ -.cache/npm \ No newline at end of file diff --git a/nv b/nv deleted file mode 120000 index 7392898..0000000 --- a/nv +++ /dev/null @@ -1 +0,0 @@ -.cache/nv \ No newline at end of file diff --git a/xinitrc b/xinitrc index c0b1022..c636ffe 100755 --- a/xinitrc +++ b/xinitrc @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # ~/.xinitrc # @@ -11,6 +11,6 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then unset f fi -[ -f /etc/xprofile ] && source /etc/xprofile -[ -f ~/.xprofile ] && source ~/.xprofile +[ -f /etc/xprofile ] && . /etc/xprofile +[ -f ~/.xprofile ] && . ~/.xprofile diff --git a/xprofile b/xprofile index 0b821e2..4232742 100755 --- a/xprofile +++ b/xprofile @@ -7,7 +7,7 @@ # -[ -f ~/.Xresources ] && xrdb ~/.Xresources +[ -f ~/.config/Xresources/main ] && xrdb -I"$HOME" ~/.config/Xresources/main xset b off export GTK2_RC_FILES="$HOME/.gtkrc-2.0" @@ -40,16 +40,17 @@ tryDM() { xmonad ) executable=xmonad;; *) executable=$1;; esac - path=$(which $executable 2> /dev/null) - if [ $? -eq 0 ]; then + if commannd -v "$executable" + then found=1 - exec $path $parameters + exec "$executable" $parameters fi fi } -if [ ! -z $1 ]; then - tryDM $1 +if [ -n "$1" ] +then + tryDM "$1" fi tryDM i3 tryDM xfce4