diff --git a/aliases/zsh_aliases b/aliases/zsh_aliases index 4909a0f..44c99da 100644 --- a/aliases/zsh_aliases +++ b/aliases/zsh_aliases @@ -19,7 +19,8 @@ alias hst="history" alias nf="neofetch" alias rur="xrdb ~/.Xresources" function gvx() { urxvt --help 2>&1 | grep $1 ; } -alias dum="du -B M" +# list file sizes in megabytes with depth 1 +alias dum="du -d 1 -B M" # install deb files function ideb() { sudo dpkg -i $1 ; } @@ -242,6 +243,7 @@ alias gchm="git checkout master" alias gchnw="git checkout -b wip" alias gchw="git checkout wip" alias gheadm1="git reset --hard HEAD~1" +alias glstf="git ls-tree -r HEAD --name-only" # push {{{ # alias egc="nvim -c \"set syn=gitcommit\" -c \"set tw=72\" commit-msg.txt" @@ -249,7 +251,7 @@ alias gst="git stash" alias gstp="git stash pop" alias gc="git commit" -alias gcam="git commit --amend" +alias gcam="ga && git commit --amend" # todo: fix function gcm(){ echo git commit -m \""$1"\" ; } @@ -259,8 +261,7 @@ function psg() { git push } alias gps="git push" -alias gpsfrc="git push --force" -alias gdwip="git push -d origin wip && git branch -D wip" +alias gpsf="git push --force" alias gclear="git stash clear" # }}} push # @@ -281,9 +282,12 @@ alias crm="mrk README.md" # functions {{{ function gcho() { git checkout $1 ; } +function gchon() { git checkout -b $1 ; } function gcln() { git clone $1 ; } function gchp() { git cherry-pick $1 ; } +alias gchpc="git cherry-pick --continue" +# add multiple push repos function gremotes() { git remote set-url --add --push origin $1 git remote set-url --add --push origin $2 @@ -300,16 +304,10 @@ function gmrgr() { } # }}} merge repos # +# assume file unchanged function gunc() { git update-index --assume-unchanged $1 ; } - -# pull all {{{ # -function gpla() { - cmds="lc snp 9r sch" - for cmd in $cmds; do - eval $cmd && gst && gpl && gstp && gclear - done -} -# }}} pull all # +# delete branch locally and on server +function grmb() { git push -d origin $1 && git branch -D $1 ; } # functions }}} @@ -372,7 +370,7 @@ alias pr3="$cd_school/136/par/3" cd_209="f ~/Documents/School/209"; alias 209="$cd_209" alias 9r="$cd_209/mokkar" -alias l8="$cd_209/mokkar/lab8" +alias l9="$cd_209/mokkar/lab9" alias 9a="$cd_209/mokkar/a3" # }}} @@ -410,10 +408,12 @@ function run() { # }}} compile and run with input file # # temp {{{ # -alias m8="make checkpasswd && ./checkpasswd < passwd.in" -alias m3="make pfact && ./pfact.out 14" -function pf() { ./pfact.out $1 ; } -alias 35w="c9 3-5_wait.c && ./3-5_wait.out abc a" +function m9() { + c9 write_test_file.c + ./write_test_file.out test.txt + od -vtu1 test.txt +} +alias m92="c9 time_reads.c && ./time_reads.out 1 test.txt" # }}} temp # # }}} diff --git a/configs/NZXT/i3/config b/configs/NZXT/i3/config index bd70f52..91356d2 100644 --- a/configs/NZXT/i3/config +++ b/configs/NZXT/i3/config @@ -3,9 +3,7 @@ set $def_term "rxvt-unicode" exec redshift -O 4000 # random bg -# exec_always feh -z --bg-fill ~/Pictures/Backgrounds/* -# exec_always feh --bg-fill ~/Pictures/Backgrounds/ -exec_always ~/.local/bin/wal -i "$HOME/Pictures/Backgrounds/" +exec ~/.local/bin/wal -i "$HOME/Pictures/Backgrounds/vibrant" # exec_always ~/.local/bin/wal -i "$HOME/Pictures/Backgrounds/retro-mountains-pink.jpg" exec imwheel # exec --no-startup-id i3-msg 'workspace 1 ; exec $def_term' @@ -89,9 +87,9 @@ bindsym control+Shift+x kill # container display {{{ # # backgrounds -# bindsym $mod+g exec feh -z --bg-fill ~/Pictures/Backgrounds/* -bindsym $mod+g exec ~/.local/bin/wal -i "$HOME/Pictures/Backgrounds/" -# bindsym $mod+z exec feh --bg-max ~/Pictures/Backgrounds/deadpool.png +bindsym $mod+q exec ~/.local/bin/wal -i "$HOME/Pictures/Backgrounds/vibrant" +bindsym $mod+w exec ~/.local/bin/wal -i "$HOME/Pictures/Backgrounds/dim" +bindsym $mod+r exec ~/.local/bin/wal -i "$HOME/Pictures/Backgrounds/" bindsym $mod+z exec ~/.local/bin/wal -i "$HOME/Pictures/Backgrounds/sunset-2.jpg" # enter fullscreen mode for the focused container @@ -147,6 +145,7 @@ assign [class="Slack"] $ws6 set $ws7 "7 " workspace $ws7 output $samsung +bindsym $mod+F7 workspace $ws7; exec $def_term set $ws8 "8 " assign [class="jetbrains-"] $ws8 @@ -213,10 +212,10 @@ bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcu # }}} reload config # # resizing windows {{{ # -bindsym $mod+control+h resize grow width 10 px or 10 ppt -bindsym $mod+control+k resize grow height 10 px or 10 ppt -bindsym $mod+control+j resize shrink height 10 px or 10 ppt -bindsym $mod+control+l resize shrink width 10 px or 10 ppt +bindsym $mod+control+h resize grow width 3 px or 3 ppt +bindsym $mod+control+k resize grow height 3 px or 3 ppt +bindsym $mod+control+j resize shrink height 3 px or 3 ppt +bindsym $mod+control+l resize shrink width 3 px or 3 ppt # }}} resizing windows # # gaps {{{ # diff --git a/dotfiles/Xresources b/dotfiles/Xresources index ae525dd..840916a 100644 --- a/dotfiles/Xresources +++ b/dotfiles/Xresources @@ -1,13 +1,11 @@ ! URxvt.font: xft:hack:size=14 URxvt.font: xft:hack:size=13 -/* transparency {{{ */ URxvt*inheritPixmap: true URxvt*transparent: true ! URxvt*shading: 0 to 99 darkens, 101 to 200 lightens -URxvt*shading: 40 -! URxvt*shading: 20 -/* }}} transparency */ +! URxvt*shading: 30 +URxvt*shading: 20 URxvt.scrollBar: false