diff --git a/.config/nvim/lua/plugins/chrome.lua b/.config/nvim/lua/plugins/chrome.lua index 147dee3..6e79652 100644 --- a/.config/nvim/lua/plugins/chrome.lua +++ b/.config/nvim/lua/plugins/chrome.lua @@ -1,136 +1,129 @@ return { - { - "nvim-lualine/lualine.nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, - config = function() - require("lualine").setup({ - options = { - --`theme=codedark, - component_separators = { left = "", right = "" }, - section_separators = { left = "", right = "" }, - }, - sections = { - lualine_a = { "mode" }, - lualine_b = { "branch", "diff", "diagnostics" }, - lualine_c = { - { "filename", path = 1 }, + { + "nvim-lualine/lualine.nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, + config = function() + require("lualine").setup({ + options = { + --`theme=codedark, + component_separators = { left = "", right = "" }, + section_separators = { left = "", right = "" }, + }, + sections = { + lualine_a = { "mode" }, + lualine_b = { "branch", "diff", "diagnostics" }, + lualine_c = { + { "filename", path = 1 }, - -- Determine class/function name - function() - local current_buff = vim.api.nvim_get_current_buf() - local current_node = vim.treesitter.get_node() - if not current_node then - return "" - end - local class = nil - local func = nil - local expr = current_node - while expr do - if expr:type() == "function_definition" then - func = expr - elseif expr:type() == "class_definition" then - class = expr - end - expr = expr:parent() - end + -- Determine class/function name + function() + local current_buff = vim.api.nvim_get_current_buf() + local current_node = vim.treesitter.get_node() + if not current_node then + return "" + end + local class = nil + local func = nil + local expr = current_node + while expr do + if expr:type() == "function_definition" then + func = expr + elseif expr:type() == "class_definition" then + class = expr + end + expr = expr:parent() + end - if not func then - return "" - end - for child in func:iter_children() do - if child:type() == "identifier" then - func = child - break - end - end - local func_text = vim.treesitter.get_node_text(func, current_buff) - if class then - for child in class:iter_children() do - if child:type() == "identifier" then - class = child - break - end - end - func_text = vim.treesitter.get_node_text(class, current_buff) .. ":" .. func_text - end - if vim.bo.filetype == "lua" then - -- Patch out invalid parsing of lua (and other?) files - return "" - end - return func_text - end, - }, - lualine_x = { "encoding", "filetype" }, - lualine_y = { - function() - -- Display an active Python virtual environment if active - local venv = os.getenv("VIRTUAL_ENV") - if venv then - return vim.fn.fnamemodify(venv, ":t") - -- Put other useful paths here as available - else - return "" - end - end, - }, - lualine_z = { "location" }, - }, - }) - end, - }, - { - "romgrk/barbar.nvim", - tag = "v1.9.1", - init = function() - vim.g.barbar_auto_setup = false - end, - opts = { - animation = false, - }, - }, - { - "folke/which-key.nvim", - event = "VeryLazy", - keys = { - { - "", - function() - require("which-key").show() - end, - mode = { "n", "v", "i" }, - }, - }, - }, - { - "preservim/tagbar", - vim.keymap.set("n", "fs", ":TagbarToggle", { desc = "Toggle Tagbar" }), - }, - --{ - -- "yegappan/taglist", - -- vim.keymap.set("n", "fs", ":TlistToggle", { desc = "Toggle Taglist" }), - -- vim.cmd("let Tlist_Use_Right_Window = 1"), - -- vim.cmd("let Tlist_Show_One_File = 1"), - -- vim.cmd("let Tlist_WinWidth = 50"), - --}, - { - "goolord/alpha-nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, - config = function() - local alpha = require("alpha") - local dashboard = require("alpha.themes.startify") + if not func then + return "" + end + for child in func:iter_children() do + if child:type() == "identifier" then + func = child + break + end + end + local func_text = vim.treesitter.get_node_text(func, current_buff) + if class then + for child in class:iter_children() do + if child:type() == "identifier" then + class = child + break + end + end + func_text = vim.treesitter.get_node_text(class, current_buff) .. ":" .. func_text + end + if vim.bo.filetype == "lua" then + -- Patch out invalid parsing of lua (and other?) files + return "" + end + return func_text + end, + }, + lualine_x = { "encoding", "filetype" }, + lualine_y = { + function() + -- Display an active Python virtual environment if active + local venv = os.getenv("VIRTUAL_ENV") + if venv then + return vim.fn.fnamemodify(venv, ":t") + -- Put other useful paths here as available + else + return "" + end + end, + }, + lualine_z = { "location" }, + }, + }) + end, + }, + { + "romgrk/barbar.nvim", + tag = "v1.9.1", + init = function() + vim.g.barbar_auto_setup = false + end, + opts = { + animation = false, + }, + }, + { + "folke/which-key.nvim", + event = "VeryLazy", + keys = { + { + "", + function() + require("which-key").show() + end, + mode = { "n", "v", "i" }, + }, + }, + }, + { + "preservim/tagbar", + vim.keymap.set("n", "fs", ":TagbarToggle", { desc = "Toggle Tagbar" }), + }, + { + "goolord/alpha-nvim", + dependencies = { "nvim-tree/nvim-web-devicons", "nvim-neo-tree/neo-tree.nvim" }, + config = function() + local alpha = require("alpha") + local dashboard = require("alpha.themes.startify") - dashboard.section.header.val = { - " ", - " ███╗ ██╗███████╗ ██████╗ ██╗ ██╗██╗███╗ ███╗ ", - " ████╗ ██║██╔════╝██╔═══██╗██║ ██║██║████╗ ████║ ", - " ██╔██╗ ██║█████╗ ██║ ██║██║ ██║██║██╔████╔██║ ", - " ██║╚██╗██║██╔══╝ ██║ ██║╚██╗ ██╔╝██║██║╚██╔╝██║ ", - " ██║ ╚████║███████╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║ ", - " ╚═╝ ╚═══╝╚══════╝ ╚═════╝ ╚═══╝ ╚═╝╚═╝ ╚═╝ ", - " ", - } + dashboard.section.header.val = { + " ", + " ███╗ ██╗███████╗ ██████╗ ██╗ ██╗██╗███╗ ███╗ ", + " ████╗ ██║██╔════╝██╔═══██╗██║ ██║██║████╗ ████║ ", + " ██╔██╗ ██║█████╗ ██║ ██║██║ ██║██║██╔████╔██║ ", + " ██║╚██╗██║██╔══╝ ██║ ██║╚██╗ ██╔╝██║██║╚██╔╝██║ ", + " ██║ ╚████║███████╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║ ", + " ╚═╝ ╚═══╝╚══════╝ ╚═════╝ ╚═══╝ ╚═╝╚═╝ ╚═╝ ", + " ", + } - alpha.setup(dashboard.opts) - end, - }, + alpha.setup(dashboard.opts) + end, + }, } diff --git a/.config/nvim/lua/plugins/neotree.lua b/.config/nvim/lua/plugins/neotree.lua index 60aba4c..be4762c 100644 --- a/.config/nvim/lua/plugins/neotree.lua +++ b/.config/nvim/lua/plugins/neotree.lua @@ -7,15 +7,12 @@ return { "MunifTanjim/nui.nvim", -- {"3rd/image.nvim", opts = {}}, -- Optional image support in preview window: See `# Preview Mode` for more information }, - lazy = false, -- neo-tree will lazily load itself + lazy = true, -- neo-tree will lazily load itself opts = { filesystem = { filtered_items = { visible = true, - -- hide_dotfiles = false, - hide_by_name = { - ".git", - }, + hide_gitignored = true, }, }, event_handlers = { @@ -23,7 +20,7 @@ return { event = "file_opened", handler = function(file_path) --auto close neo-tree when file is opened - vim.cmd("Neotree close") + vim.cmd("Neotree close") end, }, }, diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index dd6d8be..1be3077 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -25,6 +25,9 @@ bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-no-clear "xcli bind S-down split-window -v -c "#{pane_current_path}" bind S-right split-window -h -c "#{pane_current_path}" +bind J split-window -v -c "#{pane_current_path}" +bind L split-window -h -c "#{pane_current_path}" + # Override new window bind c new-window -c "~/" @@ -34,9 +37,18 @@ bind -n C-Right select-pane -R bind -n C-Up select-pane -U bind -n C-Down select-pane -D + +bind -n C-H select-pane -L +bind -n C-J select-pane -D +bind -n C-K select-pane -U +bind -n C-L select-pane -R + bind -n C-S-Left previous-window bind -n C-S-Right next-window +bind -n M-H previous-window +bind -n M-L next-window + # Config bind R source-file ~/.config/tmux/tmux.conf \; display "Config reloaded!" diff --git a/.zshrc b/.zshrc index 0016c98..2ff7fd6 100644 --- a/.zshrc +++ b/.zshrc @@ -149,5 +149,5 @@ zinit light zsh-users/zsh-syntax-highlighting # Key bindings config #KEYTIMEOUT=5 # ^[ for esc; ^I for tab -bindkey '^[[Z' autosuggest-accept +bindkey '^a' autosuggest-accept