Squashed commit of the following:
- customized tmux bar - swapped harpoon keys - fixed exit terminal key - removed trailing commas in waybar config - neovim - added proj search - added notes bind - bind to exit term (doesnt really work for me) - auto cwd OF file dir OR git main dir WHEN bufenter and bind - swaped tmux move keys - changed showmethekey windowrule
This commit is contained in:
parent
5887bb0d4d
commit
989269f4d5
|
@ -7,8 +7,8 @@ if ok then
|
||||||
vim.keymap.set("n","<C-e>", ui.toggle_quick_menu)
|
vim.keymap.set("n","<C-e>", ui.toggle_quick_menu)
|
||||||
|
|
||||||
|
|
||||||
vim.keymap.set("n","<C-y>", function() ui.nav_file(1) end)
|
vim.keymap.set("n","<C-t>", function() ui.nav_file(1) end)
|
||||||
vim.keymap.set("n","<C-t>", function() ui.nav_file(2) end)
|
vim.keymap.set("n","<C-y>", function() ui.nav_file(2) end)
|
||||||
vim.keymap.set("n","<C-n>", function() ui.nav_file(3) end)
|
vim.keymap.set("n","<C-n>", function() ui.nav_file(3) end)
|
||||||
vim.keymap.set("n","<C-s>", function() ui.nav_file(4) end)
|
vim.keymap.set("n","<C-s>", function() ui.nav_file(4) end)
|
||||||
end
|
end
|
||||||
|
|
|
@ -42,6 +42,7 @@ if ok then
|
||||||
vim.keymap.set('n', '<leader>pg', builtin.live_grep, {})
|
vim.keymap.set('n', '<leader>pg', builtin.live_grep, {})
|
||||||
vim.keymap.set('n', '<leader>pb', builtin.buffers, {})
|
vim.keymap.set('n', '<leader>pb', builtin.buffers, {})
|
||||||
vim.keymap.set('n', '<leader>ph', builtin.help_tags, {})
|
vim.keymap.set('n', '<leader>ph', builtin.help_tags, {})
|
||||||
|
vim.keymap.set('n', '<leader>pr', builtin.registers, {})
|
||||||
vim.keymap.set('n', '<leader>ps', function()
|
vim.keymap.set('n', '<leader>ps', function()
|
||||||
builtin.grep_string({ search = vim.fn.input("Grep > ") });
|
builtin.grep_string({ search = vim.fn.input("Grep > ") });
|
||||||
end)
|
end)
|
||||||
|
@ -56,4 +57,8 @@ if ok then
|
||||||
vim.keymap.set('n', '<leader>gg', builtin.git_files, {})
|
vim.keymap.set('n', '<leader>gg', builtin.git_files, {})
|
||||||
vim.keymap.set('n', '<leader>gs', builtin.git_status, {})
|
vim.keymap.set('n', '<leader>gs', builtin.git_status, {})
|
||||||
vim.keymap.set('n', '<leader>gm', builtin.git_commits, {})
|
vim.keymap.set('n', '<leader>gm', builtin.git_commits, {})
|
||||||
|
|
||||||
|
vim.keymap.set('n', '<leader>proj', function ()
|
||||||
|
require('telescope.builtin').find_files({cwd = "~/stuff/scripts"})
|
||||||
|
end, {})
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,7 +1,10 @@
|
||||||
vim.g.mapleader=" "
|
vim.g.mapleader=" "
|
||||||
vim.g.maplocalleader=" "
|
vim.g.maplocalleader=" "
|
||||||
|
|
||||||
vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)
|
vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)
|
||||||
|
|
||||||
|
-- notes
|
||||||
|
vim.keymap.set("n", "<leader>notes", ":e ~/stuff/notes/notes.md<CR>")
|
||||||
|
|
||||||
--move highlighted stuffs
|
--move highlighted stuffs
|
||||||
vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
|
vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
|
||||||
|
@ -62,8 +65,32 @@ vim.keymap.set('n', '<leader>tp', ':tabp<CR>')
|
||||||
-- make a error check thing for c
|
-- make a error check thing for c
|
||||||
vim.keymap.set("n", "<leader>ee", "oif err != nil {<CR>}<Esc>Oreturn err<Esc>")
|
vim.keymap.set("n", "<leader>ee", "oif err != nil {<CR>}<Esc>Oreturn err<Esc>")
|
||||||
|
|
||||||
|
-- terminal niceites
|
||||||
|
vim.keymap.set("n", "<C-;>", ":", { desc = "Enter command mode" })
|
||||||
|
vim.keymap.set("v", "<C-;>", ":", { desc = "Enter command mode (visual)" })
|
||||||
|
vim.keymap.set("t", "<C-e>", "<C-\\><C-n>", { desc = "Exit terminal" })
|
||||||
|
|
||||||
|
|
||||||
|
--change cwd to directory of buffer or git master directory
|
||||||
|
local function set_cwd()
|
||||||
|
local fname = vim.fn.expand("%:p")
|
||||||
|
if not fname:find("fugitive") and not fname:find("term") then -- no dot in filename
|
||||||
|
vim.cmd('cd ' .. vim.fn.expand('%:p:h'))
|
||||||
|
|
||||||
|
local gitroot = vim.fn.system("git rev-parse --show-toplevel")
|
||||||
|
if string.find(gitroot, "fatal", 1, true) == nil then
|
||||||
|
vim.cmd("cd " .. gitroot)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
vim.keymap.set("n", "<leader>c", set_cwd, {})
|
||||||
|
|
||||||
|
vim.api.nvim_create_autocmd({ "BufEnter" }, {
|
||||||
|
pattern = "*",
|
||||||
|
callback = set_cwd
|
||||||
|
})
|
||||||
|
|
||||||
-- auto closing para
|
-- auto closing para
|
||||||
local function set_auto_close(doclose)
|
local function set_auto_close(doclose)
|
||||||
if doclose==true then
|
if doclose==true then
|
||||||
|
@ -105,8 +132,6 @@ end
|
||||||
|
|
||||||
vim.keymap.set("n", "<leader>k", toggle_auto_close)
|
vim.keymap.set("n", "<leader>k", toggle_auto_close)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-- update every buffer
|
-- update every buffer
|
||||||
vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost" }, {
|
vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost" }, {
|
||||||
pattern = "*",
|
pattern = "*",
|
||||||
|
|
|
@ -254,8 +254,8 @@ for_window [app_id="showmethekey-gtk"] \
|
||||||
floating enable, \
|
floating enable, \
|
||||||
sticky enable, \
|
sticky enable, \
|
||||||
border none, \
|
border none, \
|
||||||
move position 257 1664, \
|
move position 357 1660, \
|
||||||
resize set 1487 50, \
|
resize set 1160 50, \
|
||||||
|
|
||||||
# im-emoji-picker window
|
# im-emoji-picker window
|
||||||
no_focus [title="im-emoji-picker"]
|
no_focus [title="im-emoji-picker"]
|
||||||
|
|
|
@ -36,15 +36,15 @@ setw -g pane-base-index 1
|
||||||
set -g renumber-windows on # renumber windows when one is closed
|
set -g renumber-windows on # renumber windows when one is closed
|
||||||
|
|
||||||
# nav rebinds
|
# nav rebinds
|
||||||
bind -r C-h select-pane -L
|
bind -r h select-pane -L
|
||||||
bind -r C-j select-pane -D
|
bind -r j select-pane -D
|
||||||
bind -r C-k select-pane -U
|
bind -r k select-pane -U
|
||||||
bind -r C-l select-pane -R
|
bind -r l select-pane -R
|
||||||
|
|
||||||
bind -r h resize-pane -L 5
|
bind -r C-h resize-pane -L 5
|
||||||
bind -r j resize-pane -D 5
|
bind -r C-j resize-pane -D 5
|
||||||
bind -r k resize-pane -U 5
|
bind -r C-k resize-pane -U 5
|
||||||
bind -r l resize-pane -R 5
|
bind -r C-l resize-pane -R 5
|
||||||
bind -r m resize-pane -Z # maximize
|
bind -r m resize-pane -Z # maximize
|
||||||
|
|
||||||
# pane joining
|
# pane joining
|
||||||
|
@ -60,14 +60,15 @@ bind-key -r H split-window -h -f
|
||||||
|
|
||||||
|
|
||||||
# colors/theme
|
# colors/theme
|
||||||
set -g status-bg "#333333"
|
# using vars in this cause the chars to not use the color
|
||||||
|
set -g status-bg "#222222"
|
||||||
set -g status-fg "#f1f1f1"
|
set -g status-fg "#f1f1f1"
|
||||||
set -wg mode-style bg="#333334"
|
set -wg mode-style bg="#222222"
|
||||||
set -g pane-border-style fg='#333333'
|
set -g pane-border-style fg='#222222'
|
||||||
set -g pane-active-border-style fg='#a030f0'
|
set -g pane-active-border-style fg='#a030f0'
|
||||||
active_window_fg='#e080f0'
|
active_window_fg='#e080f0'
|
||||||
set -g status-left "#[fg=${session_fg},bold,bg=${bg}][ #S] "
|
set -g status-left "#[fg=#f1f1f1,bold,bg=#4020af] #S #[fg=#4020af,bg=#222222] "
|
||||||
set -g status-left-length 40
|
set -g status-left-length 40
|
||||||
set -g window-status-current-format "#[fg=${active_window_fg},bg=default] #I:#W"
|
set -g window-status-current-format "#[fg=${active_window_fg},bg=#222222]#I:#W #[fg=#f1f1f1,bg=#222222]"
|
||||||
set -g window-status-format "#[fg=${default_fg},bg=default]#I:#W"
|
set -g window-status-format "#[fg=#f1f1f1,bg=#222222]#I:#W #[fg=#f1f1f1,bg=#222222]"
|
||||||
# set -g window-status-last-style "fg=${default_fg},bg=default"
|
set -g status-right '#[fg=#4020af,bg=#222222]#[fg=#f1f1f1,bg=#4020af] @#H %H:%M %d-%b-%y'
|
||||||
|
|
|
@ -24,12 +24,12 @@
|
||||||
|
|
||||||
"custom/ws_end_arrow":{
|
"custom/ws_end_arrow":{
|
||||||
"format": "",
|
"format": "",
|
||||||
"tooltip": false,
|
"tooltip": false
|
||||||
},
|
},
|
||||||
|
|
||||||
"custom/mod_end_arrow":{
|
"custom/mod_end_arrow":{
|
||||||
"format": "",
|
"format": "",
|
||||||
"tooltip": false,
|
"tooltip": false
|
||||||
},
|
},
|
||||||
|
|
||||||
"hyprland/workspaces": {
|
"hyprland/workspaces": {
|
||||||
|
@ -84,7 +84,7 @@
|
||||||
"17": ["DP-1"],
|
"17": ["DP-1"],
|
||||||
"18": ["DP-1"],
|
"18": ["DP-1"],
|
||||||
"19": ["DP-1"],
|
"19": ["DP-1"],
|
||||||
"20": ["DP-1"],
|
"20": ["DP-1"]
|
||||||
},
|
},
|
||||||
"sort-by-name": true
|
"sort-by-name": true
|
||||||
},
|
},
|
||||||
|
@ -133,7 +133,7 @@
|
||||||
"17": ["DP-1"],
|
"17": ["DP-1"],
|
||||||
"18": ["DP-1"],
|
"18": ["DP-1"],
|
||||||
"19": ["DP-1"],
|
"19": ["DP-1"],
|
||||||
"20": ["DP-1"],
|
"20": ["DP-1"]
|
||||||
},
|
},
|
||||||
"sort-by-name": true
|
"sort-by-name": true
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue