diff options
Diffstat (limited to '.config')
| -rw-r--r-- | .config/nvim/init.lua | 40 | ||||
| -rw-r--r-- | .config/sway/config | 2 |
2 files changed, 8 insertions, 34 deletions
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index d92a728..9d39e3a 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1,9 +1,3 @@ -if not vim.tbl_flatten then - vim.tbl_flatten = function(t) - return vim.iter(t):flatten():totable() - end -end - vim.pack.add({ { src = "https://github.com/neovim/nvim-lspconfig" }, @@ -17,6 +11,8 @@ vim.pack.add({ { src = "https://github.com/nvim-treesitter/nvim-treesitter", build = ":TSUpdate" }, { src = "https://github.com/echasnovski/mini.nvim" }, + { src = "https://github.com/stevearc/oil.nvim" }, + { src = "https://github.com/nvim-telescope/telescope.nvim" }, { src = "https://github.com/nvim-lua/plenary.nvim" }, @@ -45,12 +41,6 @@ vim.opt.signcolumn = "yes" vim.opt.scrolloff = 5 vim.opt.showmode = false -vim.api.nvim_create_autocmd("BufWritePre", { - callback = function() - vim.lsp.buf.format({ async = false }) - end, -}) - vim.api.nvim_create_autocmd("TextYankPost", { callback = function() vim.highlight.on_yank({ timeout = 150 }) @@ -71,7 +61,7 @@ vim.api.nvim_create_autocmd('LspAttach', { require("nvim-treesitter").setup({ ensure_installed = { "lua", "vim", "bash", "json", "python", - "cpp", "css", "java", "c", "typst", "r", + "cpp", "css", "java", "c", }, highlight = { enable = true }, }) @@ -103,6 +93,8 @@ vim.lsp.config("lua_ls", { }, }) +require("oil").setup() + vim.lsp.config("pyright", { capabilities = capabilities, }) @@ -128,16 +120,6 @@ vim.lsp.config("cssls", { capabilities = capabilities, }) -vim.lsp.config("tinymist", { - capabilities = capabilities, -}) - -vim.lsp.config("r_language_server", { - capabilities = capabilities, - settings = { - filetypes = { "r", "rmd" }, - }, -}) vim.lsp.enable({ @@ -147,8 +129,6 @@ vim.lsp.enable({ "html", "cssls", "ts_ls", - "tinymist", - "languageserver", "bashls", }) @@ -214,7 +194,7 @@ require('telescope').setup({ local builtin = require('telescope.builtin') -vim.keymap.set('n', '<leader>o', ":Ex<CR>", { desc = "files explorer" }) +vim.keymap.set("n", "<leader>o", "<CMD>Oil<CR>", { desc = "Open parent directory" }) vim.keymap.set('n', '<leader>ff', builtin.find_files, { desc = "files" }) vim.keymap.set('n', '<leader>fg', builtin.live_grep, { desc = "grep" }) @@ -241,10 +221,9 @@ vim.keymap.set("n", "<leader><Tab>", "<cmd>bprevious<CR>", { desc = "prev buffer vim.keymap.set("n", "K", vim.lsp.buf.hover, { desc = "hover docs" }) vim.keymap.set("n", "M", vim.lsp.buf.signature_help, { desc = "signature help" }) -vim.keymap.set("n", "<leader>tt", ":!typst watch %<CR>") - vim.keymap.set("n", "<leader>c", require("conform").format, { desc = "format" }) + require("lualine").setup({ options = { section_separators = '', component_separators = '' }, sections = { @@ -257,13 +236,8 @@ require("lualine").setup({ }, }) --- te kolory trzeba zamienic ale nie chce mi sie z tym jebac --- vim.api.nvim_set_hl(0, "lualine_y_normal", { bg = "#111111" }) vim.cmd("colorscheme jellybeans") --- vim.api.nvim_set_hl(0, "Normal", { bg = "#121212" }) --- - local s = luasnip.snippet local t = luasnip.text_node diff --git a/.config/sway/config b/.config/sway/config index 8fa51f8..c655cb9 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -10,7 +10,7 @@ set $menu wmenu-run -f "JetBrainsMonoNF 10" -N "#121212" -s "#121212" -S "#C9DE9 set $scriptsmenu scripts_menu.sh -output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill +output * background ~/pictures/zielony_port.jpg fill exec wlsunset -T 4200 exec waybar |