From bffabd904c09d82e04558500d658671b8eb360d5 Mon Sep 17 00:00:00 2001 From: neodarz Date: Sat, 29 Jul 2017 16:46:09 +0200 Subject: update --- i3/.config/i3/config | 4 +- i3pystatus/.config/i3pystatus/conf.py | 55 ++------ newsbeuter/.newsbeuter/blog_conf | 2 +- newsbeuter/.newsbeuter/urls_blog | 2 + newsbeuter/.newsbeuter/youtube_conf | 3 +- qterminal.org/.config/qterminal.org/qterminal.ini | 6 +- zsh/.zsh/aliases.zsh | 17 ++- zsh/.zsh/banner.zsh | 162 ---------------------- zsh/.zsh/banner.zsh_ | 162 ++++++++++++++++++++++ zsh/.zsh/keychain.zsh | 4 +- 10 files changed, 202 insertions(+), 215 deletions(-) delete mode 100755 zsh/.zsh/banner.zsh create mode 100755 zsh/.zsh/banner.zsh_ diff --git a/i3/.config/i3/config b/i3/.config/i3/config index 73b7c39..36622e6 100644 --- a/i3/.config/i3/config +++ b/i3/.config/i3/config @@ -96,7 +96,7 @@ bindsym --release Caps_Lock exec pkill -SIGRTMIN+11 i3blocks bindsym --release Num_Lock exec pkill -SIGRTMIN+11 i3blocks # App -bindsym --release $WinKey+o exec scrot ~/screenshots/%b\ %d-%H:%M:%S.png +bindsym --release $WinKey+o exec scrot -s ~/screenshots/%Y-%m-%d-%H:%M:%S.png bindsym $WinKey+Shift+F1 exec qterminal -e ranger bindsym $WinKey+Shift+F2 exec qterminal -e cmus bindsym $WinKey+Shift+F3 exec qterminal -e mutt @@ -105,7 +105,7 @@ bindsym $WinKey+Shift+F5 exec firefox bindsym $WinKey+Shift+F6 exec qterminal -e atom bindsym $WinKey+Shift+F7 exec terminator -e ncmpcpp bindsym $WinKey+Shift+v move morkspace to output right -bindsym $WinKey+control+l exec i3lock -g +bindsym $WinKey+control+l exec i3lock-fancy #bindsym $WinKey+Shift+$AltKey+0 exec ~/.config/i3/switch-workspace.py 6 # start a terminal diff --git a/i3pystatus/.config/i3pystatus/conf.py b/i3pystatus/.config/i3pystatus/conf.py index 4359251..e1dfcfa 100644 --- a/i3pystatus/.config/i3pystatus/conf.py +++ b/i3pystatus/.config/i3pystatus/conf.py @@ -3,29 +3,19 @@ from i3pystatus import Status status = Status(logfile='/home/neodarz/i3pystatus.log') -status.register("text", - text=" ░▒▓█",) status.register("keyboard_locks", format="{caps} {num}", - hints = {"separator": False, "separator_block_width": 0}, caps_off="", num_off="",) -status.register("text", - text=" ░▒▓█▓▒░ ", - hints = {"separator": False, "separator_block_width": 0},) # Displays clock like this: # Tue 30 Jul 11:59:46 PM KW31 # ^-- calendar week status.register("clock", - format=" %a %-d %b  %X", - hints = {"separator": False, "separator_block_width": 0},) + format=(' %a %-d %b  %X S%V', 'Europe/Paris')) -status.register("text", - text=" ░▒▓█▓▒░ ", - hints = {"separator": False, "separator_block_width": 0},) @@ -56,12 +46,8 @@ status.register("battery", "DIS": "↓", "CHR": "↑", "FULL": "=", - }, - hints = {"markup": "pango", "separator": False, "separator_block_width": 0},) + }) -status.register("text", - text=" ░▒▓█▓▒░ ", - hints = {"separator": False, "separator_block_width": 0},) # Displays whether a DHCP client is running #status.register("runwatch", @@ -84,45 +70,29 @@ status.register("network", interface="enp3s0", format_up=" {v4cidr}", format_down="", - hints = {"markup": "pango", "separator": False, "separator_block_width": 0},) + hints = {"markup": "pango"},) -status.register("text", - text=" ░▒▓█▓▒░ ", - hints = {"separator": False, "separator_block_width": 0},) +#status.register("network", +# interface="wlp3s0", +# format_up=" {essid}  {quality:03.0f}%", +# format_down="", +# hints = {"markup": "pango"},) -# Note: requires both netifaces and basiciw (for essid and quality) -status.register("network", - interface="wlp3s0", - format_up=" {essid}  {quality:03.0f}%", - format_down="", - hints = {"markup": "pango", "separator": False, "separator_block_width": 0},) - -status.register("text", - text=" ░▒▓█▓▒░ ", - hints = {"separator": False, "separator_block_width": 0},) # Shows disk usage of / # Format: # 42/128G [86G] status.register("disk", path="/", - format=" {avail}G", - hints = {"separator": False, "separator_block_width": 0},) + format=" {avail}G") -status.register("text", - text=" ░▒▓█▓▒░ ", - hints = {"separator": False, "separator_block_width": 0},) # Shows pulseaudio default sink volume # # Note: requires libpulseaudio from PyPI status.register("pulseaudio", - format="{volume}",format_muted="", - hints = {"separator": False, "separator_block_width": 0},) + format="{volume}",format_muted="") -status.register("text", - text=" █▓▒░ ", - hints = {"separator": False, "separator_block_width": 0},) #status.register("backlight", # format="{brightness}",) @@ -133,14 +103,15 @@ status.register("text", # Shows mpd status # Format: # Cloud connected▶Reroute to Remain +status.register("taskwarrior") + status.register("cmus", format="{status} {song_elapsed}/{song_length} {artist} - {title}", status={ "stopped": "◾", "playing": "▶", "paused": "▷", - },format_not_running="", - hints = {"separator": False, "separator_block_width": 0},) + },format_not_running="") status.register("now_playing", diff --git a/newsbeuter/.newsbeuter/blog_conf b/newsbeuter/.newsbeuter/blog_conf index de4bd47..10a933f 100644 --- a/newsbeuter/.newsbeuter/blog_conf +++ b/newsbeuter/.newsbeuter/blog_conf @@ -3,4 +3,4 @@ auto-reload yes download-full-page yes refresh-on-startup yes -macro o set browser "firefox %u"; open-in-browser ; +macro o set browser "qutebrowser %u"; open-in-browser ; diff --git a/newsbeuter/.newsbeuter/urls_blog b/newsbeuter/.newsbeuter/urls_blog index db9e509..be297e7 100644 --- a/newsbeuter/.newsbeuter/urls_blog +++ b/newsbeuter/.newsbeuter/urls_blog @@ -20,3 +20,5 @@ https://www.blog-libre.org/feed/ https://www.shaftinc.fr/feed.atom http://disturb.io/feed/ https://linuxtaka.wordpress.com/feed/ +https://www.stallman.org/rss/ +http://blog.rom1v.com/feed/ diff --git a/newsbeuter/.newsbeuter/youtube_conf b/newsbeuter/.newsbeuter/youtube_conf index 5b5912b..cdfb732 100644 --- a/newsbeuter/.newsbeuter/youtube_conf +++ b/newsbeuter/.newsbeuter/youtube_conf @@ -1,8 +1,7 @@ -macro p set browser "mpv %u"; open-in-browser ; set browser "firefox %u" +macro p set browser "mpv --cache-file-size=2147483647 --no-video '%u'"; open-in-browser ; set browser "firefox %u" macro o set browser "firefox %u"; open-in-browser ; macro s set browser "notify-send '%U %T'"; open-in-browser ; always-display-description true auto-reload yes -download-full-page yes refresh-on-startup yes diff --git a/qterminal.org/.config/qterminal.org/qterminal.ini b/qterminal.org/.config/qterminal.org/qterminal.ini index 388e666..3413147 100644 --- a/qterminal.org/.config/qterminal.org/qterminal.ini +++ b/qterminal.org/.config/qterminal.org/qterminal.ini @@ -37,9 +37,9 @@ Width=70 [MainWindow] ApplicationTransparency=0 -pos=@Point(480 18) -size=@Size(476 861) -state=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\xfc\x2\0\0\0\x1\xfb\0\0\0&\0\x42\0o\0o\0k\0m\0\x61\0r\0k\0s\0\x44\0o\0\x63\0k\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x88\0\xff\xff\xff\0\0\x1\xdc\0\0\x3]\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0) +pos=@Point(0 18) +size=@Size(1436 861) +state=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\xfc\x2\0\0\0\x1\xfb\0\0\0&\0\x42\0o\0o\0k\0m\0\x61\0r\0k\0s\0\x44\0o\0\x63\0k\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x8a\0\xff\xff\xff\0\0\x5\x9c\0\0\x3]\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0) [Sessions] size=0 diff --git a/zsh/.zsh/aliases.zsh b/zsh/.zsh/aliases.zsh index 2016691..bbf057b 100755 --- a/zsh/.zsh/aliases.zsh +++ b/zsh/.zsh/aliases.zsh @@ -26,7 +26,7 @@ alias cp="cp -r -i" alias scp="scp -r" alias mkdir="mkdir -p" alias xsel="xsel -b" -alias fuck='sudo $(fc -ln -1)' +eval "$(thefuck --alias)" alias v="nvim" alias vi="nvim" alias vim="nvim" @@ -116,6 +116,13 @@ alias rssblog="newsbeuter -c /home/neodarz/.newsbeuter/blog.db -u /home/neodarz/ alias rsscode="newsbeuter -c /home/neodarz/.newsbeuter/code.db -u /home/neodarz/.newsbeuter/urls_code -C /home/neodarz/.newsbeuter/code_conf" alias rsshardware="newsbeuter -c /home/neodarz/.newsbeuter/hardware.db -u /home/neodarz/.newsbeuter/urls_hardware -C /home/neodarz/.newsbeuter/hardware_conf" alias rssactu="newsbeuter -c /home/neodarz/.newsbeuter/actu.db -u /home/neodarz/.newsbeuter/urls_actu -C /home/neodarz/.newsbeuter/actu_conf" +alias i3lock="i3lock-fancy" +alias weatherM="weather -k 0aebbf2d72f2b78f797b650a76c88401 -c -z 47.9955,0.1939" +alias weatherC="weather -k 0aebbf2d72f2b78f797b650a76c88401 -c -z 47.1778,-1.3416" +alias vpn="sh /home/neodarz/Apps/ipsec-vpn/vpn" +alias cal="ikhal" +alias cals="vdirsyncer sync" +alias mm="offlineimap && mutt" #█▓▒░ dumb tmux trix alias tsad="printf '\033k┐(T_T)┌\033\\'" @@ -159,3 +166,11 @@ function md() { function short() { curl -F"shorten=$*" https://0x0.st } + +if ! pgrep -u "$USER" ssh-agent > /dev/null; then + ssh-agent > ~/.ssh-agent-thing +fi +if [[ "$SSH_AGENT_PID" == "" ]]; then + eval "$(<~/.ssh-agent-thing)" +fi + diff --git a/zsh/.zsh/banner.zsh b/zsh/.zsh/banner.zsh deleted file mode 100755 index 9c2903b..0000000 --- a/zsh/.zsh/banner.zsh +++ /dev/null @@ -1,162 +0,0 @@ -# ██ -# ░██ -# ██████ ██████░██ -# ░░░░██ ██░░░░ ░██████ -# ██ ░░█████ ░██░░░██ -# ██ ░░░░░██░██ ░██ -# ██████ ██████ ░██ ░██ -# ░░░░░░ ░░░░░░ ░░ ░░ -# -# ▓▓▓▓▓▓▓▓▓▓ -# ░▓ author ▓ xero -# ░▓ code ▓ http://code.xero.nu/dotfiles -# ░▓ mirror ▓ http://git.io/.files -# ░▓▓▓▓▓▓▓▓▓▓ -# ░░░░░░░░░░ -# -#█▓▒░ pick a random number -_RAND=`shuf -i1-10 -n1` - -#█▓▒░ display a random ascii banner -case $_RAND in -1) -cat << X0 - : - |\\____.____ .______._______. - ._____| / _/__ _|_ / \\ |__ - \\__ | _/_ _) Y _ _/__| __ / - / _ / \\ | | /| / | - / |___(__ |__| |_ | - \\_____l __ \\_____/__ l______/\\______/ - \\_____/ \\______/ \\______/\\______/ - x0^b7^imp! - -X0 -;; -2) -cat << X0 - : - |\\_____.____ /\\_____.________. - ._____| / _/___ _/_ / \\ _ |__ - \\__ | _/_ _) Y _ _/__| / / - / _ / \\ | | /| | - / :.. |____(__ ..:: |__| ..:: |_ ..:: | - \\_____l \\______/ l_______/\\_______/ - x0^b7^imp! - -X0 -;; -3) -cat << X0 - . - ____/|______.____ /\\_____.________. - \\ | / _/___ _/_ / \\ _ |__ - \\_ | __/ _) Y _ _/__| / / - / _ \\ \\ | | /| | - _/ .: | .: \\__ ..:: |__| ..:: |_ ..:: | - \\_____l____ /\\______/ l_______/\\_______/ - \\/ x0^b7^imp! - -X0 -;; -4) -cat << X0 - ____ _ . . _ ___ - \\ \\ - ___/\\ _____ /\\______ ____/\\ ___/\\ - \\ _ \\/ .://.:\\____//_\\_. \\ /./__ \\ - \\\\ / // ___// .\\/ _// \\ / \\ - /.: \\ \\_. // _. \\/ .:\\/ / - __/____/\\ __\\/__ //______| /\\_______/__ - \\ \\/ \\/ |/x0^b7^imp! / - _\\ | /_ - \\ / - -X0 -;; -5) -cat << X0 - - ___/\\ _____ /\\______ ____/\\ ___/\\ - \\ _ \\/ .://.:\\____//_\\_. \\ /./__ \\ - \\\\ / // ___// .\\/ _// \\ / \\ - /.: \\ \\_. // _. \\/ .:\\/ / - /____/\\ __\\/__ //______| /\\_______/ - \\/ \\/ |/x0^b7^imp! - -X0 -;; -6) -cat << X0 - - _________/\\________________________________/\\_______ - \\ / /\\_______ /______ /\\/ \\__ \\ - \\_ / _/ / _/ /\\_ _/ _/ / / / / - _/ _ \\_/ ______/_/ _ \\_/ / / / - \\ \\ / \\_ / \\ / \\/ / - \\______\\ /\\___________/______\\ /\\_________/ - \\ / \\ / x0^b7^imp! - \\/ \\/ - -X0 -;; -7) -cat << X0 - - ________ /\\________________________________/\\_______ - \\ / _________ _______ __/ \\__ \\ - \\_ / _/ / _/ /\\_ _/ _/ / / / / - _/ _ \\_/ ______/_/ _ \\_/ / / / - \\ \\ / \\_ / \\ / \\/ / - \\______\\ /\\___________/______\\ /\\_________/ - \\ / \\ / x0^b7^imp! - \\/ \\/ - -X0 -;; -8) -cat << X0 - - :_____ _________ __________ _______. - ______| \\__/ ___ \\ _/ ___ \\ / |__ - / | __/\\_ |/ \\\\_ |/ \\/ : \\_ - / : \\ | /_____/| / _/ __. __/\\ - \\___ \\/ \\/ \\ _ |/ \\ < - / . \\_ \\_ \\ \\ / / / - / | _ _ \\ / / / - \\ ______|______/\\_____________/\\_____ \\ __/\\________ / / - \\/ ____|_____/ \\____________/\\_______ \\/ /\\_______\\/ / - \\/ : x0^b7^imp! \\/ \\/ - -X0 -;; -9) -cat << X0 - - :_____ _________ __________ _______. - ______| \\__/ ___ \\ _/ ___ \\ / |__ - / | __/\\_ |/ \\\\_ |/ \\/ : \\_ - / : \\ | /_____/| / _/ __. __/\\ - \\___ \\/ \\/ \\ _ |/ \\_/ - / . /_ \\_ \\ \\ / /\\ - / | _ _ \\ / / / - \\ ______|______///\\_________///\\_____ \\ __///\\______ / / - \\/ ____|_____/ \\_______/ \\_____ \\/ / \\____\\/ / - \\/ : x0^b7^imp! \\/ \\/ - -X0 -;; -10) -cat << X0 - _____ _____ - \\ \\ / /_________ ___________ _____________ - \\ \\ / /\\\\ / _\\ __ /_\\\\ __ / - _ __\\ \\/ /_ __/ / _/ _/ / __ / __ _ - // /\\ \\\\ __\\__/ \\ \\/ / / / - / / \\ \\ //____/ \\ \\ / / - / / \\_____\\_______/ \\ \\__________// - \\_____\\\\ //_____/ x0^b7^imp! - -X0 -;; -esac diff --git a/zsh/.zsh/banner.zsh_ b/zsh/.zsh/banner.zsh_ new file mode 100755 index 0000000..9c2903b --- /dev/null +++ b/zsh/.zsh/banner.zsh_ @@ -0,0 +1,162 @@ +# ██ +# ░██ +# ██████ ██████░██ +# ░░░░██ ██░░░░ ░██████ +# ██ ░░█████ ░██░░░██ +# ██ ░░░░░██░██ ░██ +# ██████ ██████ ░██ ░██ +# ░░░░░░ ░░░░░░ ░░ ░░ +# +# ▓▓▓▓▓▓▓▓▓▓ +# ░▓ author ▓ xero +# ░▓ code ▓ http://code.xero.nu/dotfiles +# ░▓ mirror ▓ http://git.io/.files +# ░▓▓▓▓▓▓▓▓▓▓ +# ░░░░░░░░░░ +# +#█▓▒░ pick a random number +_RAND=`shuf -i1-10 -n1` + +#█▓▒░ display a random ascii banner +case $_RAND in +1) +cat << X0 + : + |\\____.____ .______._______. + ._____| / _/__ _|_ / \\ |__ + \\__ | _/_ _) Y _ _/__| __ / + / _ / \\ | | /| / | + / |___(__ |__| |_ | + \\_____l __ \\_____/__ l______/\\______/ + \\_____/ \\______/ \\______/\\______/ + x0^b7^imp! + +X0 +;; +2) +cat << X0 + : + |\\_____.____ /\\_____.________. + ._____| / _/___ _/_ / \\ _ |__ + \\__ | _/_ _) Y _ _/__| / / + / _ / \\ | | /| | + / :.. |____(__ ..:: |__| ..:: |_ ..:: | + \\_____l \\______/ l_______/\\_______/ + x0^b7^imp! + +X0 +;; +3) +cat << X0 + . + ____/|______.____ /\\_____.________. + \\ | / _/___ _/_ / \\ _ |__ + \\_ | __/ _) Y _ _/__| / / + / _ \\ \\ | | /| | + _/ .: | .: \\__ ..:: |__| ..:: |_ ..:: | + \\_____l____ /\\______/ l_______/\\_______/ + \\/ x0^b7^imp! + +X0 +;; +4) +cat << X0 + ____ _ . . _ ___ + \\ \\ + ___/\\ _____ /\\______ ____/\\ ___/\\ + \\ _ \\/ .://.:\\____//_\\_. \\ /./__ \\ + \\\\ / // ___// .\\/ _// \\ / \\ + /.: \\ \\_. // _. \\/ .:\\/ / + __/____/\\ __\\/__ //______| /\\_______/__ + \\ \\/ \\/ |/x0^b7^imp! / + _\\ | /_ + \\ / + +X0 +;; +5) +cat << X0 + + ___/\\ _____ /\\______ ____/\\ ___/\\ + \\ _ \\/ .://.:\\____//_\\_. \\ /./__ \\ + \\\\ / // ___// .\\/ _// \\ / \\ + /.: \\ \\_. // _. \\/ .:\\/ / + /____/\\ __\\/__ //______| /\\_______/ + \\/ \\/ |/x0^b7^imp! + +X0 +;; +6) +cat << X0 + + _________/\\________________________________/\\_______ + \\ / /\\_______ /______ /\\/ \\__ \\ + \\_ / _/ / _/ /\\_ _/ _/ / / / / + _/ _ \\_/ ______/_/ _ \\_/ / / / + \\ \\ / \\_ / \\ / \\/ / + \\______\\ /\\___________/______\\ /\\_________/ + \\ / \\ / x0^b7^imp! + \\/ \\/ + +X0 +;; +7) +cat << X0 + + ________ /\\________________________________/\\_______ + \\ / _________ _______ __/ \\__ \\ + \\_ / _/ / _/ /\\_ _/ _/ / / / / + _/ _ \\_/ ______/_/ _ \\_/ / / / + \\ \\ / \\_ / \\ / \\/ / + \\______\\ /\\___________/______\\ /\\_________/ + \\ / \\ / x0^b7^imp! + \\/ \\/ + +X0 +;; +8) +cat << X0 + + :_____ _________ __________ _______. + ______| \\__/ ___ \\ _/ ___ \\ / |__ + / | __/\\_ |/ \\\\_ |/ \\/ : \\_ + / : \\ | /_____/| / _/ __. __/\\ + \\___ \\/ \\/ \\ _ |/ \\ < + / . \\_ \\_ \\ \\ / / / + / | _ _ \\ / / / + \\ ______|______/\\_____________/\\_____ \\ __/\\________ / / + \\/ ____|_____/ \\____________/\\_______ \\/ /\\_______\\/ / + \\/ : x0^b7^imp! \\/ \\/ + +X0 +;; +9) +cat << X0 + + :_____ _________ __________ _______. + ______| \\__/ ___ \\ _/ ___ \\ / |__ + / | __/\\_ |/ \\\\_ |/ \\/ : \\_ + / : \\ | /_____/| / _/ __. __/\\ + \\___ \\/ \\/ \\ _ |/ \\_/ + / . /_ \\_ \\ \\ / /\\ + / | _ _ \\ / / / + \\ ______|______///\\_________///\\_____ \\ __///\\______ / / + \\/ ____|_____/ \\_______/ \\_____ \\/ / \\____\\/ / + \\/ : x0^b7^imp! \\/ \\/ + +X0 +;; +10) +cat << X0 + _____ _____ + \\ \\ / /_________ ___________ _____________ + \\ \\ / /\\\\ / _\\ __ /_\\\\ __ / + _ __\\ \\/ /_ __/ / _/ _/ / __ / __ _ + // /\\ \\\\ __\\__/ \\ \\/ / / / + / / \\ \\ //____/ \\ \\ / / + / / \\_____\\_______/ \\ \\__________// + \\_____\\\\ //_____/ x0^b7^imp! + +X0 +;; +esac diff --git a/zsh/.zsh/keychain.zsh b/zsh/.zsh/keychain.zsh index 630ee9b..a4fe935 100755 --- a/zsh/.zsh/keychain.zsh +++ b/zsh/.zsh/keychain.zsh @@ -15,7 +15,7 @@ # ░░░░░░░░░░ # #█▓▒░ ssh keys -export SSH_KEY_PATH="~/.ssh/id_rsa" +#export SSH_KEY_PATH="~/.ssh/id_rsa" #█▓▒░ funtoo keychain -eval `keychain -q --eval ~/.ssh/id_rsa_mail` +#eval `keychain -q --eval ~/.ssh/id_rsa_mail` -- cgit v1.2.1