From c9e2eeed50296508f0bd25d3619e47b21e7884d6 Mon Sep 17 00:00:00 2001 From: ignuki Date: Fri, 14 Feb 2025 17:04:16 +0100 Subject: [PATCH] add dashboard and goodies --- .gitmodules | 3 + alacritty/.config/alacritty/alacritty.toml | 8 +- nvim/.config/nvim/lua/plugins/formatting.lua | 4 +- nvim/.config/nvim/lua/plugins/ui.lua | 286 ++++++++++++------- scripts/pokemon-colorscripts | 1 + tmux/.tmux.conf | 4 +- zsh/.zsh_aliases | 1 + 7 files changed, 199 insertions(+), 108 deletions(-) create mode 160000 scripts/pokemon-colorscripts diff --git a/.gitmodules b/.gitmodules index d439e03..a9025a1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "zsh/zsh-completions"] path = zsh/zsh-completions url = https://github.com/zsh-users/zsh-completions.git +[submodule "scripts/pokemon-colorscripts"] + path = scripts/pokemon-colorscripts + url = https://gitlab.com/phoneybadger/pokemon-colorscripts.git diff --git a/alacritty/.config/alacritty/alacritty.toml b/alacritty/.config/alacritty/alacritty.toml index 03c455a..0959438 100644 --- a/alacritty/.config/alacritty/alacritty.toml +++ b/alacritty/.config/alacritty/alacritty.toml @@ -1,6 +1,7 @@ -import = ["/home/ink/.config/alacritty/dracula.toml"] +import = ["~/.config/alacritty/dracula.toml"] + [font] -size = 12.0 +size = 13.0 [font.bold] family = "jetbrainsmono nerd font" @@ -17,3 +18,6 @@ style = "Italic" [font.normal] family = "jetbrainsmono nerd font" style = "Regular" + +[general] +import = ["~/.config/alacritty/dracula.toml"] diff --git a/nvim/.config/nvim/lua/plugins/formatting.lua b/nvim/.config/nvim/lua/plugins/formatting.lua index be8c63e..31df0bd 100644 --- a/nvim/.config/nvim/lua/plugins/formatting.lua +++ b/nvim/.config/nvim/lua/plugins/formatting.lua @@ -111,7 +111,7 @@ return { format_on_save = { lsp_fallback = true, async = false, - timeout_ms = 500, + timeout_ms = 3000, }, }) @@ -119,7 +119,7 @@ return { conform.format({ lsp_fallback = true, async = false, - timeout_ms = 500, + timeout_ms = 5000, }) end, { desc = "Format file or range (in visual mode)" }) end, diff --git a/nvim/.config/nvim/lua/plugins/ui.lua b/nvim/.config/nvim/lua/plugins/ui.lua index 253cb73..b6702ed 100644 --- a/nvim/.config/nvim/lua/plugins/ui.lua +++ b/nvim/.config/nvim/lua/plugins/ui.lua @@ -1,104 +1,186 @@ return { - { -- colorscheme - "Mofiqul/dracula.nvim", - lazy = false, - name = "dracula", - priority = 1000, - config = function() - local dracula = require("dracula") - dracula.setup({ - colors = { - visual = "#5a5e77", - }, - -- show the '~' characters after the end of buffers - show_end_of_buffer = true, -- default false - -- use transparent background - transparent_bg = false, -- default false - -- set custom lualine background color - lualine_bg_color = "#44475a", -- default nil - -- set italic comment - italic_comment = true, -- default false - -- overrides the default highlights with table see `:h synIDattr` - overrides = { - CursorLine = { bg = "#3e4153" }, - CursorLineNr = { fg = "DarkOrange", bold = true }, - }, - }) - vim.cmd [[colorscheme dracula-soft]] - end - }, - -- highlight color hex codes - { - "brenoprata10/nvim-highlight-colors", - opts = {}, - config = function() - local highlight = require("nvim-highlight-colors") - highlight.setup() - end - }, - { --statusline - "nvim-lualine/lualine.nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, - lazy = false, - opts = { - options = { - section_separators = "", - component_separators = "", - theme = "dracula-nvim" - }, - -- extensions = { "neo-tree", "lazy", "fzf" }, - extensions = { "fugitive", "lazy" }, - }, - }, - { -- git symbols on sidebar - "lewis6991/gitsigns.nvim", - opts = { - signs = { - add = { text = "+" }, - change = { text = "~" }, - delete = { text = "_" }, - topdelete = { text = "‾" }, - changedelete = { text = "~" }, - }, - signs_staged = { - add = { text = "+" }, - change = { text = "~" }, - delete = { text = "_" }, - topdelete = { text = "‾" }, - changedelete = { text = "~" }, - }, - }, - }, - { -- cosmetic indent lines - "lukas-reineke/indent-blankline.nvim", - main = "ibl", - opts = { - indent = { - char = "▏", - }, - scope = { - show_start = false, - show_end = false, - show_exact_scope = false, - }, - exclude = { - filetypes = { - "help", - "startify", - "dashboard", - "packer", - "neogitstatus", - "NvimTree", - "Trouble", - }, - }, - }, - }, - { -- colorful mode indicators - 'mvllow/modes.nvim', - tag = 'v0.2.1', - config = function() - require('modes').setup() - end - }, + { -- colorscheme + "Mofiqul/dracula.nvim", + lazy = false, + name = "dracula", + priority = 1000, + config = function() + local dracula = require("dracula") + dracula.setup({ + colors = { + visual = "#5a5e77", + }, + -- show the '~' characters after the end of buffers + show_end_of_buffer = true, -- default false + -- use transparent background + transparent_bg = false, -- default false + -- set custom lualine background color + lualine_bg_color = "#44475a", -- default nil + -- set italic comment + italic_comment = true, -- default false + -- overrides the default highlights with table see `:h synIDattr` + overrides = { + CursorLine = { bg = "#3e4153" }, + CursorLineNr = { fg = "DarkOrange", bold = true }, + }, + }) + vim.cmd([[colorscheme dracula-soft]]) + end, + }, + -- highlight color hex codes + { + "brenoprata10/nvim-highlight-colors", + opts = {}, + config = function() + local highlight = require("nvim-highlight-colors") + highlight.setup() + end, + }, + { --statusline + "nvim-lualine/lualine.nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, + lazy = false, + opts = { + options = { + section_separators = "", + component_separators = "", + theme = "dracula-nvim", + }, + -- extensions = { "neo-tree", "lazy", "fzf" }, + extensions = { "fugitive", "lazy" }, + }, + }, + { -- git symbols on sidebar + "lewis6991/gitsigns.nvim", + opts = { + signs = { + add = { text = "+" }, + change = { text = "~" }, + delete = { text = "_" }, + topdelete = { text = "‾" }, + changedelete = { text = "~" }, + }, + signs_staged = { + add = { text = "+" }, + change = { text = "~" }, + delete = { text = "_" }, + topdelete = { text = "‾" }, + changedelete = { text = "~" }, + }, + }, + }, + { -- cosmetic indent lines + "lukas-reineke/indent-blankline.nvim", + main = "ibl", + opts = { + indent = { + char = "▏", + }, + scope = { + show_start = false, + show_end = false, + show_exact_scope = false, + }, + exclude = { + filetypes = { + "help", + "startify", + "dashboard", + "packer", + "neogitstatus", + "NvimTree", + "Trouble", + }, + }, + }, + }, + { -- colorful mode indicators + "mvllow/modes.nvim", + tag = "v0.2.1", + config = function() + require("modes").setup() + end, + }, + { -- animate scrolling + "echasnovski/mini.animate", + version = "*", + config = function() + require("mini.animate").setup({ + -- Cursor path + cursor = { + -- Whether to enable this animation + enable = false, + }, + }) + end, + }, + { -- dashboard snack + "folke/snacks.nvim", + priority = 1000, + lazy = false, + ---@type snacks.Config + opts = { + -- your configuration comes here + -- or leave it empty to use the default settings + -- refer to the configuration section below + dashboard = { + preset = { + header = [[ + + + + + + +███╗ ██╗███████╗ ██████╗ ██╗ ██╗██╗███╗ ███╗ +████╗ ██║██╔════╝██╔═══██╗██║ ██║██║████╗ ████║ +██╔██╗ ██║█████╗ ██║ ██║██║ ██║██║██╔████╔██║ +██║╚██╗██║██╔══╝ ██║ ██║╚██╗ ██╔╝██║██║╚██╔╝██║ +██║ ╚████║███████╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║ +╚═╝ ╚═══╝╚══════╝ ╚═════╝ ╚═══╝ ╚═╝╚═╝ ╚═╝ + + + + + +]], + }, + sections = { + { section = "header" }, + { + pane = 2, + section = "terminal", + cmd = "pokemon-colorscripts -n snorlax --no-title; sleep .1", + height = 20, + padding = 0, + }, + { section = "keys", gap = 1, padding = 1 }, + { + pane = 2, + icon = " ", + title = "Recent Files", + section = "recent_files", + indent = 2, + padding = 1, + }, + { pane = 2, icon = " ", title = "Projects", section = "projects", indent = 2, padding = 1 }, + { + pane = 2, + icon = " ", + title = "Git Status", + section = "terminal", + enabled = function() + return Snacks.git.get_root() ~= nil + end, + cmd = "git status --short --branch --renames", + height = 5, + padding = 1, + ttl = 5 * 60, + indent = 3, + }, + { section = "startup" }, + }, + }, + }, + }, } diff --git a/scripts/pokemon-colorscripts b/scripts/pokemon-colorscripts new file mode 160000 index 0000000..5802ff6 --- /dev/null +++ b/scripts/pokemon-colorscripts @@ -0,0 +1 @@ +Subproject commit 5802ff67520be2ff6117a0abc78a08501f6252ad diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index ed34877..2d52ca4 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -66,9 +66,9 @@ set -g @dracula-military-time true set -g @dracula-day-month true set -g @plugin 'ofirgall/tmux-window-name' -set -g @tmux_window_name_substitute_sets "[('.+bash', 'bash')]" +set -g @tmux_window_name_substitute_sets "[('.+bash', 'bash'), ('cbonsai.+', 'cbonsai')]" set -g @tmux_window_name_shells "['bash', 'fish', 'sh', 'zsh']" -set -g @tmux_window_dir_programs "['nvim', 'vim', 'vi', 'git']" +set -g @tmux_window_dir_programs "['nvim', 'vim', 'vi', 'git', 'cbonsai']" set -g @tmux_window_name_use_tilde "True" set -g @tmux_window_name_max_name_len "100" diff --git a/zsh/.zsh_aliases b/zsh/.zsh_aliases index 503844e..3d4eb9d 100644 --- a/zsh/.zsh_aliases +++ b/zsh/.zsh_aliases @@ -1,4 +1,5 @@ alias tree='tree -CF --du -h' +alias cbonsai='cbonsai --live --infinite --time 0.3 --base 2 --wait 2 --leaf "&,#,$,*,@"' # enable color support of ls and also add handy aliases alias ls='ls --color=auto'