using xterm with Xresources now, also trying to immplement mklinks

3 files changed, 16 insertions, 17 deletions

diff --git a/.config/nvim/lua/keymaps.lua b/.config/nvim/lua/keymaps.lua
index e488e46..dbcef69 100644
--- a/.config/nvim/lua/keymaps.lua
+++ b/.config/nvim/lua/keymaps.lua
@@ -1,3 +1,3 @@
--- bindings
-vim.keymap.set("n", "<M-m>", ":make!<cr>:copen<cr><cr>")
+vim.keymap.set("n", "<M-m>", ":make<cr>") -- :copen<cr><cr>")
+vim.keymap.set("n", "<M-n>", ":cnext<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 d27f9c9..867fc87 100644
--- a/.config/nvim/lua/options.lua
+++ b/.config/nvim/lua/options.lua
@@ -1,15 +1,13 @@
 -- visual
 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",
+    black = "#242829", white = "#dcd7d7",
+    magenta = "#e18d8e",
+    cyan = "#5cadc6",
+    blue = "#84b8a9",
+    red = "#e6507a",
+    yellow = "#2e89a5",
 }
 vim.cmd("colorscheme quiet")
 vim.cmd("hi normal       guifg=" .. palette.white .. " guibg=" .. palette.black)
@@ -31,14 +29,17 @@ vim.cmd("hi error        guifg=" .. palette.black .. "guibg=" .. palette.red)
 vim.g.netrw_banner = false
 
 -- formatting
--- vim.opt.shiftwidth = 4
--- vim.opt.expandtab = true
+vim.opt.shiftwidth = 4
+vim.opt.tabstop = 4
+vim.opt.softtabstop = 4
+vim.opt.expandtab = true
 vim.opt.textwidth = 80
-vim.opt.wrap = false
 vim.opt.cindent = true
+vim.opt.filetype = "c"
+vim.opt.wrap = false
 vim.opt.cinoptions = ":0,l1,t0,g0,(0"
+vim.opt.hlsearch = false
 
 -- functional
 vim.opt.clipboard:append { "unnamedplus" }
-vim.opt.hlsearch = false
-vim.opt.makeprg = "./build.sh"
+vim.opt.makeprg = "./b"
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index 79b5dec..5db9c4c 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -15,8 +15,6 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then
 end
 vim.opt.rtp:prepend(lazypath)
 
-require("options")
-
 -- setup lazy.nvim
 require("lazy").setup({
     { "ibhagwan/fzf-lua" }