Compare commits
3 Commits
3e3d7b8173
...
3e6c115673
| Author | SHA1 | Date | |
|---|---|---|---|
| 3e6c115673 | |||
| fd6dd0ba8c | |||
| ee7157a23a |
1
init.lua
1
init.lua
@@ -7,3 +7,4 @@ require('colorscheme')
|
|||||||
require('lsp')
|
require('lsp')
|
||||||
require('keybindings')
|
require('keybindings')
|
||||||
require('diary')
|
require('diary')
|
||||||
|
require('layout')
|
||||||
|
|||||||
@@ -26,6 +26,9 @@ vim.keymap.set('n', '<leader>C', ":Calendar -view=year -split=vertical -width=27
|
|||||||
-- Open current file in browser (chromium)
|
-- Open current file in browser (chromium)
|
||||||
vim.keymap.set('n', '<space>o', ":silent !chromium '%'<cr>", { desc = "Open in browser" })
|
vim.keymap.set('n', '<space>o', ":silent !chromium '%'<cr>", { desc = "Open in browser" })
|
||||||
|
|
||||||
|
-- Open org file folder in neotree
|
||||||
|
vim.keymap.set('n', '<leader>of', ':silent :Neotree dir=/home/saschal/Documents/Eigene\\ (Briefe\\ etc.)/org<cr>', { desc = "Open org folder" })
|
||||||
|
|
||||||
-- toggle colorscheme between dark and light
|
-- toggle colorscheme between dark and light
|
||||||
vim.keymap.set('n', '<leader>m', function()
|
vim.keymap.set('n', '<leader>m', function()
|
||||||
if vim.opt.background:get() == "dark" then
|
if vim.opt.background:get() == "dark" then
|
||||||
@@ -61,6 +64,16 @@ local workspaces_fzf_picker = function(opts)
|
|||||||
end
|
end
|
||||||
vim.keymap.set('n', '<leader>w', workspaces_fzf_picker, { desc = "Workspaces" })
|
vim.keymap.set('n', '<leader>w', workspaces_fzf_picker, { desc = "Workspaces" })
|
||||||
|
|
||||||
|
------------------------------------------
|
||||||
|
--
|
||||||
|
-- Window layout save and restore
|
||||||
|
--
|
||||||
|
------------------------------------------
|
||||||
|
|
||||||
|
local layout = require('layout')
|
||||||
|
vim.keymap.set('n', '<leader>ss', function() layout.save('default') end, { desc = "Save window layout" })
|
||||||
|
vim.keymap.set('n', '<leader>sr', function() layout.restore('default') end, { desc = "Restore window layout" })
|
||||||
|
|
||||||
------------------------------------------
|
------------------------------------------
|
||||||
--
|
--
|
||||||
-- Word higlighting
|
-- Word higlighting
|
||||||
|
|||||||
64
lua/layout.lua
Normal file
64
lua/layout.lua
Normal file
@@ -0,0 +1,64 @@
|
|||||||
|
-- save and restore current window layout
|
||||||
|
-- inspired by:
|
||||||
|
-- - https://github.com/dedowsdi/.vim/blob/master/autoload/ddd/layout.vim
|
||||||
|
-- - https://vi.stackexchange.com/a/22545/53081
|
||||||
|
local M = {}
|
||||||
|
local layouts = {}
|
||||||
|
local resize_cmds = {}
|
||||||
|
|
||||||
|
function M.save(name)
|
||||||
|
layouts[name] = vim.fn.winlayout()
|
||||||
|
resize_cmds[name] = vim.fn.winrestcmd()
|
||||||
|
M.add_buf_to_layout(layouts[name])
|
||||||
|
end
|
||||||
|
|
||||||
|
function M.add_buf_to_layout(layout)
|
||||||
|
if layout[1] == "leaf" then
|
||||||
|
table.insert(layout, vim.fn.winbufnr(layout[2]))
|
||||||
|
else
|
||||||
|
for _, child_layout in ipairs(layout[2]) do
|
||||||
|
M.add_buf_to_layout(child_layout)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
function M.restore(name)
|
||||||
|
if not layouts[name] then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Create clean window
|
||||||
|
vim.cmd("new")
|
||||||
|
vim.cmd("wincmd o")
|
||||||
|
|
||||||
|
-- Recursively restore buffers
|
||||||
|
M.apply_layout(layouts[name])
|
||||||
|
|
||||||
|
-- Resize
|
||||||
|
vim.cmd(resize_cmds[name])
|
||||||
|
end
|
||||||
|
|
||||||
|
function M.apply_layout(layout)
|
||||||
|
if layout[1] == "leaf" then
|
||||||
|
-- Load buffer for leaf
|
||||||
|
if vim.fn.bufexists(layout[3]) == 1 then
|
||||||
|
vim.cmd(string.format("b %d", layout[3]))
|
||||||
|
end
|
||||||
|
else
|
||||||
|
-- Split cols or rows, split n-1 times
|
||||||
|
local split_method = layout[1] == "col" and "rightbelow split" or "rightbelow vsplit"
|
||||||
|
local wins = { vim.fn.win_getid() }
|
||||||
|
for i = 2, #layout[2] do
|
||||||
|
vim.cmd(split_method)
|
||||||
|
table.insert(wins, vim.fn.win_getid())
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Recursive into child windows
|
||||||
|
for index, win_id in ipairs(wins) do
|
||||||
|
vim.fn.win_gotoid(win_id)
|
||||||
|
M.apply_layout(layout[2][index])
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
return M
|
||||||
@@ -70,7 +70,7 @@ end
|
|||||||
-- use globally installed vue-language-server (instead of mason provided)
|
-- use globally installed vue-language-server (instead of mason provided)
|
||||||
vim.lsp.config('vue_ls', {
|
vim.lsp.config('vue_ls', {
|
||||||
-- add filetypes for typescript, javascript and vue
|
-- add filetypes for typescript, javascript and vue
|
||||||
-- filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue' },
|
filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue' },
|
||||||
init_options = {
|
init_options = {
|
||||||
vue = {
|
vue = {
|
||||||
-- disable hybrid mode, will thus use ts_ls internally
|
-- disable hybrid mode, will thus use ts_ls internally
|
||||||
|
|||||||
@@ -45,7 +45,15 @@ require("lazy").setup({
|
|||||||
-- C-k: Toggle signature help (if signature.enabled = true)
|
-- C-k: Toggle signature help (if signature.enabled = true)
|
||||||
--
|
--
|
||||||
-- See :h blink-cmp-config-keymap for defining your own keymap
|
-- See :h blink-cmp-config-keymap for defining your own keymap
|
||||||
keymap = { preset = 'enter' },
|
keymap = {
|
||||||
|
preset = 'enter',
|
||||||
|
['<Up>'] = { 'select_prev', 'fallback' },
|
||||||
|
['<Down>'] = { 'select_next', 'fallback' },
|
||||||
|
['<S-Tab>'] = { 'select_prev', 'fallback' },
|
||||||
|
['<Tab>'] = { 'select_next', 'fallback' },
|
||||||
|
['<CR>'] = { 'select_and_accept', 'fallback' },
|
||||||
|
['<C-space>'] = { 'show', 'fallback' },
|
||||||
|
},
|
||||||
signature = { enabled = true },
|
signature = { enabled = true },
|
||||||
|
|
||||||
appearance = {
|
appearance = {
|
||||||
@@ -103,7 +111,7 @@ require("lazy").setup({
|
|||||||
-- LSP manager and others
|
-- LSP manager and others
|
||||||
--
|
--
|
||||||
-- "williamboman/mason.nvim",
|
-- "williamboman/mason.nvim",
|
||||||
-- "williamboman/mason-lspconfig.nvim",
|
-- "williamboman/mason-lspconfig.nvim",
|
||||||
"neovim/nvim-lspconfig",
|
"neovim/nvim-lspconfig",
|
||||||
|
|
||||||
-- Nice plugin to show what LSPs are doing in the background (and others
|
-- Nice plugin to show what LSPs are doing in the background (and others
|
||||||
|
|||||||
Reference in New Issue
Block a user