From 3d83403358bb81338a564dfc61f105018db675b3 Mon Sep 17 00:00:00 2001 From: Ava Gaiety W Date: Mon, 16 Jun 2025 10:36:32 -0600 Subject: [PATCH] bye chezmoi, new custom nvim setup --- README.md | 2 - dot_config/nvim/init.lua | 1 - dot_config/nvim/lazy-lock.json | 45 --------- dot_config/nvim/lazyvim.json | 9 -- dot_config/nvim/lua/config/lazy.lua | 54 ----------- dot_config/nvim/lua/plugins/colorscheme.lua | 21 ----- {dot_config/kitty => kitty}/kitty-theme.conf | 0 {dot_config/kitty => kitty}/kitty.conf | 0 {dot_config/mise => mise}/config.toml | 0 nvim/init.lua | 38 ++++++++ nvim/lazy-lock.json | 50 ++++++++++ nvim/lua/config/autocmds.lua | 17 ++++ nvim/lua/config/keys.lua | 32 +++++++ nvim/lua/config/options.lua | 43 +++++++++ nvim/lua/plugins/adjust.lua | 3 + nvim/lua/plugins/codestats.lua | 17 ++++ nvim/lua/plugins/colorize.lua | 9 ++ nvim/lua/plugins/completion.lua | 51 ++++++++++ nvim/lua/plugins/dash.lua | 15 +++ nvim/lua/plugins/filefinder.lua | 46 ++++++++++ nvim/lua/plugins/folding.lua | 42 +++++++++ nvim/lua/plugins/illuminate.lua | 3 + nvim/lua/plugins/indentguide.lua | 40 ++++++++ nvim/lua/plugins/lsp.lua | 41 +++++++++ nvim/lua/plugins/moves.lua | 17 ++++ nvim/lua/plugins/notify.lua | 10 ++ nvim/lua/plugins/pairs.lua | 48 ++++++++++ nvim/lua/plugins/replace.lua | 12 +++ nvim/lua/plugins/scrolling.lua | 6 ++ nvim/lua/plugins/smear.lua | 13 +++ nvim/lua/plugins/statusline.lua | 68 ++++++++++++++ nvim/lua/plugins/symbols.lua | 20 ++++ nvim/lua/plugins/tabline.lua | 15 +++ nvim/lua/plugins/theme.lua | 18 ++++ nvim/lua/plugins/todo.lua | 4 + nvim/lua/plugins/tree.lua | 16 ++++ nvim/lua/plugins/treesitter.lua | 92 +++++++++++++++++++ .../completions/tide.fish | 0 .../conf.d/_tide_init.fish | 0 .../private_fish => private_fish}/config.fish | 0 .../functions/_tide_1_line_prompt.fish | 0 .../functions/_tide_2_line_prompt.fish | 0 .../functions/_tide_cache_variables.fish | 0 .../functions/_tide_detect_os.fish | 0 .../functions/_tide_find_and_remove.fish | 0 .../functions/_tide_fish_colorize.fish | 0 .../functions/_tide_item_aws.fish | 0 .../functions/_tide_item_character.fish | 0 .../functions/_tide_item_cmd_duration.fish | 0 .../functions/_tide_item_context.fish | 0 .../functions/_tide_item_crystal.fish | 0 .../functions/_tide_item_direnv.fish | 0 .../functions/_tide_item_distrobox.fish | 0 .../functions/_tide_item_docker.fish | 0 .../functions/_tide_item_elixir.fish | 0 .../functions/_tide_item_gcloud.fish | 0 .../functions/_tide_item_git.fish | 0 .../functions/_tide_item_go.fish | 0 .../functions/_tide_item_java.fish | 0 .../functions/_tide_item_jobs.fish | 0 .../functions/_tide_item_kubectl.fish | 0 .../functions/_tide_item_nix_shell.fish | 0 .../functions/_tide_item_node.fish | 0 .../functions/_tide_item_os.fish | 0 .../functions/_tide_item_php.fish | 0 .../functions/_tide_item_private_mode.fish | 0 .../functions/_tide_item_pulumi.fish | 0 .../functions/_tide_item_python.fish | 0 .../functions/_tide_item_ruby.fish | 0 .../functions/_tide_item_rustc.fish | 0 .../functions/_tide_item_shlvl.fish | 0 .../functions/_tide_item_status.fish | 0 .../functions/_tide_item_terraform.fish | 0 .../functions/_tide_item_time.fish | 0 .../functions/_tide_item_toolbox.fish | 0 .../functions/_tide_item_vi_mode.fish | 0 .../functions/_tide_item_zig.fish | 0 .../functions/_tide_parent_dirs.fish | 0 .../functions/_tide_print_item.fish | 0 .../functions/_tide_pwd.fish | 0 .../_tide_remove_unusable_items.fish | 0 .../functions/_tide_sub_bug-report.fish | 0 .../functions/_tide_sub_configure.fish | 0 .../functions/_tide_sub_reload.fish | 0 .../functions/fish_mode_prompt.fish | 0 .../functions/fish_prompt.fish | 0 .../functions/tide.fish | 0 .../tide/configure/choices/all/finish.fish | 0 .../tide/configure/choices/all/icons.fish | 0 .../configure/choices/all/prompt_colors.fish | 0 .../choices/all/prompt_connection.fish | 0 .../prompt_connection_andor_frame_color.fish | 0 .../configure/choices/all/prompt_spacing.fish | 0 .../tide/configure/choices/all/show_time.fish | 0 .../tide/configure/choices/all/style.fish | 0 .../tide/configure/choices/all/transient.fish | 0 .../choices/classic/classic_prompt_color.fish | 0 .../classic/classic_prompt_separators.fish | 0 .../choices/lean/lean_prompt_height.fish | 0 .../powerline/powerline_prompt_heads.fish | 0 .../powerline/powerline_prompt_style.fish | 0 .../powerline/powerline_prompt_tails.fish | 0 .../powerline_right_prompt_frame.fish | 0 .../rainbow/rainbow_prompt_separators.fish | 0 .../tide/configure/configs/classic.fish | 0 .../configure/configs/classic_16color.fish | 0 .../tide/configure/configs/lean.fish | 0 .../tide/configure/configs/lean_16color.fish | 0 .../tide/configure/configs/rainbow.fish | 0 .../configure/configs/rainbow_16color.fish | 0 .../functions/_fake_tide_cache_variables.fish | 0 .../functions/_fake_tide_item_character.fish | 0 .../_fake_tide_item_cmd_duration.fish | 0 .../functions/_fake_tide_item_git.fish | 0 .../functions/_fake_tide_item_newline.fish | 0 .../functions/_fake_tide_item_os.fish | 0 .../functions/_fake_tide_item_time.fish | 0 .../functions/_fake_tide_print_item.fish | 0 .../functions/_fake_tide_prompt.fish | 0 .../configure/functions/_fake_tide_pwd.fish | 0 .../functions/tide/configure/icons.fish | 0 121 files changed, 786 insertions(+), 132 deletions(-) delete mode 100644 dot_config/nvim/init.lua delete mode 100644 dot_config/nvim/lazy-lock.json delete mode 100644 dot_config/nvim/lazyvim.json delete mode 100644 dot_config/nvim/lua/config/lazy.lua delete mode 100644 dot_config/nvim/lua/plugins/colorscheme.lua rename {dot_config/kitty => kitty}/kitty-theme.conf (100%) rename {dot_config/kitty => kitty}/kitty.conf (100%) rename {dot_config/mise => mise}/config.toml (100%) create mode 100644 nvim/init.lua create mode 100644 nvim/lazy-lock.json create mode 100644 nvim/lua/config/autocmds.lua create mode 100644 nvim/lua/config/keys.lua create mode 100644 nvim/lua/config/options.lua create mode 100644 nvim/lua/plugins/adjust.lua create mode 100644 nvim/lua/plugins/codestats.lua create mode 100644 nvim/lua/plugins/colorize.lua create mode 100644 nvim/lua/plugins/completion.lua create mode 100644 nvim/lua/plugins/dash.lua create mode 100644 nvim/lua/plugins/filefinder.lua create mode 100644 nvim/lua/plugins/folding.lua create mode 100644 nvim/lua/plugins/illuminate.lua create mode 100644 nvim/lua/plugins/indentguide.lua create mode 100644 nvim/lua/plugins/lsp.lua create mode 100644 nvim/lua/plugins/moves.lua create mode 100644 nvim/lua/plugins/notify.lua create mode 100644 nvim/lua/plugins/pairs.lua create mode 100644 nvim/lua/plugins/replace.lua create mode 100644 nvim/lua/plugins/scrolling.lua create mode 100644 nvim/lua/plugins/smear.lua create mode 100644 nvim/lua/plugins/statusline.lua create mode 100644 nvim/lua/plugins/symbols.lua create mode 100644 nvim/lua/plugins/tabline.lua create mode 100644 nvim/lua/plugins/theme.lua create mode 100644 nvim/lua/plugins/todo.lua create mode 100644 nvim/lua/plugins/tree.lua create mode 100644 nvim/lua/plugins/treesitter.lua rename {dot_config/private_fish => private_fish}/completions/tide.fish (100%) rename {dot_config/private_fish => private_fish}/conf.d/_tide_init.fish (100%) rename {dot_config/private_fish => private_fish}/config.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_1_line_prompt.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_2_line_prompt.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_cache_variables.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_detect_os.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_find_and_remove.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_fish_colorize.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_item_aws.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_item_character.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_item_cmd_duration.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_item_context.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_item_crystal.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_item_direnv.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_item_distrobox.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_item_docker.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_item_elixir.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_item_gcloud.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_item_git.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_item_go.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_item_java.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_item_jobs.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_item_kubectl.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_item_nix_shell.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_item_node.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_item_os.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_item_php.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_item_private_mode.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_item_pulumi.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_item_python.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_item_ruby.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_item_rustc.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_item_shlvl.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_item_status.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_item_terraform.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_item_time.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_item_toolbox.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_item_vi_mode.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_item_zig.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_parent_dirs.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_print_item.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_pwd.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_remove_unusable_items.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_sub_bug-report.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_sub_configure.fish (100%) rename {dot_config/private_fish => private_fish}/functions/_tide_sub_reload.fish (100%) rename {dot_config/private_fish => private_fish}/functions/fish_mode_prompt.fish (100%) rename {dot_config/private_fish => private_fish}/functions/fish_prompt.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/choices/all/finish.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/choices/all/icons.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/choices/all/prompt_colors.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/choices/all/prompt_connection.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/choices/all/prompt_connection_andor_frame_color.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/choices/all/prompt_spacing.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/choices/all/show_time.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/choices/all/style.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/choices/all/transient.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/choices/classic/classic_prompt_color.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/choices/classic/classic_prompt_separators.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/choices/lean/lean_prompt_height.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/choices/powerline/powerline_prompt_heads.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/choices/powerline/powerline_prompt_style.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/choices/powerline/powerline_prompt_tails.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/choices/powerline/powerline_right_prompt_frame.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/choices/rainbow/rainbow_prompt_separators.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/configs/classic.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/configs/classic_16color.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/configs/lean.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/configs/lean_16color.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/configs/rainbow.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/configs/rainbow_16color.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/functions/_fake_tide_cache_variables.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/functions/_fake_tide_item_character.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/functions/_fake_tide_item_cmd_duration.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/functions/_fake_tide_item_git.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/functions/_fake_tide_item_newline.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/functions/_fake_tide_item_os.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/functions/_fake_tide_item_time.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/functions/_fake_tide_print_item.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/functions/_fake_tide_prompt.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/functions/_fake_tide_pwd.fish (100%) rename {dot_config/private_fish => private_fish}/functions/tide/configure/icons.fish (100%) diff --git a/README.md b/README.md index 83f8bbc..d2f2b68 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # Gaiety's Dotfiles Designed for Unix Systems. -Do not clone this repo manually! It's the last step via chezmoi ## Setup @@ -16,5 +15,4 @@ Misc dependencies: `git, curl` mkdir -p ~/.config/mise curl https://git.gay/gaiety/dotfiles/raw/branch/main/dot_config/mise/config.toml -o ~/.config/mise/config.toml mise install -chezmoi init --apply git@git.gay:gaiety/dotfiles.git ``` diff --git a/dot_config/nvim/init.lua b/dot_config/nvim/init.lua deleted file mode 100644 index 55b8979..0000000 --- a/dot_config/nvim/init.lua +++ /dev/null @@ -1 +0,0 @@ -require("config.lazy") diff --git a/dot_config/nvim/lazy-lock.json b/dot_config/nvim/lazy-lock.json deleted file mode 100644 index 70ece54..0000000 --- a/dot_config/nvim/lazy-lock.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "LazyVim": { "branch": "main", "commit": "3dbace941ee935c89c73fd774267043d12f57fe2" }, - "bufferline.nvim": { "branch": "main", "commit": "0b2fd861eee7595015b6561dade52fb060be10c4" }, - "catppuccin": { "branch": "main", "commit": "4fd72a9ab64b393c2c22b168508fd244877fec96" }, - "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, - "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "conform.nvim": { "branch": "master", "commit": "0ebe875d9c306f5fc829db38492ffff2a70d8e9d" }, - "dashboard-nvim": { "branch": "master", "commit": "fabf5feec96185817c732d47d363f34034212685" }, - "dressing.nvim": { "branch": "master", "commit": "c5775a888adbc50652cb370073fcfec963eca93e" }, - "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, - "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "gitsigns.nvim": { "branch": "main", "commit": "899e993850084ea33d001ec229d237bc020c19ae" }, - "grug-far.nvim": { "branch": "main", "commit": "8058c2366f21af6f446d8e0f9333ae7c22f7679a" }, - "indent-blankline.nvim": { "branch": "master", "commit": "db926997af951da38e5004ec7b9fbdc480b48f5d" }, - "lazy.nvim": { "branch": "main", "commit": "48b52b5cfcf8f88ed0aff8fde573a5cc20b1306d" }, - "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" }, - "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, - "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "482350b050bd413931c2cdd4857443c3da7d57cb" }, - "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.ai": { "branch": "main", "commit": "a9b992b13d22a8db8df6beac25afa59a10b5584d" }, - "mini.icons": { "branch": "main", "commit": "12e7b5d47bfc1b4c5ba4278fb49ec9100138df14" }, - "mini.pairs": { "branch": "main", "commit": "927d19cbdd0e752ab1c7eed87072e71d2cd6ff51" }, - "neo-tree.nvim": { "branch": "main", "commit": "206241e451c12f78969ff5ae53af45616ffc9b72" }, - "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, - "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, - "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-lint": { "branch": "master", "commit": "debabca63c0905b59ce596a55a8e33eafdf66342" }, - "nvim-lspconfig": { "branch": "master", "commit": "3ad562700d0615818bf358268ac8914f6ce2b079" }, - "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-snippets": { "branch": "main", "commit": "56b4052f71220144689caaa2e5b66222ba5661eb" }, - "nvim-treesitter": { "branch": "master", "commit": "749df308870381979dc098063973f6ace9968ef6" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "3a3c6244553f13fdd92d312c82722b57ce6c4bec" }, - "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, - "persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" }, - "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, - "telescope.nvim": { "branch": "master", "commit": "5972437de807c3bc101565175da66a1aa4f8707a" }, - "todo-comments.nvim": { "branch": "main", "commit": "319c01b99b7a8c9ac2066bf0efd4d6ec68fef444" }, - "tokyonight.nvim": { "branch": "main", "commit": "4b386e66a9599057587c30538d5e6192e3d1c181" }, - "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, - "ts-comments.nvim": { "branch": "main", "commit": "98d7d4dec0af1312d38e288f800bbf6ff562b6ab" }, - "which-key.nvim": { "branch": "main", "commit": "bfec3d6bc0a9b0b2cb11644642f78c2c3915eef0" } -} diff --git a/dot_config/nvim/lazyvim.json b/dot_config/nvim/lazyvim.json deleted file mode 100644 index 8e6b0ec..0000000 --- a/dot_config/nvim/lazyvim.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extras": [ - - ], - "news": { - "NEWS.md": "6520" - }, - "version": 6 -} \ No newline at end of file diff --git a/dot_config/nvim/lua/config/lazy.lua b/dot_config/nvim/lua/config/lazy.lua deleted file mode 100644 index 3d9b29e..0000000 --- a/dot_config/nvim/lua/config/lazy.lua +++ /dev/null @@ -1,54 +0,0 @@ -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not (vim.uv or vim.loop).fs_stat(lazypath) then - local lazyrepo = "https://github.com/folke/lazy.nvim.git" - local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) - if vim.v.shell_error ~= 0 then - vim.api.nvim_echo({ - { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, - { out, "WarningMsg" }, - { "\nPress any key to exit..." }, - }, true, {}) - vim.fn.getchar() - os.exit(1) - end -end -vim.opt.rtp:prepend(lazypath) - -require("lazy").setup({ - spec = { - -- add LazyVim and import its plugins - { "LazyVim/LazyVim", import = "lazyvim.plugins" }, - -- import/override with your plugins - { import = "plugins" }, - }, - defaults = { - -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup. - -- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default. - lazy = false, - -- It's recommended to leave version=false for now, since a lot the plugin that support versioning, - -- have outdated releases, which may break your Neovim install. - version = false, -- always use the latest git commit - -- version = "*", -- try installing the latest stable version for plugins that support semver - }, - install = { colorscheme = { "tokyonight", "habamax" } }, - checker = { - enabled = true, -- check for plugin updates periodically - notify = false, -- notify on update - }, -- automatically check for plugin updates - performance = { - rtp = { - -- disable some rtp plugins - disabled_plugins = { - "gzip", - -- "matchit", - -- "matchparen", - -- "netrwPlugin", - "tarPlugin", - "tohtml", - "tutor", - "zipPlugin", - }, - }, - }, -}) - diff --git a/dot_config/nvim/lua/plugins/colorscheme.lua b/dot_config/nvim/lua/plugins/colorscheme.lua deleted file mode 100644 index fd35bb1..0000000 --- a/dot_config/nvim/lua/plugins/colorscheme.lua +++ /dev/null @@ -1,21 +0,0 @@ -return { - -- add gruvbox - { - "catppuccin/nvim", - name = "catppuccin", - priority = 1000, - opts = { - flavour = "mocha", - transparent_background = true, - } - }, - - -- Configure LazyVim to load catppuccin - { - "LazyVim/LazyVim", - opts = { - colorscheme = "catppuccin", - }, - }, -} - diff --git a/dot_config/kitty/kitty-theme.conf b/kitty/kitty-theme.conf similarity index 100% rename from dot_config/kitty/kitty-theme.conf rename to kitty/kitty-theme.conf diff --git a/dot_config/kitty/kitty.conf b/kitty/kitty.conf similarity index 100% rename from dot_config/kitty/kitty.conf rename to kitty/kitty.conf diff --git a/dot_config/mise/config.toml b/mise/config.toml similarity index 100% rename from dot_config/mise/config.toml rename to mise/config.toml diff --git a/nvim/init.lua b/nvim/init.lua new file mode 100644 index 0000000..cd9cf11 --- /dev/null +++ b/nvim/init.lua @@ -0,0 +1,38 @@ +-- Bootstrap lazy.nvim +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not (vim.uv or vim.loop).fs_stat(lazypath) then + local lazyrepo = "https://github.com/folke/lazy.nvim.git" + local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) + if vim.v.shell_error ~= 0 then + vim.api.nvim_echo({ + { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, + { out, "WarningMsg" }, + { "\nPress any key to exit..." }, + }, true, {}) + vim.fn.getchar() + os.exit(1) + end +end +vim.opt.rtp:prepend(lazypath) + +-- Make sure to setup `mapleader` and `maplocalleader` before +-- loading lazy.nvim so that mappings are correct. +-- This is also a good place to setup other settings (vim.opt) +vim.g.mapleader = " " +vim.g.maplocalleader = "\\" + +-- Setup lazy.nvim +-- load plugins +require("lazy").setup({ + spec = { import = "plugins" }, +}, lazy_defaults, { + checker = { enabled = true }, +}) + +require "config/options" +require "config/keys" +require "config/autocmds" + +vim.schedule(function() + -- require "mappings" +end) diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json new file mode 100644 index 0000000..c1e8318 --- /dev/null +++ b/nvim/lazy-lock.json @@ -0,0 +1,50 @@ +{ + "LuaSnip": { "branch": "master", "commit": "fb525166ccc30296fb3457441eb979113de46b00" }, + "alpha-nvim": { "branch": "main", "commit": "a35468cd72645dbd52c0624ceead5f301c566dff" }, + "catppuccin": { "branch": "main", "commit": "fa42eb5e26819ef58884257d5ae95dd0552b9a66" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, + "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, + "codestats.nvim": { "branch": "master", "commit": "041b315c4f82997186fcdb3fc2f687cc128a28f3" }, + "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, + "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, + "hlargs.nvim": { "branch": "main", "commit": "752927d9ebf753802bd4788e53c67a21b8e255cc" }, + "inc-rename.nvim": { "branch": "main", "commit": "a3e31af13844534c66041ce92f29af7745883875" }, + "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, + "lazy-lsp.nvim": { "branch": "master", "commit": "15019ce6111ea3a13531b14820c430116de3048d" }, + "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "lsp-format.nvim": { "branch": "master", "commit": "42d1d3e407c846d95f84ea3767e72ed6e08f7495" }, + "lsp-zero.nvim": { "branch": "v3.x", "commit": "77550f2f6cbf0959ef1583d845661af075f3442b" }, + "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" }, + "neoscroll.nvim": { "branch": "master", "commit": "f957373912e88579e26fdaea4735450ff2ef5c9c" }, + "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, + "notify": { "branch": "master", "commit": "b5825cf9ee881dd8e43309c93374ed5b87b7a896" }, + "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, + "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" }, + "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, + "nvim-cokeline": { "branch": "main", "commit": "9fbed130683b7b6f73198c09e35ba4b33f547c08" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "517df88cf2afb36652830df2c655df2da416a0ae" }, + "nvim-lspconfig": { "branch": "master", "commit": "7ad4a11cc5742774877c529fcfb2702f7caf75e4" }, + "nvim-spectre": { "branch": "master", "commit": "72f56f7585903cd7bf92c665351aa585e150af0f" }, + "nvim-spider": { "branch": "main", "commit": "99df646eab60df0b948dd2532ef5f5512707a9a4" }, + "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, + "nvim-treesitter-endwise": { "branch": "master", "commit": "d6cbb83307d516ec076d17c9a33d704ef626ee8c" }, + "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, + "nvim-ufo": { "branch": "main", "commit": "80fe8215ba566df2fbf3bf4d25f59ff8f41bc0e1" }, + "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" }, + "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "55ad4fb76ab68460f700599b7449385f0c4e858e" }, + "resession.nvim": { "branch": "master", "commit": "84c81e5fd8a94dc85a60b97089536174e558e288" }, + "smart-open.nvim": { "branch": "0.2.x", "commit": "560d8f16e17977c8303db6f9660db58a4415ca41" }, + "smear-cursor.nvim": { "branch": "main", "commit": "aff844fc1483fd673f721a41affcd7e2fcb885f5" }, + "sqlite.lua": { "branch": "master", "commit": "50092d60feb242602d7578398c6eb53b4a8ffe7b" }, + "switch.vim": { "branch": "main", "commit": "14b28ec7bba51c734084bab5f73aef1883fb3786" }, + "symbols.nvim": { "branch": "main", "commit": "62cd4236b3eeabf3b970f225b1cc3379e11dc99c" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, + "telescope-fzy-native.nvim": { "branch": "master", "commit": "282f069504515eec762ab6d6c89903377252bf5b" }, + "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, + "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, + "vim-illuminate": { "branch": "master", "commit": "0d1e93684da00ab7c057410fecfc24f434698898" }, + "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } +} diff --git a/nvim/lua/config/autocmds.lua b/nvim/lua/config/autocmds.lua new file mode 100644 index 0000000..62622c8 --- /dev/null +++ b/nvim/lua/config/autocmds.lua @@ -0,0 +1,17 @@ +local augroup = vim.api.nvim_create_augroup -- Create/get autocommand group +local autocmd = vim.api.nvim_create_autocmd -- Create autocommand + +-- Remove whitespace on save +autocmd('BufWritePost', { + pattern = '', + command = "lua vim.notify('Save Successful')" +}) + +-- Highlight on yank +augroup('YankHighlight', { clear = true }) +autocmd('TextYankPost', { + group = 'YankHighlight', + callback = function() + vim.highlight.on_yank({ higroup = 'IncSearch', timeout = '1000' }) + end +}) diff --git a/nvim/lua/config/keys.lua b/nvim/lua/config/keys.lua new file mode 100644 index 0000000..4ae84f7 --- /dev/null +++ b/nvim/lua/config/keys.lua @@ -0,0 +1,32 @@ +local map = vim.api.nvim_set_keymap +local opts = { noremap = true, silent = true } + +map('n', '', 'bp', opts) +map('n', '', 'bn', opts) +map('n', '<[b>', 'bp', opts) +map('n', '<]b>', 'bn', opts) +map('n', 'w', 'bd', opts) +map('n', 's', 'w', opts) +map('n', 'S', 'w!', opts) +map('n', '', 'za', opts) +map('n', '`', 'Neotree toggle', opts) +map('n', '~', 'SymbolsToggle', opts) +map('n', 'e', 'Neotree toggle', opts) +map('n', 'ff', "Telescope live_grep", opts) +map('n', 'fq', "Telescope quickfix", opts) +map('n', 'fr', "Telescope registers", opts) +map('n', 'f/', "Telescope current_buffer_fuzzy_find", opts) +map('n', 'flr', "Telescope lsp_references", opts) +map('n', 'fls', "Telescope treesitter", opts) +map('n', 'fld', "Telescope diagnostics", opts) +map('n', 'fgs', "Telescope git_status", opts) +map('n', 'fgb', "Telescope git_branches", opts) +map('n', 'fgc', "Telescope git_commits", opts) +map('n', 'fgC', "Telescope git_bcommits", opts) +map('n', 't', "Switch", opts) +map('n', 'r', "Spectre", opts) +map('n', '', "", opts) +map('n', '', "", opts) +map('n', '', "Switch", opts) +map('n', '', "Switch", opts) +map('n', 'r', ":IncRename ", opts) diff --git a/nvim/lua/config/options.lua b/nvim/lua/config/options.lua new file mode 100644 index 0000000..6f122af --- /dev/null +++ b/nvim/lua/config/options.lua @@ -0,0 +1,43 @@ +-- This file is automatically loaded by plugins.core +vim.g.mapleader = " " +vim.g.maplocalleader = "\\" + +-- LazyVim auto format +vim.g.autoformat = true + +-- Use pretty notifications +vim.notify = require("notify") + +-- Set Theme +vim.cmd.colorscheme "catppuccin" + +-- Set Misc Options +local opt = vim.opt + +opt.cursorline = true -- Enable highlighting of the current line +opt.autoindent = true +opt.expandtab = true -- Use spaces instead of tabs +opt.shiftwidth = 2 -- Size of an indent +opt.tabstop = 2 -- Size of an indent +opt.linebreak = true -- Wrap lines at convenient points +opt.list = true -- Show some invisible characters (tabs... +-- opt.mouse = false +opt.number = true -- Print line number +opt.relativenumber = true -- Relative line numbers +opt.ruler = false -- Disable the default ruler +opt.scrolloff = 4 -- Lines of context +opt.sidescrolloff = 8 -- Columns of context +opt.spelllang = { "en" } +opt.showmode = false -- Dont show mode since we have a statusline +opt.termguicolors = true -- True color support +opt.undofile = true +opt.undolevels = 10000 +opt.virtualedit = "block" -- Allow cursor to move where there is no text in visual block mode +opt.wrap = false -- Disable line wrap +opt.signcolumn = "yes" +opt.foldcolumn = "0" +opt.foldlevel = 99 +opt.foldlevelstart = 99 +opt.foldmethod = "expr" +opt.foldexpr = "nvim_treesitter#foldexpr()" +opt.foldenable = true diff --git a/nvim/lua/plugins/adjust.lua b/nvim/lua/plugins/adjust.lua new file mode 100644 index 0000000..09f9a03 --- /dev/null +++ b/nvim/lua/plugins/adjust.lua @@ -0,0 +1,3 @@ +return { + "AndrewRadev/switch.vim" +} diff --git a/nvim/lua/plugins/codestats.lua b/nvim/lua/plugins/codestats.lua new file mode 100644 index 0000000..e743e54 --- /dev/null +++ b/nvim/lua/plugins/codestats.lua @@ -0,0 +1,17 @@ +return { + "liljaylj/codestats.nvim", + dependencies = { "nvim-lua/plenary.nvim" }, + event = { "TextChanged", "InsertEnter" }, + cmd = { "CodeStatsXpSend", "CodeStatsProfileUpdate" }, + config = function() + require("codestats").setup({ + username = "gaiety", -- needed to fetch profile data + base_url = "https://codestats.net", -- codestats.net base url + api_key = "SFMyNTY.WjJGcFpYUjUjI01qSXhPVFU9.fMtCrS4QvdQKCgS_pasnqpWGUyrk3At646kPkN7LIn8", + send_on_exit = true, -- send xp on nvim exit + send_on_timer = true, -- send xp on timer + timer_interval = 60000, -- timer interval in milliseconds (minimum 1000ms to prevent DDoSing codestat.net servers) + curl_timeout = 5, -- curl request timeout in seconds + }) + end, +} diff --git a/nvim/lua/plugins/colorize.lua b/nvim/lua/plugins/colorize.lua new file mode 100644 index 0000000..d7d4d7f --- /dev/null +++ b/nvim/lua/plugins/colorize.lua @@ -0,0 +1,9 @@ +return { + "catgoose/nvim-colorizer.lua", + event = "BufReadPre", + opts = { -- set to setup table + mode = "virtualtext", + virtualtext = "■", + virtualtext_inline = true, + }, +} diff --git a/nvim/lua/plugins/completion.lua b/nvim/lua/plugins/completion.lua new file mode 100644 index 0000000..34f20b1 --- /dev/null +++ b/nvim/lua/plugins/completion.lua @@ -0,0 +1,51 @@ +return { + { + "windwp/nvim-ts-autotag", + config = function() + require('nvim-ts-autotag').setup({ + opts = { + enable_close = true, -- Auto close tags + enable_rename = true, -- Auto rename pairs of tags + enable_close_on_slash = true -- Auto close on trailing '] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + [''] = cmp.mapping.complete(), + [''] = cmp.mapping.abort(), + [''] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. + }), + sources = cmp.config.sources({ + { name = 'nvim_lsp' }, + { name = 'luasnip' }, -- For luasnip users. + }, { + { name = 'buffer' }, + }) + }) + end + }, + { + "L3MON4D3/LuaSnip", + dependencies = { + "rafamadriz/friendly-snippets", + "saadparwaiz1/cmp_luasnip", + }, + } +} diff --git a/nvim/lua/plugins/dash.lua b/nvim/lua/plugins/dash.lua new file mode 100644 index 0000000..fa4f5a6 --- /dev/null +++ b/nvim/lua/plugins/dash.lua @@ -0,0 +1,15 @@ +return { + "goolord/alpha-nvim", + -- dependencies = { 'echasnovski/mini.icons' }, + dependencies = { 'nvim-tree/nvim-web-devicons' }, + config = function() + local startify = require("alpha.themes.startify") + -- available: devicons, mini, default is mini + -- if provider not loaded and enabled is true, it will try to use another provider + startify.file_icons.provider = "devicons" + require("alpha").setup( + startify.config + ) + end, +} + diff --git a/nvim/lua/plugins/filefinder.lua b/nvim/lua/plugins/filefinder.lua new file mode 100644 index 0000000..b106317 --- /dev/null +++ b/nvim/lua/plugins/filefinder.lua @@ -0,0 +1,46 @@ +return { + { + 'nvim-telescope/telescope.nvim', + tag = '0.1.8', + dependencies = { 'nvim-lua/plenary.nvim' }, + config = function() + -- You dont need to set any of these options. These are the default ones. Only + -- the loading is important + require('telescope').setup { + extensions = { + fzf = { + fuzzy = true, -- false will only do exact matching + override_generic_sorter = true, -- override the generic sorter + override_file_sorter = true, -- override the file sorter + case_mode = "smart_case", -- or "ignore_case" or "respect_case" + -- the default case_mode is "smart_case" + } + } + } + -- To get fzf loaded and working with telescope, you need to call + -- load_extension, somewhere after setup function: + require('telescope').load_extension('fzf') + end, + }, + { + 'nvim-telescope/telescope-fzf-native.nvim', + build = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release' + }, + { + "danielfalk/smart-open.nvim", + branch = "0.2.x", + config = function() + require("telescope").load_extension("smart_open") + vim.keymap.set("n", "", function() + require("telescope").extensions.smart_open.smart_open() + end, { noremap = true, silent = true }) + end, + dependencies = { + "kkharji/sqlite.lua", + -- Only required if using match_algorithm fzf + { "nvim-telescope/telescope-fzf-native.nvim", build = "make" }, + -- Optional. If installed, native fzy will be used when match_algorithm is fzy + { "nvim-telescope/telescope-fzy-native.nvim" }, + }, + } +} diff --git a/nvim/lua/plugins/folding.lua b/nvim/lua/plugins/folding.lua new file mode 100644 index 0000000..5cdb28f --- /dev/null +++ b/nvim/lua/plugins/folding.lua @@ -0,0 +1,42 @@ +local handler = function(virtText, lnum, endLnum, width, truncate) + local newVirtText = {} + local suffix = (' 󰁂 %d '):format(endLnum - lnum) + local sufWidth = vim.fn.strdisplaywidth(suffix) + local targetWidth = width - sufWidth + local curWidth = 0 + for _, chunk in ipairs(virtText) do + local chunkText = chunk[1] + local chunkWidth = vim.fn.strdisplaywidth(chunkText) + if targetWidth > curWidth + chunkWidth then + table.insert(newVirtText, chunk) + else + chunkText = truncate(chunkText, targetWidth - curWidth) + local hlGroup = chunk[2] + table.insert(newVirtText, { chunkText, hlGroup }) + chunkWidth = vim.fn.strdisplaywidth(chunkText) + -- str width returned from truncate() may less than 2nd argument, need padding + if curWidth + chunkWidth < targetWidth then + suffix = suffix .. (' '):rep(targetWidth - curWidth - chunkWidth) + end + break + end + curWidth = curWidth + chunkWidth + end + table.insert(newVirtText, { suffix, 'MoreMsg' }) + return newVirtText +end + +return { + "kevinhwang91/nvim-ufo", + dependencies = { + "kevinhwang91/promise-async", + }, + config = function() + require('ufo').setup({ + fold_virt_text_handler = handler, + provider_selector = function(_bufnr, _filetype, _buftype) + return { 'treesitter', 'indent' } + end + }) + end, +} diff --git a/nvim/lua/plugins/illuminate.lua b/nvim/lua/plugins/illuminate.lua new file mode 100644 index 0000000..de4c1de --- /dev/null +++ b/nvim/lua/plugins/illuminate.lua @@ -0,0 +1,3 @@ +return { + "RRethy/vim-illuminate", +} diff --git a/nvim/lua/plugins/indentguide.lua b/nvim/lua/plugins/indentguide.lua new file mode 100644 index 0000000..b02a22f --- /dev/null +++ b/nvim/lua/plugins/indentguide.lua @@ -0,0 +1,40 @@ +return { + { + "HiPhish/rainbow-delimiters.nvim", + }, + { + "lukas-reineke/indent-blankline.nvim", + main = "ibl", + ---@module "ibl" + ---@type ibl.config + opts = {}, + config = function() + local highlight = { + "RainbowRed", + "RainbowYellow", + "RainbowBlue", + "RainbowOrange", + "RainbowGreen", + "RainbowViolet", + "RainbowCyan", + } + local hooks = require "ibl.hooks" + -- create the highlight groups in the highlight setup hook, so they are reset + -- every time the colorscheme changes + hooks.register(hooks.type.HIGHLIGHT_SETUP, function() + vim.api.nvim_set_hl(0, "RainbowRed", { fg = "#E06C75" }) + vim.api.nvim_set_hl(0, "RainbowYellow", { fg = "#E5C07B" }) + vim.api.nvim_set_hl(0, "RainbowBlue", { fg = "#61AFEF" }) + vim.api.nvim_set_hl(0, "RainbowOrange", { fg = "#D19A66" }) + vim.api.nvim_set_hl(0, "RainbowGreen", { fg = "#98C379" }) + vim.api.nvim_set_hl(0, "RainbowViolet", { fg = "#C678DD" }) + vim.api.nvim_set_hl(0, "RainbowCyan", { fg = "#56B6C2" }) + end) + + vim.g.rainbow_delimiters = { highlight = highlight } + require("ibl").setup { scope = { highlight = highlight } } + + hooks.register(hooks.type.SCOPE_HIGHLIGHT, hooks.builtin.scope_highlight_from_extmark) + end, + }, +} diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua new file mode 100644 index 0000000..4c4a68b --- /dev/null +++ b/nvim/lua/plugins/lsp.lua @@ -0,0 +1,41 @@ +return { + { + "smjonas/inc-rename.nvim", + opts = {} + }, + { + "dundalek/lazy-lsp.nvim", + dependencies = { + "neovim/nvim-lspconfig", + { "VonHeikemen/lsp-zero.nvim", branch = "v3.x" }, + "hrsh7th/cmp-nvim-lsp", + "hrsh7th/nvim-cmp", + }, + config = function() + local lsp_zero = require("lsp-zero") + + lsp_zero.on_attach(function(_client, bufnr) + -- see :help lsp-zero-keybindings to learn the available actions + lsp_zero.default_keymaps({ + buffer = bufnr, + preserve_mappings = false + }) + end) + + require("lazy-lsp").setup {} + end, + }, + { + "lukas-reineke/lsp-format.nvim", + config = function() + require("lsp-format").setup {} + + vim.api.nvim_create_autocmd('LspAttach', { + callback = function(args) + local client = assert(vim.lsp.get_client_by_id(args.data.client_id)) + require("lsp-format").on_attach(client, args.buf) + end, + }) + end, + }, +} diff --git a/nvim/lua/plugins/moves.lua b/nvim/lua/plugins/moves.lua new file mode 100644 index 0000000..88a433f --- /dev/null +++ b/nvim/lua/plugins/moves.lua @@ -0,0 +1,17 @@ +return { + { "chrisgrieser/nvim-spider", lazy = true }, + { + "folke/flash.nvim", + event = "VeryLazy", + ---@type Flash.Config + opts = {}, + -- stylua: ignore + keys = { + { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" }, + { "S", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" }, + { "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" }, + { "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" }, + { "", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" }, + }, + } +} diff --git a/nvim/lua/plugins/notify.lua b/nvim/lua/plugins/notify.lua new file mode 100644 index 0000000..85c3bbc --- /dev/null +++ b/nvim/lua/plugins/notify.lua @@ -0,0 +1,10 @@ +return { + "rcarriga/nvim-notify", + name = "notify", + lazy = true, + config = function() + require("notify").setup({ + background_colour = "#7f849c" + }) + end, +} diff --git a/nvim/lua/plugins/pairs.lua b/nvim/lua/plugins/pairs.lua new file mode 100644 index 0000000..6d50630 --- /dev/null +++ b/nvim/lua/plugins/pairs.lua @@ -0,0 +1,48 @@ +return { + { + 'RRethy/nvim-treesitter-endwise', + }, + { + 'windwp/nvim-autopairs', + event = "InsertEnter", + config = function() + require('nvim-autopairs').setup() + + local npairs = require("nvim-autopairs") + local Rule = require('nvim-autopairs.rule') + local cmp_autopairs = require('nvim-autopairs.completion.cmp') + local cmp = require('cmp') + cmp.event:on( + 'confirm_done', + cmp_autopairs.on_confirm_done() + ) + + npairs.setup({ + check_ts = true, + ts_config = { + lua = { 'string' }, -- it will not add a pair on that treesitter node + javascript = { 'template_string' }, + java = false, -- don't check treesitter on java + } + }) + + local ts_conds = require('nvim-autopairs.ts-conds') + + + -- press % => %% only while inside a comment or string + npairs.add_rules({ + Rule("%", "%", "lua") + :with_pair(ts_conds.is_ts_node({ 'string', 'comment' })), + Rule("$", "$", "lua") + :with_pair(ts_conds.is_not_ts_node({ 'function' })) + }) + end, + opts = { + enabled = function(bufnr) return true end, + disable_filetype = { "TelescopePrompt", "spectre_panel", "snacks_picker_input" }, + enable_check_bracket_line = false, + map_cr = true, + map_bs = true, -- map the key + }, + } +} diff --git a/nvim/lua/plugins/replace.lua b/nvim/lua/plugins/replace.lua new file mode 100644 index 0000000..fb34e8b --- /dev/null +++ b/nvim/lua/plugins/replace.lua @@ -0,0 +1,12 @@ +return { + "folke/noice.nvim", + dependencies = { + "nvim-pack/nvim-spectre", + "nvim-lua/plenary.nvim", + }, + config = function () + require("noice").setup { + presets = { inc_rename = true } + } + end +} diff --git a/nvim/lua/plugins/scrolling.lua b/nvim/lua/plugins/scrolling.lua new file mode 100644 index 0000000..7d01357 --- /dev/null +++ b/nvim/lua/plugins/scrolling.lua @@ -0,0 +1,6 @@ +return { + "karb94/neoscroll.nvim", + opts = { + easing = "quadratic" + }, +} diff --git a/nvim/lua/plugins/smear.lua b/nvim/lua/plugins/smear.lua new file mode 100644 index 0000000..07ce877 --- /dev/null +++ b/nvim/lua/plugins/smear.lua @@ -0,0 +1,13 @@ +return { + "sphamba/smear-cursor.nvim", + opts = { + stiffness = 0.8, -- 0.6 [0, 1] + trailing_stiffness = 0.5, -- 0.4 [0, 1] + stiffness_insert_mode = 0.6, -- 0.4 [0, 1] + trailing_stiffness_insert_mode = 0.6, -- 0.4 [0, 1] + distance_stop_animating = 0.5, + time_interval = 7, -- milliseconds + cursor_color = "#f9e2af", + legacy_computing_symbols_support = true, + }, +} diff --git a/nvim/lua/plugins/statusline.lua b/nvim/lua/plugins/statusline.lua new file mode 100644 index 0000000..5d4ee28 --- /dev/null +++ b/nvim/lua/plugins/statusline.lua @@ -0,0 +1,68 @@ +return { + 'nvim-lualine/lualine.nvim', + dependencies = { 'nvim-tree/nvim-web-devicons' }, + config = function() + -- Bubbles config for lualine + -- Author: lokesh-krishna + -- MIT license, see LICENSE for more details. + + -- stylua: ignore + local colors = { + blue = '#89b4fa', + cyan = '#89dceb', + black = '#1e1e2e', + white = '#cdd6f4', + red = '#f38ba8', + violet = '#cba6f7', + grey = '#303030', + } + + local bubbles_theme = { + normal = { + a = { fg = colors.black, bg = colors.violet }, + b = { fg = colors.white, bg = colors.grey }, + c = { fg = colors.white }, + }, + + insert = { a = { fg = colors.black, bg = colors.blue } }, + visual = { a = { fg = colors.black, bg = colors.cyan } }, + replace = { a = { fg = colors.black, bg = colors.red } }, + + inactive = { + a = { fg = colors.white, bg = colors.black }, + b = { fg = colors.white, bg = colors.black }, + c = { fg = colors.white }, + }, + } + + require('lualine').setup { + options = { + theme = bubbles_theme, + component_separators = '', + section_separators = { left = '', right = '' }, + }, + sections = { + lualine_a = { { 'mode', separator = { left = '' }, right_padding = 2 } }, + lualine_b = { 'filename', 'branch' }, + lualine_c = { + '%=', --[[ add your center components here in place of this comment ]] + }, + lualine_x = {}, + lualine_y = { 'filetype', 'progress' }, + lualine_z = { + { 'location', separator = { right = '' }, left_padding = 2 }, + }, + }, + inactive_sections = { + lualine_a = { 'filename' }, + lualine_b = {}, + lualine_c = {}, + lualine_x = {}, + lualine_y = {}, + lualine_z = { 'location' }, + }, + tabline = {}, + extensions = {}, + } + end, +} diff --git a/nvim/lua/plugins/symbols.lua b/nvim/lua/plugins/symbols.lua new file mode 100644 index 0000000..190e85b --- /dev/null +++ b/nvim/lua/plugins/symbols.lua @@ -0,0 +1,20 @@ +return { + "oskarrrrrrr/symbols.nvim", + config = function() + local r = require("symbols.recipes") + require("symbols").setup( + r.DefaultFilters, + r.AsciiSymbols, + { + sidebar = { + unfold_on_goto = true, + close_on_goto = true, + preview = { + show_always = true, + show_line_number = true, + } + }, + } + ) + end +} diff --git a/nvim/lua/plugins/tabline.lua b/nvim/lua/plugins/tabline.lua new file mode 100644 index 0000000..0665da8 --- /dev/null +++ b/nvim/lua/plugins/tabline.lua @@ -0,0 +1,15 @@ +return { + { + "willothy/nvim-cokeline", + dependencies = { + "nvim-lua/plenary.nvim", -- Required for v0.4.0+ + "nvim-tree/nvim-web-devicons", -- If you want devicons + "stevearc/resession.nvim" -- Optional, for persistent history + }, + config = function() + require('cokeline').setup({ + show_if_buffers_are_at_least = 2, + }) + end, + } +} diff --git a/nvim/lua/plugins/theme.lua b/nvim/lua/plugins/theme.lua new file mode 100644 index 0000000..2bd8927 --- /dev/null +++ b/nvim/lua/plugins/theme.lua @@ -0,0 +1,18 @@ +return { + "catppuccin/nvim", + lazy = true, + name = "catppuccin", + opts = { + flavour = "mocha", + integrations = { + cmp = true, + gitsigns = true, + treesitter = true, + barbar = true, + }, + transparent_background = true, -- disables setting the background color. + styles = { -- Handles the styles of general hi groups (see `:h highlight-args`): + comments = { "italic" }, -- Change the style of comments + }, + } +} diff --git a/nvim/lua/plugins/todo.lua b/nvim/lua/plugins/todo.lua new file mode 100644 index 0000000..51935de --- /dev/null +++ b/nvim/lua/plugins/todo.lua @@ -0,0 +1,4 @@ +return { + "folke/todo-comments.nvim", + dependencies = { "nvim-lua/plenary.nvim" }, +} diff --git a/nvim/lua/plugins/tree.lua b/nvim/lua/plugins/tree.lua new file mode 100644 index 0000000..2510423 --- /dev/null +++ b/nvim/lua/plugins/tree.lua @@ -0,0 +1,16 @@ +return { + "nvim-neo-tree/neo-tree.nvim", + branch = "v3.x", + dependencies = { + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended + "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 + ---@module "neo-tree" + ---@type neotree.Config? + opts = { + -- fill any relevant options here + }, +} diff --git a/nvim/lua/plugins/treesitter.lua b/nvim/lua/plugins/treesitter.lua new file mode 100644 index 0000000..a214fde --- /dev/null +++ b/nvim/lua/plugins/treesitter.lua @@ -0,0 +1,92 @@ +return { + { + "folke/which-key.nvim", + opts = { + spec = { + { "", desc = "Decrement Selection", mode = "x" }, + { "", desc = "Increment Selection", mode = { "x", "n" } }, + }, + }, + }, + { + "m-demare/hlargs.nvim", + event = { "VeryLazy" }, + }, + { + "nvim-treesitter/nvim-treesitter", + version = false, -- last release is way too old and doesn't work on Windows + build = ":TSUpdate", + event = { "VeryLazy" }, + lazy = vim.fn.argc(-1) == 0, -- load treesitter early when opening a file from the cmdline + init = function(plugin) + -- PERF: add nvim-treesitter queries to the rtp and it's custom query predicates early + -- This is needed because a bunch of plugins no longer `require("nvim-treesitter")`, which + -- no longer trigger the **nvim-treesitter** module to be loaded in time. + -- Luckily, the only things that those plugins need are the custom queries, which we make available + -- during startup. + require("lazy.core.loader").add_to_rtp(plugin) + require("nvim-treesitter.query_predicates") + end, + cmd = { "TSUpdateSync", "TSUpdate", "TSInstall" }, + keys = { + { "", desc = "Increment Selection" }, + { "", desc = "Decrement Selection", mode = "x" }, + }, + opts_extend = { "ensure_installed" }, + ---@type TSConfig + ---@diagnostic disable-next-line: missing-fields + opts = { + highlight = { enable = true }, + indent = { enable = true }, + ensure_installed = { + "bash", + "c", + "diff", + "html", + "javascript", + "jsdoc", + "json", + "jsonc", + "lua", + "luadoc", + "luap", + "markdown", + "markdown_inline", + "printf", + "python", + "query", + "regex", + "toml", + "tsx", + "typescript", + "vim", + "vimdoc", + "xml", + "yaml", + }, + incremental_selection = { + enable = true, + keymaps = { + init_selection = "", + node_incremental = "", + scope_incremental = false, + node_decremental = "", + }, + }, + textobjects = { + move = { + enable = true, + goto_next_start = { ["]f"] = "@function.outer", ["]c"] = "@class.outer", ["]a"] = "@parameter.inner" }, + goto_next_end = { ["]F"] = "@function.outer", ["]C"] = "@class.outer", ["]A"] = "@parameter.inner" }, + goto_previous_start = { ["[f"] = "@function.outer", ["[c"] = "@class.outer", ["[a"] = "@parameter.inner" }, + goto_previous_end = { ["[F"] = "@function.outer", ["[C"] = "@class.outer", ["[A"] = "@parameter.inner" }, + }, + }, + }, + }, + { + "windwp/nvim-ts-autotag", + event = "VeryLazy", + opts = {}, + } +} diff --git a/dot_config/private_fish/completions/tide.fish b/private_fish/completions/tide.fish similarity index 100% rename from dot_config/private_fish/completions/tide.fish rename to private_fish/completions/tide.fish diff --git a/dot_config/private_fish/conf.d/_tide_init.fish b/private_fish/conf.d/_tide_init.fish similarity index 100% rename from dot_config/private_fish/conf.d/_tide_init.fish rename to private_fish/conf.d/_tide_init.fish diff --git a/dot_config/private_fish/config.fish b/private_fish/config.fish similarity index 100% rename from dot_config/private_fish/config.fish rename to private_fish/config.fish diff --git a/dot_config/private_fish/functions/_tide_1_line_prompt.fish b/private_fish/functions/_tide_1_line_prompt.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_1_line_prompt.fish rename to private_fish/functions/_tide_1_line_prompt.fish diff --git a/dot_config/private_fish/functions/_tide_2_line_prompt.fish b/private_fish/functions/_tide_2_line_prompt.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_2_line_prompt.fish rename to private_fish/functions/_tide_2_line_prompt.fish diff --git a/dot_config/private_fish/functions/_tide_cache_variables.fish b/private_fish/functions/_tide_cache_variables.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_cache_variables.fish rename to private_fish/functions/_tide_cache_variables.fish diff --git a/dot_config/private_fish/functions/_tide_detect_os.fish b/private_fish/functions/_tide_detect_os.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_detect_os.fish rename to private_fish/functions/_tide_detect_os.fish diff --git a/dot_config/private_fish/functions/_tide_find_and_remove.fish b/private_fish/functions/_tide_find_and_remove.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_find_and_remove.fish rename to private_fish/functions/_tide_find_and_remove.fish diff --git a/dot_config/private_fish/functions/_tide_fish_colorize.fish b/private_fish/functions/_tide_fish_colorize.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_fish_colorize.fish rename to private_fish/functions/_tide_fish_colorize.fish diff --git a/dot_config/private_fish/functions/_tide_item_aws.fish b/private_fish/functions/_tide_item_aws.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_item_aws.fish rename to private_fish/functions/_tide_item_aws.fish diff --git a/dot_config/private_fish/functions/_tide_item_character.fish b/private_fish/functions/_tide_item_character.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_item_character.fish rename to private_fish/functions/_tide_item_character.fish diff --git a/dot_config/private_fish/functions/_tide_item_cmd_duration.fish b/private_fish/functions/_tide_item_cmd_duration.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_item_cmd_duration.fish rename to private_fish/functions/_tide_item_cmd_duration.fish diff --git a/dot_config/private_fish/functions/_tide_item_context.fish b/private_fish/functions/_tide_item_context.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_item_context.fish rename to private_fish/functions/_tide_item_context.fish diff --git a/dot_config/private_fish/functions/_tide_item_crystal.fish b/private_fish/functions/_tide_item_crystal.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_item_crystal.fish rename to private_fish/functions/_tide_item_crystal.fish diff --git a/dot_config/private_fish/functions/_tide_item_direnv.fish b/private_fish/functions/_tide_item_direnv.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_item_direnv.fish rename to private_fish/functions/_tide_item_direnv.fish diff --git a/dot_config/private_fish/functions/_tide_item_distrobox.fish b/private_fish/functions/_tide_item_distrobox.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_item_distrobox.fish rename to private_fish/functions/_tide_item_distrobox.fish diff --git a/dot_config/private_fish/functions/_tide_item_docker.fish b/private_fish/functions/_tide_item_docker.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_item_docker.fish rename to private_fish/functions/_tide_item_docker.fish diff --git a/dot_config/private_fish/functions/_tide_item_elixir.fish b/private_fish/functions/_tide_item_elixir.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_item_elixir.fish rename to private_fish/functions/_tide_item_elixir.fish diff --git a/dot_config/private_fish/functions/_tide_item_gcloud.fish b/private_fish/functions/_tide_item_gcloud.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_item_gcloud.fish rename to private_fish/functions/_tide_item_gcloud.fish diff --git a/dot_config/private_fish/functions/_tide_item_git.fish b/private_fish/functions/_tide_item_git.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_item_git.fish rename to private_fish/functions/_tide_item_git.fish diff --git a/dot_config/private_fish/functions/_tide_item_go.fish b/private_fish/functions/_tide_item_go.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_item_go.fish rename to private_fish/functions/_tide_item_go.fish diff --git a/dot_config/private_fish/functions/_tide_item_java.fish b/private_fish/functions/_tide_item_java.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_item_java.fish rename to private_fish/functions/_tide_item_java.fish diff --git a/dot_config/private_fish/functions/_tide_item_jobs.fish b/private_fish/functions/_tide_item_jobs.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_item_jobs.fish rename to private_fish/functions/_tide_item_jobs.fish diff --git a/dot_config/private_fish/functions/_tide_item_kubectl.fish b/private_fish/functions/_tide_item_kubectl.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_item_kubectl.fish rename to private_fish/functions/_tide_item_kubectl.fish diff --git a/dot_config/private_fish/functions/_tide_item_nix_shell.fish b/private_fish/functions/_tide_item_nix_shell.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_item_nix_shell.fish rename to private_fish/functions/_tide_item_nix_shell.fish diff --git a/dot_config/private_fish/functions/_tide_item_node.fish b/private_fish/functions/_tide_item_node.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_item_node.fish rename to private_fish/functions/_tide_item_node.fish diff --git a/dot_config/private_fish/functions/_tide_item_os.fish b/private_fish/functions/_tide_item_os.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_item_os.fish rename to private_fish/functions/_tide_item_os.fish diff --git a/dot_config/private_fish/functions/_tide_item_php.fish b/private_fish/functions/_tide_item_php.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_item_php.fish rename to private_fish/functions/_tide_item_php.fish diff --git a/dot_config/private_fish/functions/_tide_item_private_mode.fish b/private_fish/functions/_tide_item_private_mode.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_item_private_mode.fish rename to private_fish/functions/_tide_item_private_mode.fish diff --git a/dot_config/private_fish/functions/_tide_item_pulumi.fish b/private_fish/functions/_tide_item_pulumi.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_item_pulumi.fish rename to private_fish/functions/_tide_item_pulumi.fish diff --git a/dot_config/private_fish/functions/_tide_item_python.fish b/private_fish/functions/_tide_item_python.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_item_python.fish rename to private_fish/functions/_tide_item_python.fish diff --git a/dot_config/private_fish/functions/_tide_item_ruby.fish b/private_fish/functions/_tide_item_ruby.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_item_ruby.fish rename to private_fish/functions/_tide_item_ruby.fish diff --git a/dot_config/private_fish/functions/_tide_item_rustc.fish b/private_fish/functions/_tide_item_rustc.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_item_rustc.fish rename to private_fish/functions/_tide_item_rustc.fish diff --git a/dot_config/private_fish/functions/_tide_item_shlvl.fish b/private_fish/functions/_tide_item_shlvl.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_item_shlvl.fish rename to private_fish/functions/_tide_item_shlvl.fish diff --git a/dot_config/private_fish/functions/_tide_item_status.fish b/private_fish/functions/_tide_item_status.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_item_status.fish rename to private_fish/functions/_tide_item_status.fish diff --git a/dot_config/private_fish/functions/_tide_item_terraform.fish b/private_fish/functions/_tide_item_terraform.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_item_terraform.fish rename to private_fish/functions/_tide_item_terraform.fish diff --git a/dot_config/private_fish/functions/_tide_item_time.fish b/private_fish/functions/_tide_item_time.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_item_time.fish rename to private_fish/functions/_tide_item_time.fish diff --git a/dot_config/private_fish/functions/_tide_item_toolbox.fish b/private_fish/functions/_tide_item_toolbox.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_item_toolbox.fish rename to private_fish/functions/_tide_item_toolbox.fish diff --git a/dot_config/private_fish/functions/_tide_item_vi_mode.fish b/private_fish/functions/_tide_item_vi_mode.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_item_vi_mode.fish rename to private_fish/functions/_tide_item_vi_mode.fish diff --git a/dot_config/private_fish/functions/_tide_item_zig.fish b/private_fish/functions/_tide_item_zig.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_item_zig.fish rename to private_fish/functions/_tide_item_zig.fish diff --git a/dot_config/private_fish/functions/_tide_parent_dirs.fish b/private_fish/functions/_tide_parent_dirs.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_parent_dirs.fish rename to private_fish/functions/_tide_parent_dirs.fish diff --git a/dot_config/private_fish/functions/_tide_print_item.fish b/private_fish/functions/_tide_print_item.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_print_item.fish rename to private_fish/functions/_tide_print_item.fish diff --git a/dot_config/private_fish/functions/_tide_pwd.fish b/private_fish/functions/_tide_pwd.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_pwd.fish rename to private_fish/functions/_tide_pwd.fish diff --git a/dot_config/private_fish/functions/_tide_remove_unusable_items.fish b/private_fish/functions/_tide_remove_unusable_items.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_remove_unusable_items.fish rename to private_fish/functions/_tide_remove_unusable_items.fish diff --git a/dot_config/private_fish/functions/_tide_sub_bug-report.fish b/private_fish/functions/_tide_sub_bug-report.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_sub_bug-report.fish rename to private_fish/functions/_tide_sub_bug-report.fish diff --git a/dot_config/private_fish/functions/_tide_sub_configure.fish b/private_fish/functions/_tide_sub_configure.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_sub_configure.fish rename to private_fish/functions/_tide_sub_configure.fish diff --git a/dot_config/private_fish/functions/_tide_sub_reload.fish b/private_fish/functions/_tide_sub_reload.fish similarity index 100% rename from dot_config/private_fish/functions/_tide_sub_reload.fish rename to private_fish/functions/_tide_sub_reload.fish diff --git a/dot_config/private_fish/functions/fish_mode_prompt.fish b/private_fish/functions/fish_mode_prompt.fish similarity index 100% rename from dot_config/private_fish/functions/fish_mode_prompt.fish rename to private_fish/functions/fish_mode_prompt.fish diff --git a/dot_config/private_fish/functions/fish_prompt.fish b/private_fish/functions/fish_prompt.fish similarity index 100% rename from dot_config/private_fish/functions/fish_prompt.fish rename to private_fish/functions/fish_prompt.fish diff --git a/dot_config/private_fish/functions/tide.fish b/private_fish/functions/tide.fish similarity index 100% rename from dot_config/private_fish/functions/tide.fish rename to private_fish/functions/tide.fish diff --git a/dot_config/private_fish/functions/tide/configure/choices/all/finish.fish b/private_fish/functions/tide/configure/choices/all/finish.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/choices/all/finish.fish rename to private_fish/functions/tide/configure/choices/all/finish.fish diff --git a/dot_config/private_fish/functions/tide/configure/choices/all/icons.fish b/private_fish/functions/tide/configure/choices/all/icons.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/choices/all/icons.fish rename to private_fish/functions/tide/configure/choices/all/icons.fish diff --git a/dot_config/private_fish/functions/tide/configure/choices/all/prompt_colors.fish b/private_fish/functions/tide/configure/choices/all/prompt_colors.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/choices/all/prompt_colors.fish rename to private_fish/functions/tide/configure/choices/all/prompt_colors.fish diff --git a/dot_config/private_fish/functions/tide/configure/choices/all/prompt_connection.fish b/private_fish/functions/tide/configure/choices/all/prompt_connection.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/choices/all/prompt_connection.fish rename to private_fish/functions/tide/configure/choices/all/prompt_connection.fish diff --git a/dot_config/private_fish/functions/tide/configure/choices/all/prompt_connection_andor_frame_color.fish b/private_fish/functions/tide/configure/choices/all/prompt_connection_andor_frame_color.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/choices/all/prompt_connection_andor_frame_color.fish rename to private_fish/functions/tide/configure/choices/all/prompt_connection_andor_frame_color.fish diff --git a/dot_config/private_fish/functions/tide/configure/choices/all/prompt_spacing.fish b/private_fish/functions/tide/configure/choices/all/prompt_spacing.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/choices/all/prompt_spacing.fish rename to private_fish/functions/tide/configure/choices/all/prompt_spacing.fish diff --git a/dot_config/private_fish/functions/tide/configure/choices/all/show_time.fish b/private_fish/functions/tide/configure/choices/all/show_time.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/choices/all/show_time.fish rename to private_fish/functions/tide/configure/choices/all/show_time.fish diff --git a/dot_config/private_fish/functions/tide/configure/choices/all/style.fish b/private_fish/functions/tide/configure/choices/all/style.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/choices/all/style.fish rename to private_fish/functions/tide/configure/choices/all/style.fish diff --git a/dot_config/private_fish/functions/tide/configure/choices/all/transient.fish b/private_fish/functions/tide/configure/choices/all/transient.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/choices/all/transient.fish rename to private_fish/functions/tide/configure/choices/all/transient.fish diff --git a/dot_config/private_fish/functions/tide/configure/choices/classic/classic_prompt_color.fish b/private_fish/functions/tide/configure/choices/classic/classic_prompt_color.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/choices/classic/classic_prompt_color.fish rename to private_fish/functions/tide/configure/choices/classic/classic_prompt_color.fish diff --git a/dot_config/private_fish/functions/tide/configure/choices/classic/classic_prompt_separators.fish b/private_fish/functions/tide/configure/choices/classic/classic_prompt_separators.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/choices/classic/classic_prompt_separators.fish rename to private_fish/functions/tide/configure/choices/classic/classic_prompt_separators.fish diff --git a/dot_config/private_fish/functions/tide/configure/choices/lean/lean_prompt_height.fish b/private_fish/functions/tide/configure/choices/lean/lean_prompt_height.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/choices/lean/lean_prompt_height.fish rename to private_fish/functions/tide/configure/choices/lean/lean_prompt_height.fish diff --git a/dot_config/private_fish/functions/tide/configure/choices/powerline/powerline_prompt_heads.fish b/private_fish/functions/tide/configure/choices/powerline/powerline_prompt_heads.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/choices/powerline/powerline_prompt_heads.fish rename to private_fish/functions/tide/configure/choices/powerline/powerline_prompt_heads.fish diff --git a/dot_config/private_fish/functions/tide/configure/choices/powerline/powerline_prompt_style.fish b/private_fish/functions/tide/configure/choices/powerline/powerline_prompt_style.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/choices/powerline/powerline_prompt_style.fish rename to private_fish/functions/tide/configure/choices/powerline/powerline_prompt_style.fish diff --git a/dot_config/private_fish/functions/tide/configure/choices/powerline/powerline_prompt_tails.fish b/private_fish/functions/tide/configure/choices/powerline/powerline_prompt_tails.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/choices/powerline/powerline_prompt_tails.fish rename to private_fish/functions/tide/configure/choices/powerline/powerline_prompt_tails.fish diff --git a/dot_config/private_fish/functions/tide/configure/choices/powerline/powerline_right_prompt_frame.fish b/private_fish/functions/tide/configure/choices/powerline/powerline_right_prompt_frame.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/choices/powerline/powerline_right_prompt_frame.fish rename to private_fish/functions/tide/configure/choices/powerline/powerline_right_prompt_frame.fish diff --git a/dot_config/private_fish/functions/tide/configure/choices/rainbow/rainbow_prompt_separators.fish b/private_fish/functions/tide/configure/choices/rainbow/rainbow_prompt_separators.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/choices/rainbow/rainbow_prompt_separators.fish rename to private_fish/functions/tide/configure/choices/rainbow/rainbow_prompt_separators.fish diff --git a/dot_config/private_fish/functions/tide/configure/configs/classic.fish b/private_fish/functions/tide/configure/configs/classic.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/configs/classic.fish rename to private_fish/functions/tide/configure/configs/classic.fish diff --git a/dot_config/private_fish/functions/tide/configure/configs/classic_16color.fish b/private_fish/functions/tide/configure/configs/classic_16color.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/configs/classic_16color.fish rename to private_fish/functions/tide/configure/configs/classic_16color.fish diff --git a/dot_config/private_fish/functions/tide/configure/configs/lean.fish b/private_fish/functions/tide/configure/configs/lean.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/configs/lean.fish rename to private_fish/functions/tide/configure/configs/lean.fish diff --git a/dot_config/private_fish/functions/tide/configure/configs/lean_16color.fish b/private_fish/functions/tide/configure/configs/lean_16color.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/configs/lean_16color.fish rename to private_fish/functions/tide/configure/configs/lean_16color.fish diff --git a/dot_config/private_fish/functions/tide/configure/configs/rainbow.fish b/private_fish/functions/tide/configure/configs/rainbow.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/configs/rainbow.fish rename to private_fish/functions/tide/configure/configs/rainbow.fish diff --git a/dot_config/private_fish/functions/tide/configure/configs/rainbow_16color.fish b/private_fish/functions/tide/configure/configs/rainbow_16color.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/configs/rainbow_16color.fish rename to private_fish/functions/tide/configure/configs/rainbow_16color.fish diff --git a/dot_config/private_fish/functions/tide/configure/functions/_fake_tide_cache_variables.fish b/private_fish/functions/tide/configure/functions/_fake_tide_cache_variables.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/functions/_fake_tide_cache_variables.fish rename to private_fish/functions/tide/configure/functions/_fake_tide_cache_variables.fish diff --git a/dot_config/private_fish/functions/tide/configure/functions/_fake_tide_item_character.fish b/private_fish/functions/tide/configure/functions/_fake_tide_item_character.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/functions/_fake_tide_item_character.fish rename to private_fish/functions/tide/configure/functions/_fake_tide_item_character.fish diff --git a/dot_config/private_fish/functions/tide/configure/functions/_fake_tide_item_cmd_duration.fish b/private_fish/functions/tide/configure/functions/_fake_tide_item_cmd_duration.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/functions/_fake_tide_item_cmd_duration.fish rename to private_fish/functions/tide/configure/functions/_fake_tide_item_cmd_duration.fish diff --git a/dot_config/private_fish/functions/tide/configure/functions/_fake_tide_item_git.fish b/private_fish/functions/tide/configure/functions/_fake_tide_item_git.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/functions/_fake_tide_item_git.fish rename to private_fish/functions/tide/configure/functions/_fake_tide_item_git.fish diff --git a/dot_config/private_fish/functions/tide/configure/functions/_fake_tide_item_newline.fish b/private_fish/functions/tide/configure/functions/_fake_tide_item_newline.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/functions/_fake_tide_item_newline.fish rename to private_fish/functions/tide/configure/functions/_fake_tide_item_newline.fish diff --git a/dot_config/private_fish/functions/tide/configure/functions/_fake_tide_item_os.fish b/private_fish/functions/tide/configure/functions/_fake_tide_item_os.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/functions/_fake_tide_item_os.fish rename to private_fish/functions/tide/configure/functions/_fake_tide_item_os.fish diff --git a/dot_config/private_fish/functions/tide/configure/functions/_fake_tide_item_time.fish b/private_fish/functions/tide/configure/functions/_fake_tide_item_time.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/functions/_fake_tide_item_time.fish rename to private_fish/functions/tide/configure/functions/_fake_tide_item_time.fish diff --git a/dot_config/private_fish/functions/tide/configure/functions/_fake_tide_print_item.fish b/private_fish/functions/tide/configure/functions/_fake_tide_print_item.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/functions/_fake_tide_print_item.fish rename to private_fish/functions/tide/configure/functions/_fake_tide_print_item.fish diff --git a/dot_config/private_fish/functions/tide/configure/functions/_fake_tide_prompt.fish b/private_fish/functions/tide/configure/functions/_fake_tide_prompt.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/functions/_fake_tide_prompt.fish rename to private_fish/functions/tide/configure/functions/_fake_tide_prompt.fish diff --git a/dot_config/private_fish/functions/tide/configure/functions/_fake_tide_pwd.fish b/private_fish/functions/tide/configure/functions/_fake_tide_pwd.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/functions/_fake_tide_pwd.fish rename to private_fish/functions/tide/configure/functions/_fake_tide_pwd.fish diff --git a/dot_config/private_fish/functions/tide/configure/icons.fish b/private_fish/functions/tide/configure/icons.fish similarity index 100% rename from dot_config/private_fish/functions/tide/configure/icons.fish rename to private_fish/functions/tide/configure/icons.fish