aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.bashrc8
-rw-r--r--.config/dunst/dunstrc4
-rwxr-xr-x.config/sxiv/exec/key-handler8
-rw-r--r--.vimrc26
4 files changed, 23 insertions, 23 deletions
diff --git a/.bashrc b/.bashrc
index 6110eef..5259146 100644
--- a/.bashrc
+++ b/.bashrc
@@ -49,8 +49,8 @@ send() {
for name in "$@"
do
name=$(echo "http://shmibbles.me/tmp/$(basename $name)" | sed 's/ /%20/g')
- echo $name | xclip -i -selection clipboard
- echo $name | xclip -i -selection primary
+ echo $name | tr -d '\n' | xclip -i -selection clipboard
+ echo $name | tr -d '\n' | xclip -i -selection primary
done
fi
else
@@ -65,8 +65,8 @@ sendi() {
for name in "$@"
do
name=$(echo "http://shmibbles.me/img/$(basename $name)" | sed 's/ /%20/g')
- echo $name | xclip -i -selection clipboard
- echo $name | xclip -i -selection primary
+ echo $name | tr -d '\n' | xclip -i -selection clipboard
+ echo $name | tr -d '\n' | xclip -i -selection primary
done
fi
else
diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc
index e581916..3ac60ec 100644
--- a/.config/dunst/dunstrc
+++ b/.config/dunst/dunstrc
@@ -144,12 +144,12 @@
# Otherwise the '#' and following would be interpreted as a comment.
background = "#333333"
foreground = "#dcdcdc"
- timeout = 0
+ timeout = 10
[urgency_normal]
background = "#333333"
foreground = "#fcfcfc"
- timeout = 0
+ timeout = 10
[urgency_critical]
background = "#a25136"
diff --git a/.config/sxiv/exec/key-handler b/.config/sxiv/exec/key-handler
index 592f365..30b05a8 100755
--- a/.config/sxiv/exec/key-handler
+++ b/.config/sxiv/exec/key-handler
@@ -18,8 +18,8 @@ case "$1" in
notify-send "uploading $(basename $2) to /tmp/ failed"
else
name=$(echo "http://shmibbles.me/tmp/$(basename $2)" | sed 's/ /%20/g')
- echo "$name" | xclip -i -selection clipboard
- echo "$name" | xclip -i -selection primary
+ echo "$name" | tr -d '\n' | xclip -i -selection clipboard
+ echo "$name" | tr -d '\n' | xclip -i -selection primary
notify-send "uploaded $(basename $2) to /tmp/"
fi
;;
@@ -29,8 +29,8 @@ case "$1" in
notify-send "uploading $(basename $2) to /img/ failed"
else
name=$(echo "http://shmibbles.me/img/$(basename $2)" | sed 's/ /%20/g')
- echo "$name" | xclip -i -selection clipboard
- echo "$name" | xclip -i -selection primary
+ echo "$name" | tr -d '\n' | xclip -i -selection clipboard
+ echo "$name" | tr -d '\n' | xclip -i -selection primary
notify-send "uploaded $(basename $2) to /img/"
fi
;;
diff --git a/.vimrc b/.vimrc
index 266093a..2ff0919 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,5 +1,6 @@
syntax on
filetype plugin on
+"set omnifunc=syntaxcomplete#Complete
set autoindent
"colours!
@@ -7,9 +8,9 @@ colorscheme anotherdark
set background=dark
"tab controls to match pentadactyl
-map <C-n> <Esc>:tabn<CR>
-map <C-p> <Esc>:tabp<CR>
-map <C-t> <Esc>:tabnew<CR>
+noremap <C-n> <Esc>:tabn<CR>
+noremap <C-p> <Esc>:tabp<CR>
+noremap <C-t> <Esc>:tabnew<CR>
"insert lines above and below with (=|+)
"very hackish, but i couldn't think of a better way
@@ -21,11 +22,10 @@ let g:session_autosave = 'no'
let g:session_autoload = 'no'
"folds!
-map fo zO
-map fc zC
-map fm zM
-map fr zR
-
+nnoremap fo zO
+nnoremap fc zC
+nnoremap fm zM
+nnoremap fr zR
"copy words from above and below the cursor
inoremap <expr> <c-y> pumvisible() ? "\<c-y>" : matchstr(getline(line('.')-1), '\%' . virtcol('.') . 'v\%(\k\+\\|.\)')
@@ -69,26 +69,26 @@ autocmd FileType vim call Settings_vim()
function! Settings_asm()
setlocal cindent
set foldmethod=syntax
- map \\ A<Tab>;<Space>
+ noremap -- A<Tab>;<Space>
endfunction
function! Settings_c()
setlocal cindent
set foldmethod=syntax
- map \\ A<Space>/*<Space><Space>*/<Esc>hhi
+ noremap -- A<Space>/*<Space><Space>*/<Esc>hhi
endfunction
function! Settings_haskell()
setlocal smartindent
- map \\ A<Space>--<Space>
+ noremap -- A<Space>--<Space>
endfunction
function! Settings_script()
setlocal smartindent
- map \\ A<Space>#<Space>
+ noremap -- A<Space>#<Space>
endfunction
function! Settings_vim()
setlocal smartindent
- map \\ A<Space>"<Space>
+ noremap -- A<Space>"<Space>
endfunction