diff --git a/HOME/.gitconfig b/HOME/.gitconfig index a4f1d0d..bb11679 100644 --- a/HOME/.gitconfig +++ b/HOME/.gitconfig @@ -1,12 +1,12 @@ [core] - filemode = false - pager = diff-so-fancy | less --tabs=4 -RFX - autorcrlf = true + filemode = false + pager = diff-so-fancy | less --tabs=4 -RFX + autorcrlf = true [user] - name = Henrik Bakken - email = bakken.henrik@gmail.com + name = Henrik Bakken + email = bakken.henrik@gmail.com [filter "lfs"] - clean = git-lfs clean -- %f - smudge = git-lfs smudge -- %f - process = git-lfs filter-process - required = true + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process + required = true diff --git a/nvim/init.lua b/nvim/init.lua index 425b5fc..d5412d5 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -147,6 +147,7 @@ map("n", "", ":cn", { noremap = true }) -- remove buffer map("n", "", ":bprev:bd#", { noremap = true }) map("n", "", ":bprev:bd!#", { noremap = true }) +map("n", "", ":checkt", { noremap = true }) -- ---------------------------------------- -- PACKER @@ -222,9 +223,7 @@ require("packer").startup {function(use) vim.g.nvim_tree_auto_open = 0 vim.g.nvim_tree_disable_netrw = 0 local map = vim.api.nvim_set_keymap - map("n", "", ":NvimTreeToggle", {noremap = true}) - map("n", "", ":NvimTreeRefresh", {noremap = true}) - map("n", "", ":NvimTreeFindFile", {noremap = true}) + map("n", "", ":NvimTreeToggle", {noremap = true}) end } @@ -274,7 +273,7 @@ require("packer").startup {function(use) vim.g.seoul256_background = 235 end } - vim.cmd "colorscheme zenburn" + vim.cmd "colorscheme seoul256" -- coloring of colornames use {"rrethy/vim-hexokinase", @@ -432,7 +431,7 @@ use {"nvim-treesitter/nvim-treesitter", map("n", "", "Telescope git_files", opts ) map("n", "", "Telescope live_grep", opts ) map("n", "", "Telescope buffers", opts ) - -- map("n", "", "Telescope filetypes", opts ) + map("n", "", "Telescope filetypes", opts ) map("n", "", "Telescope colorscheme", opts ) map("n", "la", "Telescope lsp_code_actions", opts ) map("v", "la", "Telescope lsp_range_code_actions", opts ) @@ -574,7 +573,7 @@ use {"nvim-treesitter/nvim-treesitter", } local map = vim.api.nvim_set_keymap local opts = { noremap = true } - map("n", "", ":Trouble", opts) + map("n", "", ":Trouble", opts) end } @@ -587,9 +586,8 @@ use {"nvim-treesitter/nvim-treesitter", -- keywords recognized as todo comments keywords = { ERROR = { icon = " ", color = "error" }, - FIX = { icon = " ", color = "warning" }, + WIP = { icon = " ", color = "warning" }, TODO = { icon = " ", color = "warning" }, - FEAT = { icon = " ", color = "info" }, PERF = { icon = " ", color = "info" }, MAYBE = { icon = " ", color = "default" }, IDEA = { icon = " ", color = "hint" }, @@ -607,7 +605,7 @@ use {"nvim-treesitter/nvim-treesitter", } local map = vim.api.nvim_set_keymap local opts = { noremap = true } - map("n", "", ":TodoTrouble", opts) + map("n", "", ":TodoTrouble", opts) end } @@ -702,13 +700,13 @@ use {"nvim-treesitter/nvim-treesitter", rootMarkers = { ".git/" }, languages = { python = { - -- { - -- lintCommand = "flake8 --max-line-length 88 --format '%(path)s:%(row)d:%(col)d: %(code)s %(code)s %(text)s' --stdin-display-name ${INPUT} -", - -- lintStdin = true, - -- lintIgnoreExitCode = true, - -- lintFormats = {"%f:%l:%c: %t%n%n%n %m"}, - -- lintSource = "flake8" - -- }, + { + lintCommand = "flake8 --max-line-length 88 --format '%(path)s:%(row)d:%(col)d: %(code)s %(code)s %(text)s' --stdin-display-name ${INPUT} -", + lintStdin = true, + lintIgnoreExitCode = true, + lintFormats = {"%f:%l:%c: %t%n%n%n %m"}, + lintSource = "flake8" + }, { formatCommand = "isort --stdout --profile black --force-single-line-imports -", formatStdin = true