thomasave
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: thomasave:60cf97bb09f7dbd1116ae85e663069778c6b56cc
Branches Tags
thomasave:master
thomasave:NixOS
thomasave:original
thomasave:riva
thomasave:laptop
..
compare: thomasave:bf0f34cbaf309f8dbc2476690b5d7fe5d350d7f2
Branches Tags
thomasave:master
thomasave:NixOS
thomasave:original
thomasave:riva
thomasave:laptop

3 Commits
60cf97bb09 ... bf0f34cbaf

Author SHA1 Message Date
Thomas Avé bf0f34cbaf Edit mappings 2023-08-25 22:44:52 +02:00
Thomas Avé cf358c74d6 Switch to Snippy 2023-08-25 22:44:42 +02:00
Thomas Avé 442227bbb6 Small cursorline theme tweak 2023-08-25 22:43:48 +02:00
6 changed files with 67 additions and 34 deletions
Show Stats Expand all files Collapse all files

4
nvim/colorschemes/material/lua/lush_theme/material.lua
View File

@ -35,7 +35,7 @@ local theme = lush(function(injected_functions)
TelescopeResultsLineNr { LineNr }, -- TelescopeResultsLineNr xxx links to LineNr
TroubleIndent { LineNr }, -- TroubleIndent xxx links to LineNr
TroubleLocation { LineNr }, -- TroubleLocation xxx links to LineNr
CursorLineNr { fg="#f0c674", }, -- CursorLineNr xxx ctermfg=221 guifg=#f0c674
CursorLineNr { fg=hsl(211, 100, 63), }, -- CursorLineNr xxx ctermfg=221 guifg=#f0c674
TroubleFoldIcon { CursorLineNr }, -- TroubleFoldIcon xxx links to CursorLineNr
Question { fg="#b5bd68", }, -- Question xxx ctermfg=143 guifg=#b5bd68
StatusLine { bg="#455a64", fg="#c5c8c6", }, -- StatusLine xxx ctermfg=250 ctermbg=237 guifg=#c5c8c6 guibg=#455A64
@ -77,7 +77,7 @@ local theme = lush(function(injected_functions)
TabLineFill { gui="reverse", }, -- TabLineFill xxx cterm=reverse gui=reverse
CursorColumn { bg="#212d32", }, -- CursorColumn xxx ctermbg=235 guibg=#212D32
lspReference { CursorColumn }, -- lspReference xxx links to CursorColumn
CursorLine { bg="#212d32", }, -- CursorLine xxx ctermbg=235 guibg=#212D32
CursorLine { bg=hsl(225, 100, 25), }, -- CursorLine xxx ctermbg=235 guibg=#212D32
ColorColumn { bg="#212d32", }, -- ColorColumn xxx ctermbg=235 guibg=#212D32
Cursor { bg="fg", }, -- Cursor xxx guifg=bg guibg=fg
RedrawDebugNormal { gui="reverse", }, -- RedrawDebugNormal xxx cterm=reverse gui=reverse

6
nvim/lazy-lock.json
View File

@ -6,9 +6,7 @@
"cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"diffview.nvim": { "branch": "main", "commit": "db97e667e03294bfa9f15e544e78f3082247bf79" },
"editorconfig.nvim": { "branch": "master", "commit": "5b9e303e1d6f7abfe616ce4cc8d3fffc554790bf" },
"formatter.nvim": { "branch": "master", "commit": "44c89f09dcc220dc2a9b056e93c3a87c86e79804" },
"friendly-snippets": { "branch": "main", "commit": "377d45475b49e37460a902d6d569d2093d4037d0" },
"lazy.nvim": { "branch": "main", "commit": "dac844ed617dda4f9ec85eb88e9629ad2add5e05" },
"leap.nvim": { "branch": "main", "commit": "5efe985cf68fac3b6a6dfe7a75fbfaca8db2af9c" },
"lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" },
@ -23,14 +21,12 @@
"nvim-treesitter": { "branch": "master", "commit": "add1864bbf2d3b8e789ec6b4715bb5a4073e3b60" },
"nvim-web-devicons": { "branch": "master", "commit": "cfc8824cc1db316a276b36517f093baccb8e799a" },
"plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" },
"supertab": { "branch": "master", "commit": "f0093ae12a9115498f887199809a6114659fc858" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" },
"telescope-undo.nvim": { "branch": "main", "commit": "3dec002ea3e7952071d26fbb5d01e2038a58a554" },
"telescope.nvim": { "branch": "master", "commit": "2d92125620417fbea82ec30303823e3cd69e90e8" },
"trim.nvim": { "branch": "master", "commit": "2df124c2c2844d3143091ebd3ae8b49bbe06bc5e" },
"trouble.nvim": { "branch": "main", "commit": "40aad004f53ae1d1ba91bcc5c29d59f07c5f01d3" },
"undotree": { "branch": "master", "commit": "0e11ba7325efbbb3f3bebe06213afa3e7ec75131" },
"vim-bracketed-paste": { "branch": "master", "commit": "45411da73cc159e4fc2138d930553d247bbfbcdc" },
"vim-python-pep8-indent": { "branch": "master", "commit": "60ba5e11a61618c0344e2db190210145083c91f8" },
"vim-rooter": { "branch": "master", "commit": "4f52ca556a0b9e257bf920658714470ea0320b7a" },
"vim-vsnip": { "branch": "master", "commit": "7753ba9c10429c29d25abfd11b4c60b76718c438" },
"vim-vsnip-integ": { "branch": "master", "commit": "1914e72cf3de70df7f5dde476cd299aba2440aef" },

9
nvim/lua/lsp_config.lua
View File

@ -54,6 +54,15 @@ cmp.setup({
})
})
require('snippy').setup({
mappings = {
is = {
['<leader><Tab>'] = 'expand_or_advance',
['<leader><S-Tab>'] = 'previous',
},
},
})
-- Set configuration for specific filetype.
cmp.setup.filetype('gitcommit', {
sources = cmp.config.sources({

55
nvim/lua/mappings.lua
View File

@ -1,24 +1,31 @@
vim.api.nvim_set_keymap("i", "jj", "<Esc>", {})
vim.api.nvim_set_keymap("n", "j", "gj", {})
vim.api.nvim_set_keymap("n", "k", "gk", {})
vim.api.nvim_set_keymap("n", "<S-k>", "<Nop>", {})
vim.api.nvim_set_keymap("v", "<S-y>", "\"+y", { noremap = true })
-- vim.api.nvim_set_keymap("n", "<S-p>", "\"+p", { noremap = true })
-- vim.api.nvim_set_keymap("v", "<S-p>", "\"+p", { noremap = true })
vim.api.nvim_set_keymap("t", "jj", "<C-\\><C-n>", { noremap = true, silent = true })
vim.api.nvim_set_keymap("n", "<Backspace>", ":q<cr>", { noremap = true, silent = true })
vim.api.nvim_set_keymap("n", "<C-U>", "<C-O>", { noremap = true })
vim.api.nvim_set_keymap("n", "<C-E>", "<C-U>", { noremap = true })
vim.api.nvim_set_keymap("n", "<C-I>", "<C-I>", { noremap = true })
vim.api.nvim_set_keymap("n", "<Tab>", "<Nop>", { noremap = true })
vim.api.nvim_set_keymap("n", "<leader><space>", ":noh<cr>", { noremap = true, silent = true })
vim.api.nvim_set_keymap("n", "gn", ":n<cr>", { noremap = true, silent = true })
vim.api.nvim_set_keymap("n", "<leader>d", ":TroubleToggle<cr>", { noremap = true, silent = true })
vim.api.nvim_set_keymap("n", "gi", ":ClangdSwitchSourceHeader<cr>", { noremap = true, silent = true })
vim.api.nvim_set_keymap("n", "<leader>t", ":NvimTreeFindFileToggle<cr>", { noremap = true, silent = true })
vim.api.nvim_set_keymap("n", "<leader>a", "<C-A>", { noremap = true, silent = true })
vim.api.nvim_set_keymap("n", "<leader>x", "<C-X>", { noremap = true, silent = true })
-- vim.api.nvim_set_keymap("n", "<S-h>x", "<C-h>", { noremap = true, silent = true })
-- vim.api.nvim_set_keymap("n", "<S-j>x", "<C-j>", { noremap = true, silent = true })
-- vim.api.nvim_set_keymap("n", "<S-k>x", "<C-k>", { noremap = true, silent = true })
-- vim.api.nvim_set_keymap("n", "<S-l>x", "<C-l>", { noremap = true, silent = true })
vim.keymap.set("i", "jj", "<Esc>", {})
vim.keymap.set("n", "j", "gj", {})
vim.keymap.set("n", "k", "gk", {})
vim.keymap.set("n", "<S-k>", "<Nop>", {})
-- vim.keymap.set("n", "<S-p>", "\"+p", { noremap = true })
-- vim.keymap.set("v", "<S-p>", "\"+p", { noremap = true })
vim.keymap.set("t", "jj", "<C-\\><C-n>", { noremap = true, silent = true })
vim.keymap.set("n", "<Backspace>", ":q<cr>", { noremap = true, silent = true })
vim.keymap.set("n", "<C-U>", "<C-O>", { noremap = true })
vim.keymap.set("n", "<C-E>", "<C-U>zz", { noremap = true })
vim.keymap.set("n", "<C-D>", "<C-D>zz", { noremap = true })
vim.keymap.set("n", "<C-I>", "<C-I>", { noremap = true })
vim.keymap.set("n", "n", "nzz", { noremap = true })
vim.keymap.set("n", "N", "Nzz", { noremap = true })
vim.keymap.set("x", "<leader>p", [["_dP]], { noremap = true })
vim.keymap.set("v", "<leader>y", [["+y]])
vim.keymap.set("v", "<leader>Y", [["+Y]])
vim.keymap.set("n", "<Tab>", "<Nop>", { noremap = true })
vim.keymap.set("n", "<leader><space>", ":noh<cr>", { noremap = true, silent = true })
vim.keymap.set("n", "gn", ":n<cr>", { noremap = true, silent = true })
vim.keymap.set("n", "<leader>d", ":TroubleToggle<cr>", { noremap = true, silent = true })
vim.keymap.set("n", "gi", ":ClangdSwitchSourceHeader<cr>", { noremap = true, silent = true })
vim.keymap.set("n", "<leader>t", ":NvimTreeFindFileToggle<cr>", { noremap = true, silent = true })
vim.keymap.set("x", "<leader>a", "<C-A>", { noremap = true, silent = true })
vim.keymap.set("x", "<leader>x", "<C-X>", { noremap = true, silent = true })
vim.keymap.set("x", "<leader>ga", "g<C-A>", { noremap = true, silent = true })
vim.keymap.set("x", "<leader>gx", "g<C-X>", { noremap = true, silent = true })
-- vim.keymap.set("n", "<S-h>x", "<C-h>", { noremap = true, silent = true })
-- vim.keymap.set("n", "<S-j>x", "<C-j>", { noremap = true, silent = true })
-- vim.keymap.set("n", "<S-k>x", "<C-k>", { noremap = true, silent = true })
-- vim.keymap.set("n", "<S-l>x", "<C-l>", { noremap = true, silent = true })

4
nvim/lua/plugins.lua
View File

@ -13,16 +13,14 @@ end
vim.opt.rtp:prepend(lazypath)
require('lazy').setup({
"rafamadriz/friendly-snippets",
'ConradIrwin/vim-bracketed-paste',
'airblade/vim-rooter',
'cappyzawa/trim.nvim',
'ggandor/leap.nvim',
'mhartington/formatter.nvim',
'gpanders/editorconfig.nvim',
'intrntbrn/awesomewm-vim-tmux-navigator',
'mbbill/undotree',
'numToStr/Comment.nvim',
'debugloop/telescope-undo.nvim',
{'vimwiki/vimwiki'},
'windwp/nvim-autopairs',
{'lervag/vimtex', ft='latex'},

23
nvim/lua/telescope_config.lua
View File

@ -40,11 +40,34 @@ require("telescope").setup{
["<C-k>"] = actions.move_selection_previous,
},
},
},
extensions = {
undo = {
side_by_side = true,
layout_strategy = "vertical",
layout_config = {
preview_height = 0.5,
},
mappings = {
i = {
-- IMPORTANT: Note that telescope-undo must be available when telescope is configured if
-- you want to replicate these defaults and use the following actions. This means
-- installing as a dependency of telescope in it's `requirements` and loading this
-- extension from there instead of having the separate plugin definition as outlined
-- above.
["<cr>"] = require("telescope-undo.actions").restore,
["<S-y>"] = require("telescope-undo.actions").yank_additions,
},
},
}
}
}
telescope.load_extension("undo")
telescope.load_extension('fzf')
vim.api.nvim_set_keymap("n", "<C-p>", "<CMD>lua require'telescope_config'.project_files()<CR>", {noremap = true, silent = true})
vim.api.nvim_set_keymap("n", "<C-O>", "<cmd>lua require('telescope_config').buffers()<cr>", { silent = true, noremap = true })
vim.api.nvim_set_keymap("n", "<C-f>", "<cmd>lua require('telescope.builtin').live_grep{ cwd = vim.fn.systemlist(\"git rev-parse --show-toplevel 2> /dev/null || pwd\")[1] }<cr>", { silent = true, noremap = true })