mirror of
https://github.com/halfdan/dotfiles.git
synced 2025-09-10 19:56:24 +00:00
Setting up a lot of changes
This commit is contained in:
@@ -2,4 +2,4 @@ vim.cmd('let g:nvcode_termcolors=256')
|
||||
|
||||
vim.cmd('colorscheme ' .. O.colorscheme)
|
||||
|
||||
vim.cmd('highlight Normal guibg=NONE ctermbg=NONE')
|
||||
-- vim.cmd('highlight Normal guibg=NONE ctermbg=NONE')
|
||||
|
@@ -1,7 +1,7 @@
|
||||
require'lualine'.setup {
|
||||
options = {
|
||||
icons_enabled = true,
|
||||
theme = 'auto',
|
||||
theme = 'gruvbox-baby',
|
||||
--component_separators = {'', ''},
|
||||
--section_separators = {'', ''},
|
||||
disabled_filetypes = {}
|
||||
@@ -9,8 +9,8 @@ require'lualine'.setup {
|
||||
sections = {
|
||||
lualine_a = {'mode'},
|
||||
lualine_b = {'branch'},
|
||||
lualine_c = { 'filename', 'data', "require'lsp-status'.status()" },
|
||||
lualine_x = {'filetype'},
|
||||
lualine_c = { 'filename', 'diff' },
|
||||
lualine_x = {"require'lsp-status'.status()", 'filetype'},
|
||||
lualine_y = {'progress'},
|
||||
lualine_z = {'location'}
|
||||
},
|
||||
@@ -23,5 +23,14 @@ require'lualine'.setup {
|
||||
lualine_z = {}
|
||||
},
|
||||
tabline = {},
|
||||
extensions = {}
|
||||
extensions = {},
|
||||
winbar = {
|
||||
lualine_a = {
|
||||
},
|
||||
lualine_b = {},
|
||||
lualine_c = {'filename' },
|
||||
lualine_x = {},
|
||||
lualine_y = {},
|
||||
lualine_z = {}
|
||||
}
|
||||
}
|
||||
|
@@ -47,10 +47,21 @@ return require("packer").startup({
|
||||
-- Goodies
|
||||
use {'tpope/vim-fugitive'}
|
||||
use {'tpope/vim-surround'} -- ✅
|
||||
use {'tpope/vim-dispatch'}
|
||||
use {'tpope/vim-dispatch'}
|
||||
|
||||
-- Testing
|
||||
use {'vim-test/vim-test'}
|
||||
use {
|
||||
"nvim-neotest/neotest",
|
||||
requires = {
|
||||
"nvim-lua/plenary.nvim",
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
"antoinemadec/FixCursorHold.nvim",
|
||||
|
||||
"jfpedroza/neotest-elixir"
|
||||
}
|
||||
}
|
||||
use {"nvim-neotest/neotest-vim-test" }
|
||||
|
||||
-- Treesitter
|
||||
use {"nvim-treesitter/nvim-treesitter", run = ":TSUpdate"}
|
||||
@@ -65,6 +76,9 @@ return require("packer").startup({
|
||||
requires = {'kyazdani42/nvim-web-devicons'}
|
||||
}
|
||||
|
||||
use {'rcarriga/nvim-notify'}
|
||||
|
||||
use {'nvim-orgmode/orgmode'}
|
||||
|
||||
use {'justinmk/vim-sneak'}
|
||||
|
||||
@@ -84,7 +98,10 @@ return require("packer").startup({
|
||||
use {'hrsh7th/nvim-cmp'}
|
||||
use {'tzachar/cmp-tabnine', run = './install.sh'}
|
||||
use {'onsails/lspkind-nvim'} -- Display symbol with cmp suggestions
|
||||
use {'L3MON4D3/LuaSnip'}
|
||||
use {
|
||||
'L3MON4D3/LuaSnip',
|
||||
requires = {"rafamadriz/friendly-snippets"},
|
||||
}
|
||||
use {'saadparwaiz1/cmp_luasnip'}
|
||||
|
||||
use {'glepnir/lspsaga.nvim'}
|
||||
|
@@ -1,3 +1,5 @@
|
||||
vim.notify = require("notify")
|
||||
|
||||
vim.cmd('set iskeyword+=-') -- treat dash separated words as a word text object"
|
||||
vim.cmd('set shortmess+=c') -- Don't pass messages to |ins-completion-menu|.
|
||||
vim.cmd('set inccommand=split') -- Make substitution work in realtime
|
||||
@@ -17,7 +19,8 @@ vim.o.mouse = "a" -- Enable your mouse
|
||||
vim.o.splitbelow = true -- Horizontal splits will automatically be below
|
||||
vim.o.termguicolors = true -- set term gui colors most terminals support this
|
||||
vim.o.splitright = true -- Vertical splits will automatically be to the right
|
||||
vim.o.conceallevel = 0 -- So that I can see `` in markdown files
|
||||
vim.opt.conceallevel = 2
|
||||
vim.opt.concealcursor = 'nc'
|
||||
vim.cmd('set ts=2') -- Insert 4 spaces for a tab
|
||||
vim.cmd('set sw=2') -- Change the number of space characters inserted for indentation
|
||||
vim.cmd('set expandtab') -- Converts tabs to spaces
|
||||
@@ -34,10 +37,10 @@ vim.o.updatetime = 300 -- Faster completion
|
||||
vim.o.timeoutlen = 500 -- By default timeoutlen is 1000 ms
|
||||
vim.o.clipboard = "unnamedplus" -- Copy paste between vim and everything else
|
||||
vim.o.laststatus = 3 -- Set global status bar
|
||||
vim.opt.winbar = "%=%m %f" -- Show winbar with modified flag and filename right adjusted
|
||||
|
||||
-- Enable telescope theme
|
||||
vim.g.gruvbox_baby_telescope_theme = 1
|
||||
vim.g.gruvbox_baby_background_color = "dark"
|
||||
-- vim.g.gruvbox_baby_telescope_theme = 1
|
||||
-- vim.g.gruvbox_baby_background_color = "dark"
|
||||
|
||||
vim.g.colorscheme = "gruvbox-baby" -- Set colorscheme
|
||||
vim.g.mapleader = ' '
|
||||
|
@@ -1,10 +1,12 @@
|
||||
local actions = require('telescope.actions')
|
||||
|
||||
require("telescope").load_extension("git_worktree")
|
||||
|
||||
-- Global remapping
|
||||
------------------------------
|
||||
-- '--color=never',
|
||||
require('telescope').setup {
|
||||
defaults = {
|
||||
find_command = {'rg', '--no-heading', '--with-filename', '--line-number', '--column', '--smart-case'},
|
||||
file_ignore_patterns = {"_build", "node_modules", "deps" },
|
||||
prompt_position = "bottom",
|
||||
--prompt_prefix = " ",
|
||||
prompt_prefix = " ",
|
||||
@@ -16,7 +18,6 @@ require('telescope').setup {
|
||||
layout_strategy = "horizontal",
|
||||
layout_defaults = {horizontal = {mirror = false}, vertical = {mirror = false}},
|
||||
file_sorter = require'telescope.sorters'.get_fuzzy_file,
|
||||
file_ignore_patterns = {"_build", "node_modules", "deps" },
|
||||
generic_sorter = require'telescope.sorters'.get_generic_fuzzy_sorter,
|
||||
shorten_path = true,
|
||||
winblend = 0,
|
||||
@@ -32,7 +33,6 @@ require('telescope').setup {
|
||||
file_previewer = require'telescope.previewers'.vim_buffer_cat.new,
|
||||
grep_previewer = require'telescope.previewers'.vim_buffer_vimgrep.new,
|
||||
qflist_previewer = require'telescope.previewers'.vim_buffer_qflist.new,
|
||||
layout_strategy = "horizontal",
|
||||
-- Developer configurations: Not meant for general override
|
||||
buffer_previewer_maker = require'telescope.previewers'.buffer_previewer_maker,
|
||||
mappings = {
|
||||
@@ -43,7 +43,6 @@ require('telescope').setup {
|
||||
-- To disable a keymap, put [map] = false
|
||||
-- So, to not map "<C-n>", just put
|
||||
-- ["<c-x>"] = false,
|
||||
|
||||
|
||||
-- Otherwise, just set the mapping to the function that you want it to be.
|
||||
-- ["<C-i>"] = actions.select_horizontal,
|
||||
|
@@ -1,11 +1,13 @@
|
||||
require('nvim-treesitter.configs').setup({
|
||||
ensure_installed = { "python", "go", "elixir", "rust", "gomod", "json", "lua", "ruby", "yaml" },
|
||||
ensure_installed = { "python", "go", "elixir", "rust", "gomod", "json", "lua", "ruby", "yaml", "org" },
|
||||
ignore_install = { "haskell" },
|
||||
highlight = {
|
||||
enable = true
|
||||
enable = true,
|
||||
additional_vim_regex_highlighting = {'org'},
|
||||
},
|
||||
indent = {
|
||||
enable = true
|
||||
enable = true,
|
||||
disable = { 'org' },
|
||||
},
|
||||
incremental_selection = {
|
||||
enable = true,
|
||||
|
Reference in New Issue
Block a user