made bar fit more perfect and changed keymaps slightly
This commit is contained in:
pika
parent
600c3c81a2
commit
03afba17b5
3 changed files with 124 additions and 114 deletions
|
|
@ -1,4 +1,4 @@
|
|||
vim.g.mapleader = ' '
|
||||
vim.g.mapleader = " "
|
||||
|
||||
-- ─< lua/keymaps.lua >─────────────────────────────────────────────────────────────────
|
||||
-- local nomap = vim.keymap.del
|
||||
|
|
@ -7,73 +7,85 @@ vim.g.mapleader = ' '
|
|||
|
||||
local map = vim.keymap.set
|
||||
|
||||
map("n", "<Esc>", "<cmd>nohlsearch<CR>")
|
||||
|
||||
-- ─< Comment >─────────────────────────────────────────────────────────────────────────
|
||||
map('n', '<S-c>', 'gcc', { desc = 'comment toggle', remap = true })
|
||||
map('v', '<S-c>', 'gc', { desc = 'comment toggle', remap = true })
|
||||
map("n", "<S-c>", "gcc", { desc = "comment toggle", remap = true })
|
||||
map("v", "<S-c>", "gc", { desc = "comment toggle", remap = true })
|
||||
|
||||
-- ─< Terminal >────────────────────────────────────────────────────────────────────────
|
||||
map('t', '<C-x>', '<C-\\><C-N>', { desc = 'terminal escape terminal mode' })
|
||||
map("t", "<C-x>", "<C-\\><C-N>", { desc = "terminal escape terminal mode" })
|
||||
|
||||
-- ─< Movement while in "insert"-mode >─────────────────────────────────────────────────
|
||||
map('i', '<C-b>', '<ESC>^i', { desc = 'move beginning of line' })
|
||||
map('i', '<C-e>', '<End>', { desc = 'move end of line' })
|
||||
map('i', '<C-h>', '<Left>', { desc = 'move left' })
|
||||
map('i', '<C-l>', '<Right>', { desc = 'move right' })
|
||||
map('i', '<C-j>', '<Down>', { desc = 'move down' })
|
||||
map('i', '<C-k>', '<Up>', { desc = 'move up' })
|
||||
map("i", "<C-b>", "<ESC>^i", { desc = "move beginning of line" })
|
||||
map("i", "<C-e>", "<End>", { desc = "move end of line" })
|
||||
map("i", "<C-h>", "<Left>", { desc = "move left" })
|
||||
map("i", "<C-l>", "<Right>", { desc = "move right" })
|
||||
map("i", "<C-j>", "<Down>", { desc = "move down" })
|
||||
map("i", "<C-k>", "<Up>", { desc = "move up" })
|
||||
-- ───────────────────────────────────< Add yours here >───────────────────────────────────
|
||||
|
||||
map('n', ';', ':', { desc = 'CMD enter command mode' })
|
||||
map('i', 'jk', '<ESC>')
|
||||
map('i', '<C-c>', '<ESC>')
|
||||
map('n', '<C-c>', '<ESC>')
|
||||
map('v', '<C-c>', '<ESC>')
|
||||
map("n", ";", ":", { desc = "CMD enter command mode" })
|
||||
map("i", "jk", "<ESC>")
|
||||
map("i", "<C-c>", "<ESC>")
|
||||
map("n", "<C-c>", "<ESC>")
|
||||
map("v", "<C-c>", "<ESC>")
|
||||
|
||||
map('n', '<leader>x', '<cmd>bd!<CR>')
|
||||
map("n", "<leader>x", "<cmd>bd!<CR>")
|
||||
|
||||
-- ─< Activate color plugin >───────────────────────────────────────────────────────────
|
||||
map('n', '<leader>C', '<cmd>ColorizerToggle<CR>')
|
||||
map("n", "<leader>C", "<cmd>ColorizerToggle<CR>")
|
||||
|
||||
--─< Toggle NvimTree >─────────────────────────────────────────────────────────────────
|
||||
map('n', '<leader>e', ':NvimTreeToggle<CR>', { noremap = true, silent = true, desc = '[e]xplorer' })
|
||||
map("n", "<leader>e", ":NvimTreeToggle<CR>", { noremap = true, silent = true, desc = "[e]xplorer" })
|
||||
|
||||
-- ─< Disable arrow keys in normal mode >───────────────────────────────────────────────
|
||||
map('n', '<left>', '<cmd>echo "Use h to move!!"<CR>')
|
||||
map('n', '<right>', '<cmd>echo "Use l to move!!"<CR>')
|
||||
map('n', '<up>', '<cmd>echo "Use k to move!!"<CR>')
|
||||
map('n', '<down>', '<cmd>echo "Use j to move!!"<CR>')
|
||||
map("n", "<left>", '<cmd>echo "Use h to move!!"<CR>')
|
||||
map("n", "<right>", '<cmd>echo "Use l to move!!"<CR>')
|
||||
map("n", "<up>", '<cmd>echo "Use k to move!!"<CR>')
|
||||
map("n", "<down>", '<cmd>echo "Use j to move!!"<CR>')
|
||||
|
||||
map('n', '<leader>l', '<C-w><C-l>', { desc = 'Move focus to the right window' })
|
||||
map('n', '<leader>h', '<C-w><C-h>', { desc = 'Move focus to the left window' })
|
||||
map('n', '<leader>j', '<C-w><C-j>', { desc = 'Move focus to the lower window' })
|
||||
map('n', '<leader>k', '<C-w><C-k>', { desc = 'Move focus to the upper window' })
|
||||
map("n", "<leader>l", "<C-w><C-l>", { desc = "Move focus to the right window" })
|
||||
map("n", "<leader>h", "<C-w><C-h>", { desc = "Move focus to the left window" })
|
||||
map("n", "<leader>j", "<C-w><C-j>", { desc = "Move focus to the lower window" })
|
||||
map("n", "<leader>k", "<C-w><C-k>", { desc = "Move focus to the upper window" })
|
||||
|
||||
map('n', '<leader>p', vim.cmd.Ex)
|
||||
map('n', '<leader>q', vim.cmd.q)
|
||||
map('n', '<leader>s', vim.cmd.w)
|
||||
-- map("n", "<leader>p", vim.cmd.Ex)
|
||||
map("n", "<leader>q", vim.cmd.q)
|
||||
map("n", "<leader>s", vim.cmd.w)
|
||||
|
||||
-- ─< Comment-Box mappings >────────────────────────────────────────────────────────────
|
||||
map('n', '<leader>cd', '<Cmd>CBd<CR>', { noremap = true, silent = true, desc = '[c]ommentbox [d]elete' })
|
||||
map('v', '<leader>cd', '<Cmd>CBd<CR>', { noremap = true, silent = true, desc = '[c]ommentbox [d]elete' })
|
||||
map("n", "<leader>cd", "<Cmd>CBd<CR>", { noremap = true, silent = true, desc = "[c]ommentbox [d]elete" })
|
||||
map("v", "<leader>cd", "<Cmd>CBd<CR>", { noremap = true, silent = true, desc = "[c]ommentbox [d]elete" })
|
||||
|
||||
map('n', '<leader>cy', '<Cmd>CBy<CR>', { noremap = true, silent = true, desc = '[y]ank content of Commentbox' })
|
||||
map('v', '<leader>cy', '<Cmd>CBy<CR>', { noremap = true, silent = true, desc = '[y]ank content of Commentbox' })
|
||||
map("n", "<leader>cy", "<Cmd>CBy<CR>", { noremap = true, silent = true, desc = "[y]ank content of Commentbox" })
|
||||
map("v", "<leader>cy", "<Cmd>CBy<CR>", { noremap = true, silent = true, desc = "[y]ank content of Commentbox" })
|
||||
|
||||
map('n', '<leader>cb', '<Cmd>CBlabox1<CR>', { noremap = true, silent = true, desc = '[c]reate comment [b]ox' })
|
||||
map('v', '<leader>cb', '<Cmd>CBlabox1<CR>', { noremap = true, silent = true, desc = '[c]reate comment [b]ox' })
|
||||
map('n', '<leader>cB', '<Cmd>CBcabox1<CR>', { noremap = true, silent = true, desc = '[c]reate comment [b]ox (B)centered' })
|
||||
map('v', '<leader>cB', '<Cmd>CBcabox1<CR>', { noremap = true, silent = true, desc = '[c]reate comment [b]ox (B)centered' })
|
||||
map('n', '<leader>cc', '<Cmd>CBllbox14<CR>', { noremap = true, silent = true, desc = '[c]reate [c]omment' })
|
||||
map('v', '<leader>cc', '<Cmd>CBllbox14<CR>', { noremap = true, silent = true, desc = '[c]reate [c]omment' })
|
||||
map('n', '<leader>cC', '<Cmd>CBclbox14<CR>', { noremap = true, silent = true, desc = '[c]reate [c]omment (C)entered' })
|
||||
map('v', '<leader>cC', '<Cmd>CBclbox14<CR>', { noremap = true, silent = true, desc = '[c]reate [c]omment (C)entered' })
|
||||
map("n", "<leader>cb", "<Cmd>CBlabox1<CR>", { noremap = true, silent = true, desc = "[c]reate comment [b]ox" })
|
||||
map("v", "<leader>cb", "<Cmd>CBlabox1<CR>", { noremap = true, silent = true, desc = "[c]reate comment [b]ox" })
|
||||
map(
|
||||
"n",
|
||||
"<leader>cB",
|
||||
"<Cmd>CBcabox1<CR>",
|
||||
{ noremap = true, silent = true, desc = "[c]reate comment [b]ox (centered)" }
|
||||
)
|
||||
map(
|
||||
"v",
|
||||
"<leader>cB",
|
||||
"<Cmd>CBcabox1<CR>",
|
||||
{ noremap = true, silent = true, desc = "[c]reate comment [b]ox (centered)" }
|
||||
)
|
||||
map("n", "<leader>cc", "<Cmd>CBllbox14<CR>", { noremap = true, silent = true, desc = "[c]reate [c]omment" })
|
||||
map("v", "<leader>cc", "<Cmd>CBllbox14<CR>", { noremap = true, silent = true, desc = "[c]reate [c]omment" })
|
||||
map("n", "<leader>cC", "<Cmd>CBclbox14<CR>", { noremap = true, silent = true, desc = "[c]reate [c]omment (C)entered" })
|
||||
map("v", "<leader>cC", "<Cmd>CBclbox14<CR>", { noremap = true, silent = true, desc = "[c]reate [c]omment (C)entered" })
|
||||
|
||||
map('n', '<leader>cl', '<Cmd>CBllline8<CR>', { noremap = true, silent = true, desc = '[c]reate comment [l]ine' })
|
||||
map('n', '<leader>cL', '<Cmd>CBlcline8<CR>', { noremap = true, silent = true, desc = '[c]reate comment [L]ine' })
|
||||
map("n", "<leader>cl", "<Cmd>CBllline8<CR>", { noremap = true, silent = true, desc = "[c]reate comment [l]ine" })
|
||||
map("n", "<leader>cL", "<Cmd>CBlcline8<CR>", { noremap = true, silent = true, desc = "[c]reate comment [L]ine" })
|
||||
|
||||
-- ─< LoremIpsum generator >────────────────────────────────────────────────────────────
|
||||
map('n', '<leader>L', ':LoremIpsum ')
|
||||
map("n", "<leader>L", ":LoremIpsum ")
|
||||
|
||||
-- window management
|
||||
map('n', '<leader>sv', '<C-w>v', { desc = 'Split window vertically' }) -- split window vertically
|
||||
map('n', '<leader>sh', '<C-w>s', { desc = 'Split window horizontally' }) -- split window horizontally
|
||||
map("n", "<leader>sv", "<C-w>v", { desc = "Split window vertically" }) -- split window vertically
|
||||
map("n", "<leader>sh", "<C-w>s", { desc = "Split window horizontally" }) -- split window horizontally
|
||||
|
|
|
|||
|
|
@ -1,71 +1,71 @@
|
|||
return {
|
||||
'nvim-lualine/lualine.nvim',
|
||||
dependencies = { 'nvim-tree/nvim-web-devicons' },
|
||||
config = function()
|
||||
local lualine = require 'lualine'
|
||||
local lazy_status = require 'lazy.status' -- to configure lazy pending updates count
|
||||
"nvim-lualine/lualine.nvim",
|
||||
dependencies = { "nvim-tree/nvim-web-devicons" },
|
||||
config = function()
|
||||
local lualine = require("lualine")
|
||||
local lazy_status = require("lazy.status") -- to configure lazy pending updates count
|
||||
|
||||
local colors = {
|
||||
blue = '#57a5e5',
|
||||
green = '#70c2be',
|
||||
violet = '#aaaaff',
|
||||
yellow = '#dbb651',
|
||||
red = '#e75a7c',
|
||||
fg = '#f1e9dc',
|
||||
bg = '#252623',
|
||||
inactive_bg = '#3a3d37',
|
||||
}
|
||||
local colors = {
|
||||
blue = "#57a5e5",
|
||||
green = "#70c2be",
|
||||
violet = "#aaaaff",
|
||||
yellow = "#dbb651",
|
||||
red = "#e75a7c",
|
||||
fg = "#f1e9dc",
|
||||
bg = "#31332e",
|
||||
inactive_bg = "#3a3d37",
|
||||
}
|
||||
|
||||
local my_lualine_theme = {
|
||||
normal = {
|
||||
a = { bg = colors.blue, fg = colors.bg, gui = 'bold' },
|
||||
b = { bg = colors.bg, fg = colors.fg },
|
||||
c = { bg = colors.bg, fg = colors.fg },
|
||||
},
|
||||
insert = {
|
||||
a = { bg = colors.green, fg = colors.bg, gui = 'bold' },
|
||||
b = { bg = colors.bg, fg = colors.fg },
|
||||
c = { bg = colors.bg, fg = colors.fg },
|
||||
},
|
||||
visual = {
|
||||
a = { bg = colors.violet, fg = colors.bg, gui = 'bold' },
|
||||
b = { bg = colors.bg, fg = colors.fg },
|
||||
c = { bg = colors.bg, fg = colors.fg },
|
||||
},
|
||||
command = {
|
||||
a = { bg = colors.yellow, fg = colors.bg, gui = 'bold' },
|
||||
b = { bg = colors.bg, fg = colors.fg },
|
||||
c = { bg = colors.bg, fg = colors.fg },
|
||||
},
|
||||
replace = {
|
||||
a = { bg = colors.red, fg = colors.bg, gui = 'bold' },
|
||||
b = { bg = colors.bg, fg = colors.fg },
|
||||
c = { bg = colors.bg, fg = colors.fg },
|
||||
},
|
||||
inactive = {
|
||||
a = { bg = colors.inactive_bg, fg = colors.semilightgray, gui = 'bold' },
|
||||
b = { bg = colors.inactive_bg, fg = colors.semilightgray },
|
||||
c = { bg = colors.inactive_bg, fg = colors.semilightgray },
|
||||
},
|
||||
}
|
||||
local my_lualine_theme = {
|
||||
normal = {
|
||||
a = { bg = colors.blue, fg = colors.bg, gui = "bold" },
|
||||
b = { bg = colors.bg, fg = colors.fg },
|
||||
c = { bg = colors.bg, fg = colors.fg },
|
||||
},
|
||||
insert = {
|
||||
a = { bg = colors.green, fg = colors.bg, gui = "bold" },
|
||||
b = { bg = colors.bg, fg = colors.fg },
|
||||
c = { bg = colors.bg, fg = colors.fg },
|
||||
},
|
||||
visual = {
|
||||
a = { bg = colors.violet, fg = colors.bg, gui = "bold" },
|
||||
b = { bg = colors.bg, fg = colors.fg },
|
||||
c = { bg = colors.bg, fg = colors.fg },
|
||||
},
|
||||
command = {
|
||||
a = { bg = colors.yellow, fg = colors.bg, gui = "bold" },
|
||||
b = { bg = colors.bg, fg = colors.fg },
|
||||
c = { bg = colors.bg, fg = colors.fg },
|
||||
},
|
||||
replace = {
|
||||
a = { bg = colors.red, fg = colors.bg, gui = "bold" },
|
||||
b = { bg = colors.bg, fg = colors.fg },
|
||||
c = { bg = colors.bg, fg = colors.fg },
|
||||
},
|
||||
inactive = {
|
||||
a = { bg = colors.inactive_bg, fg = colors.semilightgray, gui = "bold" },
|
||||
b = { bg = colors.inactive_bg, fg = colors.semilightgray },
|
||||
c = { bg = colors.inactive_bg, fg = colors.semilightgray },
|
||||
},
|
||||
}
|
||||
|
||||
-- configure lualine with modified theme
|
||||
lualine.setup {
|
||||
options = {
|
||||
theme = my_lualine_theme,
|
||||
},
|
||||
sections = {
|
||||
lualine_x = {
|
||||
{
|
||||
lazy_status.updates,
|
||||
cond = lazy_status.has_updates,
|
||||
color = { fg = '#ff9e64' },
|
||||
},
|
||||
{ 'encoding' },
|
||||
{ 'fileformat' },
|
||||
{ 'filetype' },
|
||||
},
|
||||
},
|
||||
}
|
||||
end,
|
||||
-- configure lualine with modified theme
|
||||
lualine.setup({
|
||||
options = {
|
||||
theme = my_lualine_theme,
|
||||
},
|
||||
sections = {
|
||||
lualine_x = {
|
||||
{
|
||||
lazy_status.updates,
|
||||
cond = lazy_status.has_updates,
|
||||
color = { fg = "#ff9e64" },
|
||||
},
|
||||
{ "encoding" },
|
||||
{ "fileformat" },
|
||||
{ "filetype" },
|
||||
},
|
||||
},
|
||||
})
|
||||
end,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,13 +38,11 @@ return {
|
|||
"json",
|
||||
"javascript",
|
||||
"typescript",
|
||||
"tsx",
|
||||
"graphql",
|
||||
"lua",
|
||||
"query",
|
||||
"c",
|
||||
"prisma",
|
||||
"svelte",
|
||||
"hyprlang",
|
||||
"ini",
|
||||
"passwd",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue