Skip to content

Commit

Permalink
changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Marcin Bałazy authored and Marcin Bałazy committed Aug 25, 2024
1 parent 499ff6c commit 1f47eed
Show file tree
Hide file tree
Showing 4 changed files with 112 additions and 104 deletions.
102 changes: 64 additions & 38 deletions config.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,25 @@ vim.g.skip_ts_context_commentstring_module = true

require("bufferline").setup {
options = {
-- enable = false,
buffer_close_icon = 'x',
close_icon = '',
}
}

vim.cmd("set number relativenumber")
vim.cmd("set timeoutlen=150")
vim.cmd("set viminfo='100,<50,s10,h,%")
vim.opt.scrolloff = 16

vim.cmd([[command! -nargs=0 Session :SessionLoad]])
-- vim.cmd([[command! -nargs=0 Session :lua MiniSessions.read()]])
vim.cmd([[command! -nargs=0 GoToFile :Telescope find_files]])
vim.cmd([[command! -nargs=0 GoToCommand :Telescope commands]])
vim.cmd([[command! -nargs=0 FindFile :Telescope live_grep]])

vim.cmd('highlight clear CursorLine')
vim.cmd('highlight clear CursorLineNR')

lvim.lsp.installer.setup.automatic_installation.exclude = { 'tsserver' }
lvim.format_on_save = false
lvim.leader = "space"
lvim.colorscheme = 'catppuccin'
Expand Down Expand Up @@ -64,20 +65,32 @@ lvim.builtin.nvimtree.setup.view.float.open_win_config = {

lvim.builtin.nvimtree.setup.reload_on_bufenter = true
lvim.builtin.nvimtree.setup.auto_reload_on_write = true

require("telescope").load_extension("persisted")
require("telescope").load_extension("package_info")

lvim.builtin.alpha.dashboard.section.buttons.entries = {
{ "c", lvim.icons.ui.Fire .. " Current Sessions", "<CMD>SessionLoad<CR>" },
{ "s", lvim.icons.ui.Code .. " Sessions", "<CMD>Telescope persisted<CR>" },
{ "f", lvim.icons.ui.FindFile .. " Find File", "<CMD>Telescope find_files<CR>" },
{ "n", lvim.icons.ui.NewFile .. " New File", "<CMD>ene!<CR>" },
{ "p", lvim.icons.ui.Project .. " Projects ", "<CMD>Telescope projects<CR>" },
{ "r", lvim.icons.ui.History .. " Recent files", ":Telescope oldfiles <CR>" },
{ "t", lvim.icons.ui.FindText .. " Find Text", "<CMD>Telescope live_grep<CR>" },
{ "s", lvim.icons.ui.Code .. " Sessions", "<CMD>SessionManager<CR>" },
{ "f", lvim.icons.ui.FindFile .. " Find File", "<CMD>Telescope find_files<CR>" },
{ "n", lvim.icons.ui.NewFile .. " New File", "<CMD>ene!<CR>" },
{ "p", lvim.icons.ui.Project .. " Projects ", "<CMD>Telescope projects<CR>" },
{ "r", lvim.icons.ui.History .. " Recent files", ":Telescope oldfiles <CR>" },
{ "t", lvim.icons.ui.FindText .. " Find Text", "<CMD>Telescope live_grep<CR>" },
}

local config = require('session_manager.config')
require('session_manager').setup({
autoload_mode = { config.AutoloadMode.GitSession, config.AutoloadMode.CurrentDir }, -- Define what to do when Neovim is started without arguments. See "Autoload mode" section below.
autosave_last_session = true, -- Automatically save last session on exit and on session switch.
autosave_ignore_not_normal = true, -- Plugin will not save a session when no buffers are opened, or all of them aren't writable or listed.
-- autosave_ignore_dirs = {}, -- A list of directories where the session will not be autosaved.
-- autosave_ignore_filetypes = { -- All buffers of these file types will be closed before the session is saved.
-- 'gitcommit',
-- 'gitrebase',
-- },
-- autosave_ignore_buftypes = {}, -- All buffers of these bufer types will be closed before the session is saved.
-- autosave_only_in_session = false, -- Always autosaves session. If true, only autosaves after a session is active.
-- max_path_length = 80, -- Shorten the display path if length exceeds this threshold. Use 0 if don't want to shorten the path at all.
})

local actions = require("lvim.utils.modules").require_on_exported_call "telescope.actions"
local fb_actions = require "telescope".extensions.file_browser.actions

Expand All @@ -89,10 +102,13 @@ lvim.builtin.telescope = {
-- layout_strategy = "horizontal",
layout_strategy = "flex",
layout_config = {
flip_columns = 130,
width = 0.85,
height = 0.8,
height = 0.88,
preview_cutoff = 20,
-- preview_width = 0.5,
horizontal = {
preview_width = 0.5,
},
prompt_position = "bottom",
},
mappings = {
Expand All @@ -119,22 +135,6 @@ lvim.builtin.telescope = {
},
}

require("persisted").setup({
save_dir = vim.fn.expand(vim.fn.stdpath("data") .. "/sessions/"), -- directory where session files are saved
silent = false, -- silent nvim message when sourcing session file
use_git_branch = false, -- create session files based on the branch of the git enabled repository
autosave = true, -- automatically save session files when exiting Neovim
should_autosave = nil, -- function to determine if a session should be autosaved
autoload = true, -- automatically load the session for the cwd on Neovim startup
on_autoload_no_session = nil, -- function to run when `autoload = true` but there is no session to load
follow_cwd = true, -- change session file name to match current working directory if it changes
allowed_dirs = nil, -- table of dirs that the plugin will auto-save and auto-load from
ignored_dirs = nil, -- table of dirs that are ignored when auto-saving and auto-loading
telescope = { -- options for the telescope extension
reset_prompt_after_deletion = true, -- whether to reset prompt after session deleted
},
})

lvim.builtin.telescope.defaults.prompt_prefix = ""
lvim.builtin.telescope.defaults.selection_caret = "> "
-- lvim.builtin.telescope.defaults.file_ignore_patterns = { "NvimTree", ".yarn" }
Expand All @@ -144,13 +144,13 @@ require 'nvim-treesitter.configs'.setup {
enable = true,
},
rainbow = {
enable = false,
enable = true,
-- list of languages you want to disable the plugin for
-- disable = { 'jsx', 'cpp' },
-- Which query to use for finding delimiters
query = 'rainbow-parens',
-- query = 'rainbow-parens',
-- Highlight the entire buffer all at once
strategy = require('ts-rainbow').strategy.global,
-- strategy = require('ts-rainbow').strategy.global,
},
highlight = {
enable = true,
Expand All @@ -163,10 +163,7 @@ require 'nvim-treesitter.configs'.setup {
ensure_installed = { "lua", "vim", "vimdoc", "javascript", "typescript", "json", "dockerfile", "tsx" },
}


-- local components = require("lvim.core.lualine.components")
lvim.builtin.lualine.sections.lualine_a = {}
lvim.builtin.lualine.options.section_separators = { left = '', right = '' }
lvim.lsp.installer.setup.automatic_installation.exclude = { 'tsserver' }

-- section_separators = { left = '', right = '' },

Expand All @@ -189,14 +186,23 @@ local function getPackageInfoStatus()
return package_info.get_status()
end

-- local components = require("lvim.core.lualine.components")

-- lvim.builtin.lualine.winbar = {
-- lualine_a = { {
-- 'buffers',
-- section_separators = { left = '', right = '' },
-- },
-- },
-- }

lvim.builtin.lualine.sections.lualine_b = { 'branch', 'diff' }
lvim.builtin.lualine.options.section_separators = { left = '', right = '' }

lvim.builtin.lualine.sections.lualine_c = {
{ "filename", file_status = true, newfile_status = false, path = 3, shorting_target = 30 },
}

lvim.builtin.lualine.sections.lualine_x = { 'diagnostics', { searchCount } }

lvim.builtin.lualine.sections.lualine_y = {
'location',
{ getPackageInfoStatus }
Expand Down Expand Up @@ -272,5 +278,25 @@ require("lint-node").setup({
debug = true
})

-- Call the setup function
require("pair-ls").setup({
-- The pair-ls command to run
cmd = { "pair-ls", "lsp", "-port", "8080" },

-- The function configures the root directory for the server
root_dir = function(fname, util)
return util.root_pattern(".git", ".hg")(fname) or vim.loop.cwd()
end,

-- Pass a function here to run custom logic on attach
on_attach = function(client, bufnr) end,

-- See :help vim.lsp.start_client
flags = {
allow_incremental_sync = true,
debounce_text_changes = nil,
},
})

-- load snippets
-- require("luasnip.loaders.from_vscode").lazy_load({ paths = { "./snippets/" } })
20 changes: 11 additions & 9 deletions lazy-lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@
"ChatGPT.nvim": { "branch": "main", "commit": "f081338f07216a46d3915ce46c1fcb083bcb5016" },
"Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
"LuaSnip": { "branch": "master", "commit": "1def35377854535bb3b0f4cc7a33c083cdb12571" },
"advanced-git-search.nvim": { "branch": "main", "commit": "198cc402af1790ab26830fdbf24a28c336a20ba6" },
"advanced-git-search.nvim": { "branch": "main", "commit": "36ea105a7b7063a6879ac3b8afffe6fb326e27b1" },
"alpha-nvim": { "branch": "main", "commit": "29074eeb869a6cbac9ce1fbbd04f5f5940311b32" },
"bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" },
"bufferline.nvim": { "branch": "main", "commit": "73540cb95f8d95aa1af3ed57713c6720c78af915" },
"catppuccin": { "branch": "main", "commit": "ba5f4153a5dad99505baba936bd0373534400ac3" },
"catppuccin": { "branch": "main", "commit": "4fd72a9ab64b393c2c22b168508fd244877fec96" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
"dressing.nvim": { "branch": "master", "commit": "c5775a888adbc50652cb370073fcfec963eca93e" },
"fine-cmdline.nvim": { "branch": "main", "commit": "aec9efebf6f4606a5204d49ffa3ce2eeb7e08a3e" },
"friendly-snippets": { "branch": "main", "commit": "3e9a3f5a0cfcef1741e352c37bda4e82e5eb846a" },
"gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" },
Expand All @@ -26,6 +27,7 @@
"mason-lspconfig.nvim": { "branch": "main", "commit": "273fdde8ac5e51f3a223ba70980e52bbc09d9f6f" },
"mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" },
"neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" },
"neovim-session-manager": { "branch": "master", "commit": "cbaebd92dce84e9ba63cb07d3199e5a19b204c1a" },
"nlsp-settings.nvim": { "branch": "main", "commit": "707b43110daf27c1aec8c16c2a92c2cb9a06f8df" },
"none-ls.nvim": { "branch": "main", "commit": "3a4826687da4310af379515086d71faca4d21288" },
"nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
Expand All @@ -34,28 +36,28 @@
"nvim-dap": { "branch": "master", "commit": "13ce59d4852be2bb3cd4967947985cb0ceaff460" },
"nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" },
"nvim-lspconfig": { "branch": "master", "commit": "aa5f4f4ee10b2688fb37fa46215672441d5cd5d9" },
"nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
"nvim-tree.lua": { "branch": "master", "commit": "64f61e4c913047a045ff90bd188dd3b54ee443cf" },
"nvim-treesitter": { "branch": "master", "commit": "d5a1c2b0c8ec5bb377a41c1c414b315d6b3e9432" },
"nvim-ts-context-commentstring": { "branch": "main", "commit": "0bdccb9c67a42a5e2d99384dc9bfa29b1451528f" },
"nvim-ts-rainbow2": { "branch": "master", "commit": "b3120cd5ae9ca524af9cb602f41e12e301fa985f" },
"nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" },
"octo.nvim": { "branch": "master", "commit": "aa5dfa573220a0a511a25ee14ce1570b6c23e56a" },
"octo.nvim": { "branch": "master", "commit": "0134169886958f3874f16eed7fe73d906a3e7e17" },
"onedark.nvim": { "branch": "master", "commit": "fae34f7c635797f4bf62fb00e7d0516efa8abe37" },
"onedarker.nvim": { "branch": "freeze", "commit": "b00dd2189f264c5aeb4cf04c59439655ecd573ec" },
"package-info.nvim": { "branch": "master", "commit": "018bc10e28b00e28e239b1fff7c497304f8b1bf5" },
"package-info.nvim": { "branch": "master", "commit": "268f4669fc29546726009ad665d26901dbf62c3b" },
"pair-ls.nvim": { "branch": "master", "commit": "ccf3280d8cafec48e4947dd827abbc456435dfad" },
"plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" },
"pretty_hover": { "branch": "master", "commit": "5b0688954447d65e13cba548305700b0af8d4831" },
"pretty_hover": { "branch": "master", "commit": "f327f170be3ef7c5d8394ed3e0866a20e1a53b62" },
"project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" },
"rainbow-delimiters.nvim": { "branch": "master", "commit": "9f3d10e66a79e8975926f8cb930856e4930d9da4" },
"schemastore.nvim": { "branch": "main", "commit": "8c46453bdf84ad91877effb95e0b6c7b51ea7dda" },
"structlog.nvim": { "branch": "main", "commit": "45b26a2b1036bb93c0e83f4225e85ab3cee8f476" },
"telescope-file-browser.nvim": { "branch": "master", "commit": "19a0b7f14b2ee3f6513366d9184a03cada77713f" },
"telescope-file-browser.nvim": { "branch": "master", "commit": "a46780830b576049c675680650f773bedfa8677a" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
"telescope.nvim": { "branch": "0.1.x", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" },
"toggleterm.nvim": { "branch": "main", "commit": "066cccf48a43553a80a210eb3be89a15d789d6e6" },
"tokyodark.nvim": { "branch": "master", "commit": "14bc1b3e596878a10647af7c82de7736300f3322" },
"tokyonight.nvim": { "branch": "main", "commit": "67afeaf7fd6ebba000633e89f63c31694057edde" },
"trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" },
"trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" },
"typescript-tools.nvim": { "branch": "master", "commit": "f8c2e0b36b651c85f52ad5c5373ff8b07adc15a7" },
"vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" },
"vim-illuminate": { "branch": "master", "commit": "e522e0dd742a83506db0a72e1ced68c9c130f185" },
Expand Down
78 changes: 31 additions & 47 deletions lua/plugins.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,25 @@ lvim.plugins = {
{
"nvim-telescope/telescope-file-browser.nvim",
},
{
'stevearc/pair-ls.nvim'
},
{
'VonHeikemen/fine-cmdline.nvim',
dependencies = {
{ 'MunifTanjim/nui.nvim' }
}
},
{
"olimorris/persisted.nvim",
config = true
'stevearc/dressing.nvim',
opts = {},
},
{ 'Shatur/neovim-session-manager' },
{
"catppuccin/nvim",
name = "catppuccin",
priority = 1000
},
{ "catppuccin/nvim", name = "catppuccin", priority = 1000 },
{
"jackMort/ChatGPT.nvim",
event = "VeryLazy",
Expand Down Expand Up @@ -41,7 +49,7 @@ lvim.plugins = {
"ThePrimeagen/harpoon",
},
{
"HiPhish/nvim-ts-rainbow2",
"HiPhish/rainbow-delimiters.nvim",
},
{
"sindrets/diffview.nvim",
Expand Down Expand Up @@ -100,64 +108,43 @@ lvim.plugins = {
{
"folke/trouble.nvim",
dependencies = { "nvim-tree/nvim-web-devicons" },
version = '2.10.0',
cmd = "Trouble",
opts = {
height = 15,
action_keys = {
-- key mappings for actions in the trouble list
-- map to {} to remove a mapping, for example:
-- close = {},
close = "q", -- close the list
cancel = "<esc>", -- cancel the preview and get back to your last window / buffer / cursor
refresh = "r", -- manually refresh
jump = { "<cr>", "<tab>", "<2-leftmouse>" }, -- jump to the diagnostic or open / close folds
open_split = { "<c-x>" }, -- open buffer in new split
open_vsplit = { "<c-v>" }, -- open buffer in new vsplit
open_tab = { "<c-t>" }, -- open buffer in new tab
jump_close = { "o" }, -- jump to the diagnostic and close the list
toggle_mode = "m", -- toggle between "workspace" and "document" diagnostics mode
switch_severity = "s", -- switch "diagnostics" severity filter level to HINT / INFO / WARN / ERROR
toggle_preview = "P", -- toggle auto_preview
hover = "K", -- opens a small popup with the full multiline message
preview = "p", -- preview the diagnostic location
open_code_href = "c", -- if present, open a URI with more information about the diagnostic error
close_folds = { "zM", "zm" }, -- close all folds
open_folds = { "zR", "zr" }, -- open all folds
toggle_fold = { "zA", "za" }, -- toggle fold of current file
previous = "k", -- previous item
next = "j", -- next item
help = "?" -- help menu
},
focus = true, -- Focus the window when opened
},
},
{
"navarasu/onedark.nvim",
},
-- {
-- "MysticalDevil/inlay-hints.nvim",
-- dependencies = { "neovim/nvim-lspconfig" },
-- config = function()
-- require("inlay-hints").setup()
-- end
-- },
{
"pmizio/typescript-tools.nvim",
dependencies = { "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig" },
opts = {
settings = {
tsserver_path = nil,
publish_diagnostic_on = "change",
separate_diagnostic_server = false,
tsserver_plugins = { "@styled/typescript-styled-plugin" },
tsserver_file_preferences = {
includeInlayParameterNameHints = "all",
includeInlayParameterNameHintsWhenArgumentMatchesName = true,
includeInlayFunctionParameterTypeHints = true,
includeInlayVariableTypeHints = true,
includeInlayPropertyDeclarationTypeHints = true,
includeInlayFunctionLikeReturnTypeHints = true,
includeInlayEnumMemberValueHints = true,
},
},
-- tsserver_file_preferences = {
-- includeInlayParameterNameHints = "all",
-- includeInlayParameterNameHintsWhenArgumentMatchesName = false,
-- includeInlayFunctionParameterTypeHints = true,
-- includeInlayVariableTypeHints = false,
-- includeInlayPropertyDeclarationTypeHints = true,
-- includeInlayFunctionLikeReturnTypeHints = false,
-- includeInlayEnumMemberValueHints = true,
-- },
},
},
{ "tpope/vim-surround" },
-- {
-- "windwp/nvim-ts-autotag",
-- event = "InsertEnter",
-- },
{
'tiagovla/tokyodark.nvim'
},
Expand All @@ -177,9 +164,6 @@ lvim.plugins = {
require("pretty_hover").setup({})
end
},
-- {
-- "p00f/nvim-ts-rainbow",
-- },
{ "David-Kunz/jester" },
{
'pwntester/octo.nvim',
Expand Down
Loading

0 comments on commit 1f47eed

Please sign in to comment.