minor updates and such
This commit is contained in:
parent
7bc48c6df4
commit
7d66dea176
|
@ -1,6 +1,6 @@
|
||||||
require("lualine").setup({
|
require("lualine").setup({
|
||||||
options = {
|
options = {
|
||||||
theme = "onedark",
|
theme = "tokyonight",
|
||||||
tabline = {
|
tabline = {
|
||||||
lualine_a = { "buffers" },
|
lualine_a = { "buffers" },
|
||||||
lualine_b = { "branch" },
|
lualine_b = { "branch" },
|
||||||
|
|
|
@ -30,6 +30,7 @@ null_ls.setup({
|
||||||
sources = {
|
sources = {
|
||||||
formatting.prettier,
|
formatting.prettier,
|
||||||
formatting.stylua,
|
formatting.stylua,
|
||||||
|
null_ls.builtins.code_actions.gitsigns,
|
||||||
|
|
||||||
-- Here we set a conditional to call the rubocop formatter. If we have a Gemfile in the project, we call "bundle exec rubocop", if not we only call "rubocop".
|
-- Here we set a conditional to call the rubocop formatter. If we have a Gemfile in the project, we call "bundle exec rubocop", if not we only call "rubocop".
|
||||||
conditional(function(utils)
|
conditional(function(utils)
|
||||||
|
|
|
@ -46,7 +46,7 @@ require("lazy").setup({
|
||||||
|
|
||||||
-- Useful status updates for LSP
|
-- Useful status updates for LSP
|
||||||
-- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
|
-- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
|
||||||
{ "j-hui/fidget.nvim", opts = {} },
|
{ "j-hui/fidget.nvim", opts = {} },
|
||||||
|
|
||||||
-- Additional lua configuration, makes nvim stuff amazing!
|
-- Additional lua configuration, makes nvim stuff amazing!
|
||||||
"folke/neodev.nvim",
|
"folke/neodev.nvim",
|
||||||
|
@ -55,11 +55,16 @@ require("lazy").setup({
|
||||||
|
|
||||||
{ -- Autocompletion
|
{ -- Autocompletion
|
||||||
"hrsh7th/nvim-cmp",
|
"hrsh7th/nvim-cmp",
|
||||||
dependencies = { "hrsh7th/cmp-nvim-lsp", "L3MON4D3/LuaSnip", "saadparwaiz1/cmp_luasnip" },
|
dependencies = {
|
||||||
|
"hrsh7th/cmp-nvim-lsp",
|
||||||
|
"L3MON4D3/LuaSnip",
|
||||||
|
"saadparwaiz1/cmp_luasnip",
|
||||||
|
"rafamadriz/friendly-snippets",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
-- Useful plugin to show you pending keybinds.
|
-- Useful plugin to show you pending keybinds.
|
||||||
{ "folke/which-key.nvim", opts = {} },
|
{ "folke/which-key.nvim", opts = {} },
|
||||||
{ -- Adds git releated signs to the gutter, as well as utilities for managing changes
|
{ -- Adds git releated signs to the gutter, as well as utilities for managing changes
|
||||||
"lewis6991/gitsigns.nvim",
|
"lewis6991/gitsigns.nvim",
|
||||||
opts = {
|
opts = {
|
||||||
|
@ -114,7 +119,7 @@ require("lazy").setup({
|
||||||
},
|
},
|
||||||
|
|
||||||
-- "gc" to comment visual regions/lines
|
-- "gc" to comment visual regions/lines
|
||||||
{ "numToStr/Comment.nvim", opts = {} },
|
{ "numToStr/Comment.nvim", opts = {} },
|
||||||
|
|
||||||
-- Fuzzy Finder (files, lsp, etc)
|
-- Fuzzy Finder (files, lsp, etc)
|
||||||
{ "nvim-telescope/telescope.nvim", version = "*", dependencies = { "nvim-lua/plenary.nvim" } },
|
{ "nvim-telescope/telescope.nvim", version = "*", dependencies = { "nvim-lua/plenary.nvim" } },
|
||||||
|
|
|
@ -1,4 +1,23 @@
|
||||||
return {
|
return {
|
||||||
|
{
|
||||||
|
"ThePrimeagen/refactoring.nvim",
|
||||||
|
requires = {
|
||||||
|
{ "nvim-lua/plenary.nvim" },
|
||||||
|
{ "nvim-treesitter/nvim-treesitter" },
|
||||||
|
},
|
||||||
|
config = function()
|
||||||
|
require("refactoring").setup({})
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"folke/tokyonight.nvim",
|
||||||
|
lazy = false, -- make sure we load this during startup if it is your main colorscheme
|
||||||
|
priority = 1000, -- make sure to load this before all the other start plugins
|
||||||
|
config = function()
|
||||||
|
-- load the colorscheme here
|
||||||
|
vim.cmd([[colorscheme tokyonight]])
|
||||||
|
end,
|
||||||
|
},
|
||||||
-- formatting & linting
|
-- formatting & linting
|
||||||
"jose-elias-alvarez/null-ls.nvim",
|
"jose-elias-alvarez/null-ls.nvim",
|
||||||
-- use("jayp0521/mason-null-ls.nvim")
|
-- use("jayp0521/mason-null-ls.nvim")
|
||||||
|
@ -23,4 +42,10 @@ return {
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"rafamadriz/friendly-snippets",
|
||||||
|
config = function()
|
||||||
|
require("luasnip.loaders.from_vscode").lazy_load()
|
||||||
|
end,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,21 +15,12 @@ vim.opt.wrap = false
|
||||||
vim.opt.swapfile = false
|
vim.opt.swapfile = false
|
||||||
vim.opt.backup = false
|
vim.opt.backup = false
|
||||||
vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
|
vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
|
||||||
vim.opt.undofile = true
|
|
||||||
|
|
||||||
vim.opt.hlsearch = false
|
|
||||||
vim.opt.incsearch = true
|
vim.opt.incsearch = true
|
||||||
|
|
||||||
vim.opt.termguicolors = true
|
|
||||||
|
|
||||||
vim.opt.scrolloff = 8
|
vim.opt.scrolloff = 8
|
||||||
vim.opt.signcolumn = "yes"
|
|
||||||
vim.opt.isfname:append("@-@")
|
vim.opt.isfname:append("@-@")
|
||||||
|
|
||||||
vim.opt.updatetime = 50
|
|
||||||
|
|
||||||
vim.opt.colorcolumn = "80"
|
vim.opt.colorcolumn = "80"
|
||||||
|
|
||||||
vim.opt.mouse = ""
|
vim.opt.mouse = "v"
|
||||||
|
|
||||||
vim.g.mapleader = " "
|
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
if [[ $# -eq 1 ]]; then
|
if [[ $# -eq 1 ]]; then
|
||||||
selected=$1
|
selected=$1
|
||||||
else
|
else
|
||||||
selected=$(find ~/.config ~/Development/nurx ~/Development ~/Development/keeps-next ~/Development/keeps-frontend -mindepth 1 -maxdepth 1 -type d | fzf)
|
#selected=$(find ~/.config ~/Development ~/Development/keeps-next ~/Development/keeps-frontend ~/Development/keeps-frontend/bug/**/ -mindepth 1 -maxdepth 1 -type d | fzf)
|
||||||
#selected=$(find ~/.config ~/Development -mindepth 1 -maxdepth 1 -type d | fzf)
|
selected=$(find ~/Development/* -mindepth 1 -maxdepth 10 -type d -prune -a ! -name "node_modules" | fzf)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -z $selected ]]; then
|
if [[ -z $selected ]]; then
|
||||||
|
|
Loading…
Reference in New Issue