diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d547881 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +packer_compiled.lua diff --git a/ftplugin/yaml.lua b/ftplugin/yaml.lua new file mode 100644 index 0000000..09db0f8 --- /dev/null +++ b/ftplugin/yaml.lua @@ -0,0 +1,2 @@ +vim.opt.shiftwidth = 4 +vim.opt.tabstop = 4 diff --git a/init.lua b/init.lua index 9876062..083f2bb 100644 --- a/init.lua +++ b/init.lua @@ -9,7 +9,9 @@ require "lsp" --local theme = vim.env.LIGHTMODE == "1" and "onehalflight" or "onedark" --vim.cmd("colorscheme " .. theme) -vim.g.onedark_terminal_italics = true +--vim.g.onedark_terminal_italics = true --vim.opt.background = "light" -vim.opt.background = "dark" -vim.cmd("colorscheme onedark") +--vim.opt.background = "dark" +--vim.cmd("colorscheme onedark") + +--vim.cmd("colorscheme github_dark") diff --git a/lua/config.lua b/lua/config.lua index d266b00..66de8be 100644 --- a/lua/config.lua +++ b/lua/config.lua @@ -71,7 +71,7 @@ require("nvim-treesitter.configs").setup { ------------- require("lualine").setup { - options = {theme = "onedark", icons_enabled = true}, + options = {theme = "github", icons_enabled = true}, sections = { lualine_a = {"mode"}, lualine_b = { @@ -137,3 +137,13 @@ require("lualine").setup { }, extensions = {} } + +----------------------- +-- GITHUB NVIM THEME -- +----------------------- +require("github-theme").setup( + { + theme_style = "dark_default", + hide_inactive_statusline = false + } +) diff --git a/lua/keybinds.lua b/lua/keybinds.lua index b82f580..8e08979 100644 --- a/lua/keybinds.lua +++ b/lua/keybinds.lua @@ -69,7 +69,7 @@ map("n", "p", ":Buffers ") map("n", "h", ":Helptags ") map("n", ";", ":History: ") map("n", "c", ":Commands ") -map("n", "/", ":Rg ") +map("n", "s", ":Rg ") --map("n", "[", ":Windows ") --------- diff --git a/lua/lsp.lua b/lua/lsp.lua index 3da52d5..c5a5b03 100644 --- a/lua/lsp.lua +++ b/lua/lsp.lua @@ -138,7 +138,17 @@ end -- enable null-ls integration (optional) require("null-ls").config {} -require("lspconfig")["null-ls"].setup {on_attach = common_on_attach} +require("lspconfig")["null-ls"].setup { + on_attach = common_on_attach, + handlers = { + ["textDocument/publishDiagnostics"] = vim.lsp.with( + vim.lsp.diagnostic.on_publish_diagnostics, + { + virtual_text = false + } + ) + } +} local tsserver_on_attach = function(client, bufnr) local ts_utils = require("nvim-lsp-ts-utils") @@ -147,7 +157,12 @@ local tsserver_on_attach = function(client, bufnr) eslint_enable_diagnostics = true, eslint_enable_code_actions = true, enable_import_on_completion = true, - filter_out_diagnostics_by_severity = {"error", "warning", "information", "hint"} + filter_out_diagnostics_by_severity = { + "information", + "hint" + --"warning", + --"error", + } } ts_utils.setup_client(client) @@ -168,12 +183,20 @@ require("nvim-lsp-installer").on_server_ready( local opts = { on_attach = common_on_attach, + capabilities = capabilities, flags = { debounce_text_changes = 150 }, - capabilities = capabilities, settings = { format = {enable = false} + }, + handlers = { + ["textDocument/publishDiagnostics"] = vim.lsp.with( + vim.lsp.diagnostic.on_publish_diagnostics, + { + virtual_text = false + } + ) } } @@ -186,10 +209,18 @@ require("nvim-lsp-installer").on_server_ready( if server.name == "tsserver" then opts.on_attach = tsserver_on_attach - --opts.handlers = { - -- ["textDocument/publishDiagnostics"] = function() - -- end - --} + elseif server.name == "sumneko_lua" then + opts.settings.Lua = { + diagnostics = { + globals = { + -- neovim + "vim", + -- awesome + "awesome", + "client" + } + } + } end server:setup(opts) diff --git a/lua/plugins.lua b/lua/plugins.lua index 51205f3..bd4d6f9 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -19,7 +19,8 @@ require("packer").startup( use "dhruvasagar/vim-table-mode" -- VIM THEMING - use "rafi/awesome-vim-colorschemes" -- vim themes + --use "rafi/awesome-vim-colorschemes" -- vim themes + use "projekt0n/github-nvim-theme" -- FILE MANAGEMENT use "junegunn/fzf" diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua deleted file mode 100644 index 94954e8..0000000 --- a/plugin/packer_compiled.lua +++ /dev/null @@ -1,236 +0,0 @@ --- Automatically generated packer.nvim plugin loader code - -if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then - vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"') - return -end - -vim.api.nvim_command('packadd packer.nvim') - -local no_errors, error_msg = pcall(function() - - local time - local profile_info - local should_profile = false - if should_profile then - local hrtime = vim.loop.hrtime - profile_info = {} - time = function(chunk, start) - if start then - profile_info[chunk] = hrtime() - else - profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6 - end - end - else - time = function(chunk, start) end - end - -local function save_profiles(threshold) - local sorted_times = {} - for chunk_name, time_taken in pairs(profile_info) do - sorted_times[#sorted_times + 1] = {chunk_name, time_taken} - end - table.sort(sorted_times, function(a, b) return a[2] > b[2] end) - local results = {} - for i, elem in ipairs(sorted_times) do - if not threshold or threshold and elem[2] > threshold then - results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms' - end - end - - _G._packer = _G._packer or {} - _G._packer.profile_output = results -end - -time([[Luarocks path setup]], true) -local package_path_str = "/home/guy/.cache/nvim/packer_hererocks/2.0.5/share/lua/5.1/?.lua;/home/guy/.cache/nvim/packer_hererocks/2.0.5/share/lua/5.1/?/init.lua;/home/guy/.cache/nvim/packer_hererocks/2.0.5/lib/luarocks/rocks-5.1/?.lua;/home/guy/.cache/nvim/packer_hererocks/2.0.5/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/home/guy/.cache/nvim/packer_hererocks/2.0.5/lib/lua/5.1/?.so" -if not string.find(package.path, package_path_str, 1, true) then - package.path = package.path .. ';' .. package_path_str -end - -if not string.find(package.cpath, install_cpath_pattern, 1, true) then - package.cpath = package.cpath .. ';' .. install_cpath_pattern -end - -time([[Luarocks path setup]], false) -time([[try_loadstring definition]], true) -local function try_loadstring(s, component, name) - local success, result = pcall(loadstring(s)) - if not success then - vim.schedule(function() - vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {}) - end) - end - return result -end - -time([[try_loadstring definition]], false) -time([[Defining packer_plugins]], true) -_G.packer_plugins = { - LuaSnip = { - loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/LuaSnip", - url = "https://github.com/L3MON4D3/LuaSnip" - }, - ale = { - loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/ale", - url = "https://github.com/dense-analysis/ale" - }, - ["awesome-vim-colorschemes"] = { - loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/awesome-vim-colorschemes", - url = "https://github.com/rafi/awesome-vim-colorschemes" - }, - ["bclose.vim"] = { - loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/bclose.vim", - url = "https://github.com/rbgrouleff/bclose.vim" - }, - ["bracey.vim"] = { - loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/bracey.vim", - url = "https://github.com/turbio/bracey.vim" - }, - ["cmp-nvim-lsp"] = { - loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", - url = "https://github.com/hrsh7th/cmp-nvim-lsp" - }, - cmp_luasnip = { - loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/cmp_luasnip", - url = "https://github.com/saadparwaiz1/cmp_luasnip" - }, - ["emmet-vim"] = { - loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/emmet-vim", - url = "https://github.com/mattn/emmet-vim" - }, - fzf = { - loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/fzf", - url = "https://github.com/junegunn/fzf" - }, - ["fzf.vim"] = { - loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/fzf.vim", - url = "https://github.com/junegunn/fzf.vim" - }, - hop = { - config = { "\27LJ\1\0025\0\0\2\0\3\0\a4\0\0\0%\1\1\0>\0\2\0027\0\2\0002\1\0\0>\0\2\1G\0\1\0\nsetup\bhop\frequire\0" }, - loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/hop", - url = "https://github.com/phaazon/hop.nvim" - }, - ["lualine.nvim"] = { - loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/lualine.nvim", - url = "https://github.com/nvim-lualine/lualine.nvim" - }, - ["null-ls.nvim"] = { - loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/null-ls.nvim", - url = "https://github.com/jose-elias-alvarez/null-ls.nvim" - }, - ["nvim-autopairs"] = { - loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/nvim-autopairs", - url = "https://github.com/windwp/nvim-autopairs" - }, - ["nvim-cmp"] = { - loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/nvim-cmp", - url = "https://github.com/hrsh7th/nvim-cmp" - }, - ["nvim-lsp-installer"] = { - loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/nvim-lsp-installer", - url = "https://github.com/williamboman/nvim-lsp-installer" - }, - ["nvim-lsp-ts-utils"] = { - loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/nvim-lsp-ts-utils", - url = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils" - }, - ["nvim-lspconfig"] = { - loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", - url = "https://github.com/neovim/nvim-lspconfig" - }, - ["nvim-treesitter"] = { - loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/nvim-treesitter", - url = "https://github.com/nvim-treesitter/nvim-treesitter" - }, - ["nvim-web-devicons"] = { - loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/nvim-web-devicons", - url = "https://github.com/kyazdani42/nvim-web-devicons" - }, - ["packer.nvim"] = { - loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/packer.nvim", - url = "https://github.com/wbthomason/packer.nvim" - }, - ["plenary.nvim"] = { - loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/plenary.nvim", - url = "https://github.com/nvim-lua/plenary.nvim" - }, - ["ranger.vim"] = { - loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/ranger.vim", - url = "https://github.com/francoiscabrol/ranger.vim" - }, - semshi = { - loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/semshi", - url = "https://github.com/numirias/semshi" - }, - ["vim-js"] = { - loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/vim-js", - url = "https://github.com/yuezk/vim-js" - }, - ["vim-jsx-improve"] = { - loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/vim-jsx-improve", - url = "https://github.com/chemzqm/vim-jsx-improve" - }, - ["vim-jsx-pretty"] = { - loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/vim-jsx-pretty", - url = "https://github.com/maxmellon/vim-jsx-pretty" - }, - ["vim-python-pep8-indent"] = { - loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/vim-python-pep8-indent", - url = "https://github.com/Vimjas/vim-python-pep8-indent" - }, - ["vim-table-mode"] = { - loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/vim-table-mode", - url = "https://github.com/dhruvasagar/vim-table-mode" - }, - ["yats.vim"] = { - loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/yats.vim", - url = "https://github.com/HerringtonDarkholme/yats.vim" - } -} - -time([[Defining packer_plugins]], false) --- Config for: hop -time([[Config for hop]], true) -try_loadstring("\27LJ\1\0025\0\0\2\0\3\0\a4\0\0\0%\1\1\0>\0\2\0027\0\2\0002\1\0\0>\0\2\1G\0\1\0\nsetup\bhop\frequire\0", "config", "hop") -time([[Config for hop]], false) -if should_profile then save_profiles() end - -end) - -if not no_errors then - vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None') -end