dotfiles

commit 658c9624f1580f2e107e2c9de061697ebf633149
parent c0e8d2b99c112ca203c055949a5ab5141e2a0b3a
Author: Matsuda Kenji <ftvda283@gmail.com>
Date:   Mon,  5 Oct 2020 13:56:45 +0900

edited x11

Diffstat:
R
.Xmodmap -> .config/X11/Xmodmap
 | 
0

R
.Xresources -> .config/X11/Xresources
 | 
0

M
.config/X11/xinitrc
 | 
7
+++----
M
.config/nvim/init.vim
 | 
31
+++++++++++++++++++++----------

4 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/.Xmodmap b/.config/X11/Xmodmap
diff --git a/.Xresources b/.config/X11/Xresources
diff --git a/.config/X11/xinitrc b/.config/X11/xinitrc
@@ -1,12 +1,10 @@
 #!/bin/sh
 
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
+userresources=$XDG_CONFIG_HOME/X11/Xresources
+usermodmap=$Home/.Xmodmap
 sysresources=/etc/X11/xinit/.Xresources
 sysmodmap=/etc/X11/xinit/.Xmodmap
 
-# merge in defaults and keymaps
-
 if [ -f $sysresources ]; then
     xrdb -merge $sysresources
 fi
@@ -38,4 +36,5 @@ export GTK_IM_MODULE=fcitx
 export QT_IM_MODULE=fcitx
 export XMODIFIERS="@im=fcitx"
 
+fcitx &
 exec i3
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
@@ -13,13 +13,24 @@ noremap <c-j> <c-w><c-j>
 noremap <c-k> <c-w><c-k>
 noremap <c-l> <c-w><c-l>
 
-autocmd Filetype html inoremap ;1 <h1></h1><++><Esc>8hi
-autocmd Filetype html inoremap ;2 <h2></h2><++><Esc>8hi
-autocmd Filetype html inoremap ;3 <h3></h3><++><Esc>8hi
-autocmd Filetype html inoremap ;4 <h4></h4><++><Esc>8hi
-autocmd Filetype html inoremap ;5 <h5></h5><++><Esc>8hi
-autocmd Filetype html inoremap ;6 <h6></h6><++><Esc>8hi
-autocmd Filetype html inoremap ;p <p></p><++><Esc>7hi
-autocmd Filetype html inoremap ;b <b></b><++><Esc>7hi
-autocmd Filetype html inoremap ;i <i></i><++><Esc>7hi
-autocmd Filetype html noremap <Space><Space> /<++><Enter>"_4dla
+map <up> <nop>
+map <down> <nop>
+map <left> <nop>
+map <right> <nop>
+
+imap <up> <nop>
+imap <down> <nop>
+imap <left> <nop>
+imap <right> <nop>
+
+autocmd Filetype html inoremap ;1 <h1></h1><Esc>4hi
+autocmd Filetype html inoremap ;2 <h2></h2><Esc>4hi
+autocmd Filetype html inoremap ;3 <h3></h3><Esc>4hi
+autocmd Filetype html inoremap ;4 <h4></h4><Esc>4hi
+autocmd Filetype html inoremap ;5 <h5></h5><Esc>4hi
+autocmd Filetype html inoremap ;6 <h6></h6><Esc>4hi
+autocmd Filetype html inoremap ;p <p></p><Esc>3hi
+autocmd Filetype html inoremap ;b <b></b><Esc>3hi
+autocmd Filetype html inoremap ;i <i></i><Esc>3hi
+autocmd Filetype html inoremap ;pre <pre></pre><Esc>5hi
+autocmd Filetype html inoremap ;cd <code></code><Esc>6hi