some vim and neovim changes, also add alacritty

5 files changed, 121 insertions, 70 deletions

diff --git a/.config/.emacs b/.config/.emacs
new file mode 100644
index 0000000..8492a0b
--- /dev/null
+++ b/.config/.emacs
@@ -0,0 +1,31 @@
+(menu-bar-mode 0)
+(tool-bar-mode 0)
+(scroll-bar-mode 0)
+
+(setq inhibit-startup-screen t)
+
+(add-to-list 'default-frame-alist '(font . "PxPlus IBM VGA 8x16-12"))
+
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ '(custom-enabled-themes '(apropospriate-dark))
+ '(custom-safe-themes
+   '("f1b2de4bc88d1120782b0417fe97f97cc9ac7c5798282087d4d1d9290e3193bb"
+     "b6c43bb2aea78890cf6bd4a970e6e0277d2daf0075272817ea8bb53f9c6a7f0a"
+     "0ed3d96a506b89c1029a1ed904b11b5adcebeb2e0c16098c99c0ad95cb124729"
+     "b273cc6a1d492660fff886a3cae1f00d5fd2d53b55fb374a21a14afd74fdec92"
+     "d80952c58cf1b06d936b1392c38230b74ae1a2a6729594770762dc0779ac66b7"
+     "da75eceab6bea9298e04ce5b4b07349f8c02da305734f7c0c8c6af7b5eaa9738"
+     default))
+ '(package-selected-packages
+   '(ample-theme anti-zenburn-theme apropospriate-theme gruvbox-theme
+		 rfc-mode)))
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ )
diff --git a/.config/.vimrc b/.config/.vimrc
index 55f9908..5b07ac5 100644
--- a/.config/.vimrc
+++ b/.config/.vimrc
@@ -1,52 +1,42 @@
-source $VIMRUNTIME/defaults.vim
-
-let data_dir = has('nvim') ? stdpath('data') . '/site' : '~/.vim'
-if empty(glob(data_dir . '/autoload/plug.vim'))
-  silent execute '!curl -fLo '.data_dir.'/autoload/plug.vim --create-dirs  https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
-  autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
-endif
-
-call plug#begin()
-Plug '4513ECHO/vim-colors-hatsunemiku'
-call plug#end()
-
+"Visual
 set termguicolors
-colorscheme hatsunemiku
-
-"set shiftwidth=4
-"set smarttab
-"set expandtab
-"set tabstop=4
-"set softtabstop=0
+syntax on
+hi normal guifg=#dcd7d7 guibg=#242829
+hi comment gui=italic
+hi string guifg=#bf739f
+set laststatus=0
+let g:netrw_banner=0
 
-set tabstop=8
-set shiftwidth=8
-set softtabstop=8
+"Formatting
+set tabstop=4
+set shiftwidth=4
+set softtabstop=4
 set textwidth=80
 set noexpandtab
-
 set nowrap
 set cindent
-"set cinoptions=(,{,!,l1
 set cinoptions=:0,l1,t0,g0,(0
 
-let g:netrw_banner=0
-
-set makeprg=./build.sh
+"Functional
+set incsearch
+set nohlsearch
 
+"Bindings
 let mapleader=","
 
-map <leader>e  :Ex<cr>
-map <leader>ve :vs<bar>wincmd l<bar>Ex<cr>
-map <leader>t  :vertical rightbelow terminal<space>
-map <leader>m  :make!<cr>:vertical rightbelow copen<cr><cr>:wincmd =<cr>
-map <leader>n  :cnext<cr>
-map <leader>z  :cd %:p:h<cr>
-map <leader>q  :q<cr>
-map <leader>b  :buffers<cr>:b<space>
+map <leader>e	:Ex<cr>
+map <leader>ve	:vs<bar>wincmd l<bar>Ex<cr>
+map <leader>t	:vertical rightbelow terminal<space>
+map <leader>b	:buffers<cr>:b<space>
+map <leader>q	:q<cr>
+
+set makeprg=./build.sh
+map <leader>m	:make!<cr>:vertical rightbelow copen<cr><cr>:wincmd =<cr>
+map <leader>n	:cnext<cr>
 
 map <leader>y "+y
 map <leader>p "+p
 
+"Comments
 map <leader>cm I/*<space><esc>A<space>*/<esc>0
 map <leader>cd ^dwA<backspace><backspace><backspace><esc>0
diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml
new file mode 100644
index 0000000..6914ebc
--- /dev/null
+++ b/.config/alacritty/alacritty.toml
@@ -0,0 +1,8 @@
+[general]
+import = [
+	"~/.config/alacritty/themes/hatsunemiku.toml"
+]
+
+[font]
+normal = { family = "PxPlus IBM VGA 8x16", style = "Regular" } 
+size = 12.0
diff --git a/.config/alacritty/themes/hatsunemiku.toml b/.config/alacritty/themes/hatsunemiku.toml
new file mode 100644
index 0000000..d39317a
--- /dev/null
+++ b/.config/alacritty/themes/hatsunemiku.toml
@@ -0,0 +1,23 @@
+[colors.primary]
+background = '#242829'
+foreground = '#dcd7d7'
+
+[colors.normal]
+black   = '#242829'
+red     = '#df2683'
+green   = '#13868c'
+yellow  = '#fcfcdf'
+blue    = '#1a86b9'
+magenta = '#bc7fd2'
+cyan    = '#7cc7d6'
+white   = '#4a4b4b'
+
+[colors.bright]
+black   = '#7b8b99'
+red     = '#df2683'
+green   = '#13868c'
+yellow  = '#fcfcdf'
+blue    = '#1a86b9'
+magenta = '#bc7fd2'
+cyan    = '#7cc7d6'
+white   = '#dcd7d7'
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 6af4444..df25163 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -1,47 +1,46 @@
-let data_dir = has('nvim') ? stdpath('data') . '/site' : '~/.vim'
-if empty(glob(data_dir . '/autoload/plug.vim'))
-  silent execute '!curl -fLo '.data_dir.'/autoload/plug.vim --create-dirs  https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
-  autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
-endif
-
-call plug#begin()
-Plug '4513ECHO/vim-colors-hatsunemiku'
-call plug#end()
-
+"Visual
+syntax off
 set termguicolors
-colorscheme hatsunemiku
-
-set incsearch
-set nohlsearch
-
-set clipboard+=unnamedplus
+colorscheme habamax
+hi normal guifg=#dcd7d7 guibg=#242829
+hi comment gui=italic
+hi string guifg=#bf739f
+set laststatus=0
+let g:netrw_banner=0
 
-set tabstop=8
-set shiftwidth=8
-set softtabstop=8
+"Formatting
+set tabstop=4
+set shiftwidth=4
+set softtabstop=4
 set textwidth=80
 set noexpandtab
-
 set nowrap
 set cindent
 set cinoptions=:0,l1,t0,g0,(0
 
-let g:netrw_banner=0
+"Functional
+set clipboard+=unnamedplus
+set incsearch
+set nohlsearch
+
+"Bindings
+let mapleader=","
+
+map <leader>e	:Ex<cr>
+map <leader>ve	:vs<bar>wincmd l<bar>Ex<cr>
+map <leader>t	:vertical rightbelow terminal<space>
+map <leader>b	:buffers<cr>:b<space>
+map <leader>q	:q<cr>
+
+map <leader>sh	:split<space>
+map <leader>sv	:vertical<space>split<space>
 
 set makeprg=./build.sh
+map <leader>m	:make!<cr>:vertical rightbelow copen<cr><cr>:wincmd =<cr>
+map <leader>n	:cnext<cr>
 
-let mapleader=","
+map <leader>g	:grep!<space>-rn<space><space>.<left><left>''<left>
 
-map <leader>e  :Ex<cr>
-map <leader>ve :vs<bar>wincmd l<bar>Ex<cr>
-map <leader>t  :vertical rightbelow terminal<space>
-map <leader>m  :make!<cr>:vertical rightbelow copen<cr><cr>:wincmd =<cr>
-map <leader>n  :cnext<cr>
-map <leader>z  :cd %:p:h<cr>
-map <leader>q  :q<cr>
-map <leader>b  :buffers<cr>:b<space>
-map <leader>p  :let @+ = expand("%")<cr>
-map <leader>fp :let @+ = expand("%:p")<cr>
-
-map <leader>cm I/*<space><esc>A<space>*/<esc>0
-map <leader>cd ^dwA<backspace><backspace><backspace><esc>0
+"Comments
+map <leader>cm	I/*<space><esc>A<space>*/<esc>0
+map <leader>cd	^dwA<backspace><backspace><backspace><esc>0