diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index 2c77030..94ce0bd 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -4,19 +4,19 @@ size = 11 [font.bold] -family = "Liberation Mono" +family = "Inconsolata" style = "Bold" [font.bold_italic] -family = "Liberation Mono" +family = "Inconsolata" style = "Bold Italic" [font.italic] -family = "Liberation Mono" +family = "Inconsolata" style = "Italic" [font.normal] -family = "Liberation Mono" +family = "Inconsolata" style = "Regular" [[keyboard.bindings]] diff --git a/.config/aliasrc b/.config/aliasrc index b7023a8..45a6c77 100644 --- a/.config/aliasrc +++ b/.config/aliasrc @@ -46,6 +46,7 @@ alias \ paratest="docker compose exec fpm ./test" \ jsonlint="python -m json.tool" \ ts="~/.local/bin/tmux-sessionizer" \ + tmux="tmux attach-session || tmux" \ fresh="docker compose exec fpm php artisan migrate:fresh --seed" \ shrug="echo '¯\\_(ツ)_/¯' | xclip -selection clipboard && echo 'Copied ASCII shrug to clipboard'" \ dab="cat ~/Documents/dab.txt | xclip -selection clipboard && echo 'Copied ASCII dab to clipboard'" diff --git a/.config/nvim/lua/tovi/plugins/harpoon.lua b/.config/nvim/lua/tovi/plugins/harpoon.lua index 5edf911..19744c2 100644 --- a/.config/nvim/lua/tovi/plugins/harpoon.lua +++ b/.config/nvim/lua/tovi/plugins/harpoon.lua @@ -22,19 +22,19 @@ return { harpoon.ui:toggle_quick_menu(harpoon:list()) end, { desc = "Toggle quick menu for harpoon" }) - keymap.set("n", "", function() + keymap.set("n", "", function() harpoon:list():select(1) end, { desc = "Go to first harpoon file" }) - keymap.set("n", "", function() + keymap.set("n", "", function() harpoon:list():select(2) end, { desc = "Go to second harpoon file" }) - keymap.set("n", "", function() + keymap.set("n", "", function() harpoon:list():select(3) end, { desc = "Go to third harpoon file" }) - keymap.set("n", "", function() + keymap.set("n", "", function() harpoon:list():select(4) end, { desc = "Go to fourth harpoon file" }) end, diff --git a/.config/nvim/lua/tovi/plugins/lualine.lua b/.config/nvim/lua/tovi/plugins/lualine.lua index ebc4419..53c62aa 100644 --- a/.config/nvim/lua/tovi/plugins/lualine.lua +++ b/.config/nvim/lua/tovi/plugins/lualine.lua @@ -5,56 +5,11 @@ return { local lualine = require("lualine") local lazy_status = require("lazy.status") - -- local colors = { - -- blue = "#65D1FF", - -- green = "#3EFFDC", - -- violet = "#FF61EF", - -- yellow = "#FFDA7B", - -- red = "#FF4A4A", - -- fg = "#c3ccdc", - -- bg = "#112638", - -- inactive_bg = "#2c3043", - -- } - -- - -- 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 = 'eldritch', - section_separators = { left = "", right = "" }, - component_separators = { left = "|", right = "|" }, + theme = 'catppuccin', + component_separators = { left = '', right = '' }, + section_separators = { left = '', right = '' }, }, sections = { lualine_b = { diff --git a/.tmux.conf b/.tmux.conf index 097ec55..ce021f2 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -68,5 +68,9 @@ set -g @plugin 'catppuccin/tmux' set -g @catppuccin_flavour 'mocha' # or frappe, macchiato, mocha +set -g @catppuccin_status_left_separator "" +set -g @catppuccin_window_middle_separator " " +set -g @catppuccin_status_modules_right "application session directory date_time" + # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) run '~/.tmux/plugins/tpm/tpm'