mirror of
https://github.com/ivuorinen/dotfiles.git
synced 2026-02-01 22:47:48 +00:00
Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1222b8fdb3 | |||
| cced3a5310 | |||
|
|
6c680a0fa9 | ||
|
|
6746fb5381 | ||
| 7b2831ec94 | |||
| a605d46294 | |||
|
|
5e98f61942 | ||
|
|
e2583f4d91 | ||
| 80b2e542bf |
12
Brewfile
12
Brewfile
@@ -14,8 +14,6 @@ tap "mongodb/brew"
|
|||||||
tap "shivammathur/extensions"
|
tap "shivammathur/extensions"
|
||||||
tap "shivammathur/php"
|
tap "shivammathur/php"
|
||||||
tap "teamookla/speedtest"
|
tap "teamookla/speedtest"
|
||||||
# Interpreted, interactive, object-oriented programming language
|
|
||||||
brew "python@3.10"
|
|
||||||
# Automate deployment, configuration, and upgrading
|
# Automate deployment, configuration, and upgrading
|
||||||
brew "ansible"
|
brew "ansible"
|
||||||
# Zstandard is a real-time compression algorithm
|
# Zstandard is a real-time compression algorithm
|
||||||
@@ -36,6 +34,8 @@ brew "glib"
|
|||||||
brew "pkg-config"
|
brew "pkg-config"
|
||||||
# Open source suite of directory software
|
# Open source suite of directory software
|
||||||
brew "openldap"
|
brew "openldap"
|
||||||
|
# Get a file from an HTTP, HTTPS or FTP server
|
||||||
|
brew "curl"
|
||||||
# Libraries to talk to Microsoft SQL Server and Sybase databases
|
# Libraries to talk to Microsoft SQL Server and Sybase databases
|
||||||
brew "freetds"
|
brew "freetds"
|
||||||
# C/C++ and Java libraries for Unicode and globalization
|
# C/C++ and Java libraries for Unicode and globalization
|
||||||
@@ -48,6 +48,8 @@ brew "php"
|
|||||||
brew "composer"
|
brew "composer"
|
||||||
# GNU File, Shell, and Text utilities
|
# GNU File, Shell, and Text utilities
|
||||||
brew "coreutils"
|
brew "coreutils"
|
||||||
|
# Get, unpack, build, and install modules from CPAN
|
||||||
|
brew "cpanminus"
|
||||||
# Diff that understands syntax
|
# Diff that understands syntax
|
||||||
brew "difftastic"
|
brew "difftastic"
|
||||||
# Tool for exploring each layer in a docker image
|
# Tool for exploring each layer in a docker image
|
||||||
@@ -126,6 +128,10 @@ brew "nvm"
|
|||||||
brew "openjdk"
|
brew "openjdk"
|
||||||
# Generate clients, server & docs from an OpenAPI spec (v2, v3)
|
# Generate clients, server & docs from an OpenAPI spec (v2, v3)
|
||||||
brew "openapi-generator"
|
brew "openapi-generator"
|
||||||
|
# Highly capable, feature-rich programming language
|
||||||
|
brew "perl"
|
||||||
|
# Interpreted, interactive, object-oriented programming language
|
||||||
|
brew "python@3.10"
|
||||||
# Interpreted, interactive, object-oriented programming language
|
# Interpreted, interactive, object-oriented programming language
|
||||||
brew "python@3.8"
|
brew "python@3.8"
|
||||||
# RC file (dotfile) management
|
# RC file (dotfile) management
|
||||||
@@ -226,6 +232,8 @@ cask "insomnia"
|
|||||||
cask "jetbrains-toolbox"
|
cask "jetbrains-toolbox"
|
||||||
# Kubernetes IDE
|
# Kubernetes IDE
|
||||||
cask "lens"
|
cask "lens"
|
||||||
|
# Neovim Client
|
||||||
|
cask "neovide"
|
||||||
# Reverse proxy, secure introspectable tunnels to localhost
|
# Reverse proxy, secure introspectable tunnels to localhost
|
||||||
cask "ngrok"
|
cask "ngrok"
|
||||||
# Collaboration platform for API development
|
# Collaboration platform for API development
|
||||||
|
|||||||
@@ -3,7 +3,11 @@ local install_path = vim.fn.stdpath 'data' .. '/site/pack/packer/start/packer.nv
|
|||||||
local is_bootstrap = false
|
local is_bootstrap = false
|
||||||
if vim.fn.empty(vim.fn.glob(install_path)) > 0 then
|
if vim.fn.empty(vim.fn.glob(install_path)) > 0 then
|
||||||
is_bootstrap = true
|
is_bootstrap = true
|
||||||
vim.fn.system { 'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path }
|
vim.fn.system {
|
||||||
|
'git', 'clone', '--depth', '1',
|
||||||
|
'https://github.com/wbthomason/packer.nvim',
|
||||||
|
install_path
|
||||||
|
}
|
||||||
vim.cmd [[packadd packer.nvim]]
|
vim.cmd [[packadd packer.nvim]]
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -25,7 +29,11 @@ require('packer').startup(function(use)
|
|||||||
|
|
||||||
use { -- Autocompletion
|
use { -- Autocompletion
|
||||||
'hrsh7th/nvim-cmp',
|
'hrsh7th/nvim-cmp',
|
||||||
requires = { 'hrsh7th/cmp-nvim-lsp', 'L3MON4D3/LuaSnip', 'saadparwaiz1/cmp_luasnip' },
|
requires = {
|
||||||
|
'hrsh7th/cmp-nvim-lsp',
|
||||||
|
'L3MON4D3/LuaSnip',
|
||||||
|
'saadparwaiz1/cmp_luasnip',
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
use { -- Highlight, edit, and navigate code
|
use { -- Highlight, edit, and navigate code
|
||||||
@@ -45,30 +53,30 @@ require('packer').startup(function(use)
|
|||||||
use 'tpope/vim-rhubarb'
|
use 'tpope/vim-rhubarb'
|
||||||
use 'lewis6991/gitsigns.nvim'
|
use 'lewis6991/gitsigns.nvim'
|
||||||
|
|
||||||
use 'drewtempelmeyer/palenight.vim' -- Theme based off the Material Pale Night
|
-- Theme based off the Material Pale Night
|
||||||
use 'nvim-lualine/lualine.nvim' -- Fancier statusline
|
use 'drewtempelmeyer/palenight.vim'
|
||||||
use 'lukas-reineke/indent-blankline.nvim' -- Add indentation guides even on blank lines
|
-- Fancier statusline
|
||||||
use 'numToStr/Comment.nvim' -- "gc" to comment visual regions/lines
|
use 'nvim-lualine/lualine.nvim'
|
||||||
use 'tpope/vim-sleuth' -- Detect tabstop and shiftwidth automatically
|
-- Add indentation guides even on blank lines.
|
||||||
|
use 'lukas-reineke/indent-blankline.nvim'
|
||||||
|
-- "gc" to comment visual regions/lines
|
||||||
|
use 'numToStr/Comment.nvim'
|
||||||
|
-- Detect tabstop and shiftwidth automatically.
|
||||||
|
use 'tpope/vim-sleuth'
|
||||||
|
|
||||||
-- Fuzzy Finder (files, lsp, etc)
|
-- Fuzzy Finder (files, lsp, etc)
|
||||||
use { 'nvim-telescope/telescope.nvim', branch = '0.1.x', requires = { 'nvim-lua/plenary.nvim' } }
|
use { 'nvim-telescope/telescope.nvim',
|
||||||
|
branch = '0.1.x',
|
||||||
-- Fuzzy Finder Algorithm which requires local dependencies to be built. Only load if `make` is available
|
requires = { 'nvim-lua/plenary.nvim' }
|
||||||
use { 'nvim-telescope/telescope-fzf-native.nvim', run = 'make', cond = vim.fn.executable 'make' == 1 }
|
|
||||||
|
|
||||||
use {
|
|
||||||
"folke/which-key.nvim",
|
|
||||||
config = function()
|
|
||||||
require("which-key").setup {
|
|
||||||
-- your configuration comes here
|
|
||||||
-- or leave it empty to use the default settings
|
|
||||||
-- refer to the configuration section below
|
|
||||||
}
|
|
||||||
end
|
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Add custom plugins to packer from ~/.config/nvim/lua/custom/plugins.lua
|
-- Fuzzy Finder Algorithm which requires local dependencies to be built.
|
||||||
|
-- Only load if `make` is available
|
||||||
|
use { 'nvim-telescope/telescope-fzf-native.nvim',
|
||||||
|
run = 'make', cond = vim.fn.executable 'make' == 1 }
|
||||||
|
|
||||||
|
-- Add custom plugins to packer from
|
||||||
|
-- ~/.config/nvim/lua/custom/plugins.lua
|
||||||
local has_plugins, plugins = pcall(require, 'custom.plugins')
|
local has_plugins, plugins = pcall(require, 'custom.plugins')
|
||||||
if has_plugins then
|
if has_plugins then
|
||||||
plugins(use)
|
plugins(use)
|
||||||
@@ -92,12 +100,13 @@ if is_bootstrap then
|
|||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Automatically source and re-compile packer whenever you save this init.lua
|
-- Automatically source and re-compile packer
|
||||||
|
-- whenever you save this init.lua, or packages.lua
|
||||||
local packer_group = vim.api.nvim_create_augroup('Packer', { clear = true })
|
local packer_group = vim.api.nvim_create_augroup('Packer', { clear = true })
|
||||||
vim.api.nvim_create_autocmd('BufWritePost', {
|
vim.api.nvim_create_autocmd('BufWritePost', {
|
||||||
command = 'source <afile> | PackerCompile',
|
command = 'source <afile> | PackerCompile',
|
||||||
group = packer_group,
|
group = packer_group,
|
||||||
pattern = vim.fn.expand '$MYVIMRC',
|
pattern = { vim.fn.expand '$MYVIMRC', '~/.dotfiles/config/nvim/**/*.lua' },
|
||||||
})
|
})
|
||||||
|
|
||||||
-- [[ Setting options ]]
|
-- [[ Setting options ]]
|
||||||
@@ -106,8 +115,9 @@ vim.api.nvim_create_autocmd('BufWritePost', {
|
|||||||
-- Set highlight on search
|
-- Set highlight on search
|
||||||
vim.o.hlsearch = false
|
vim.o.hlsearch = false
|
||||||
|
|
||||||
-- Make line numbers default
|
-- Make line numbers default, enabled relative linenumbers
|
||||||
vim.wo.number = true
|
vim.wo.number = true
|
||||||
|
vim.opt.relativenumber = true
|
||||||
|
|
||||||
-- Enable mouse mode
|
-- Enable mouse mode
|
||||||
vim.o.mouse = 'a'
|
vim.o.mouse = 'a'
|
||||||
@@ -133,10 +143,19 @@ vim.cmd.colorscheme('palenight')
|
|||||||
-- Set completeopt to have a better completion experience
|
-- Set completeopt to have a better completion experience
|
||||||
vim.o.completeopt = 'menuone,noselect'
|
vim.o.completeopt = 'menuone,noselect'
|
||||||
|
|
||||||
|
-- Configure and disable providers.
|
||||||
|
vim.g.python3_host_prog = '/opt/homebrew/bin/python3'
|
||||||
|
vim.g.loaded_ruby_provider = 0
|
||||||
|
|
||||||
|
-- Setup winbar
|
||||||
|
-- See :h statusline
|
||||||
|
vim.o.winbar = '%=%m %f'
|
||||||
|
|
||||||
-- [[ Basic Keymaps ]]
|
-- [[ Basic Keymaps ]]
|
||||||
-- Set <space> as the leader key
|
-- Set <space> as the leader key
|
||||||
-- See `:help mapleader`
|
-- See `:help mapleader`
|
||||||
-- NOTE: Must happen before plugins are required (otherwise wrong leader will be used)
|
-- NOTE: Must happen before plugins are required
|
||||||
|
-- (otherwise wrong leader will be used)
|
||||||
vim.g.mapleader = ' '
|
vim.g.mapleader = ' '
|
||||||
vim.g.maplocalleader = ' '
|
vim.g.maplocalleader = ' '
|
||||||
|
|
||||||
@@ -148,7 +167,9 @@ vim.keymap.set({ 'n', 'v' }, '<Space>', '<Nop>', { silent = true })
|
|||||||
vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
|
vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
|
||||||
vim.keymap.set('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
|
vim.keymap.set('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
|
||||||
|
|
||||||
local highlight_group = vim.api.nvim_create_augroup('YankHighlight', { clear = true })
|
local highlight_group = vim.api.nvim_create_augroup(
|
||||||
|
'YankHighlight', { clear = true }
|
||||||
|
)
|
||||||
vim.api.nvim_create_autocmd('TextYankPost', {
|
vim.api.nvim_create_autocmd('TextYankPost', {
|
||||||
callback = function()
|
callback = function()
|
||||||
vim.highlight.on_yank()
|
vim.highlight.on_yank()
|
||||||
@@ -161,8 +182,8 @@ vim.api.nvim_create_autocmd('TextYankPost', {
|
|||||||
-- See `:help lualine.txt`
|
-- See `:help lualine.txt`
|
||||||
require('lualine').setup {
|
require('lualine').setup {
|
||||||
options = {
|
options = {
|
||||||
icons_enabled = false,
|
icons_enabled = true,
|
||||||
theme = 'onedark',
|
theme = 'auto',
|
||||||
component_separators = '|',
|
component_separators = '|',
|
||||||
section_separators = '',
|
section_separators = '',
|
||||||
},
|
},
|
||||||
@@ -174,8 +195,11 @@ require('Comment').setup()
|
|||||||
-- Enable `lukas-reineke/indent-blankline.nvim`
|
-- Enable `lukas-reineke/indent-blankline.nvim`
|
||||||
-- See `:help indent_blankline.txt`
|
-- See `:help indent_blankline.txt`
|
||||||
require('indent_blankline').setup {
|
require('indent_blankline').setup {
|
||||||
char = '┊',
|
-- char = '┊',
|
||||||
show_trailing_blankline_indent = false,
|
show_trailing_blankline_indent = true,
|
||||||
|
space_char_blankline = " ",
|
||||||
|
show_current_context = true,
|
||||||
|
show_current_context_start = true,
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Gitsigns
|
-- Gitsigns
|
||||||
@@ -207,34 +231,67 @@ require('telescope').setup {
|
|||||||
pcall(require('telescope').load_extension, 'fzf')
|
pcall(require('telescope').load_extension, 'fzf')
|
||||||
|
|
||||||
-- See `:help telescope.builtin`
|
-- See `:help telescope.builtin`
|
||||||
vim.keymap.set('n', '<leader>?', require('telescope.builtin').oldfiles, {
|
vim.keymap.set('n', '<leader>?', require('telescope.builtin').oldfiles,
|
||||||
desc = '[?] Find recently opened files'
|
{ desc = '[?] Find recently opened files' })
|
||||||
})
|
vim.keymap.set('n', '<leader><space>', require('telescope.builtin').buffers,
|
||||||
vim.keymap.set('n', '<leader><space>', require('telescope.builtin').buffers, {
|
{ desc = '[ ] Find existing buffers' })
|
||||||
desc = '[ ] Find existing buffers'
|
|
||||||
})
|
|
||||||
vim.keymap.set('n', '<leader>/', function()
|
vim.keymap.set('n', '<leader>/', function()
|
||||||
-- You can pass additional configuration to telescope to change theme, layout, etc.
|
-- You can pass additional configuration to telescope to
|
||||||
require('telescope.builtin').current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {
|
-- change theme, layout, etc.
|
||||||
|
require('telescope.builtin').current_buffer_fuzzy_find(
|
||||||
|
require('telescope.themes').get_dropdown {
|
||||||
winblend = 10,
|
winblend = 10,
|
||||||
previewer = false,
|
previewer = false,
|
||||||
})
|
})
|
||||||
end, { desc = '[/] Fuzzily search in current buffer]' })
|
end, { desc = '[/] Fuzzily search in current buffer]' })
|
||||||
|
|
||||||
vim.keymap.set('n', '<leader>sf', require('telescope.builtin').find_files, { desc = '[S]earch [F]iles' })
|
vim.keymap.set('n', '<leader>sf', require('telescope.builtin').find_files,
|
||||||
vim.keymap.set('n', '<leader>sh', require('telescope.builtin').help_tags, { desc = '[S]earch [H]elp' })
|
{ desc = '[S]earch [F]iles' })
|
||||||
vim.keymap.set('n', '<leader>sw', require('telescope.builtin').grep_string, { desc = '[S]earch current [W]ord' })
|
vim.keymap.set('n', '<leader>sh', require('telescope.builtin').help_tags,
|
||||||
vim.keymap.set('n', '<leader>sg', require('telescope.builtin').live_grep, { desc = '[S]earch by [G]rep' })
|
{ desc = '[S]earch [H]elp' })
|
||||||
vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics, { desc = '[S]earch [D]iagnostics' })
|
vim.keymap.set('n', '<leader>sw', require('telescope.builtin').grep_string,
|
||||||
|
{ desc = '[S]earch current [W]ord' })
|
||||||
|
vim.keymap.set('n', '<leader>sg', require('telescope.builtin').live_grep,
|
||||||
|
{ desc = '[S]earch by [G]rep' })
|
||||||
|
vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics,
|
||||||
|
{ desc = '[S]earch [D]iagnostics' })
|
||||||
|
|
||||||
|
-- Load custom treesitter grammar for org filetype
|
||||||
|
require('orgmode').setup_ts_grammar()
|
||||||
|
|
||||||
-- [[ Configure Treesitter ]]
|
-- [[ Configure Treesitter ]]
|
||||||
-- See `:help nvim-treesitter`
|
-- See `:help nvim-treesitter`
|
||||||
require('nvim-treesitter.configs').setup {
|
require('nvim-treesitter.configs').setup {
|
||||||
-- Add languages to be installed here that you want installed for treesitter
|
-- Add languages to be installed here that you want
|
||||||
ensure_installed = { 'c', 'cpp', 'go', 'lua', 'php', 'python', 'rust', 'typescript', 'help' },
|
-- installed for treesitter
|
||||||
|
ensure_installed = {
|
||||||
|
'bash',
|
||||||
|
'c', 'comment', 'cpp',
|
||||||
|
'diff', 'dockerfile',
|
||||||
|
'gitattributes', 'gitignore', 'go',
|
||||||
|
'html', 'http',
|
||||||
|
'javascript', 'jq', 'jsdoc', 'json',
|
||||||
|
'lua',
|
||||||
|
'markdown',
|
||||||
|
'org',
|
||||||
|
'php', 'phpdoc', 'python',
|
||||||
|
'regex', 'rust',
|
||||||
|
'scss', 'sql',
|
||||||
|
'typescript',
|
||||||
|
'vim', 'vue',
|
||||||
|
'yaml',
|
||||||
|
'help',
|
||||||
|
},
|
||||||
|
|
||||||
|
highlight = {
|
||||||
|
enable = true,
|
||||||
|
-- Required for spellcheck, some LaTex highlights and
|
||||||
|
-- code block highlights that do not have ts grammar
|
||||||
|
additional_vim_regex_highlighting = {'org'},
|
||||||
|
},
|
||||||
|
|
||||||
highlight = { enable = true },
|
|
||||||
indent = { enable = true, disable = { 'python' } },
|
indent = { enable = true, disable = { 'python' } },
|
||||||
|
|
||||||
incremental_selection = {
|
incremental_selection = {
|
||||||
enable = true,
|
enable = true,
|
||||||
keymaps = {
|
keymaps = {
|
||||||
@@ -244,10 +301,12 @@ require('nvim-treesitter.configs').setup {
|
|||||||
node_decremental = '<c-backspace>',
|
node_decremental = '<c-backspace>',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
textobjects = {
|
textobjects = {
|
||||||
select = {
|
select = {
|
||||||
enable = true,
|
enable = true,
|
||||||
lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim
|
-- Automatically jump forward to textobj, similar to targets.vim
|
||||||
|
lookahead = true,
|
||||||
keymaps = {
|
keymaps = {
|
||||||
-- You can use the capture groups defined in textobjects.scm
|
-- You can use the capture groups defined in textobjects.scm
|
||||||
['aa'] = '@parameter.outer',
|
['aa'] = '@parameter.outer',
|
||||||
@@ -290,21 +349,31 @@ require('nvim-treesitter.configs').setup {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
require('orgmode').setup({
|
||||||
|
org_agenda_files = {
|
||||||
|
'~/Library/Mobile Documents/iCloud~md~obsidian/Documents/_nvalt/**/*',
|
||||||
|
'~/.dotfiles/local/org/**/*'
|
||||||
|
},
|
||||||
|
org_default_notes_file = '~/Library/Mobile Documents/iCloud~md~obsidian/Documents/_nvalt/refile.org',
|
||||||
|
})
|
||||||
|
|
||||||
-- Diagnostic keymaps
|
-- Diagnostic keymaps
|
||||||
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
|
vim.keymap.set('n', 'dz', vim.diagnostic.goto_prev)
|
||||||
vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
|
vim.keymap.set('n', 'dx', vim.diagnostic.goto_next)
|
||||||
vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float)
|
vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float)
|
||||||
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist)
|
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist)
|
||||||
|
|
||||||
-- LSP settings.
|
-- LSP settings.
|
||||||
-- This function gets run when an LSP connects to a particular buffer.
|
-- This function gets run when an LSP connects to a particular buffer.
|
||||||
local on_attach = function(_, bufnr)
|
local on_attach = function(_, bufnr)
|
||||||
-- NOTE: Remember that lua is a real programming language, and as such it is possible
|
-- NOTE: Remember that lua is a real programming language,
|
||||||
-- to define small helper and utility functions so you don't have to repeat yourself
|
-- and as such it is possible to define small helper and
|
||||||
|
-- utility functions so you don't have to repeat yourself
|
||||||
-- many times.
|
-- many times.
|
||||||
--
|
--
|
||||||
-- In this case, we create a function that lets us more easily define mappings specific
|
-- In this case, we create a function that lets us more
|
||||||
-- for LSP related items. It sets the mode, buffer and description for us each time.
|
-- easily define mappings specific for LSP related items.
|
||||||
|
-- It sets the mode, buffer and description for us each time.
|
||||||
local nmap = function(keys, func, desc)
|
local nmap = function(keys, func, desc)
|
||||||
if desc then
|
if desc then
|
||||||
desc = 'LSP: ' .. desc
|
desc = 'LSP: ' .. desc
|
||||||
@@ -317,11 +386,14 @@ local on_attach = function(_, bufnr)
|
|||||||
nmap('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
|
nmap('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
|
||||||
|
|
||||||
nmap('gd', vim.lsp.buf.definition, '[G]oto [D]efinition')
|
nmap('gd', vim.lsp.buf.definition, '[G]oto [D]efinition')
|
||||||
nmap('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
|
nmap('gr', require('telescope.builtin').lsp_references,
|
||||||
|
'[G]oto [R]eferences')
|
||||||
nmap('gI', vim.lsp.buf.implementation, '[G]oto [I]mplementation')
|
nmap('gI', vim.lsp.buf.implementation, '[G]oto [I]mplementation')
|
||||||
nmap('<leader>D', vim.lsp.buf.type_definition, 'Type [D]efinition')
|
nmap('<leader>D', vim.lsp.buf.type_definition, 'Type [D]efinition')
|
||||||
nmap('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
|
nmap('<leader>ds', require('telescope.builtin').lsp_document_symbols,
|
||||||
nmap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
|
'[D]ocument [S]ymbols')
|
||||||
|
nmap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols,
|
||||||
|
'[W]orkspace [S]ymbols')
|
||||||
|
|
||||||
-- See `:help K` for why this keymap
|
-- See `:help K` for why this keymap
|
||||||
nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
|
nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
|
||||||
@@ -329,8 +401,10 @@ local on_attach = function(_, bufnr)
|
|||||||
|
|
||||||
-- Lesser used LSP functionality
|
-- Lesser used LSP functionality
|
||||||
nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
|
nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
|
||||||
nmap('<leader>wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder')
|
nmap('<leader>wa', vim.lsp.buf.add_workspace_folder,
|
||||||
nmap('<leader>wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder')
|
'[W]orkspace [A]dd Folder')
|
||||||
|
nmap('<leader>wr', vim.lsp.buf.remove_workspace_folder,
|
||||||
|
'[W]orkspace [R]emove Folder')
|
||||||
nmap('<leader>wl', function()
|
nmap('<leader>wl', function()
|
||||||
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
||||||
end, '[W]orkspace [L]ist Folders')
|
end, '[W]orkspace [L]ist Folders')
|
||||||
@@ -348,15 +422,79 @@ end
|
|||||||
-- Setup mason so it can manage external tooling
|
-- Setup mason so it can manage external tooling
|
||||||
require('mason').setup()
|
require('mason').setup()
|
||||||
|
|
||||||
-- Enable the following language servers
|
-- Enable the following language servers.
|
||||||
-- Feel free to add/remove any LSPs that you want here. They will automatically be installed
|
-- Feel free to add/remove any LSPs that you want here.
|
||||||
local servers = { 'clangd', 'rust_analyzer', 'pyright', 'tsserver', 'sumneko_lua', 'gopls' }
|
-- They will automatically be installed.
|
||||||
|
-- https://github.com/williamboman/mason-lspconfig.nvim#available-lsp-servers
|
||||||
|
local servers = {
|
||||||
|
-- a
|
||||||
|
'angularls',
|
||||||
|
'ansiblels',
|
||||||
|
-- b
|
||||||
|
'bashls',
|
||||||
|
-- c
|
||||||
|
'clangd',
|
||||||
|
'cssls',
|
||||||
|
-- d
|
||||||
|
'dockerls',
|
||||||
|
-- e
|
||||||
|
'eslint',
|
||||||
|
'emmet_ls',
|
||||||
|
-- f
|
||||||
|
-- g
|
||||||
|
'gopls',
|
||||||
|
'graphql',
|
||||||
|
-- h
|
||||||
|
'html',
|
||||||
|
-- i
|
||||||
|
-- j
|
||||||
|
'quick_lint_js', -- js
|
||||||
|
'jsonls',
|
||||||
|
-- k
|
||||||
|
-- l
|
||||||
|
'sumneko_lua', -- lua
|
||||||
|
-- m
|
||||||
|
'marksman', -- markdown
|
||||||
|
-- n
|
||||||
|
-- o
|
||||||
|
'spectral', --openapi
|
||||||
|
-- p
|
||||||
|
'intelephense', 'phpactor', 'psalm',
|
||||||
|
'pyright',
|
||||||
|
-- q
|
||||||
|
-- r
|
||||||
|
'rust_analyzer',
|
||||||
|
-- s
|
||||||
|
'sqlls',
|
||||||
|
'stylelint_lsp',
|
||||||
|
-- t
|
||||||
|
'tailwindcss',
|
||||||
|
'terraformls',
|
||||||
|
'tflint',
|
||||||
|
'tsserver',
|
||||||
|
-- u
|
||||||
|
-- v / w
|
||||||
|
'volar', -- vue
|
||||||
|
'vuels', -- vue
|
||||||
|
-- x / y / z
|
||||||
|
'lemminx', -- xml
|
||||||
|
'yamlls', -- yaml
|
||||||
|
}
|
||||||
|
|
||||||
-- Ensure the servers above are installed
|
-- Ensure the servers above are installed
|
||||||
require('mason-lspconfig').setup {
|
require('mason-lspconfig').setup {
|
||||||
ensure_installed = servers,
|
ensure_installed = servers,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
require("mason-lspconfig").setup_handlers {
|
||||||
|
-- The first entry (without a key) will be the default handler
|
||||||
|
-- and will be called for each installed server that doesn't have
|
||||||
|
-- a dedicated handler.
|
||||||
|
function (server_name) -- default handler (optional)
|
||||||
|
require("lspconfig")[server_name].setup {}
|
||||||
|
end,
|
||||||
|
}
|
||||||
|
|
||||||
-- nvim-cmp supports additional completion capabilities
|
-- nvim-cmp supports additional completion capabilities
|
||||||
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
||||||
capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
|
capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
|
||||||
@@ -384,7 +522,8 @@ require('lspconfig').sumneko_lua.setup {
|
|||||||
settings = {
|
settings = {
|
||||||
Lua = {
|
Lua = {
|
||||||
runtime = {
|
runtime = {
|
||||||
-- Tell the language server which version of Lua you're using (most likely LuaJIT)
|
-- Tell the language server which version of Lua you're
|
||||||
|
-- using (most likely LuaJIT)
|
||||||
version = 'LuaJIT',
|
version = 'LuaJIT',
|
||||||
-- Setup your lua path
|
-- Setup your lua path
|
||||||
path = runtime_path,
|
path = runtime_path,
|
||||||
@@ -396,7 +535,8 @@ require('lspconfig').sumneko_lua.setup {
|
|||||||
library = vim.api.nvim_get_runtime_file('', true),
|
library = vim.api.nvim_get_runtime_file('', true),
|
||||||
checkThirdParty = false,
|
checkThirdParty = false,
|
||||||
},
|
},
|
||||||
-- Do not send telemetry data containing a randomized but unique identifier
|
-- Do not send telemetry data containing a randomized
|
||||||
|
-- but unique identifier
|
||||||
telemetry = { enable = false },
|
telemetry = { enable = false },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -445,5 +585,61 @@ cmp.setup {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
-- barbar keymaps
|
||||||
|
local map = vim.api.nvim_set_keymap
|
||||||
|
local opts = { noremap = true, silent = true }
|
||||||
|
|
||||||
|
-- Move to previous/next
|
||||||
|
map('n', '<C-,>', '<Cmd>BufferPrevious<CR>', opts)
|
||||||
|
map('n', '<C-.>', '<Cmd>BufferNext<CR>', opts)
|
||||||
|
-- Re-order to previous/next
|
||||||
|
map('n', '<C-<>', '<Cmd>BufferMovePrevious<CR>', opts)
|
||||||
|
map('n', '<C->>', '<Cmd>BufferMoveNext<CR>', opts)
|
||||||
|
-- Goto buffer in position...
|
||||||
|
map('n', '<A-1>', '<Cmd>BufferGoto 1<CR>', opts)
|
||||||
|
map('n', '<A-2>', '<Cmd>BufferGoto 2<CR>', opts)
|
||||||
|
map('n', '<A-3>', '<Cmd>BufferGoto 3<CR>', opts)
|
||||||
|
map('n', '<A-4>', '<Cmd>BufferGoto 4<CR>', opts)
|
||||||
|
map('n', '<A-5>', '<Cmd>BufferGoto 5<CR>', opts)
|
||||||
|
map('n', '<A-6>', '<Cmd>BufferGoto 6<CR>', opts)
|
||||||
|
map('n', '<A-7>', '<Cmd>BufferGoto 7<CR>', opts)
|
||||||
|
map('n', '<A-8>', '<Cmd>BufferGoto 8<CR>', opts)
|
||||||
|
map('n', '<A-9>', '<Cmd>BufferGoto 9<CR>', opts)
|
||||||
|
map('n', '<A-0>', '<Cmd>BufferLast<CR>', opts)
|
||||||
|
-- Pin/unpin buffer
|
||||||
|
map('n', '<A-p>', '<Cmd>BufferPin<CR>', opts)
|
||||||
|
-- Close buffer
|
||||||
|
map('n', '<A-c>', '<Cmd>BufferClose<CR>', opts)
|
||||||
|
-- Wipeout buffer
|
||||||
|
-- :BufferWipeout
|
||||||
|
-- Close commands
|
||||||
|
-- :BufferCloseAllButCurrent
|
||||||
|
-- :BufferCloseAllButPinned
|
||||||
|
-- :BufferCloseAllButCurrentOrPinned
|
||||||
|
-- :BufferCloseBuffersLeft
|
||||||
|
-- :BufferCloseBuffersRight
|
||||||
|
-- Magic buffer-picking mode
|
||||||
|
map('n', '<C-p>', '<Cmd>BufferPick<CR>', opts)
|
||||||
|
-- Sort automatically by...
|
||||||
|
map('n', '<Space>bb', '<Cmd>BufferOrderByBufferNumber<CR>', opts)
|
||||||
|
map('n', '<Space>bd', '<Cmd>BufferOrderByDirectory<CR>', opts)
|
||||||
|
map('n', '<Space>bl', '<Cmd>BufferOrderByLanguage<CR>', opts)
|
||||||
|
map('n', '<Space>bw', '<Cmd>BufferOrderByWindowNumber<CR>', opts)
|
||||||
|
|
||||||
|
-- Other:
|
||||||
|
-- :BarbarEnable - enables barbar (enabled by default)
|
||||||
|
-- :BarbarDisable - very bad command, should never be used
|
||||||
|
|
||||||
|
vim.api.nvim_create_autocmd("BufWritePost",
|
||||||
|
{ pattern = "plugins.lua", command = "source <afile> | PackerSync" })
|
||||||
|
vim.api.nvim_create_autocmd("BufRead",
|
||||||
|
{ pattern = "*/node_modules/*", command = "lua vim.diagnostic.disable(0)" })
|
||||||
|
vim.api.nvim_create_autocmd("BufNewFile",
|
||||||
|
{ pattern = "*/node_modules/*", command = "lua vim.diagnostic.disable(0)" })
|
||||||
|
-- Enable spell checking for certain file types
|
||||||
|
vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" },
|
||||||
|
{ pattern = { "*.txt", "*.md", "*.tex" },
|
||||||
|
command = "setlocal spell" })
|
||||||
|
|
||||||
-- The line beneath this is called `modeline`. See `:help modeline`
|
-- The line beneath this is called `modeline`. See `:help modeline`
|
||||||
-- vim: ts=2 sts=2 sw=2 et
|
-- vim: ts=2 sts=2 sw=2 et
|
||||||
|
|||||||
74
config/nvim/lua/custom/plugins.lua
Normal file
74
config/nvim/lua/custom/plugins.lua
Normal file
@@ -0,0 +1,74 @@
|
|||||||
|
return function(use)
|
||||||
|
|
||||||
|
-- 💥 Create key bindings that stick.
|
||||||
|
-- WhichKey is a lua plugin that displays a popup with
|
||||||
|
-- possible keybindings of the command you started typing.
|
||||||
|
use({ "folke/which-key.nvim", config = function() require("which-key").setup({}) end })
|
||||||
|
|
||||||
|
-- 🍨 Soothing pastel theme for (Neo)vim
|
||||||
|
-- https://github.com/catppuccin/nvim
|
||||||
|
-- use { "catppuccin/nvim", as = "catppuccin" }
|
||||||
|
-- vim.cmd.colorscheme('catppuccin-latte')
|
||||||
|
|
||||||
|
-- markdown preview plugin for (neo)vim
|
||||||
|
-- https://github.com/iamcco/markdown-preview.nvim
|
||||||
|
use({ "iamcco/markdown-preview.nvim",
|
||||||
|
run = function() vim.fn["mkdp#util#install"]() end,
|
||||||
|
})
|
||||||
|
|
||||||
|
-- The neovim tabline plugin.
|
||||||
|
-- https://github.com/romgrk/barbar.nvim
|
||||||
|
use 'nvim-tree/nvim-web-devicons'
|
||||||
|
use { 'romgrk/barbar.nvim', wants = 'nvim-web-devicons' }
|
||||||
|
|
||||||
|
-- Pretty UI
|
||||||
|
use 'stevearc/dressing.nvim' -- Neovim plugin to improve the default vim.ui interfaces
|
||||||
|
use 'rcarriga/nvim-notify' -- A fancy, configurable, notification manager for NeoVim
|
||||||
|
use 'vigoux/notifier.nvim' -- Non-intrusive notification system for neovim
|
||||||
|
use { 'folke/todo-comments.nvim', -- ✅ Highlight, list and search todo comments in your projects
|
||||||
|
requires = 'nvim-lua/plenary.nvim',
|
||||||
|
config = function() require('todo-comments').setup {} end,
|
||||||
|
}
|
||||||
|
|
||||||
|
-- The Refactoring library based off the Refactoring book by Martin Fowler
|
||||||
|
-- https://github.com/ThePrimeagen/refactoring.nvim
|
||||||
|
use {
|
||||||
|
"ThePrimeagen/refactoring.nvim",
|
||||||
|
requires = {
|
||||||
|
{"nvim-lua/plenary.nvim"},
|
||||||
|
{"nvim-treesitter/nvim-treesitter"}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
-- An asynchronous linter plugin for Neovim complementary to the built-in Language Server Protocol support.
|
||||||
|
-- https://github.com/mfussenegger/nvim-lint
|
||||||
|
use 'mfussenegger/nvim-lint'
|
||||||
|
vim.api.nvim_create_autocmd({ "BufWritePost" }, {
|
||||||
|
callback = function() require("lint").try_lint() end,
|
||||||
|
})
|
||||||
|
|
||||||
|
-- nvim orgmode, to get me use nvim even more.
|
||||||
|
use ({ "nvim-orgmode/orgmode",
|
||||||
|
config = function() require("orgmode").setup({}) end,
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Remaps for the refactoring operations currently offered by the plugin
|
||||||
|
local map = vim.api.nvim_set_keymap
|
||||||
|
local refactoring_opts = { noremap = true, silent = true, expr = false }
|
||||||
|
map("v", "<leader>re", [[ <Esc><Cmd>lua require('refactoring').refactor('Extract Function')<CR>]], refactoring_opts)
|
||||||
|
map("v", "<leader>rf", [[ <Esc><Cmd>lua require('refactoring').refactor('Extract Function To File')<CR>]], refactoring_opts)
|
||||||
|
map("v", "<leader>rv", [[ <Esc><Cmd>lua require('refactoring').refactor('Extract Variable')<CR>]], refactoring_opts)
|
||||||
|
map("v", "<leader>ri", [[ <Esc><Cmd>lua require('refactoring').refactor('Inline Variable')<CR>]], refactoring_opts)
|
||||||
|
|
||||||
|
-- Extract block doesn't need visual mode
|
||||||
|
map("n", "<leader>rb", [[ <Cmd>lua require('refactoring').refactor('Extract Block')<CR>]], refactoring_opts)
|
||||||
|
map("n", "<leader>rbf", [[ <Cmd>lua require('refactoring').refactor('Extract Block To File')<CR>]], refactoring_opts)
|
||||||
|
|
||||||
|
-- Inline variable can also pick up the identifier currently under the cursor without visual mode
|
||||||
|
map("n", "<leader>ri", [[ <Cmd>lua require('refactoring').refactor('Inline Variable')<CR>]],refactoring_opts)
|
||||||
|
|
||||||
|
-- prompt for a refactor to apply when the remap is triggered
|
||||||
|
map("v", "<leader>rr", ":lua require('refactoring').select_refactor()<CR>", refactoring_opts)
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
@@ -84,6 +84,17 @@ _G.packer_plugins = {
|
|||||||
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/LuaSnip",
|
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/LuaSnip",
|
||||||
url = "https://github.com/L3MON4D3/LuaSnip"
|
url = "https://github.com/L3MON4D3/LuaSnip"
|
||||||
},
|
},
|
||||||
|
["barbar.nvim"] = {
|
||||||
|
loaded = true,
|
||||||
|
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/barbar.nvim",
|
||||||
|
url = "https://github.com/romgrk/barbar.nvim",
|
||||||
|
wants = { "nvim-web-devicons" }
|
||||||
|
},
|
||||||
|
catppuccin = {
|
||||||
|
loaded = true,
|
||||||
|
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/catppuccin",
|
||||||
|
url = "https://github.com/catppuccin/nvim"
|
||||||
|
},
|
||||||
["cmp-nvim-lsp"] = {
|
["cmp-nvim-lsp"] = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp",
|
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp",
|
||||||
@@ -94,6 +105,11 @@ _G.packer_plugins = {
|
|||||||
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/cmp_luasnip",
|
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/cmp_luasnip",
|
||||||
url = "https://github.com/saadparwaiz1/cmp_luasnip"
|
url = "https://github.com/saadparwaiz1/cmp_luasnip"
|
||||||
},
|
},
|
||||||
|
["dressing.nvim"] = {
|
||||||
|
loaded = true,
|
||||||
|
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/dressing.nvim",
|
||||||
|
url = "https://github.com/stevearc/dressing.nvim"
|
||||||
|
},
|
||||||
["fidget.nvim"] = {
|
["fidget.nvim"] = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/fidget.nvim",
|
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/fidget.nvim",
|
||||||
@@ -114,6 +130,11 @@ _G.packer_plugins = {
|
|||||||
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/lualine.nvim",
|
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/lualine.nvim",
|
||||||
url = "https://github.com/nvim-lualine/lualine.nvim"
|
url = "https://github.com/nvim-lualine/lualine.nvim"
|
||||||
},
|
},
|
||||||
|
["markdown-preview.nvim"] = {
|
||||||
|
loaded = true,
|
||||||
|
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/markdown-preview.nvim",
|
||||||
|
url = "https://github.com/iamcco/markdown-preview.nvim"
|
||||||
|
},
|
||||||
["mason-lspconfig.nvim"] = {
|
["mason-lspconfig.nvim"] = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim",
|
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim",
|
||||||
@@ -124,16 +145,31 @@ _G.packer_plugins = {
|
|||||||
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/mason.nvim",
|
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/mason.nvim",
|
||||||
url = "https://github.com/williamboman/mason.nvim"
|
url = "https://github.com/williamboman/mason.nvim"
|
||||||
},
|
},
|
||||||
|
["notifier.nvim"] = {
|
||||||
|
loaded = true,
|
||||||
|
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/notifier.nvim",
|
||||||
|
url = "https://github.com/vigoux/notifier.nvim"
|
||||||
|
},
|
||||||
["nvim-cmp"] = {
|
["nvim-cmp"] = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/nvim-cmp",
|
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/nvim-cmp",
|
||||||
url = "https://github.com/hrsh7th/nvim-cmp"
|
url = "https://github.com/hrsh7th/nvim-cmp"
|
||||||
},
|
},
|
||||||
|
["nvim-lint"] = {
|
||||||
|
loaded = true,
|
||||||
|
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/nvim-lint",
|
||||||
|
url = "https://github.com/mfussenegger/nvim-lint"
|
||||||
|
},
|
||||||
["nvim-lspconfig"] = {
|
["nvim-lspconfig"] = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
|
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
|
||||||
url = "https://github.com/neovim/nvim-lspconfig"
|
url = "https://github.com/neovim/nvim-lspconfig"
|
||||||
},
|
},
|
||||||
|
["nvim-notify"] = {
|
||||||
|
loaded = true,
|
||||||
|
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/nvim-notify",
|
||||||
|
url = "https://github.com/rcarriga/nvim-notify"
|
||||||
|
},
|
||||||
["nvim-treesitter"] = {
|
["nvim-treesitter"] = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
|
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
|
||||||
@@ -146,6 +182,17 @@ _G.packer_plugins = {
|
|||||||
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/opt/nvim-treesitter-textobjects",
|
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/opt/nvim-treesitter-textobjects",
|
||||||
url = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects"
|
url = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects"
|
||||||
},
|
},
|
||||||
|
["nvim-web-devicons"] = {
|
||||||
|
loaded = true,
|
||||||
|
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
|
||||||
|
url = "https://github.com/nvim-tree/nvim-web-devicons"
|
||||||
|
},
|
||||||
|
orgmode = {
|
||||||
|
config = { "\27LJ\2\n9\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\forgmode\frequire\0" },
|
||||||
|
loaded = true,
|
||||||
|
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/orgmode",
|
||||||
|
url = "https://github.com/nvim-orgmode/orgmode"
|
||||||
|
},
|
||||||
["packer.nvim"] = {
|
["packer.nvim"] = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/packer.nvim",
|
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/packer.nvim",
|
||||||
@@ -161,6 +208,11 @@ _G.packer_plugins = {
|
|||||||
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/plenary.nvim",
|
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/plenary.nvim",
|
||||||
url = "https://github.com/nvim-lua/plenary.nvim"
|
url = "https://github.com/nvim-lua/plenary.nvim"
|
||||||
},
|
},
|
||||||
|
["refactoring.nvim"] = {
|
||||||
|
loaded = true,
|
||||||
|
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/refactoring.nvim",
|
||||||
|
url = "https://github.com/ThePrimeagen/refactoring.nvim"
|
||||||
|
},
|
||||||
["telescope-fzf-native.nvim"] = {
|
["telescope-fzf-native.nvim"] = {
|
||||||
cond = { true },
|
cond = { true },
|
||||||
loaded = false,
|
loaded = false,
|
||||||
@@ -174,6 +226,12 @@ _G.packer_plugins = {
|
|||||||
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/telescope.nvim",
|
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/telescope.nvim",
|
||||||
url = "https://github.com/nvim-telescope/telescope.nvim"
|
url = "https://github.com/nvim-telescope/telescope.nvim"
|
||||||
},
|
},
|
||||||
|
["todo-comments.nvim"] = {
|
||||||
|
config = { "\27LJ\2\n?\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\18todo-comments\frequire\0" },
|
||||||
|
loaded = true,
|
||||||
|
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/todo-comments.nvim",
|
||||||
|
url = "https://github.com/folke/todo-comments.nvim"
|
||||||
|
},
|
||||||
["vim-fugitive"] = {
|
["vim-fugitive"] = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/vim-fugitive",
|
path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/vim-fugitive",
|
||||||
@@ -198,6 +256,14 @@ _G.packer_plugins = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
time([[Defining packer_plugins]], false)
|
time([[Defining packer_plugins]], false)
|
||||||
|
-- Config for: orgmode
|
||||||
|
time([[Config for orgmode]], true)
|
||||||
|
try_loadstring("\27LJ\2\n9\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\forgmode\frequire\0", "config", "orgmode")
|
||||||
|
time([[Config for orgmode]], false)
|
||||||
|
-- Config for: todo-comments.nvim
|
||||||
|
time([[Config for todo-comments.nvim]], true)
|
||||||
|
try_loadstring("\27LJ\2\n?\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\18todo-comments\frequire\0", "config", "todo-comments.nvim")
|
||||||
|
time([[Config for todo-comments.nvim]], false)
|
||||||
-- Config for: which-key.nvim
|
-- Config for: which-key.nvim
|
||||||
time([[Config for which-key.nvim]], true)
|
time([[Config for which-key.nvim]], true)
|
||||||
try_loadstring("\27LJ\2\n;\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\14which-key\frequire\0", "config", "which-key.nvim")
|
try_loadstring("\27LJ\2\n;\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\14which-key\frequire\0", "config", "which-key.nvim")
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
SCRIPT=$(basename "$0")
|
SCRIPT=$(basename "$0")
|
||||||
|
|
||||||
source "$HOME/.dotfiles/scripts/shared.sh"
|
source "$DOTFILES/scripts/shared.sh"
|
||||||
|
|
||||||
function section_install
|
function section_install
|
||||||
{
|
{
|
||||||
@@ -74,7 +74,7 @@ function section_brew
|
|||||||
;;
|
;;
|
||||||
update)
|
update)
|
||||||
brew update && brew outdated && brew upgrade && brew cleanup
|
brew update && brew outdated && brew upgrade && brew cleanup
|
||||||
echo "🎉 Done!"
|
msg_done "🎉 Done!"
|
||||||
;;
|
;;
|
||||||
updatebundle)
|
updatebundle)
|
||||||
# Updates .dotfiles/Brewfile with descriptions
|
# Updates .dotfiles/Brewfile with descriptions
|
||||||
|
|||||||
@@ -75,7 +75,9 @@ handle_file_ln "$HOME/.dotfiles/config/functions" "$HOME/.config/functions"
|
|||||||
handle_file_ln "$HOME/.dotfiles/config/gh/config.yml" "$HOME/.config/gh/config.yml"
|
handle_file_ln "$HOME/.dotfiles/config/gh/config.yml" "$HOME/.config/gh/config.yml"
|
||||||
handle_file_ln "$HOME/.dotfiles/config/git/config" "$HOME/.config/git/config"
|
handle_file_ln "$HOME/.dotfiles/config/git/config" "$HOME/.config/git/config"
|
||||||
handle_file_ln "$HOME/.dotfiles/config/git/gitignore" "$HOME/.config/git/gitignore"
|
handle_file_ln "$HOME/.dotfiles/config/git/gitignore" "$HOME/.config/git/gitignore"
|
||||||
|
handle_file_ln "$HOME/.dotfiles/config/nvim/after/plugin/defaults.lua" "$HOME/.config/nvim/after/plugin/defaults.lua"
|
||||||
handle_file_ln "$HOME/.dotfiles/config/nvim/init.lua" "$HOME/.config/nvim/init.lua"
|
handle_file_ln "$HOME/.dotfiles/config/nvim/init.lua" "$HOME/.config/nvim/init.lua"
|
||||||
|
handle_file_ln "$HOME/.dotfiles/config/nvim/lua/custom/plugins.lua" "$HOME/.config/nvim/lua/custom/plugins.lua"
|
||||||
handle_file_ln "$HOME/.dotfiles/config/nvim/plugin/packer_compiled.lua" "$HOME/.config/nvim/plugin/packer_compiled.lua"
|
handle_file_ln "$HOME/.dotfiles/config/nvim/plugin/packer_compiled.lua" "$HOME/.config/nvim/plugin/packer_compiled.lua"
|
||||||
handle_file_ln "$HOME/.dotfiles/config/tmux/tmux.conf" "$HOME/.config/tmux/tmux.conf"
|
handle_file_ln "$HOME/.dotfiles/config/tmux/tmux.conf" "$HOME/.config/tmux/tmux.conf"
|
||||||
handle_file_ln "$HOME/.dotfiles/config/wtf/config.yml" "$HOME/.config/wtf/config.yml"
|
handle_file_ln "$HOME/.dotfiles/config/wtf/config.yml" "$HOME/.config/wtf/config.yml"
|
||||||
|
|||||||
6
zshrc
6
zshrc
@@ -5,7 +5,7 @@
|
|||||||
autoload -U colors zsh/terminfo
|
autoload -U colors zsh/terminfo
|
||||||
colors
|
colors
|
||||||
|
|
||||||
export PATH="/opt/homebrew/bin:/usr/local/sbin:$PATH"
|
export PATH="/opt/homebrew/opt/ruby/bin:/opt/homebrew/bin:/usr/local/sbin:$PATH"
|
||||||
|
|
||||||
if [ command -v brew &> /dev/null ]; then
|
if [ command -v brew &> /dev/null ]; then
|
||||||
BREW_BIN=$(brew --prefix)/bin
|
BREW_BIN=$(brew --prefix)/bin
|
||||||
@@ -72,13 +72,13 @@ if command -v antigen &> /dev/null; then
|
|||||||
antigen bundle zsh-users/zsh-completions
|
antigen bundle zsh-users/zsh-completions
|
||||||
antigen bundle MichaelAquilina/zsh-you-should-use
|
antigen bundle MichaelAquilina/zsh-you-should-use
|
||||||
antigen bundle unixorn/autoupdate-antigen.zshplugin
|
antigen bundle unixorn/autoupdate-antigen.zshplugin
|
||||||
|
antigen bundle Sparragus/zsh-auto-nvm-use
|
||||||
# antigen bundle git-auto-fetch
|
# antigen bundle git-auto-fetch
|
||||||
|
|
||||||
hash php 2>/dev/null && antigen bundle php
|
hash php 2>/dev/null && antigen bundle php
|
||||||
hash nvm 2>/dev/null && antigen bundle nvm
|
hash nvm 2>/dev/null && antigen bundle nvm
|
||||||
hash docker 2>/dev/null && antigen bundle docker
|
hash docker 2>/dev/null && antigen bundle docker
|
||||||
|
hash ruby 2>/dev/null && antigen bundle ruby
|
||||||
hash nvm 2>/dev/null && antigen bundle Sparragus/zsh-auto-nvm-use
|
|
||||||
hash python 2>/dev/null && antigen bundle MichaelAquilina/zsh-autoswitch-virtualenv
|
hash python 2>/dev/null && antigen bundle MichaelAquilina/zsh-autoswitch-virtualenv
|
||||||
hash jq 2>/dev/null && antigen bundle reegnz/jq-zsh-plugin
|
hash jq 2>/dev/null && antigen bundle reegnz/jq-zsh-plugin
|
||||||
hash docker-compose 2>/dev/null && antigen bundle sroze/docker-compose-zsh-plugin
|
hash docker-compose 2>/dev/null && antigen bundle sroze/docker-compose-zsh-plugin
|
||||||
|
|||||||
Reference in New Issue
Block a user