aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.config/nvim/lua/general.lua5
-rw-r--r--.config/nvim/lua/lsp.lua11
-rw-r--r--.config/nvim/lua/plugins.lua1
-rw-r--r--.gitconfig22
-rwxr-xr-x.profile2
5 files changed, 14 insertions, 27 deletions
diff --git a/.config/nvim/lua/general.lua b/.config/nvim/lua/general.lua
index 4d02f1d..b44ab20 100644
--- a/.config/nvim/lua/general.lua
+++ b/.config/nvim/lua/general.lua
@@ -10,6 +10,8 @@ vim.opt.undolevels = 1000
vim.opt.wrap = false
vim.opt.colorcolumn = "120"
vim.opt.scrolloff = 5
+vim.opt.spelllang = "en,nb"
+vim.opt.cursorline = true
-- vim.opt.tabstop = 4
-- vim.opt.softtabstop = -1
@@ -23,6 +25,9 @@ vim.cmd [[autocmd FileType css setlocal shiftwidth=2 softtabstop=2 expandtab]]
vim.cmd [[autocmd FileType html setlocal shiftwidth=2 softtabstop=2 expandtab]]
vim.cmd [[autocmd FileType json setlocal shiftwidth=2 softtabstop=2 expandtab]]
vim.cmd [[autocmd FileType cs setlocal shiftwidth=4 softtabstop=4 expandtab]]
+vim.cmd [[autocmd FileType mail setlocal textwidth=72 colorcolumn=72 spell]]
+vim.cmd [[autocmd FileType markdown setlocal textwidth=72 colorcolumn=72 spell]]
+vim.cmd [[autocmd FileType gitcommit setlocal textwidth=72 colorcolumn=50,72 spell]]
vim.cmd [[filetype indent off]]
diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua
index 495f7fa..a2207d5 100644
--- a/.config/nvim/lua/lsp.lua
+++ b/.config/nvim/lua/lsp.lua
@@ -163,14 +163,6 @@ lspconfig.rust_analyzer.setup({
on_attach = on_attach;
})
-lspconfig.sqls.setup({
- on_attach = function(client, bufnr)
- require("sqls").on_attach(client, bufnr)
- on_attach(client, bufnr)
- end;
- capabilities = capabilities;
-})
-
lspconfig.omnisharp.setup({
cmd = { "omnisharp" };
@@ -295,6 +287,9 @@ null_ls.setup({
};
})
+vim.lsp.handlers["textDocument/hover"] =
+ vim.lsp.with(vim.lsp.handlers.hover,
+ { border = "rounded"; relative = "cursor"; max_width = 80 })
-- Debugging
local dap, dapui = require("dap"), require("dapui")
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index 157b926..b7e5071 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -47,7 +47,6 @@ local PKGS = {
{ url = "https://github.com/editorconfig/editorconfig-vim.git" };
{ url = "https://github.com/nathom/filetype.nvim.git" };
{ url = "https://github.com/wfxr/minimap.vim.git" };
- { url = "https://github.com/preservim/nerdcommenter.git" };
-- LSP
{ url = "https://github.com/neovim/nvim-lspconfig.git" };
diff --git a/.gitconfig b/.gitconfig
index 9400d9f..136adc4 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,6 +1,5 @@
[user]
name = Luca Matei Pintilie
- signingKey = CA875B8CE4FF7C9F
[pull]
rebase = false
@@ -8,18 +7,6 @@
[commit]
gpgSign = true
-[tag]
- gpgSign = true
-
-[pull]
- rebase = false
-
-[init]
- defaultBranch = master
-
-[push]
- autoSetupRemote = true
-
[core]
pager = delta
@@ -27,10 +14,8 @@
diffFilter = delta --color-only
[delta]
- # use n and N to move between diff sections
- navigate = true
- # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)
- light = false
+ navigate = true # use n and N to move between diff sections
+ light = false # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)
[merge]
conflictstyle = diff3
@@ -57,4 +42,5 @@
hunk-header-line-number-style = "#067a00"
hunk-header-style = file line-number syntax
-
+[init]
+ defaultBranch = master
diff --git a/.profile b/.profile
index 8971a9b..bfe7c25 100755
--- a/.profile
+++ b/.profile
@@ -25,12 +25,14 @@ EDITOR="$(which nvim 2> /dev/null || which vim 2> /dev/null || which nano 2> /de
GTK_THEME="Dracula"
BAT_THEME="Dracula"
TERMINAL="alacritty"
+XDG_CONFIG_HOME="$HOME/.config"
export DENO_INSTALL
export DENO_NO_UPDATE_CHECK
export DENO_NO_PROMPT
export DOTNET_CLI_TELEMETRY_OPTOUT
export NEXT_TELEMETRY_DEBUG
+export XDG_CONFIG_HOME
export GOPROXY
export EDITOR