diff --git a/.stylua.toml b/.stylua.toml new file mode 100644 index 0000000..df96b7b --- /dev/null +++ b/.stylua.toml @@ -0,0 +1,6 @@ +column_width = 120 +line_endings = "Unix" +indent_type = "Spaces" +indent_width = 2 +quote_style = "AutoPreferDouble" +no_call_parentheses = true diff --git a/init.lua b/init.lua index 10ace3e..37f4b1d 100644 --- a/init.lua +++ b/init.lua @@ -1,14 +1,14 @@ if vim.g.vscode then - -- config vscode - Map = vim.keymap.set - Cmd = vim.cmd + -- config vscode + Map = vim.keymap.set + Cmd = vim.cmd - VSCodeNotify = vim.fn.VSCodeNotify - VSCodeCall = vim.fn.VSCodeCall + VSCodeNotify = vim.fn.VSCodeNotify + VSCodeCall = vim.fn.VSCodeCall - require("vscode.functions") - require("vscode.mappings") + require "vscode.functions" + require "vscode.mappings" else - -- config neovim - require("core") + -- config neovim + require "core" end diff --git a/lazy-lock.json b/lazy-lock.json index 34eeaea..d94ae3e 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -31,7 +31,7 @@ "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, - "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" }, + "nvim-lspconfig": { "branch": "master", "commit": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98" }, "nvim-material-icon": { "branch": "main", "commit": "7a8893417c6947925d00946d16b81b56574796a9" }, "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, @@ -39,7 +39,7 @@ "nvim-tree.lua": { "branch": "master", "commit": "2bc725a3ebc23f0172fb0ab4d1134b81bcc13812" }, "nvim-treesitter": { "branch": "master", "commit": "73fb37ed77b18ac357ca8e6e35835a8db6602332" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "5f9bf4b1ead7707e4e74e5319ee56bdc81fb73db" }, - "nvim-ts-autotag": { "branch": "main", "commit": "cb57b07803476ee902c89412aeff219a9a58be13" }, + "nvim-ts-autotag": { "branch": "main", "commit": "6f38e4231c34497259121a007c61a0fd2f16403e" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "cbab9ad88036915beebd13b47e100743ff2ed2d5" }, "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, diff --git a/lua/core/neovide.lua b/lua/core/neovide.lua index 3113708..fd56ef3 100644 --- a/lua/core/neovide.lua +++ b/lua/core/neovide.lua @@ -1,75 +1,66 @@ if vim.g.neovide then - local opts = { noremap = true, silent = true } - vim.g.neovide_input_use_logo = 1 -- enable use of the logo (cmd) key - vim.keymap.set("n", "", ":w", opts) -- Save - vim.keymap.set("v", "", '"+y', opts) -- Copy - vim.keymap.set("n", "", '"+P', opts) -- Paste normal mode - vim.keymap.set("v", "", '"+P', opts) -- Paste visual mode - vim.keymap.set("x", "", '"+P', opts) -- Paste visual mode - vim.keymap.set("c", "", "+", opts) -- Paste command mode - vim.keymap.set("c", "", '"+P', opts) -- Paste command mode - vim.keymap.set("i", "", 'l"+Pli', opts) -- Paste insert mode - vim.keymap.set( - "n", - "", - "lua require('Comment.api').toggle.linewise.current()$i", - opts - ) - vim.keymap.set( - "i", - "", - "lua require('Comment.api').toggle.linewise.current()$i", - opts - ) - vim.keymap.set("v", "", "lua require('Comment.api').toggle.linewise(vim.fn.visualmode())", opts) + local opts = { noremap = true, silent = true } + vim.g.neovide_input_use_logo = 1 -- enable use of the logo (cmd) key + vim.keymap.set("n", "", ":w", opts) -- Save + vim.keymap.set("v", "", '"+y', opts) -- Copy + vim.keymap.set("n", "", '"+P', opts) -- Paste normal mode + vim.keymap.set("v", "", '"+P', opts) -- Paste visual mode + vim.keymap.set("x", "", '"+P', opts) -- Paste visual mode + vim.keymap.set("c", "", "+", { noremap = true }) -- Paste command mode + vim.keymap.set("i", "", 'l"+Pli', opts) -- Paste insert mode + vim.keymap.set( + "n", + "", + "lua require('Comment.api').toggle.linewise.current()$i", + opts + ) + vim.keymap.set( + "i", + "", + "lua require('Comment.api').toggle.linewise.current()$i", + opts + ) + vim.keymap.set("v", "", "lua require('Comment.api').toggle.linewise(vim.fn.visualmode())", opts) - -- vim.keymap.set("n", "", ":w", opts) -- Save - -- vim.keymap.set("v", "", '"+y', opts) -- Copy - -- vim.keymap.set("n", "", '"+P', opts) -- Paste normal mode - -- vim.keymap.set("v", "", '"+P', opts) -- Paste visual mode - -- vim.keymap.set("c", "", "+", opts) -- Paste command mode - -- vim.keymap.set("i", "", 'l"+Pli', opts) -- Paste insert mode - -- vim.keymap.set("t", "", '"+Pi', opts) + vim.o.guifont = "Hasklug_Nerd_Font:h15" + vim.g.neovide_padding_top = 0 + vim.g.neovide_padding_bottom = 1 + vim.g.neovide_padding_right = 1 + vim.g.neovide_padding_left = 1 - vim.o.guifont = "Hasklug_Nerd_Font:h15" - vim.g.neovide_padding_top = 0 - vim.g.neovide_padding_bottom = 1 - vim.g.neovide_padding_right = 1 - vim.g.neovide_padding_left = 1 + -- config for transparent + vim.g.neovide_transparency = 1 + vim.g.neovide_hide_mouse_when_typing = false + vim.g.neovide_underline_automatic_scaling = false + vim.g.neovide_refresh_rate_idle = 5 + vim.g.neovide_no_idle = true + vim.g.neovide_remember_window_size = true + vim.g.neovide_touch_drag_timeout = 0.17 + vim.g.neovide_show_border = false + vim.g.neovide_theme = "auto" + vim.g.neovide_confirm_quit = true + vim.g.neovide_remember_window_size = true + vim.g.neovide_cursor_smooth_blink = true + -- animation config + --vim.g.neovide_scroll_animation_length = 0.3 + --vim.g.neovide_cursor_animation_length = 0.13 + vim.g.neovide_cursor_trail_size = 0.8 + vim.g.neovide_cursor_antialiasing = true + vim.g.neovide_cursor_animate_in_insert_mode = true + vim.g.neovide_cursor_vfx_mode = "torpedo" - -- config for transparent - vim.g.neovide_transparency = 1 - vim.g.neovide_hide_mouse_when_typing = false - vim.g.neovide_underline_automatic_scaling = false - vim.g.neovide_refresh_rate_idle = 5 - vim.g.neovide_no_idle = true - vim.g.neovide_remember_window_size = true - vim.g.neovide_touch_drag_timeout = 0.17 - vim.g.neovide_show_border = false - vim.g.neovide_theme = "auto" - vim.g.neovide_confirm_quit = true - vim.g.neovide_remember_window_size = true - vim.g.neovide_cursor_smooth_blink = true - -- animation config - --vim.g.neovide_scroll_animation_length = 0.3 - --vim.g.neovide_cursor_animation_length = 0.13 - vim.g.neovide_cursor_trail_size = 0.8 - vim.g.neovide_cursor_antialiasing = true - vim.g.neovide_cursor_animate_in_insert_mode = true - vim.g.neovide_cursor_vfx_mode = "torpedo" + vim.opt.linespace = 0 + vim.g.neovide_scale_factor = 1 + vim.opt.cmdheight = 0 + vim.opt.spell = false - vim.opt.linespace = 0 - vim.g.neovide_scale_factor = 1 - vim.opt.cmdheight = 0 - vim.opt.spell = false - - vim.g.neovide_window_blurred = true - vim.g.neovide_floating_blur_amount_x = 2.0 - vim.g.neovide_floating_blur_amount_y = 2.0 - vim.g.neovide_floating_shadow = false - vim.g.neovide_floating_z_height = 10 - vim.g.neovide_light_angle_degrees = 45 - vim.g.neovide_light_radius = 5 + vim.g.neovide_window_blurred = true + vim.g.neovide_floating_blur_amount_x = 2.0 + vim.g.neovide_floating_blur_amount_y = 2.0 + vim.g.neovide_floating_shadow = false + vim.g.neovide_floating_z_height = 10 + vim.g.neovide_light_angle_degrees = 45 + vim.g.neovide_light_radius = 5 end -- -- Allow clipboard copy paste in neovim diff --git a/lua/plugins/alpha.lua b/lua/plugins/alpha.lua index 743401c..927a7d6 100644 --- a/lua/plugins/alpha.lua +++ b/lua/plugins/alpha.lua @@ -1,11 +1,11 @@ return { - -- dashboard - { - "goolord/alpha-nvim", - lazy = true, - event = "VimEnter", - config = function() - require("user.alpha") - end, - }, + -- dashboard + { + "goolord/alpha-nvim", + lazy = true, + event = "VimEnter", + config = function() + require "user.alpha" + end, + }, } diff --git a/lua/plugins/breadcrumb.lua b/lua/plugins/breadcrumb.lua index bde138a..1919118 100644 --- a/lua/plugins/breadcrumb.lua +++ b/lua/plugins/breadcrumb.lua @@ -1,10 +1,10 @@ return { - "SmiteshP/nvim-navic", - lazy = true, - dependencies = "neovim/nvim-lspconfig", - event = "InsertEnter", - config = function() - require("user.breadcrumb") - require("user.winbar") - end, + "SmiteshP/nvim-navic", + lazy = true, + dependencies = "neovim/nvim-lspconfig", + event = "InsertEnter", + config = function() + require "user.breadcrumb" + require "user.winbar" + end, } diff --git a/lua/plugins/bufferline.lua b/lua/plugins/bufferline.lua index f93e407..eba0f24 100644 --- a/lua/plugins/bufferline.lua +++ b/lua/plugins/bufferline.lua @@ -1,168 +1,168 @@ return { - "akinsho/bufferline.nvim", - branch = "main", - event = { "BufRead", "InsertEnter", "BufNewFile" }, - config = function() - local status_ok, bufferline = pcall(require, "bufferline") - if not status_ok then - return - end + "akinsho/bufferline.nvim", + branch = "main", + event = { "BufRead", "InsertEnter", "BufNewFile" }, + config = function() + local status_ok, bufferline = pcall(require, "bufferline") + if not status_ok then + return + end - local icons = vim.g.pcode_icons - local use_icons = true + local icons = vim.g.pcode_icons + local use_icons = true - -- get folder name from current directory - local _get_folder_name = function() - local str = vim.fn.fnamemodify(vim.fn.getcwd(), ":t") - return " " .. icons.ui.ProjekFolder .. " " .. str:lower():gsub("^%l", string.upper) .. " " - end + -- get folder name from current directory + local _get_folder_name = function() + local str = vim.fn.fnamemodify(vim.fn.getcwd(), ":t") + return " " .. icons.ui.ProjekFolder .. " " .. str:lower():gsub("^%l", string.upper) .. " " + end - local function diagnostics_indicator(num, _, diagnostics, _) - local result = {} - local symbols = { - error = icons.diagnostics.Error, - warning = icons.diagnostics.Warning, - info = icons.diagnostics.Information, - } - if not use_icons then - return "(" .. num .. ")" - end - for name, count in pairs(diagnostics) do - if symbols[name] and count > 0 then - table.insert(result, symbols[name] .. " " .. count) - end - end - result = table.concat(result, " ") - return #result > 0 and result or "" - end + local function diagnostics_indicator(num, _, diagnostics, _) + local result = {} + local symbols = { + error = icons.diagnostics.Error, + warning = icons.diagnostics.Warning, + info = icons.diagnostics.Information, + } + if not use_icons then + return "(" .. num .. ")" + end + for name, count in pairs(diagnostics) do + if symbols[name] and count > 0 then + table.insert(result, symbols[name] .. " " .. count) + end + end + result = table.concat(result, " ") + return #result > 0 and result or "" + end - vim.opt.termguicolors = true + vim.opt.termguicolors = true - bufferline.setup({ - options = { - color_icons = true, - numbers = "none", -- | "ordinal" | "buffer_id" | "both" | function({ ordinal, id, lower, raise }): string, - close_command = function(bufnum) - require("user.utils.bufferline").bufremove(bufnum) - end, - right_mouse_command = function(bufnum) - require("user.utils.bufferline").bufremove(bufnum) - end, - -- close_command = "bdelete! %d", - -- right_mouse_command = "bdelete! %d", - left_mouse_command = "buffer %d", - middle_mouse_command = nil, + bufferline.setup { + options = { + color_icons = true, + numbers = "none", -- | "ordinal" | "buffer_id" | "both" | function({ ordinal, id, lower, raise }): string, + close_command = function(bufnum) + require("user.utils.bufferline").bufremove(bufnum) + end, + right_mouse_command = function(bufnum) + require("user.utils.bufferline").bufremove(bufnum) + end, + -- close_command = "bdelete! %d", + -- right_mouse_command = "bdelete! %d", + left_mouse_command = "buffer %d", + middle_mouse_command = nil, - indicator_icon = nil, - indicator = { style = "icon", icon = icons.ui.BoldLineLeft }, - buffer_close_icon = icons.ui.Close, - modified_icon = icons.ui.Circle, - close_icon = icons.ui.BoldClose, - left_trunc_marker = icons.ui.ArrowCircleLeft, - right_trunc_marker = icons.ui.ArrowCircleRight, - max_name_length = 30, - max_prefix_length = 30, - tab_size = 21, - diagnostics = false, -- | "nvim_lsp" | "coc", - diagnostics_update_in_insert = false, - diagnostics_indicator = diagnostics_indicator, - offsets = { - { - filetype = "NvimTree", - text = _get_folder_name(), - highlight = "Directory", - text_align = "left", - padding = 1, - }, - { - filetype = "neo-tree", - text = _get_folder_name(), - highlight = "Directory", - text_align = "left", - padding = 1, - }, - }, - show_buffer_icons = true, - show_buffer_close_icons = true, - show_close_icon = true, - show_tab_indicators = true, - persist_buffer_sort = true, -- whether or not custom sorted buffers should persist - separator_style = { "", "" }, -- | "thick" | "thin" | { 'any', 'any' }, - enforce_regular_tabs = true, - always_show_bufferline = true, - }, - highlights = { - background = { - fg = { attribute = "fg", highlight = "TabLine" }, - bg = { attribute = "none", highlight = "TabLine" }, - }, - buffer_visible = { - fg = { attribute = "fg", highlight = "TabLine" }, - bg = { attribute = "none", highlight = "TabLine" }, - }, - close_button = { - fg = { attribute = "fg", highlight = "TabLine" }, - bg = { attribute = "none", highlight = "TabLine" }, - }, - close_button_visible = { - fg = { attribute = "fg", highlight = "TabLine" }, - bg = { attribute = "none", highlight = "TabLine" }, - }, - tab_selected = { - fg = { attribute = "fg", highlight = "Normal" }, - bg = { attribute = "bg", highlight = "Normal" }, - }, - tab = { - fg = { attribute = "fg", highlight = "TabLine" }, - bg = { attribute = "bg", highlight = "TabLine" }, - }, - tab_close = { - -- fg = {attribute='fg',highlight='LspDiagnosticsDefaultError'}, - fg = { attribute = "fg", highlight = "TabLineSel" }, - bg = { attribute = "bg", highlight = "Normal" }, - }, - duplicate_selected = { - fg = { attribute = "fg", highlight = "TabLineSel" }, - bg = { attribute = "bg", highlight = "TabLineSel" }, - underline = true, - }, - duplicate_visible = { - fg = { attribute = "fg", highlight = "TabLine" }, - bg = { attribute = "bg", highlight = "TabLine" }, - underline = true, - }, - duplicate = { - fg = { attribute = "fg", highlight = "TabLine" }, - bg = { attribute = "bg", highlight = "TabLine" }, - underline = true, - }, + indicator_icon = nil, + indicator = { style = "icon", icon = icons.ui.BoldLineLeft }, + buffer_close_icon = icons.ui.Close, + modified_icon = icons.ui.Circle, + close_icon = icons.ui.BoldClose, + left_trunc_marker = icons.ui.ArrowCircleLeft, + right_trunc_marker = icons.ui.ArrowCircleRight, + max_name_length = 30, + max_prefix_length = 30, + tab_size = 21, + diagnostics = false, -- | "nvim_lsp" | "coc", + diagnostics_update_in_insert = false, + diagnostics_indicator = diagnostics_indicator, + offsets = { + { + filetype = "NvimTree", + text = _get_folder_name(), + highlight = "Directory", + text_align = "left", + padding = 1, + }, + { + filetype = "neo-tree", + text = _get_folder_name(), + highlight = "Directory", + text_align = "left", + padding = 1, + }, + }, + show_buffer_icons = true, + show_buffer_close_icons = true, + show_close_icon = true, + show_tab_indicators = true, + persist_buffer_sort = true, -- whether or not custom sorted buffers should persist + separator_style = { "", "" }, -- | "thick" | "thin" | { 'any', 'any' }, + enforce_regular_tabs = true, + always_show_bufferline = true, + }, + highlights = { + background = { + fg = { attribute = "fg", highlight = "TabLine" }, + bg = { attribute = "none", highlight = "TabLine" }, + }, + buffer_visible = { + fg = { attribute = "fg", highlight = "TabLine" }, + bg = { attribute = "none", highlight = "TabLine" }, + }, + close_button = { + fg = { attribute = "fg", highlight = "TabLine" }, + bg = { attribute = "none", highlight = "TabLine" }, + }, + close_button_visible = { + fg = { attribute = "fg", highlight = "TabLine" }, + bg = { attribute = "none", highlight = "TabLine" }, + }, + tab_selected = { + fg = { attribute = "fg", highlight = "Normal" }, + bg = { attribute = "bg", highlight = "Normal" }, + }, + tab = { + fg = { attribute = "fg", highlight = "TabLine" }, + bg = { attribute = "bg", highlight = "TabLine" }, + }, + tab_close = { + -- fg = {attribute='fg',highlight='LspDiagnosticsDefaultError'}, + fg = { attribute = "fg", highlight = "TabLineSel" }, + bg = { attribute = "bg", highlight = "Normal" }, + }, + duplicate_selected = { + fg = { attribute = "fg", highlight = "TabLineSel" }, + bg = { attribute = "bg", highlight = "TabLineSel" }, + underline = true, + }, + duplicate_visible = { + fg = { attribute = "fg", highlight = "TabLine" }, + bg = { attribute = "bg", highlight = "TabLine" }, + underline = true, + }, + duplicate = { + fg = { attribute = "fg", highlight = "TabLine" }, + bg = { attribute = "bg", highlight = "TabLine" }, + underline = true, + }, - modified = { - fg = { attribute = "fg", highlight = "TabLine" }, - bg = { attribute = "bg", highlight = "TabLine" }, - }, - modified_selected = { - fg = { attribute = "fg", highlight = "Normal" }, - bg = { attribute = "bg", highlight = "Normal" }, - }, - modified_visible = { - fg = { attribute = "fg", highlight = "TabLine" }, - bg = { attribute = "bg", highlight = "TabLine" }, - }, + modified = { + fg = { attribute = "fg", highlight = "TabLine" }, + bg = { attribute = "bg", highlight = "TabLine" }, + }, + modified_selected = { + fg = { attribute = "fg", highlight = "Normal" }, + bg = { attribute = "bg", highlight = "Normal" }, + }, + modified_visible = { + fg = { attribute = "fg", highlight = "TabLine" }, + bg = { attribute = "bg", highlight = "TabLine" }, + }, - separator = { - fg = { attribute = "bg", highlight = "TabLine" }, - bg = { attribute = "bg", highlight = "TabLine" }, - }, - separator_selected = { - fg = { attribute = "bg", highlight = "Normal" }, - bg = { attribute = "bg", highlight = "Normal" }, - }, - indicator_selected = { - fg = { attribute = "fg", highlight = "LspDiagnosticsDefaultHint" }, - bg = { attribute = "bg", highlight = "Normal" }, - }, - }, - }) - end, + separator = { + fg = { attribute = "bg", highlight = "TabLine" }, + bg = { attribute = "bg", highlight = "TabLine" }, + }, + separator_selected = { + fg = { attribute = "bg", highlight = "Normal" }, + bg = { attribute = "bg", highlight = "Normal" }, + }, + indicator_selected = { + fg = { attribute = "fg", highlight = "LspDiagnosticsDefaultHint" }, + bg = { attribute = "bg", highlight = "Normal" }, + }, + }, + } + end, }