change vim nvim and emacs configsHEADmaster

3 files changed, 27 insertions, 21 deletions

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"