Merge branch 'master' of ssh://git.venberg.xyz:7920/Gabe/dotfiles
This commit is contained in:
commit
be3bc4095c
|
@ -3,8 +3,14 @@
|
||||||
name = Gabe Venberg
|
name = Gabe Venberg
|
||||||
[alias]
|
[alias]
|
||||||
hist = log --graph --date-order --date=short --pretty=format:'%C(auto)%h%d %C(reset)%s %C(bold blue)%ce %C(reset)%C(green)%cr (%cd)'
|
hist = log --graph --date-order --date=short --pretty=format:'%C(auto)%h%d %C(reset)%s %C(bold blue)%ce %C(reset)%C(green)%cr (%cd)'
|
||||||
graph = log --graph --date-order --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) (%C(bold red)%an%C(reset)/%C(bold cyan)%ae%C(reset)) - %C(white)%s%C(reset)%C(yellow)%d%C(reset)' --all
|
graph = log --graph --topo-order --all --pretty=format:'%C(auto)%h %C(cyan)%an %C(blue)%ar %C(auto)%d %s'
|
||||||
[init]
|
[init]
|
||||||
defaultBranch = trunk
|
defaultBranch = trunk
|
||||||
[push]
|
[push]
|
||||||
autoSetupRemote = true
|
autoSetupRemote = true
|
||||||
|
[difftool]
|
||||||
|
prompt = false
|
||||||
|
[diff]
|
||||||
|
tool = nvimdiff
|
||||||
|
[difftool "nvimdiff"]
|
||||||
|
cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
|
||||||
|
|
|
@ -191,9 +191,10 @@ font pango:DejaVu Sans Mono 8
|
||||||
bindsym $mod+control+plus exec --no-startup-id "xbacklight -inc 10; notify-send --expire-time=500 Brightness\ $(xbacklight -get | cut --delimiter=. -f 1)"
|
bindsym $mod+control+plus exec --no-startup-id "xbacklight -inc 10; notify-send --expire-time=500 Brightness\ $(xbacklight -get | cut --delimiter=. -f 1)"
|
||||||
bindsym $mod+control+minus exec --no-startup-id "xbacklight -dec 10; notify-send --expire-time=500 Brightness\ $(xbacklight -get | cut --delimiter=. -f 1)"
|
bindsym $mod+control+minus exec --no-startup-id "xbacklight -dec 10; notify-send --expire-time=500 Brightness\ $(xbacklight -get | cut --delimiter=. -f 1)"
|
||||||
|
|
||||||
#screenshot everything with mod+s, current window with mod+shift+s
|
#screenshot everything with mod+s, current window with mod+shift+s, selection with mod+ctrl+s
|
||||||
bindsym $mod+s exec --no-startup-id "maim ~/Pictures/$(date +%s).png; notify-send --expire-time=1000 'Whole-desktop screenshot taken'"
|
bindsym $mod+s exec --no-startup-id "maim ~/Pictures/$(date +%s).png; notify-send --expire-time=1000 'Whole-desktop screenshot taken'"
|
||||||
bindsym $mod+shift+s exec --no-startup-id "maim -i $(xdotool getactivewindow) ~/Pictures/$(date +%s).png; notify-send --expire-time=1000 'Window screenshot taken'"
|
bindsym $mod+shift+s exec --no-startup-id "maim -i $(xdotool getactivewindow) ~/Pictures/$(date +%s).png; notify-send --expire-time=1000 'Window screenshot taken'"
|
||||||
|
bindsym $mod+ctrl+s exec --no-startup-id "maim -s ~/Pictures/$(date +%s).png; notify-send --expire-time=1000 'Whole-desktop screenshot taken'"
|
||||||
|
|
||||||
#colour picker with xcolor
|
#colour picker with xcolor
|
||||||
bindsym --release $mod+c exec --no-startup-id "xcolor -s"
|
bindsym --release $mod+c exec --no-startup-id "xcolor -s"
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
-- bootstrapping packer
|
-- bootstrapping packer
|
||||||
local fn=vim.fn
|
local fn = vim.fn
|
||||||
local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim'
|
local install_path = fn.stdpath('data') .. '/site/pack/packer/start/packer.nvim'
|
||||||
if fn.empty(fn.glob(install_path)) > 0 then
|
if fn.empty(fn.glob(install_path)) > 0 then
|
||||||
Packer_Bootstrap = fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path})
|
Packer_Bootstrap = fn.system({ 'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim',
|
||||||
|
install_path })
|
||||||
end
|
end
|
||||||
|
|
||||||
return require('packer').startup(function(use)
|
return require('packer').startup(function(use)
|
||||||
|
|
||||||
--startup speed
|
--startup speed
|
||||||
use 'lewis6991/impatient.nvim'
|
use 'lewis6991/impatient.nvim'
|
||||||
|
|
||||||
|
@ -16,12 +16,38 @@ return require('packer').startup(function(use)
|
||||||
|
|
||||||
use { 'nvim-treesitter/nvim-treesitter',
|
use { 'nvim-treesitter/nvim-treesitter',
|
||||||
run = ':TSUpdate',
|
run = ':TSUpdate',
|
||||||
config=function() require('nvim-treesitter').setup{
|
config = function()
|
||||||
ensure_installed='maintained',
|
require('nvim-treesitter').setup {
|
||||||
highlight={enable=true},
|
ensure_installed = {
|
||||||
indent={enable=true},
|
'c',
|
||||||
incremental_selection={enable=true}
|
'lua',
|
||||||
}end,
|
'vim',
|
||||||
|
'vimdoc',
|
||||||
|
'query',
|
||||||
|
'bash',
|
||||||
|
'comment',
|
||||||
|
'cpp',
|
||||||
|
'diff',
|
||||||
|
'git_config',
|
||||||
|
'git_rebase',
|
||||||
|
'gitattributes',
|
||||||
|
'gitcommit',
|
||||||
|
'gitignore',
|
||||||
|
'json',
|
||||||
|
'jsonc',
|
||||||
|
'latex',
|
||||||
|
'make',
|
||||||
|
'python',
|
||||||
|
'regex',
|
||||||
|
'rust',
|
||||||
|
'toml',
|
||||||
|
},
|
||||||
|
auto_install = true,
|
||||||
|
highlight = { enable = true },
|
||||||
|
indent = { enable = true },
|
||||||
|
incremental_selection = { enable = true }
|
||||||
|
}
|
||||||
|
end,
|
||||||
}
|
}
|
||||||
use {
|
use {
|
||||||
{
|
{
|
||||||
|
@ -51,22 +77,22 @@ return require('packer').startup(function(use)
|
||||||
'texlab',
|
'texlab',
|
||||||
'clangd',
|
'clangd',
|
||||||
},
|
},
|
||||||
automatic_installation=true
|
automatic_installation = true
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"neovim/nvim-lspconfig",
|
"neovim/nvim-lspconfig",
|
||||||
after = {"mason-lspconfig.nvim", "rust-tools.nvim"},
|
after = { "mason-lspconfig.nvim", "rust-tools.nvim" },
|
||||||
config = function()
|
config = function()
|
||||||
require('LSPconfig')
|
require('LSPconfig')
|
||||||
end
|
end
|
||||||
},
|
},
|
||||||
{'simrat39/rust-tools.nvim',},
|
{ 'simrat39/rust-tools.nvim', },
|
||||||
{'mfussenegger/nvim-jdtls',},
|
{ 'mfussenegger/nvim-jdtls', },
|
||||||
}
|
}
|
||||||
|
|
||||||
use {'hrsh7th/nvim-cmp',
|
use { 'hrsh7th/nvim-cmp',
|
||||||
requires = {
|
requires = {
|
||||||
'neovim/nvim-lspconfig',
|
'neovim/nvim-lspconfig',
|
||||||
'hrsh7th/cmp-nvim-lsp',
|
'hrsh7th/cmp-nvim-lsp',
|
||||||
|
@ -88,24 +114,24 @@ return require('packer').startup(function(use)
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
use {'L3MON4D3/LuaSnip',
|
use { 'L3MON4D3/LuaSnip',
|
||||||
requires={
|
requires = {
|
||||||
'rafamadriz/friendly-snippets'
|
'rafamadriz/friendly-snippets'
|
||||||
},
|
},
|
||||||
config=function()
|
config = function()
|
||||||
require("luasnip.loaders.from_snipmate").load()
|
require("luasnip.loaders.from_snipmate").load()
|
||||||
require("luasnip.loaders.from_vscode").load()
|
require("luasnip.loaders.from_vscode").load()
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
use {'nvim-telescope/telescope.nvim',
|
use { 'nvim-telescope/telescope.nvim',
|
||||||
requires = {
|
requires = {
|
||||||
{'nvim-lua/plenary.nvim'},
|
{ 'nvim-lua/plenary.nvim' },
|
||||||
{'nvim-lua/popup.nvim'},
|
{ 'nvim-lua/popup.nvim' },
|
||||||
{'nvim-treesitter/nvim-treesitter'},
|
{ 'nvim-treesitter/nvim-treesitter' },
|
||||||
{'nvim-telescope/telescope-symbols.nvim'},
|
{ 'nvim-telescope/telescope-symbols.nvim' },
|
||||||
{'nvim-telescope/telescope-file-browser.nvim'},
|
{ 'nvim-telescope/telescope-file-browser.nvim' },
|
||||||
{'folke/trouble.nvim'},
|
{ 'folke/trouble.nvim' },
|
||||||
},
|
},
|
||||||
config = function()
|
config = function()
|
||||||
local trouble = require("trouble.providers.telescope")
|
local trouble = require("trouble.providers.telescope")
|
||||||
|
@ -121,17 +147,19 @@ return require('packer').startup(function(use)
|
||||||
}
|
}
|
||||||
|
|
||||||
--file browser
|
--file browser
|
||||||
use {'kyazdani42/nvim-tree.lua',
|
use { 'kyazdani42/nvim-tree.lua',
|
||||||
requires = {
|
requires = {
|
||||||
'kyazdani42/nvim-web-devicons', -- optional, for file icon
|
'kyazdani42/nvim-web-devicons', -- optional, for file icon
|
||||||
},
|
},
|
||||||
config = function() require'nvim-tree'.setup {
|
config = function()
|
||||||
|
require 'nvim-tree'.setup {
|
||||||
|
|
||||||
on_attach = function(bufnr)
|
on_attach = function(bufnr)
|
||||||
local api = require('nvim-tree.api')
|
local api = require('nvim-tree.api')
|
||||||
|
|
||||||
local function opts(desc)
|
local function opts(desc)
|
||||||
return { desc = 'nvim-tree: ' .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true }
|
return { desc = 'nvim-tree: ' .. desc, buffer = bufnr, noremap = true, silent = true,
|
||||||
|
nowait = true }
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
@ -234,16 +262,16 @@ return require('packer').startup(function(use)
|
||||||
vim.keymap.set('n', 'q', api.tree.close, opts('Close'))
|
vim.keymap.set('n', 'q', api.tree.close, opts('Close'))
|
||||||
vim.keymap.set('n', 'g?', api.tree.toggle_help, opts('Help'))
|
vim.keymap.set('n', 'g?', api.tree.toggle_help, opts('Help'))
|
||||||
vim.keymap.set('n', 'W', api.tree.collapse_all, opts('Collapse'))
|
vim.keymap.set('n', 'W', api.tree.collapse_all, opts('Collapse'))
|
||||||
|
|
||||||
end,
|
end,
|
||||||
-- on_attach = on_attach
|
-- on_attach = on_attach
|
||||||
} end
|
}
|
||||||
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
--UI stuff
|
--UI stuff
|
||||||
|
|
||||||
use {'simrat39/symbols-outline.nvim',
|
use { 'simrat39/symbols-outline.nvim',
|
||||||
config=function()
|
config = function()
|
||||||
local opts = {
|
local opts = {
|
||||||
highlight_hovered_item = true,
|
highlight_hovered_item = true,
|
||||||
show_guides = true,
|
show_guides = true,
|
||||||
|
@ -263,48 +291,50 @@ return require('packer').startup(function(use)
|
||||||
}
|
}
|
||||||
require("symbols-outline").setup(opts)
|
require("symbols-outline").setup(opts)
|
||||||
end
|
end
|
||||||
}
|
|
||||||
|
|
||||||
use {'stevearc/dressing.nvim',
|
|
||||||
config=function()
|
|
||||||
require('dressing').setup{}
|
|
||||||
end
|
|
||||||
}
|
}
|
||||||
|
|
||||||
use {'nvim-lualine/lualine.nvim',
|
use { 'stevearc/dressing.nvim',
|
||||||
requires = {'kyazdani42/nvim-web-devicons', opt = true},
|
config = function()
|
||||||
config=function() require('lualine').setup{
|
require('dressing').setup {}
|
||||||
options={
|
end
|
||||||
|
}
|
||||||
|
|
||||||
|
use { 'nvim-lualine/lualine.nvim',
|
||||||
|
requires = { 'kyazdani42/nvim-web-devicons', opt = true },
|
||||||
|
config = function()
|
||||||
|
require('lualine').setup {
|
||||||
|
options = {
|
||||||
icons_enabled = true,
|
icons_enabled = true,
|
||||||
theme = 'auto',
|
theme = 'auto',
|
||||||
component_separators = { left = '', right = ''},
|
component_separators = { left = '', right = '' },
|
||||||
section_separators = { left = '', right = ''},
|
section_separators = { left = '', right = '' },
|
||||||
disabled_filetypes = {},
|
disabled_filetypes = {},
|
||||||
always_divide_middle = true,
|
always_divide_middle = true,
|
||||||
},
|
},
|
||||||
sections = {
|
sections = {
|
||||||
lualine_a = {'mode'},
|
lualine_a = { 'mode' },
|
||||||
lualine_b = {'branch', 'diff', 'diagnostics'},
|
lualine_b = { 'branch', 'diff', 'diagnostics' },
|
||||||
lualine_c = {'filename'},
|
lualine_c = { 'filename' },
|
||||||
lualine_x = {'encoding', 'fileformat', 'filetype'},
|
lualine_x = { 'encoding', 'fileformat', 'filetype' },
|
||||||
lualine_y = {'progress'},
|
lualine_y = { 'progress' },
|
||||||
lualine_z = {'location'}
|
lualine_z = { 'location' }
|
||||||
},
|
},
|
||||||
inactive_sections = {
|
inactive_sections = {
|
||||||
lualine_a = {},
|
lualine_a = {},
|
||||||
lualine_b = {},
|
lualine_b = {},
|
||||||
lualine_c = {'filename'},
|
lualine_c = { 'filename' },
|
||||||
lualine_x = {'location'},
|
lualine_x = { 'location' },
|
||||||
lualine_y = {},
|
lualine_y = {},
|
||||||
lualine_z = {}
|
lualine_z = {}
|
||||||
},
|
},
|
||||||
extensions = {}
|
extensions = {}
|
||||||
} end,
|
}
|
||||||
}
|
end,
|
||||||
|
}
|
||||||
|
|
||||||
use {'kdheepak/tabline.nvim',
|
use { 'kdheepak/tabline.nvim',
|
||||||
config = function()
|
config = function()
|
||||||
require'tabline'.setup {
|
require 'tabline'.setup {
|
||||||
-- Defaults configuration options
|
-- Defaults configuration options
|
||||||
enable = true,
|
enable = true,
|
||||||
options = {
|
options = {
|
||||||
|
@ -319,17 +349,18 @@ config = function()
|
||||||
show_filename_only = false, -- shows base filename only instead of relative path in filename
|
show_filename_only = false, -- shows base filename only instead of relative path in filename
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
vim.cmd[[
|
vim.cmd [[
|
||||||
set guioptions-=e " Use showtabline in gui vim
|
set guioptions-=e " Use showtabline in gui vim
|
||||||
set sessionoptions+=tabpages,globals " store tabpages and globals in session
|
set sessionoptions+=tabpages,globals " store tabpages and globals in session
|
||||||
]]
|
]]
|
||||||
end,
|
end,
|
||||||
requires = { { 'hoob3rt/lualine.nvim', opt=true }, {'kyazdani42/nvim-web-devicons', opt = true} }
|
requires = { { 'hoob3rt/lualine.nvim', opt = true }, { 'kyazdani42/nvim-web-devicons', opt = true } }
|
||||||
}
|
}
|
||||||
|
|
||||||
use {'folke/trouble.nvim',
|
use { 'folke/trouble.nvim',
|
||||||
requires = "kyazdani42/nvim-web-devicons",
|
requires = "kyazdani42/nvim-web-devicons",
|
||||||
config = function() require("trouble").setup {
|
config = function()
|
||||||
|
require("trouble").setup {
|
||||||
position = "bottom", -- position of the list can be: bottom, top, left, right
|
position = "bottom", -- position of the list can be: bottom, top, left, right
|
||||||
height = 10, -- height of the trouble list when position is top or bottom
|
height = 10, -- height of the trouble list when position is top or bottom
|
||||||
width = 50, -- width of the list when position is left or right
|
width = 50, -- width of the list when position is left or right
|
||||||
|
@ -339,24 +370,25 @@ requires = { { 'hoob3rt/lualine.nvim', opt=true }, {'kyazdani42/nvim-web-devicon
|
||||||
fold_closed = "", -- icon used for closed folds
|
fold_closed = "", -- icon used for closed folds
|
||||||
group = true, -- group results by file
|
group = true, -- group results by file
|
||||||
padding = true, -- add an extra new line on top of the list
|
padding = true, -- add an extra new line on top of the list
|
||||||
action_keys = { -- key mappings for actions in the trouble list
|
action_keys = {
|
||||||
|
-- key mappings for actions in the trouble list
|
||||||
-- map to {} to remove a mapping, for example:
|
-- map to {} to remove a mapping, for example:
|
||||||
-- close = {},
|
-- close = {},
|
||||||
close = "q", -- close the list
|
close = "q", -- close the list
|
||||||
cancel = "<esc>", -- cancel the preview and get back to your last window / buffer / cursor
|
cancel = "<esc>", -- cancel the preview and get back to your last window / buffer / cursor
|
||||||
refresh = "r", -- manually refresh
|
refresh = "r", -- manually refresh
|
||||||
jump = {"<cr>", "<tab>"}, -- jump to the diagnostic or open / close folds
|
jump = { "<cr>", "<tab>" }, -- jump to the diagnostic or open / close folds
|
||||||
open_split = { "<c-x>" }, -- open buffer in new split
|
open_split = { "<c-x>" }, -- open buffer in new split
|
||||||
open_vsplit = { "<c-v>" }, -- open buffer in new vsplit
|
open_vsplit = { "<c-v>" }, -- open buffer in new vsplit
|
||||||
open_tab = { "<c-t>" }, -- open buffer in new tab
|
open_tab = { "<c-t>" }, -- open buffer in new tab
|
||||||
jump_close = {"o"}, -- jump to the diagnostic and close the list
|
jump_close = { "o" }, -- jump to the diagnostic and close the list
|
||||||
toggle_mode = "m", -- toggle between "workspace" and "document" diagnostics mode
|
toggle_mode = "m", -- toggle between "workspace" and "document" diagnostics mode
|
||||||
toggle_preview = "P", -- toggle auto_preview
|
toggle_preview = "P", -- toggle auto_preview
|
||||||
hover = "K", -- opens a small popup with the full multiline message
|
hover = "K", -- opens a small popup with the full multiline message
|
||||||
preview = "p", -- preview the diagnostic location
|
preview = "p", -- preview the diagnostic location
|
||||||
close_folds = {"zM", "zm"}, -- close all folds
|
close_folds = { "zM", "zm" }, -- close all folds
|
||||||
open_folds = {"zR", "zr"}, -- open all folds
|
open_folds = { "zR", "zr" }, -- open all folds
|
||||||
toggle_fold = {"zA", "za", '<space>'}, -- toggle fold of current file
|
toggle_fold = { "zA", "za", '<space>' }, -- toggle fold of current file
|
||||||
previous = "k", -- previous item
|
previous = "k", -- previous item
|
||||||
next = "j" -- next item
|
next = "j" -- next item
|
||||||
},
|
},
|
||||||
|
@ -365,7 +397,7 @@ requires = { { 'hoob3rt/lualine.nvim', opt=true }, {'kyazdani42/nvim-web-devicon
|
||||||
auto_close = false, -- automatically close the list when you have no diagnostics
|
auto_close = false, -- automatically close the list when you have no diagnostics
|
||||||
auto_preview = true, -- automatically preview the location of the diagnostic. <esc> to close preview and go back to last window
|
auto_preview = true, -- automatically preview the location of the diagnostic. <esc> to close preview and go back to last window
|
||||||
auto_fold = false, -- automatically fold a file trouble list at creation
|
auto_fold = false, -- automatically fold a file trouble list at creation
|
||||||
auto_jump = {"lsp_definitions"}, -- for the given modes, automatically jump if there is only a single result
|
auto_jump = { "lsp_definitions" }, -- for the given modes, automatically jump if there is only a single result
|
||||||
signs = {
|
signs = {
|
||||||
-- icons / text used for a diagnostic
|
-- icons / text used for a diagnostic
|
||||||
error = "",
|
error = "",
|
||||||
|
@ -375,13 +407,14 @@ requires = { { 'hoob3rt/lualine.nvim', opt=true }, {'kyazdani42/nvim-web-devicon
|
||||||
other = ""
|
other = ""
|
||||||
},
|
},
|
||||||
use_diagnostic_signs = false -- enabling this will use the signs defined in your lsp client
|
use_diagnostic_signs = false -- enabling this will use the signs defined in your lsp client
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
use {'romgrk/nvim-treesitter-context',
|
use { 'romgrk/nvim-treesitter-context',
|
||||||
requires = 'nvim-treesitter/nvim-treesitter',
|
requires = 'nvim-treesitter/nvim-treesitter',
|
||||||
config=function() require('treesitter-context').setup{
|
config = function()
|
||||||
|
require('treesitter-context').setup {
|
||||||
enable = true, -- Enable this plugin (Can be enabled/disabled later via commands)
|
enable = true, -- Enable this plugin (Can be enabled/disabled later via commands)
|
||||||
max_lines = 0, -- How many lines the window should span. Values <= 0 mean no limit.
|
max_lines = 0, -- How many lines the window should span. Values <= 0 mean no limit.
|
||||||
trim_scope = 'outer', -- Which context lines to discard if `max_lines` is exceeded. Choices: 'inner', 'outer'
|
trim_scope = 'outer', -- Which context lines to discard if `max_lines` is exceeded. Choices: 'inner', 'outer'
|
||||||
|
@ -391,33 +424,34 @@ requires = { { 'hoob3rt/lualine.nvim', opt=true }, {'kyazdani42/nvim-web-devicon
|
||||||
-- Separator between context and content. Should be a single character string, like '-'.
|
-- Separator between context and content. Should be a single character string, like '-'.
|
||||||
-- When separator is set, the context will only show up when there are at least 2 lines above cursorline.
|
-- When separator is set, the context will only show up when there are at least 2 lines above cursorline.
|
||||||
separator = nil,
|
separator = nil,
|
||||||
} end
|
}
|
||||||
}
|
end
|
||||||
|
}
|
||||||
|
|
||||||
use {'lewis6991/gitsigns.nvim',
|
use { 'lewis6991/gitsigns.nvim',
|
||||||
-- tag = 'release', -- To use the latest release. currently bugged
|
-- tag = 'release', -- To use the latest release. currently bugged
|
||||||
config=function() require('gitsigns').setup() end
|
config = function() require('gitsigns').setup() end
|
||||||
}
|
}
|
||||||
|
|
||||||
use 'chentau/marks.nvim'
|
use 'chentau/marks.nvim'
|
||||||
|
|
||||||
use {'lukas-reineke/indent-blankline.nvim',
|
use { 'lukas-reineke/indent-blankline.nvim',
|
||||||
config=function()
|
config = function()
|
||||||
vim.opt.list = true
|
vim.opt.list = true
|
||||||
vim.opt.listchars:append("eol:↴")
|
vim.opt.listchars:append("eol:↴")
|
||||||
require('indent_blankline').setup{
|
require('indent_blankline').setup {
|
||||||
show_end_of_line=true,
|
show_end_of_line = true,
|
||||||
show_current_context=true
|
show_current_context = true
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
--editing utilities
|
--editing utilities
|
||||||
|
|
||||||
use {'numToStr/Comment.nvim',
|
use { 'numToStr/Comment.nvim',
|
||||||
config = function()
|
config = function()
|
||||||
require('Comment').setup()
|
require('Comment').setup()
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
use {
|
use {
|
||||||
|
@ -437,17 +471,17 @@ end
|
||||||
max_join_length = 256,
|
max_join_length = 256,
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
}
|
}
|
||||||
|
|
||||||
use "jbyuki/venn.nvim"
|
use "jbyuki/venn.nvim"
|
||||||
|
|
||||||
--color scheme stuff.
|
--color scheme stuff.
|
||||||
|
|
||||||
use 'bluz71/vim-moonfly-colors'
|
use 'bluz71/vim-moonfly-colors'
|
||||||
|
|
||||||
use 'bluz71/vim-nightfly-guicolors'
|
use 'bluz71/vim-nightfly-guicolors'
|
||||||
|
|
||||||
if Packer_Bootstrap then
|
if Packer_Bootstrap then
|
||||||
require('packer').sync()
|
require('packer').sync()
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
|
9
nvim_minimal/.config/nvim/foldtext.vimrc
Normal file
9
nvim_minimal/.config/nvim/foldtext.vimrc
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
"TODO: port to LUA!
|
||||||
|
function! Minimal_foldtext()
|
||||||
|
let lines_count = v:foldend - v:foldstart + 1
|
||||||
|
let lines_count_text = '+' . v:folddashes . '| ' . printf("%10S" , lines_count) . ' lines |'
|
||||||
|
let line_level_text = '| ' . printf("%8S" , 'level ' . v:foldlevel) . ' |'
|
||||||
|
let fold_text_end = line_level_text . repeat('-',8)
|
||||||
|
let fold_text_length = strlen(lines_count_text . fold_text_end) + &foldcolumn
|
||||||
|
return lines_count_text . repeat('-' , winwidth(0) - fold_text_length - 4) . fold_text_end
|
||||||
|
endfunction
|
81
nvim_minimal/.config/nvim/init.lua
Normal file
81
nvim_minimal/.config/nvim/init.lua
Normal file
|
@ -0,0 +1,81 @@
|
||||||
|
--set some aliases to make typing this faster.
|
||||||
|
local cmd = vim.cmd
|
||||||
|
local opt = vim.opt
|
||||||
|
local fn = vim.fn
|
||||||
|
local map = vim.api.nvim_set_keymap
|
||||||
|
|
||||||
|
--leader key is set through a variable, for some reason.
|
||||||
|
vim.g.mapleader = ';'
|
||||||
|
|
||||||
|
--helper functions
|
||||||
|
local function keyCode(string)
|
||||||
|
return vim.api.nvim_replace_termcodes(str, true, true, true, true)
|
||||||
|
end
|
||||||
|
|
||||||
|
--options using vim.opt (aliased, of course.)
|
||||||
|
opt.mouse = 'a'
|
||||||
|
opt.lazyredraw = true
|
||||||
|
opt.termguicolors = true
|
||||||
|
opt.autoread = true
|
||||||
|
opt.swapfile = false
|
||||||
|
opt.history = 500
|
||||||
|
opt.formatoptions = 'rojq'
|
||||||
|
--disable hard text wrapping, will only wrap visually.
|
||||||
|
opt.textwidth = 0
|
||||||
|
opt.wrapmargin = 0
|
||||||
|
opt.wrap = true
|
||||||
|
opt.linebreak = true
|
||||||
|
opt.breakindent = true
|
||||||
|
--add ruler to side of screen.
|
||||||
|
opt.number = true
|
||||||
|
opt.numberwidth=2
|
||||||
|
--displays cordinates of your cursor in statusbar
|
||||||
|
opt.ruler = true
|
||||||
|
--always leave 5 cells between cursor and side of window.
|
||||||
|
opt.scrolloff = 5
|
||||||
|
--better command line completion
|
||||||
|
opt.wildmenu = true
|
||||||
|
--ignore case in search if search is all lowercase.
|
||||||
|
opt.ignorecase = true
|
||||||
|
opt.smartcase = true
|
||||||
|
--show unfinished commands in statusbar.
|
||||||
|
opt.showcmd = true
|
||||||
|
--regex stuff
|
||||||
|
opt.magic = true
|
||||||
|
--always have a status line
|
||||||
|
opt.laststatus = 2
|
||||||
|
--tab stuff
|
||||||
|
opt.tabstop = 4
|
||||||
|
opt.shiftwidth = 0 --zero inherrits tabstop.
|
||||||
|
opt.autoindent = true
|
||||||
|
opt.smartindent = true
|
||||||
|
opt.smarttab = true
|
||||||
|
--space based tabs.
|
||||||
|
-- opt.softtabstop=-1 --negative value inherrits shiftwidth.
|
||||||
|
-- opt.expandtab=true
|
||||||
|
--highlight search results as you type.
|
||||||
|
opt.hlsearch = true
|
||||||
|
opt.incsearch = true
|
||||||
|
--foling stuff
|
||||||
|
opt.foldlevelstart = 5
|
||||||
|
cmd([[source ~/.config/nvim/foldtext.vimrc]])
|
||||||
|
opt.foldmethod = 'indent'
|
||||||
|
opt.foldtext = 'minimal_foldtext()'
|
||||||
|
opt.fillchars = 'stl:=,stlnc: ,vert:|,fold:-'
|
||||||
|
opt.foldcolumn = '4'
|
||||||
|
opt.foldenable = true
|
||||||
|
opt.foldignore = ''
|
||||||
|
|
||||||
|
--keyboard mappings
|
||||||
|
local opts = { noremap = true, silent = true }
|
||||||
|
--toggle spell check
|
||||||
|
map('n', '<leader>sp', ':setlocal spell!<CR>', opts)
|
||||||
|
--use ctrl+direction to move between splits.
|
||||||
|
map('n', '<C-h>', '<C-w>h', opts)
|
||||||
|
map('n', '<C-j>', '<C-w>j', opts)
|
||||||
|
map('n', '<C-k>', '<C-w>k', opts)
|
||||||
|
map('n', '<C-l>', '<C-w>l', opts)
|
||||||
|
--toggle folds with space.
|
||||||
|
map('', '<Space>', 'za', opts)
|
||||||
|
--clear highlighting with leader+h
|
||||||
|
map('', '<leader>h', ':nohls<CR>', opts)
|
|
@ -4,7 +4,7 @@ Description=SSH key agent
|
||||||
[Service]
|
[Service]
|
||||||
Type=simple
|
Type=simple
|
||||||
Environment=SSH_AUTH_SOCK=%t/ssh-agent.socket
|
Environment=SSH_AUTH_SOCK=%t/ssh-agent.socket
|
||||||
ExecStart=/usr/bin/ssh-agent -D -a $SSH_AUTH_SOCK
|
ExecStart=-/usr/bin/ssh-agent -D -a $SSH_AUTH_SOCK
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=default.target
|
WantedBy=default.target
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
#remap caps lock to a third control key. both shifts at once toggle shiftlock
|
#remap caps lock to a third control key. both shifts at once toggle shiftlock
|
||||||
setxkbmap -option ctrl:nocaps
|
setxkbmap -option ctrl:nocaps
|
||||||
|
#dark mode styling for qt and gtk apps.
|
||||||
|
export GTK_THEME=Adwaita:dark
|
||||||
|
export GTK2_RC_FILES=/usr/share/themes/Adwaita-dark/gtk-2.0/gtkrc
|
||||||
|
export QT_STYLE_OVERRIDE=adwaita-dark
|
||||||
xrdb -merge ~/.Xresources
|
xrdb -merge ~/.Xresources
|
||||||
#~/dotfiles/scripts/mousestart
|
|
||||||
i3
|
i3
|
||||||
|
|
|
@ -153,6 +153,8 @@
|
||||||
alias slideshow='feh --full-screen --randomize --auto-zoom --recursive --slideshow-delay'
|
alias slideshow='feh --full-screen --randomize --auto-zoom --recursive --slideshow-delay'
|
||||||
# converts all .doc and .docx files in the local directory to pdfs using libreoffice
|
# converts all .doc and .docx files in the local directory to pdfs using libreoffice
|
||||||
alias doc2pdf='loffice --convert-to pdf --headless *.docx#'
|
alias doc2pdf='loffice --convert-to pdf --headless *.docx#'
|
||||||
|
#common options for sshfs
|
||||||
|
alias sshmnt='sshfs -o idmap=user,compression=no,reconnect,follow_symlinks,dir_cache=yes,ServerAliveInterval=15'
|
||||||
|
|
||||||
#setup grep to be a bit more nice
|
#setup grep to be a bit more nice
|
||||||
local GREP_OPTIONS=""
|
local GREP_OPTIONS=""
|
||||||
|
@ -176,3 +178,6 @@
|
||||||
#zsh completions, if it exists.
|
#zsh completions, if it exists.
|
||||||
testPath=$(find /usr/share -path '*fzf/*completion.zsh' -print -quit 2> /dev/null)
|
testPath=$(find /usr/share -path '*fzf/*completion.zsh' -print -quit 2> /dev/null)
|
||||||
[ -f "$testPath" ] && source $testPath
|
[ -f "$testPath" ] && source $testPath
|
||||||
|
#if it was installed using git, can just source the one file:
|
||||||
|
testPath="$HOME/.fzf.zsh"
|
||||||
|
[ -f "$testPath" ] && source $testPath
|
||||||
|
|
Loading…
Reference in a new issue