diff --git a/aliases/zsh_aliases b/aliases/zsh_aliases index 3d46750..3254f5c 100644 --- a/aliases/zsh_aliases +++ b/aliases/zsh_aliases @@ -69,8 +69,6 @@ function aptr() { sudo apt remove $1 ; } # config files {{{ # alias lc="f ~/linux-config/" -alias lci="f ~/Documents/coding/ideas/" -alias vli="ni ~/Documents/coding/ideas/ideas.md" alias lca="f ~/linux-config/aliases" alias vv="ni ~/.vimrc" @@ -248,6 +246,7 @@ alias gs="git status -u" alias gchm="git checkout master" alias gchnw="git checkout -b wip" alias gchw="git checkout wip" +alias gheadm1="git reset --hard HEAD~1" # push {{{ # alias egc="nvim -c \"set syn=gitcommit\" -c \"set tw=72\" commit-msg.txt" @@ -259,7 +258,7 @@ alias gcam="git commit --amend" # todo: fix function gcm(){ echo git commit -m \""$1"\" ; } -function gpsgst() { +function gpsg() { git add . git commit -m '.' git push @@ -321,13 +320,25 @@ function gpla() { # }}} git # # coding projs {{{ # -cd_coding_dir="f ~/Documents/coding" -alias ans="f /usr/local/android-studio/bin && ./studio.sh" +coding_dir="~/Documents/coding" +cd_coding_dir="f $coding_dir" alias cdn="$cd_coding_dir" + +# ideas +ideas_dir="$coding_dir""/ideas" +alias ids="f $ideas_dir" +alias lci="f $ideas_dir/general" +alias vli="ni $ideas_dir/ideas.md" +alias fyn="f $ideas_dir/yes-no" + +alias ans="f /usr/local/android-studio/bin && ./studio.sh" +# trapbot {{{ # alias tb="$cd_coding_dir/trapbot" alias vtb="$cd_coding_dir/trapbot && ni scan_reddit.py" alias ptb="python scan_reddit.py" alias rtb="$cd_coding_dir/trapbot && python scan_reddit.py" +# }}} trapbot # + # }}} coding projs # # school {{{ # @@ -403,7 +414,7 @@ function run() { # }}} compile and run with input file # # temp {{{ # -alias m7="make childcreates && ./childcreates 3" +alias m8="make checkpasswd && ./checkpasswd < passwd.in" alias m3="make pfact && ./pfact 10" alias 35w="c9 3-5_wait.c && ./3-5_wait.out abc a" # }}} temp # diff --git a/configs/NZXT/i3/config b/configs/NZXT/i3/config index edaa717..bd70f52 100644 --- a/configs/NZXT/i3/config +++ b/configs/NZXT/i3/config @@ -8,8 +8,8 @@ exec redshift -O 4000 exec_always ~/.local/bin/wal -i "$HOME/Pictures/Backgrounds/" # 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' -# exec --no-startup-id i3-msg 'workspace 2 ; exec $def_term' +# exec --no-startup-id i3-msg 'workspace 1 ; exec $def_term' +exec --no-startup-id i3-msg 'workspace 2 ; exec $def_term' exec --no-startup-id i3-msg 'workspace 3 ; exec google-chrome' # }}} startup # @@ -102,7 +102,7 @@ bindsym $mod+s layout stacking bindsym $mod+t layout tabbed bindsym $mod+e layout toggle split -# toggle tiling / floating +# toggle tiling /floating bindsym $mod+Shift+space floating toggle # change focus between tiling / floating windows @@ -121,11 +121,11 @@ set $samsung "DVI-I-1" set $benq "HDMI-0" set $ws1 "1 " -workspace $ws1 output $samsung +workspace $ws1 output $benq bindsym $mod+F1 workspace $ws1; exec $def_term set $ws2 "2 " -workspace $ws2 output $benq +workspace $ws2 output $samsung bindsym $mod+F2 workspace $ws2; exec $def_term set $ws3 "3 " diff --git a/dotfiles/vimrc b/dotfiles/vimrc index f7965ad..177ccd1 100644 --- a/dotfiles/vimrc +++ b/dotfiles/vimrc @@ -142,6 +142,8 @@ nnoremap | let mapleader="\" " replace vim-commentary Markdown comments with HTML nnoremap cmt :%s/>\(.*\)>//g +" delete line into system clipboard +nnoremap D "+dd " reload file nnoremap e :e " reload folds diff --git a/dotfiles/zshrc b/dotfiles/zshrc index cebd334..bcdd0ef 100644 --- a/dotfiles/zshrc +++ b/dotfiles/zshrc @@ -97,6 +97,7 @@ source ~/linux-config/aliases/zsh_aliases if [ "$(whoami)" = "kevin" ]; then export PATH="${PATH}:${HOME}/.local/bin/" (cat ~/.cache/wal/sequences &) + xset r rate 200 60 fi # NZXT if [ "$(hostname)" = "NZXT" ]; @@ -106,9 +107,8 @@ then xmodmap -e "keycode 66 = BackSpace" # keyboard repeat rate - gsettings set org.gnome.desktop.peripherals.keyboard delay 25 - gsettings set org.gnome.desktop.peripherals.keyboard repeat-interval 200 + # gsettings set org.gnome.desktop.peripherals.keyboard delay 25 + # gsettings set org.gnome.desktop.peripherals.keyboard repeat-interval 200 else xrandr --dpi 150 - xset r rate 200 60 fi