some scripts, bash, tmux changes

6 files changed, 72 insertions, 42 deletions

diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
new file mode 100644
index 0000000..82326f9
--- /dev/null
+++ b/.config/nvim/init.lua
@@ -0,0 +1,16 @@
+require("plugins")
+require("keymaps")
+
+--[[
+vim.cmd("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 visual       guifg=#dcade6 guibg=#242829
+hi incsearch    guifg=#dcade6 guibg=#242829
+hi MatchParen   guifg=#dcade6 guibg=#242829
+let g:netrw_banner=0
+]]
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
deleted file mode 100644
index 85fa69f..0000000
--- a/.config/nvim/init.vim
+++ /dev/null
@@ -1,42 +0,0 @@
-"Visual
-syntax off
-set termguicolors
-colorscheme habamax
-hi normal guifg=#dcd7d7 guibg=#242829
-hi comment gui=italic
-hi string guifg=#bf739f
-set laststatus=0
-let g:netrw_banner=0
-
-"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
-
-"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>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>g	:grep!<space>-rn<space><space>.<left><left>''<left>
-
-"Comments
-map <leader>cm	I/*<space><esc>A<space>*/<esc>0
-map <leader>cd	^dwA<backspace><backspace><backspace><esc>0
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
new file mode 100644
index 0000000..a3dc542
--- /dev/null
+++ b/.config/nvim/lazy-lock.json
@@ -0,0 +1,4 @@
+{
+  "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
new file mode 100644
index 0000000..c2f2e62
--- /dev/null
+++ b/.config/nvim/lua/keymaps.lua
@@ -0,0 +1,8 @@
+-- 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")
diff --git a/.config/nvim/lua/options.lua b/.config/nvim/lua/options.lua
new file mode 100644
index 0000000..5a4c4bb
--- /dev/null
+++ b/.config/nvim/lua/options.lua
@@ -0,0 +1,19 @@
+-- visual
+vim.opt.termguicolors = true
+vim.cmd("syntax on")
+vim.cmd("colorscheme desert")
+vim.g.netrw_banner = false
+
+-- formatting
+-- vim.opt.shiftwidth = 4
+-- vim.opt.expandtab = true
+vim.opt.textwidth = 80
+vim.opt.wrap = false
+vim.opt.cindent = true
+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/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
new file mode 100644
index 0000000..79b5dec
--- /dev/null
+++ b/.config/nvim/lua/plugins.lua
@@ -0,0 +1,25 @@
+-- bootstrap lazy.nvim
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not (vim.uv or vim.loop).fs_stat(lazypath) then
+  local lazyrepo = "https://github.com/folke/lazy.nvim.git"
+  local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
+  if vim.v.shell_error ~= 0 then
+    vim.api.nvim_echo({
+      { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
+      { out, "WarningMsg" },
+      { "\nPress any key to exit..." },
+    }, true, {})
+    vim.fn.getchar()
+    os.exit(1)
+  end
+end
+vim.opt.rtp:prepend(lazypath)
+
+require("options")
+
+-- setup lazy.nvim
+require("lazy").setup({
+    { "ibhagwan/fzf-lua" }
+})
+
+vim.keymap.set("n", "<leader>f", ":FzfLua files<cr>")