diff options
-rw-r--r-- | awesome/.config/awesome/rc.lua | 6 | ||||
-rw-r--r-- | meta/.bashrc | 14 | ||||
-rwxr-xr-x | vim/.vim/vimrc | 5 |
3 files changed, 8 insertions, 17 deletions
diff --git a/awesome/.config/awesome/rc.lua b/awesome/.config/awesome/rc.lua index 6b41199..108514a 100644 --- a/awesome/.config/awesome/rc.lua +++ b/awesome/.config/awesome/rc.lua @@ -374,11 +374,11 @@ globalkeys = awful.util.table.join( {description = "lock screen then suspend", group = "launcher"}), awful.key({modkey}, "c", function() awful.spawn(cmus) end, {description = "open cmus music player", group = "launcher"}), - awful.key({modkey, "Shift"}, "c", function() awful.spawn(cmus_pause) end, + awful.key({modkey}, "XF86AudioPlay", function() awful.spawn(cmus_pause) end, {description = "cmus: pause", group = "multimedia"}), - awful.key({modkey, "Control"}, "c", function() awful.spawn(cmus_prev) end, + awful.key({modkey}, "XF86AudioPrev", function() awful.spawn(cmus_prev) end, {description = "cmus: previous track", group = "multimedia"}), - awful.key({modkey, "Mod1"}, "c", function() awful.spawn(cmus_next) end, + awful.key({modkey}, "XF86AudioNext", function() awful.spawn(cmus_next) end, {description = "cmus: next track", group = "multimedia"}), awful.key({}, "XF86AudioRaiseVolume", volume_raise, {description = "raise 5% volume", group = "multimedia"}), diff --git a/meta/.bashrc b/meta/.bashrc index 334c920..18171d0 100644 --- a/meta/.bashrc +++ b/meta/.bashrc @@ -88,8 +88,8 @@ fi export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' # some more ls aliases -#alias ll='ls -l' -#alias la='ls -A' +alias ll='ls -l' +alias la='ls -A' #alias l='ls -CF' # Alias definitions. @@ -99,22 +99,14 @@ export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quo alias x='cd ~ && startx' alias scot='scrot ~/Pictures/Screenshots/%FT%T.png' alias gcc='gcc -O2 -lm' -alias fpc='fpc -O1 -XS' +alias fpc='fpc -O1 -XS -gl' alias mount='udevil mount' alias umount='udevil umount' TF_ALIAS=fuck alias fuck='eval $(thefuck $(fc -ln -1)); history -r' - if [ -f ~/.bash_aliases ]; then . ~/.bash_aliases fi -function dct { - while true - do - dict $1 | less - done -} - # enable programmable completion features (you don't need to enable # this, if it's already enabled in /etc/bash.bashrc and /etc/profile # sources /etc/bash.bashrc). diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc index a8e8239..1effa97 100755 --- a/vim/.vim/vimrc +++ b/vim/.vim/vimrc @@ -17,14 +17,13 @@ if has("patch-7.4.710") && has("gui_running") else set listchars+=tab:├─ endif -set tabstop=8 expandtab shiftwidth=4 softtabstop=4 smarttab +set tabstop=8 expandtab shiftwidth=2 softtabstop=2 smarttab set omnifunc=syntaxcomplete#Complete set dictionary=/usr/share/dict/words set keymap=vietnamese-telex imdisable iminsert=0 imsearch=-1 autocmd BufNewFile,BufRead *.PAS setlocal filetype=pascal -autocmd FileType vim,pascal,lua,html,rst setlocal shiftwidth=2 tabstop=2 autocmd FileType c,h,cpp,arduino setlocal noexpandtab shiftwidth=8 tabstop=8 -autocmd FileType markdown setlocal textwidth=79 +autocmd FileType markdown,python setlocal shiftwidth=2 tabstop=2 autocmd FileType python syntax keyword pythonBoolean False True None autocmd BufWinEnter * let w:m1=matchadd('ColorColumn', '\%<81v.\%>80v', -1) map Q gq |