change vim nvim and emacs configsHEADmaster

7 files changed, 88 insertions, 67 deletions

diff --git a/.config/.emacs b/.config/.emacs
index 7cbf3ea..9e9164c 100644
--- a/.config/.emacs
+++ b/.config/.emacs
@@ -5,12 +5,20 @@
 
 ;; functional
 (set-default 'ring-bell-function 'ignore)
+(setq c-basic-offset 8)
+(setq indent-line-function 'insert-tab)
+
+;; keybinds
+(keymap-global-set "C-c c" 'compile)
 
 ;; visual
 (setq inhibit-startup-screen t)
 (set-default 'truncate-lines t)
-(add-to-list 'default-frame-alist '(font . "Iosevka-14"))
-(load-theme 'wombat t)
+(add-to-list 'default-frame-alist '(font . "FantasqueSansM Nerd Font-16"))
+(add-to-list 'custom-theme-load-path "~/.emacs.d/themes")
+(load-theme 'kanagawa t)
 
-;; keymaps
-(keymap-global-set "C-c c" 'compile)
+(custom-set-variables
+ '(package-selected-packages '(autothemer)))
+(custom-set-faces
+ )
diff --git a/.config/.vimrc b/.config/.vimrc
index 4914f6f..8ad26f8 100644
--- a/.config/.vimrc
+++ b/.config/.vimrc
@@ -1,24 +1,37 @@
+call plug#begin()
+Plug 'junegunn/goyo.vim'
+Plug 'junegunn/fzf.vim'
+call plug#end()
+
 "visual
 syntax on
 let g:netrw_banner=0
 set termguicolors
 set background=dark
 colorscheme quiet
-hi normal       guifg=#dcd7d7 guibg=#242829
-hi constant     guifg=#dcade6
-hi character    guifg=#dcade6
-hi number       guifg=#dcade6
-hi boolean      guifg=#dcade6
-hi float        guifg=#dcade6
-hi identifier   guifg=#5ac3fd
-hi statement    guifg=#3eade6
-hi type         guifg=#88cdf4 
-hi special      guifg=#5ac3fd
-hi preproc	guifg=#3eade6
-hi visual       guifg=#dcade6 guibg=#242829
-hi incsearch    guifg=#dcade6 guibg=#242829
-hi matchparen   guifg=#dcade6 guibg=#242829
-hi quickfixline guifg=#242829 guibg=#3eade6
+let v:colornames['bg0'] = '#242829'
+let v:colornames['fg0'] = '#dcd7d7'
+let v:colornames['mag'] = '#e18d8e'
+let v:colornames['cya'] = '#5cadc6'
+let v:colornames['blu'] = '#84b8a9'
+let v:colornames['redu'] = '#e6507a'
+let v:colornames['yel'] = '#2e89a5'
+hi normal       guifg=fg0 guibg=bg0
+hi constant     guifg=mag
+hi character    guifg=mag
+hi number       guifg=mag
+hi boolean      guifg=mag
+hi float        guifg=mag
+hi identifier   guifg=yel
+hi statement    guifg=blu
+hi type         guifg=cya
+hi special      guifg=yel
+hi preproc      guifg=blu
+hi visual       guifg=mag guibg=bg0
+hi incsearch    guifg=mag guibg=bg0
+hi matchparen   guifg=mag guibg=bg0
+hi quickfixline guifg=bg0 guibg=fg0
+hi error	guifg=bg0 guibg=redu
 
 "formatting
 set nowrap
@@ -27,12 +40,6 @@ autocmd BufRead,BufNewFile *.c,*.cpp {
 	set cinoptions=:0,l1,t0,g0,(0
 }
 
-"autocmd BufRead,BufNewFile *.cpp {
-"	set tabstop=4
-"    set shiftwidth=4
-"	set expandtab
-"}
-
 "functional
 set clipboard+=unnamedplus
 set nohlsearch
@@ -47,7 +54,6 @@ map <leader>s	:Sex<cr>
 map <leader>q	:q<cr>
 
 set makeprg=./build.sh
-map <leader>m	:make!<cr>
-":cope<cr>
+map <leader>m	:make!<cr>:cope<cr>
 map <leader>n	:cnext<cr>
 map <leader>g	:grep!<space>-rn<space><space>.<left><left>''<left>
diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml
index bafbb7e..821274d 100644
--- a/.config/alacritty/alacritty.toml
+++ b/.config/alacritty/alacritty.toml
@@ -1,30 +1,30 @@
 [window]
-padding = { x = 2, y = 2 }
+padding = { x = 4, y = 4 }
 
 [font]
-normal = { family = "FantasqueSansM Nerd Font" }
-size = 11.0
+normal = { family = "Iosevka", style = "Regular" }
+size = 15
 
 [colors.primary]
 background = '#242829'
 foreground = '#dcd7d7'
 
 [colors.normal]
-black   = '#282828'
-red     = '#cc241d'
-green   = '#98971a'
-yellow  = '#d79921'
-blue    = '#458588'
-magenta = '#b16286'
-cyan    = '#689d6a'
-white   = '#a89984'
+black   = '#242829'
+red     = '#e6507a'
+green   = '#439085'
+yellow  = '#2e89a5'
+blue    = '#84b8a9'
+magenta = '#e18d8e'
+cyan    = '#5cadc6'
+white   = '#dcd7d7'
 
 [colors.bright]
-black   = '#928374'
-red     = '#fb4934'
-green   = '#b8bb26'
-yellow  = '#fabd2f'
-blue    = '#83a598'
-magenta = '#d3869b'
-cyan    = '#8ec07c'
-white   = '#ebdbb2'
+black   = '#242829'
+red     = '#e6507a'
+green   = '#439085'
+yellow  = '#2e89a5'
+blue    = '#84b8a9'
+magenta = '#e18d8e'
+cyan    = '#5cadc6'
+white   = '#dcd7d7'
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
deleted file mode 100644
index a3dc542..0000000
--- a/.config/nvim/lazy-lock.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "fzf-lua": { "branch": "main", "commit": "8adf950093af5361621cf52208d64995b1af78b5" },
-  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }
-}
diff --git a/.config/nvim/lua/keymaps.lua b/.config/nvim/lua/keymaps.lua
index c2f2e62..e488e46 100644
--- a/.config/nvim/lua/keymaps.lua
+++ b/.config/nvim/lua/keymaps.lua
@@ -1,8 +1,3 @@
 -- bindings
-vim.keymap.set("n", "<leader>q", ":q<cr>")
-vim.keymap.set("n", "<leader>e", ":Ex<cr>")
-vim.keymap.set("n", "<leader>m", ":make!<cr>:copen<cr><cr>")
-vim.keymap.set("n", "<leader>g", ":grep!<space>-rn<space><space>.<left><left>''<left>")
--- comments
-vim.keymap.set("n", "<leader>cm", "I//<space><esc>^")
-vim.keymap.set("n", "<leader>cd", "^dw")
+vim.keymap.set("n", "<M-m>", ":make!<cr>:copen<cr><cr>")
+vim.keymap.set("n", "<M-g>", ":grep!<space>-rn<space><space>.<left><left>''<left>")
diff --git a/.config/nvim/lua/options.lua b/.config/nvim/lua/options.lua
index cfdd0c6..d27f9c9 100644
--- a/.config/nvim/lua/options.lua
+++ b/.config/nvim/lua/options.lua
@@ -2,16 +2,32 @@
 vim.opt.termguicolors = true
 vim.cmd("syntax on")
 -- vim.cmd("colorscheme desert")
+local palette = {
+	black = "#242829",
+	white = "#dcd7d7",
+	magenta = "#e18d8e",
+	cyan = "#5cadc6",
+	blue = "#84b8a9",
+	red = "#e6507a",
+	yellow = "#2e89a5",
+}
 vim.cmd("colorscheme quiet")
-vim.cmd("hi normal       guifg=#dcd7d7 guibg=#242829");
-vim.cmd("hi constant     guifg=#dcade6");
-vim.cmd("hi character    guifg=#dcade6");
-vim.cmd("hi number       guifg=#dcade6");
-vim.cmd("hi boolean      guifg=#dcade6");
-vim.cmd("hi float        guifg=#dcade6");
-vim.cmd("hi visual       guifg=#dcade6 guibg=#242829");
-vim.cmd("hi incsearch    guifg=#dcade6 guibg=#242829");
-vim.cmd("hi MatchParen   guifg=#dcade6 guibg=#242829");
+vim.cmd("hi normal       guifg=" .. palette.white .. " guibg=" .. palette.black)
+vim.cmd("hi constant     guifg=" .. palette.magenta)
+vim.cmd("hi character    guifg=" .. palette.magenta)
+vim.cmd("hi number       guifg=" .. palette.magenta)
+vim.cmd("hi boolean      guifg=" .. palette.magenta)
+vim.cmd("hi float        guifg=" .. palette.magenta)
+vim.cmd("hi identifier   guifg=" .. palette.yellow)
+vim.cmd("hi statement    guifg=" .. palette.blue)
+vim.cmd("hi type         guifg=" .. palette.cyan)
+vim.cmd("hi special      guifg=" .. palette.yellow)
+vim.cmd("hi preproc      guifg=" .. palette.blue)
+vim.cmd("hi visual       guifg=" .. palette.magenta .. "guibg=" .. palette.black)
+vim.cmd("hi incsearch    guifg=" .. palette.magenta .. "guibg=" .. palette.black)
+vim.cmd("hi matchparen   guifg=" .. palette.magenta .. "guibg=" .. palette.black)
+vim.cmd("hi quickfixline guifg=" .. palette.black .. "guibg=" .. palette.white)
+vim.cmd("hi error        guifg=" .. palette.black .. "guibg=" .. palette.red)
 vim.g.netrw_banner = false
 
 -- formatting
@@ -25,5 +41,4 @@ vim.opt.cinoptions = ":0,l1,t0,g0,(0"
 -- functional
 vim.opt.clipboard:append { "unnamedplus" }
 vim.opt.hlsearch = false
-vim.g.mapleader = ","
 vim.opt.makeprg = "./build.sh"
diff --git a/web b/web
index a7ec974..e978399 100644
--- a/web
+++ b/web
@@ -6,3 +6,4 @@ lainchan.org
 badplace.eu
 gutenberg.org
 cat-v.org
+gameprogrammingpatterns.com