kristoferssolo/SoloVim
1
0
Fork 0
mirror of https://github.com/kristoferssolo/SoloVim.git synced 2025-10-21 20:10:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

changed <CR> to <cr>

Browse Source
This commit is contained in:
Kristofers Solo 2023-04-20 17:24:19 +03:00
parent 5dc17d84db
commit a89d8ae091
3 changed files with 25 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lua/user/alpha.lua
View File

@ -16,13 +16,13 @@ dashboard.section.header.val = {
} }
dashboard.section.buttons.val = { dashboard.section.buttons.val = {
dashboard.button("f", "" .. " Find file", ":Telescope find_files <CR>"), dashboard.button("f", "" .. " Find file", ":Telescope find_files <cr>"),
dashboard.button("e", "" .. " New file", ":ene <BAR> startinsert <CR>"), dashboard.button("e", "" .. " New file", ":ene <BAR> startinsert <cr>"),
dashboard.button("p", "" .. " Find project", ":lua require('telescope').extensions.projects.projects()<CR>"), dashboard.button("p", "" .. " Find project", ":lua require('telescope').extensions.projects.projects()<cr>"),
dashboard.button("r", "" .. " Recent files", ":Telescope oldfiles <CR>"), dashboard.button("r", "" .. " Recent files", ":Telescope oldfiles <cr>"),
dashboard.button("t", "" .. " Find text", ":Telescope live_grep <CR>"), dashboard.button("t", "" .. " Find text", ":Telescope live_grep <cr>"),
dashboard.button("c", "" .. " Config", ":e ~/.config/nvim/init.lua <CR>"), dashboard.button("c", "" .. " Config", ":e ~/.config/nvim/init.lua <cr>"),
dashboard.button("q", "" .. " Quit", ":qa<CR>"), dashboard.button("q", "" .. " Quit", ":qa<cr>"),
} }
local function footer() local function footer()
return "kristofers.xyz" return "kristofers.xyz"

46
lua/user/keymaps.lua
View File

@ -1,6 +1,4 @@
-- Shorten function name
local keymap = vim.keymap.set local keymap = vim.keymap.set
-- Silent keymap option
local opts = { silent = true } local opts = { silent = true }
--Remap space as leader key --Remap space as leader key
@ -34,20 +32,14 @@ keymap("n", "<C-Down>", ":resize +2<cr>", opts)
keymap("n", "<C-Left>", ":vertical resize -2<cr>", opts) keymap("n", "<C-Left>", ":vertical resize -2<cr>", opts)
keymap("n", "<C-Right>", ":vertical resize +2<cr>", opts) keymap("n", "<C-Right>", ":vertical resize +2<cr>", opts)
-- Navigate buffers -- -- Navigate buffers
keymap("n", "<S-l>", ":bnext<cr>", opts) -- keymap("n", "<S-l>", ":bnext<cr>", opts)
keymap("n", "<S-h>", ":bprevious<cr>", opts) -- keymap("n", "<S-h>", ":bprevious<cr>", opts)
-- Clear highlights
keymap("n", "<leader>h", "<cmd>nohlsearch<cr>", opts)
-- Close buffers
keymap("n", "<S-q>", "<cmd>Bdelete!<cr>", opts)
-- Better paste -- Better paste
keymap("v", "p", '"_dP', opts) keymap("v", "p", '"_dP', opts)
-- Move current line / block wiht Alt-j/k ala vscode -- Move current line / block with Alt-j/k ala vscode
keymap("n", "<A-j>", "<cmd>m .+1<cr>==", opts) keymap("n", "<A-j>", "<cmd>m .+1<cr>==", opts)
keymap("n", "<A-k>", "<cmd>m .-2<cr>==", opts) keymap("n", "<A-k>", "<cmd>m .-2<cr>==", opts)
@ -93,31 +85,5 @@ keymap("t", "<C-j>", "<C-\\><C-N><C-w>j", opts)
keymap("t", "<C-k>", "<C-\\><C-N><C-w>k", opts) keymap("t", "<C-k>", "<C-\\><C-N><C-w>k", opts)
keymap("t", "<C-l>", "<C-\\><C-N><C-w>l", opts) keymap("t", "<C-l>", "<C-\\><C-N><C-w>l", opts)
-- Plugins -- keymap("n", "<C-b>", "<cmd>w!<cr><cmd>!compiler '%:p'<cr>")
keymap("n", "<C-o>", "<cmd>w!<cr><cmd>!opout '%:p'<cr>")
-- NvimTree
keymap("n", "<leader>e", ":NvimTreeToggle<cr>", opts)
-- Telescope
keymap("n", "<leader>ff", ":Telescope find_files<cr>", opts)
keymap("n", "<leader>ft", ":Telescope live_grep<cr>", opts)
keymap("n", "<leader>fp", ":Telescope projects<cr>", opts)
keymap("n", "<leader>fb", ":Telescope buffers<cr>", opts)
-- Git
keymap("n", "<leader>gg", "<cmd>lua _LAZYGIT_TOGGLE()<cr>", opts)
-- Comment
keymap("n", "<leader>/", "<cmd>lua require('Comment.api').toggle_current_linewise()<cr>", opts)
keymap("x", "<leader>/", '<ESC><CMD>lua require("Comment.api").toggle_linewise_op(vim.fn.visualmode())<cr>', {})
-- DAP
keymap("n", "<leader>db", "<cmd>lua require'dap'.toggle_breakpoint()<cr>", opts)
keymap("n", "<leader>dc", "<cmd>lua require'dap'.continue()<cr>", opts)
keymap("n", "<leader>di", "<cmd>lua require'dap'.step_into()<cr>", opts)
keymap("n", "<leader>do", "<cmd>lua require'dap'.step_over()<cr>", opts)
keymap("n", "<leader>dO", "<cmd>lua require'dap'.step_out()<cr>", opts)
keymap("n", "<leader>dr", "<cmd>lua require'dap'.repl.toggle()<cr>", opts)
keymap("n", "<leader>dl", "<cmd>lua require'dap'.run_last()<cr>", opts)
keymap("n", "<leader>du", "<cmd>lua require'dapui'.toggle()<cr>", opts)
keymap("n", "<leader>dt", "<cmd>lua require'dap'.terminate()<cr>", opts)

27
lua/user/whichkey.lua
View File

@ -94,15 +94,16 @@ local vmappings = {
local mappings = { local mappings = {
[";"] = { "<cmd>Alpha<cr>", "Dashboard" }, [";"] = { "<cmd>Alpha<cr>", "Dashboard" },
["/"] = { "<Plug>(comment_toggle_linewise_current)", "Comment toggle current line" }, ["/"] = { "<Plug>(comment_toggle_linewise_current)", "Comment toggle current line" },
["c"] = { "<cmd>Bdelete!<cr>", "Close Buffer" }, c = { "<cmd>Bdelete!<cr>", "Close Buffer" },
["h"] = { "<cmd>nohlsearch<cr>", "No Highlight" }, h = { "<cmd>nohlsearch<cr>", "No Highlight" },
["f"] = { f = {
"<cmd>lua require('telescope.builtin').find_files(require('telescope.themes').get_dropdown{previewer = false})<cr>", "<cmd>lua require('telescope.builtin').find_files(require('telescope.themes').get_dropdown{previewer = false})<cr>",
"Find files", "Find files",
}, },
["e"] = { "<cmd>NvimTreeToggle<cr>", "Explorer" }, e = { "<cmd>NvimTreeToggle<cr>", "Explorer" },
["F"] = { "<cmd>Telescope live_grep theme=ivy<cr>", "Find Text" }, F = { "<cmd>Telescope live_grep theme=ivy<cr>", "Find Text" },
["P"] = { "<cmd>lua require('telescope').extensions.projects.projects()<cr>", "Projects" }, P = { "<cmd>lua require('telescope').extensions.projects.projects()<cr>", "Projects" },
b = { "<cmd>Telescope buffers<cr>", "Find Buffers" },
B = { B = {
name = "Buffers", name = "Buffers",
j = { "<cmd>BufferLinePick<cr>", "Jump" }, j = { "<cmd>BufferLinePick<cr>", "Jump" },
@ -162,7 +163,6 @@ local mappings = {
name = "LSP", name = "LSP",
a = { "<cmd>lua vim.lsp.buf.code_action()<cr>", "Code Action" }, a = { "<cmd>lua vim.lsp.buf.code_action()<cr>", "Code Action" },
d = { "<cmd>Telescope diagnostics bufnr=0 theme=get_ivy<cr>", "Buffer Diagnostics" }, d = { "<cmd>Telescope diagnostics bufnr=0 theme=get_ivy<cr>", "Buffer Diagnostics" },
w = { w = {
"<cmd>Telescope diagnostics<cr>", "<cmd>Telescope diagnostics<cr>",
"Workspace Diagnostics", "Workspace Diagnostics",
@ -186,14 +186,13 @@ local mappings = {
"Workspace Symbols", "Workspace Symbols",
}, },
e = { "<cmd>Telescope quickfix<cr>", "Telescope Quickfix" }, e = { "<cmd>Telescope quickfix<cr>", "Telescope Quickfix" },
R = { R = {
name = "Rust", name = "Rust",
e = { "<cmd>RustExpandMacro<cr>", "Expand macro" }, e = { "<cmd>RustExpandMacro<cr>", "Expand macro" },
c = { "<cmd>RustOpenCargo<cr>", "Open cargo.toml" }, c = { "<cmd>RustOpenCargo<cr>", "Open cargo.toml" },
p = { "<cmd>RustParentModule<cr>", "Parent module" }, p = { "<cmd>RustParentModule<cr>", "Parent module" },
h = { "<cmd>RustHoverActions<cr>", "Hover actions" }, h = { "<cmd>RustHoverActions<cr>", "Hover actions" },
g = { "<cmd>RustViewCrateGraph<cr>", "View crate graph" }, g = { "<cmd>RustViewCrateGraph<cr>", "View create graph" },
d = { "<cmd>RustOpenExternalDocs<cr>", "Open external docs" }, d = { "<cmd>RustOpenExternalDocs<cr>", "Open external docs" },
}, },
}, },
@ -253,14 +252,12 @@ local mappings = {
d = { "<cmd>lua require('dap').toggle_breakpoint()<cr>", "Set breakpoint" }, d = { "<cmd>lua require('dap').toggle_breakpoint()<cr>", "Set breakpoint" },
t = { "<cmd>lua require('dapui').toggle()<cr>", "Toggle DAP-UI" }, t = { "<cmd>lua require('dapui').toggle()<cr>", "Toggle DAP-UI" },
c = { "<cmd>lua require('dap').continue()<cr>", "Launch debug sessions and resume execution" }, c = { "<cmd>lua require('dap').continue()<cr>", "Launch debug sessions and resume execution" },
o = { "<cmd>lua require('dap').step_over()<cr>", "Step over code" },
i = { "<cmd>lua require('dap').step_into()<cr>", "Step into code" }, i = { "<cmd>lua require('dap').step_into()<cr>", "Step into code" },
o = { "<cmd>lua require('dap').step_over()<cr>", "Step over code" },
O = { "<cmd>lua require('dap').step_out()<cr>", "Step out of code" },
r = { "<cmd>lua require('dap).repl.open()<cr>", "Inspect state" }, r = { "<cmd>lua require('dap).repl.open()<cr>", "Inspect state" },
}, T = { "<cmd>lua require('dap').terminate()<cr>", "Terminate" },
b = { l = { "<cmd>lua require('dap').run_last()<cr>", "Run last" },
name = "Build/compile/run",
b = { "<cmd>w!<cr><cmd>!compiler '%:p'<cr>", "Run/compile file" },
o = { "<cmd>!opout '%:p'<cr>", "Open file" },
}, },
} }