warg/nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Format workspace with CodeFormat

Browse Source
This commit is contained in:
Oscar Wallberg
2023-09-02 17:29:59 +02:00
parent 214ffd053d
commit ae3bc212a9
63 changed files with 1205 additions and 1061 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lua/core/autocommands.lua
+7 -7
View File
@@ -18,11 +18,11 @@ local function term_close()
-- Split previous buffer, switching to it
vim.fn.execute("split " .. vim.fn.expand("#"))
-- Close previous window (terminal)
vim.fn.execute(vim.fn.winnr("#") .. "wincmd q")
vim.fn.execute(vim.fn.winnr("#") .. "wincmd q")
end
vim.api.nvim_create_autocmd("TermClose", {
pattern = "term://*",
callback = term_close
callback = term_close,
})
local function my_hl()
@@ -47,19 +47,19 @@ local function my_hl()
-- highlight semshiErrorChar ctermfg=231 guifg=#ffffff ctermbg=160 guibg=#d70000
-- sign define semshiError text=E> texthl=semshiErrorSign
end
vim.api.nvim_create_augroup("my_colors", { clear = true })
vim.api.nvim_create_augroup("my_colors", { clear = true, })
vim.api.nvim_create_autocmd("ColorScheme", {
pattern = "*",
callback = my_hl,
group = "my_colors"
group = "my_colors",
})
vim.api.nvim_create_autocmd("FileType", {
pattern = "go",
callback = function()
callback = function ()
vim.opt_local.tabstop = 4
vim.opt_local.expandtab = false
vim.opt_local.listchars = 'tab:▏ '
vim.opt_local.listchars = "tab:▏ "
vim.opt_local.list = true
end
end,
})
lua/core/globals.lua
+6 -6
View File
@@ -14,15 +14,15 @@
limitations under the License.
]]
vim.g.is_win = vim.fn.has('win32') == 1 or vim.fn.has('win64') == 1
vim.g.is_linux = vim.fn.has('unix') == 1 and vim.fn.has('win64') ~= 1
vim.g.is_mac = vim.fn.has('macunix') == 1
vim.g.is_win = vim.fn.has("win32") == 1 or vim.fn.has("win64") == 1
vim.g.is_linux = vim.fn.has("unix") == 1 and vim.fn.has("win64") ~= 1
vim.g.is_mac = vim.fn.has("macunix") == 1
if vim.fn.executable('python3') then
if vim.fn.executable("python3") then
if vim.g.is_win then
vim.g.python3_host_prog=string.gsub(vim.fn.exepath('python3'), '.exe$', '')
vim.g.python3_host_prog = string.gsub(vim.fn.exepath("python3"), ".exe$", "")
elseif vim.g.is_linux or vim.g.is_mac then
vim.g.python3_host_prog=vim.fn.exepath('python3')
vim.g.python3_host_prog = vim.fn.exepath("python3")
end
else
error("Python 3 executable not found! You must install Python 3 and set its PATH correctly!")
lua/core/mappings.lua
+38 -38
View File
@@ -14,67 +14,67 @@
limitations under the License.
]]
local opts = { remap = false, silent = true }
local opts_expr = { remap = false, silent = true, expr = true }
local opts = { remap = false, silent = true, }
local opts_expr = { remap = false, silent = true, expr = true, }
--- Tab mappings ---
-- vim.keymap.set('n', "tn", ":tabnew <BAR> NvimTreeOpen<CR>", opts)
vim.keymap.set('n', "tn", ":tabnew<CR>", opts)
vim.keymap.set('n', "tq", ":tabclose<CR>", opts)
vim.keymap.set("n", "tn", ":tabnew<CR>", opts)
vim.keymap.set("n", "tq", ":tabclose<CR>", opts)
-- switch tabs with Ctrl+PgUp/Ctrl+PgDwn (default vim mapping)
--- Window mappings ---
vim.keymap.set('n', "<A-h>", ":wincmd h<CR>", opts)
vim.keymap.set('n', "<A-j>", ":wincmd j<CR>", opts)
vim.keymap.set('n', "<A-k>", ":wincmd k<CR>", opts)
vim.keymap.set('n', "<A-l>", ":wincmd l<CR>", opts)
vim.keymap.set("n", "<A-h>", ":wincmd h<CR>", opts)
vim.keymap.set("n", "<A-j>", ":wincmd j<CR>", opts)
vim.keymap.set("n", "<A-k>", ":wincmd k<CR>", opts)
vim.keymap.set("n", "<A-l>", ":wincmd l<CR>", opts)
-- Open new window in horizontal split
vim.keymap.set('n', "<C-w>h", ":new<CR>", opts)
vim.keymap.set("n", "<C-w>h", ":new<CR>", opts)
-- Open new window in vertical split
vim.keymap.set('n', "<C-w>v", ":vnew<CR>", opts)
vim.keymap.set("n", "<C-w>v", ":vnew<CR>", opts)
-- Open new window in horizontal split at bottom
vim.keymap.set('n', "<C-w><leader>", ":bo new<CR>", opts)
vim.keymap.set("n", "<C-w><leader>", ":bo new<CR>", opts)
-- Close buffer and window
vim.keymap.set('n', "<C-w>q", ":bd<CR>", opts)
vim.keymap.set("n", "<C-w>q", ":bd<CR>", opts)
--- Buffer mappings ---
-- Navigate up/down half a screen
vim.keymap.set({'n', 'v'}, "<C-j>", "<C-d>", opts)
vim.keymap.set({'n', 'v'}, "<C-k>", "<C-u>", opts)
vim.keymap.set({ "n", "v", }, "<C-j>", "<C-d>", opts)
vim.keymap.set({ "n", "v", }, "<C-k>", "<C-u>", opts)
-- Center cursorline
vim.keymap.set('n', "<C-Space>", "zz", opts)
vim.keymap.set("n", "<C-Space>", "zz", opts)
-- Save buffer
vim.keymap.set('n', "<C-s>", ":w<CR>", opts)
vim.keymap.set("n", "<C-s>", ":w<CR>", opts)
-- Cycle buffers
vim.keymap.set('n', "<C-End>", ":BufferLineCycleNext<CR>", opts)
vim.keymap.set('n', "<C-Home>", ":BufferLineCyclePrev<CR>", opts)
vim.keymap.set("n", "<C-End>", ":BufferLineCycleNext<CR>", opts)
vim.keymap.set("n", "<C-Home>", ":BufferLineCyclePrev<CR>", opts)
-- Close buffer without closing window
vim.keymap.set('n', "<leader>q", ":bp<bar>sp<bar>bn<bar>bd<CR>", opts)
vim.keymap.set("n", "<leader>q", ":bp<bar>sp<bar>bn<bar>bd<CR>", opts)
--- General mappings ---
-- Remap some swedish keys for easier use
vim.keymap.set('n', "ö", "}", { remap = true })
vim.keymap.set('v', "ö", "}", { remap = true })
vim.keymap.set('n', "ä", "{", { remap = true })
vim.keymap.set('v', "ä", "{", { remap = true })
vim.keymap.set('n', ",", "]", { remap = true })
vim.keymap.set('n', ".", "[", { remap = true })
vim.keymap.set("n", "ö", "}", { remap = true, })
vim.keymap.set("v", "ö", "}", { remap = true, })
vim.keymap.set("n", "ä", "{", { remap = true, })
vim.keymap.set("v", "ä", "{", { remap = true, })
vim.keymap.set("n", ",", "]", { remap = true, })
vim.keymap.set("n", ".", "[", { remap = true, })
-- yank/put using named register
vim.keymap.set('n', '<leader>y', '"0y', opts)
vim.keymap.set('v', '<leader>y', '"0y', opts)
vim.keymap.set('n', '<leader>p', '"0p', opts)
vim.keymap.set('v', '<leader>p', '"0p', opts)
vim.keymap.set("n", "<leader>y", '"0y', opts)
vim.keymap.set("v", "<leader>y", '"0y', opts)
vim.keymap.set("n", "<leader>p", '"0p', opts)
vim.keymap.set("v", "<leader>p", '"0p', opts)
-- Allow exiting insert mode in terminal by hitting <ESC>
vim.keymap.set('t', "<Esc>", "<C-\\><C-n>", opts)
vim.keymap.set("t", "<Esc>", "<C-\\><C-n>", opts)
-- Navigate forward/backwards
vim.keymap.set('n', "<C-l>", "<C-i>", opts)
vim.keymap.set('n', "<C-h>", "<C-o>", opts)
vim.keymap.set("n", "<C-l>", "<C-i>", opts)
vim.keymap.set("n", "<C-h>", "<C-o>", opts)
-- Use :diffput/get instead of normal one to allow staging visual selection
vim.keymap.set('n', "<leader>dp", "&diff ? ':diffput<CR>' : '<leader>dp'", opts_expr)
vim.keymap.set('v', "<leader>dp", "&diff ? ':diffput<CR>' : '<leader>dp'", opts_expr)
vim.keymap.set('n', "<leader>do", "&diff ? ':diffget<CR>' : '<leader>do'", opts_expr)
vim.keymap.set('v', "<leader>do", "&diff ? ':diffget<CR>' : '<leader>do'", opts_expr)
vim.keymap.set("n", "<leader>dp", "&diff ? ':diffput<CR>' : '<leader>dp'", opts_expr)
vim.keymap.set("v", "<leader>dp", "&diff ? ':diffput<CR>' : '<leader>dp'", opts_expr)
vim.keymap.set("n", "<leader>do", "&diff ? ':diffget<CR>' : '<leader>do'", opts_expr)
vim.keymap.set("v", "<leader>do", "&diff ? ':diffget<CR>' : '<leader>do'", opts_expr)
-- Remove default mappings
vim.keymap.set('', "<C-LeftMouse>", "")
vim.keymap.set('', "q", "")
vim.keymap.set("", "<C-LeftMouse>", "")
vim.keymap.set("", "q", "")
lua/core/options.lua
+4 -4
View File
@@ -35,7 +35,7 @@ vim.opt.foldlevelstart = 99
vim.opt.foldmethod = "indent"
vim.opt.foldignore = ""
vim.opt.guifont = "JetBrains Mono:11"
vim.opt.completeopt:append({ "menu", "menuone", "preview", "noinsert" })
vim.opt.completeopt:append({ "menu", "menuone", "preview", "noinsert", })
-- Max number of items
vim.opt.pumheight = 20
-- pseudo transparency for completion menu
@@ -44,7 +44,7 @@ vim.opt.pumblend = 10
vim.opt.winblend = 5
-- set nowrap
vim.opt.clipboard:append("unnamedplus")
vim.opt.matchpairs:append({ "<:>", "':'", "\":\"" })
vim.opt.matchpairs:append({ "<:>", "':'", "\":\"", })
vim.opt.fileencoding = "utf-8"
-- Only relevant with wrap enabled (default)
vim.opt.linebreak = true
@@ -61,7 +61,7 @@ vim.opt.undofile = true
-- kspell is only relevant if ':set spell' is toggled on, e.g. when editing
-- documents
vim.opt.complete:append("kspell")
vim.opt.complete:remove({ "w", "b", "u", "t" })
vim.opt.complete:remove({ "w", "b", "u", "t", })
vim.opt.spelllang = "en"
-- Align indent to next multiple value of shiftwidth.
-- E.g., only insert as many spaces necessary for reaching the next shiftwidth
@@ -83,7 +83,7 @@ vim.opt.diffopt:append("closeoff")
vim.opt.diffopt:append("internal")
-- These make diffs easier to read, please see the following:
-- https://vimways.org/2018/the-power-of-diff/
vim.opt.diffopt:append({ "indent-heuristic", "algorithm:histogram" })
vim.opt.diffopt:append({ "indent-heuristic", "algorithm:histogram", })
vim.fn.execute("filetype plugin on")
vim.opt.hlsearch = false
vim.opt.laststatus = 3