diff --git a/.zshrc b/.zshrc index 994a89c..d47cbc4 100644 --- a/.zshrc +++ b/.zshrc @@ -52,8 +52,11 @@ ZSH_THEME="sunaku" # much, much faster. # DISABLE_UNTRACKED_FILES_DIRTY="true" +GREEN='\033[0;32m' +NC='\033[0m' # No Color + # Uncomment the following line if you want to change the command execution time -# stamp shown in the history command output. +# shown stamp in the history command output. # You can set one of the optional three formats: # "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" # or set a custom format using the strftime function format specifications, @@ -136,6 +139,23 @@ alias checkout='git checkout' alias master='git checkout master' alias blame='git log --graph --pretty=oneline --abbrev-commit' +alias 2c='rclone -P sync ~/Cloud/ b2://neohomeBkt' +alias c2='rclone -P sync b2://neohomeBkt ~/Cloud/' + +alias 2p='rclone -P sync ~/Public/ b2://neoPublicBkt' +alias p2='rclone -P sync b2://neoPublicBkt ~/Public/' + +fullsync() { + echo -e "${GREEN} ☑ Upload to Pvt ${NC}"; + 2c; + echo -e "${GREEN} ☑ Download from Pvt ${NC}"; + c2; + echo -e "${GREEN} ☑ Upload to Public ${NC}"; + 2p; + echo -e "${GREEN} ☑ Download from Pvt ${NC}"; + p2; +} + alias du="ncdu -rr -x --exclude .git --exclude node_modules" alias fixtouch="xinput map-to-output 9 eDP-1" @@ -163,11 +183,9 @@ lb() { # Get IP (call with myip) alias myip="curl http://ipecho.net/plain; echo" -if [ -f /etc/bash_completion ]; then - . /etc/bash_completion -fi -export PY_USER_BIN=$(python -c 'import site; print(site.USER_BASE + "/bin")') + +export PY_USER_BIN=$(python3 -c 'import site; print(site.USER_BASE + "/bin")') export PATH=$PY_USER_BIN:$PATH export NVM_DIR="$HOME/.nvm" @@ -178,7 +196,7 @@ alias yavide="gvim --servername yavide -f -N -u /opt/yavide/.vimrc" alias screenoff="sleep 1 ; xset dpms force off" -alias t="clear; python ~/t/t.py --task-dir ~/Dropbox --list tasks" +alias t="clear; python3 ~/t/t.py --task-dir ~/Dropbox --list tasks" function ta() { t "$1" t diff --git a/desktop/i3/config b/desktop/i3/config index 71e9d9d..4229e20 100644 --- a/desktop/i3/config +++ b/desktop/i3/config @@ -19,7 +19,7 @@ font pango:monospace 8 exec --no-startup-id compton #exec feh --bg-fill /home/david/Pictures/Wallpapers/ellie_full.jpg -exec_always feh --bg-center /home/david/Pictures/wall.jpg +exec_always feh --bg-max /home/david/Pictures/wall.jpg exec setxkbmap -layout gb,ru -variant ,winkeys -option grp:caps_toggle,grp_led:scroll,terminate:ctrl_alt_bksp,compose:ralt exec /home/david/.screenlayout/main.sh @@ -151,7 +151,8 @@ bindsym $mod+p exec "/usr/bin/mocp -G" bindsym $mod+k exec "/usr/bin/mocp -f" bindsym $mod+j exec "/usr/bin/mocp -r" -bindsym $super+l exec i3lock -i /home/david/Pictures/wall.png +#bindsym $super+l exec i3lock -i /home/david/Pictures/wall.png +bindsym $super+l exec i3lock-fancy # reload the configuration file #bindsym $mod+Shift+c reload # restart i3 inplace (preserves your layout/session, can be used to upgrade i3) diff --git a/desktop/i3status/config b/desktop/i3status/config index b6ea83f..2a07eae 100644 --- a/desktop/i3status/config +++ b/desktop/i3status/config @@ -3,13 +3,14 @@ general { interval = 5 } -order += "ethernet eth0" +order += "ethernet enp37s0" order += "path_exists VPN" order += "load" +order += "disk /" order += "tztime local" -order += "tztime berlin" +order += "tztime london" -ethernet eth0 { +ethernet enp37s0 { # if you use %speed, i3status requires the cap_net_admin capability format_up = "eth: %ip (%speed)" format_down = "eth" @@ -45,9 +46,9 @@ tztime local { format = "Day: %d Local: %H:%M" } -tztime berlin { - format = "HH: %H:%M" - timezone = "Europe/Berlin" +tztime london { + format = "London: %H:%M" + timezone = "Europe/London" } load { diff --git a/setup.sh b/setup.sh index c41ad07..7481fbd 100755 --- a/setup.sh +++ b/setup.sh @@ -14,6 +14,7 @@ then rm -rf ~/.vim~ rm -f ~/.vimrc~ rm -f ~/.bashrc~ + rm -f ~/.zshrc~ echo -e "${GREEN} Deleted old backups ${RESET}" fi @@ -33,6 +34,7 @@ echo -e "${GREEN} Backing Up and moving configs ${RESET}" mv ~/.config/i3status ~/.config/i3status~ mv ~/.config/i3 ~/.config/i3~ mv ~/.bashrc ~/.bashrc~ +mv ~/.zshrc ~/.zshrc~ mv ~/.vimrc ~/.vimrc~ mv ~/.vim ~/.vim~