diff options
29 files changed, 288 insertions, 771 deletions
diff --git a/.bash_profile b/.bash_profile index a3447f9..b8ea799 100644 --- a/.bash_profile +++ b/.bash_profile @@ -8,7 +8,7 @@ source "${HOME}/.config/shell/profile" # add user's bin directory to path if [ -d "${HOME}/.local/bin" ] then - export PATH="${HOME}/.local/bin:${PATH}" + export PATH="${HOME}/.local/bin:${PATH}" fi source "${HOME}/.bashrc" diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml deleted file mode 100644 index f4d44d4..0000000 --- a/.config/alacritty/alacritty.yml +++ /dev/null @@ -1,42 +0,0 @@ -# -# getchoo's alacritty config -# - -import: - - nord.yml - -env: - TERM: alacritty - -window: - dimensions: - columns: 90 - lines: 35 - decorations: full - -font: - normal: - family: FiraCode Nerd Font - - style: Regular - - bold: - family: FiraCode Nerd Font - - style: Bold - - italic: - family: FiraCode Nerd Font - - style: Italic - - bold_italic: - family: FiraCode Nerd Font - - style: Bold Italic - - size: 12.0 - - builtin_box_drawing: true - -draw_bold_text_with_bright_colors: true diff --git a/.config/alacritty/nord.yml b/.config/alacritty/nord.yml deleted file mode 100644 index b370cb1..0000000 --- a/.config/alacritty/nord.yml +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright (c) 2017-present Arctic Ice Studio <[email protected]> -# Copyright (c) 2017-present Sven Greb <[email protected]> - -# Project: Nord Alacritty -# Version: 0.1.0 -# Repository: https://github.com/arcticicestudio/nord-alacritty -# License: MIT -# References: -# https://github.com/alacritty/alacritty - -colors: - primary: - background: '#2e3440' - foreground: '#d8dee9' - dim_foreground: '#a5abb6' - cursor: - text: '#2e3440' - cursor: '#d8dee9' - vi_mode_cursor: - text: '#2e3440' - cursor: '#d8dee9' - selection: - text: CellForeground - background: '#4c566a' - search: - matches: - foreground: CellBackground - background: '#88c0d0' - bar: - background: '#434c5e' - foreground: '#d8dee9' - normal: - black: '#3b4252' - red: '#bf616a' - green: '#a3be8c' - yellow: '#ebcb8b' - blue: '#81a1c1' - magenta: '#b48ead' - cyan: '#88c0d0' - white: '#e5e9f0' - bright: - black: '#4c566a' - red: '#bf616a' - green: '#a3be8c' - yellow: '#ebcb8b' - blue: '#81a1c1' - magenta: '#b48ead' - cyan: '#8fbcbb' - white: '#eceff4' - dim: - black: '#373e4d' - red: '#94545d' - green: '#809575' - yellow: '#b29e75' - blue: '#68809a' - magenta: '#8c738c' - cyan: '#6d96a5' - white: '#aeb3bb' diff --git a/.config/fish/config.fish b/.config/fish/config.fish index c727a72..3a4367f 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -3,32 +3,32 @@ # function set_envvars - # source bash profile - bash2env source "$HOME/.config/shell/profile" + # source bash profile + bash2env source "$HOME/.config/shell/profile" - # add user bin directory to path - if test -d "$HOME/.local/bin" - fish_add_path "$HOME/.local/bin" - end + # add user bin directory to path + if test -d "$HOME/.local/bin" + fish_add_path "$HOME/.local/bin" + end end function load_plugins - if not functions -q fisher - echo 'bootstrapping fisher' - curl -sL https://git.io/fisher | source && fisher update - end + if not functions -q fisher + echo 'bootstrapping fisher' + curl -sL https://git.io/fisher | source && fisher update + end - if command -q zoxide - zoxide init fish | source - end + if command -q zoxide + zoxide init fish | source + end - if command -q starship - starship init fish | source - end + if command -q starship + starship init fish | source + end end if status is-interactive - load_plugins + load_plugins else - set_envvars + set_envvars end diff --git a/.config/fish/functions/dotfiles.fish b/.config/fish/functions/dotfiles.fish index 8873743..e0857de 100644 --- a/.config/fish/functions/dotfiles.fish +++ b/.config/fish/functions/dotfiles.fish @@ -1,3 +1,3 @@ function dotfiles - git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME $argv + git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME $argv end diff --git a/.config/fish/functions/ls.fish b/.config/fish/functions/ls.fish index 988d2dc..d11bb64 100644 --- a/.config/fish/functions/ls.fish +++ b/.config/fish/functions/ls.fish @@ -1,3 +1,3 @@ function ls - exa --icons $argv + exa --icons $argv end diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf deleted file mode 100644 index de59c40..0000000 --- a/.config/kitty/kitty.conf +++ /dev/null @@ -1,15 +0,0 @@ -font_family FiraCode Nerd Font -bold_font auto -italic_font auto -bold_italic_font auto - -font_size 12.0 -font_features FiraCodeNerdFontCompleteM-Regular +zero +onum - -remember_window_size no -initial_window_width 900 -initial_window_height 550 - -linux_display_server x11 - -include nord.conf diff --git a/.config/kitty/nord.conf b/.config/kitty/nord.conf deleted file mode 100644 index 54f3a96..0000000 --- a/.config/kitty/nord.conf +++ /dev/null @@ -1,43 +0,0 @@ -# Nord Colorscheme for Kitty -# Based on: -# - https://gist.github.com/marcusramberg/64010234c95a93d953e8c79fdaf94192 -# - https://github.com/arcticicestudio/nord-hyper - -foreground #D8DEE9 -background #2E3440 -selection_foreground #000000 -selection_background #FFFACD -url_color #0087BD -cursor #81A1C1 - -# black -color0 #3B4252 -color8 #4C566A - -# red -color1 #BF616A -color9 #BF616A - -# green -color2 #A3BE8C -color10 #A3BE8C - -# yellow -color3 #EBCB8B -color11 #EBCB8B - -# blue -color4 #81A1C1 -color12 #81A1C1 - -# magenta -color5 #B48EAD -color13 #B48EAD - -# cyan -color6 #88C0D0 -color14 #8FBCBB - -# white -color7 #E5E9F0 -color15 #ECEFF4 diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index d8e409c..c7eb768 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -5,24 +5,23 @@ local cmd = vim.cmd local opt = vim.opt -vim.g.use_lsp_plugins = true +vim.g.use_lsp_plugins = false vim.g.use_mason = false require("getchoo.plugins") if vim.g.use_lsp_plugins then - require("getchoo.ftdetect") - require("getchoo.lsp") + require("getchoo.ftdetect") + require("getchoo.lsp") end -- text options opt.tabstop = 2 opt.shiftwidth = 2 -opt.expandtab = true +opt.expandtab = false opt.smartindent = true opt.wrap = false -- appearance opt.syntax = "on" cmd("filetype plugin indent on") -cmd("colorscheme nord") opt.termguicolors = true diff --git a/.config/nvim/lua/getchoo/.stylua.toml b/.config/nvim/lua/getchoo/.stylua.toml deleted file mode 100644 index 0435f67..0000000 --- a/.config/nvim/lua/getchoo/.stylua.toml +++ /dev/null @@ -1,2 +0,0 @@ -indent_type = "Spaces" -indent_width = 2 diff --git a/.config/nvim/lua/getchoo/config.lua b/.config/nvim/lua/getchoo/config.lua index 150ebcb..a67f734 100644 --- a/.config/nvim/lua/getchoo/config.lua +++ b/.config/nvim/lua/getchoo/config.lua @@ -5,18 +5,18 @@ local M = {} M.bufferline = { - animation = true, - auto_hide = true, - icons = true, - maximum_padding = 2, - semantic_letters = true, + animation = true, + auto_hide = true, + icons = true, + maximum_padding = 2, + semantic_letters = true, } M.lualine = { - options = { - theme = "nord", - }, - extensions = { "nvim-tree" }, + options = { + theme = "catppuccin", + }, + extensions = { "nvim-tree" }, } M.tree = {} diff --git a/.config/nvim/lua/getchoo/ftdetect.lua b/.config/nvim/lua/getchoo/ftdetect.lua index f5a15cb..5dd569d 100644 --- a/.config/nvim/lua/getchoo/ftdetect.lua +++ b/.config/nvim/lua/getchoo/ftdetect.lua @@ -1,10 +1,10 @@ -- load custom file types local filetypes = { - filename = { - PKGBUILD = "text", - [".makepkg.conf"] = "text", - }, + filename = { + PKGBUILD = "text", + [".makepkg.conf"] = "text", + }, } vim.filetype.add(filetypes) diff --git a/.config/nvim/lua/getchoo/keymap.lua b/.config/nvim/lua/getchoo/keymap.lua index b1b7a6a..9a4484c 100644 --- a/.config/nvim/lua/getchoo/keymap.lua +++ b/.config/nvim/lua/getchoo/keymap.lua @@ -4,24 +4,24 @@ local opts = { noremap = true, silent = true } local set = function(mode, key, cmd) - vim.keymap.set(mode, key, cmd, opts) + vim.keymap.set(mode, key, cmd, opts) end set("n", "<leader>t", function() - vim.cmd("NvimTreeToggle") + vim.cmd("NvimTreeToggle") end) for i = 1, 9 do - set("n", "<leader>" .. i, function() - local cmd = "BufferGoto " .. i - vim.cmd(cmd) - end) + set("n", "<leader>" .. i, function() + local cmd = "BufferGoto " .. i + vim.cmd(cmd) + end) end set("n", "<leader>p", function() - vim.cmd("BufferPick") + vim.cmd("BufferPick") end) set("n", "<leader>q", function() - vim.cmd("BufferClose") + vim.cmd("BufferClose") end) diff --git a/.config/nvim/lua/getchoo/lsp/config/cmp.lua b/.config/nvim/lua/getchoo/lsp/config/cmp.lua index 868b6f1..0f0f51f 100644 --- a/.config/nvim/lua/getchoo/lsp/config/cmp.lua +++ b/.config/nvim/lua/getchoo/lsp/config/cmp.lua @@ -5,63 +5,63 @@ local luasnip = require("luasnip") local M = {} local has_words_before = function() - local line, col = unpack(vim.api.nvim_win_get_cursor(0)) - return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil + local line, col = unpack(vim.api.nvim_win_get_cursor(0)) + return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil end local feedkey = function(key, mode) - vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(key, true, true, true), mode, true) + vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(key, true, true, true), mode, true) end M.config = { - snippet = { - expand = function(args) - vim.fn["vsnip#anonymous"](args.body) - luasnip.lsp_expand(args.body) - end, - }, - mapping = mapping.preset.insert({ - ["<Tab>"] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - elseif vim.fn["vsnip#available"](1) == 1 then - feedkey("<Plug>(vsnip-expand-or-jump)", "") - elseif has_words_before() then - cmp.complete() - else - fallback() - end - end, { "i", "s" }), - ["<S-Tab>"] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - elseif vim.fn["vsnip#available"](-1) == 1 then - feedkey("<Plug>(vsnip-jump-prev)", "") - else - fallback() - end - end, { "i", "s" }), - }), - sources = cmp.config.sources({ - { name = "nvim_lsp" }, - { name = "luasnip" }, - { name = "vsnip" }, - { name = "buffer" }, - { name = "path" }, - }), + snippet = { + expand = function(args) + vim.fn["vsnip#anonymous"](args.body) + luasnip.lsp_expand(args.body) + end, + }, + mapping = mapping.preset.insert({ + ["<Tab>"] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + elseif vim.fn["vsnip#available"](1) == 1 then + feedkey("<Plug>(vsnip-expand-or-jump)", "") + elseif has_words_before() then + cmp.complete() + else + fallback() + end + end, { "i", "s" }), + ["<S-Tab>"] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + elseif vim.fn["vsnip#available"](-1) == 1 then + feedkey("<Plug>(vsnip-jump-prev)", "") + else + fallback() + end + end, { "i", "s" }), + }), + sources = cmp.config.sources({ + { name = "nvim_lsp" }, + { name = "luasnip" }, + { name = "vsnip" }, + { name = "buffer" }, + { name = "path" }, + }), } -local capabilities = require("cmp_nvim_lsp").update_capabilities(vim.lsp.protocol.make_client_capabilities()) +local capabilities = require("cmp_nvim_lsp").default_capabilities() capabilities.textDocument.completion.completionItem.snippetSupport = true M.capabilities = capabilities M.on_attach = function(_, bufnr) - vim.api.nvim_buf_set_option(bufnr, "omnifunc", "v:lua.vim.lsp.omnifunc") + vim.api.nvim_buf_set_option(bufnr, "omnifunc", "v:lua.vim.lsp.omnifunc") end return M diff --git a/.config/nvim/lua/getchoo/lsp/config/init.lua b/.config/nvim/lua/getchoo/lsp/config/init.lua index be6c357..1c928d3 100644 --- a/.config/nvim/lua/getchoo/lsp/config/init.lua +++ b/.config/nvim/lua/getchoo/lsp/config/init.lua @@ -16,11 +16,11 @@ M.mason_lspconfig = mason.mason_lspconfig M.null_ls = null_ls.config M.treesitter = { - auto_install = true, - highlight = { - enable = true, - additional_vim_regex_highlighting = false, - }, + auto_install = true, + highlight = { + enable = true, + additional_vim_regex_highlighting = false, + }, } M.trouble = {} diff --git a/.config/nvim/lua/getchoo/lsp/config/lsp_config.lua b/.config/nvim/lua/getchoo/lsp/config/lsp_config.lua index 6b13d19..4df3fe0 100644 --- a/.config/nvim/lua/getchoo/lsp/config/lsp_config.lua +++ b/.config/nvim/lua/getchoo/lsp/config/lsp_config.lua @@ -4,35 +4,35 @@ local sources = require("getchoo.lsp.config.sources") local M = {} local on_attach = function(client, bufnr) - cmp.on_attach(client, bufnr) + cmp.on_attach(client, bufnr) end local all_config = { - capabilities = cmp.capabilities, - on_attach = on_attach, + capabilities = cmp.capabilities, + on_attach = on_attach, } local servers = {} for _, server in ipairs(sources.lsp_servers) do - servers[server] = all_config + servers[server] = all_config end servers["sumneko_lua"] = { - capabilities = cmp.capabilities, - on_attach = on_attach, - settings = { - Lua = { - runtime = { - version = "LuaJIT", - }, - diagnostics = { - globals = { "vim" }, - }, - workspace = { - library = vim.api.nvim_get_runtime_file("", true), - }, - }, - }, + capabilities = cmp.capabilities, + on_attach = on_attach, + settings = { + Lua = { + runtime = { + version = "LuaJIT", + }, + diagnostics = { + globals = { "vim" }, + }, + workspace = { + library = vim.api.nvim_get_runtime_file("", true), + }, + }, + }, } M.servers = servers diff --git a/.config/nvim/lua/getchoo/lsp/config/mason.lua b/.config/nvim/lua/getchoo/lsp/config/mason.lua index 7201814..6814697 100644 --- a/.config/nvim/lua/getchoo/lsp/config/mason.lua +++ b/.config/nvim/lua/getchoo/lsp/config/mason.lua @@ -4,11 +4,11 @@ local sources = require("getchoo.lsp.config.sources") local M = {} M.mason_tool_installer = { - ensure_installed = sources.mason, + ensure_installed = sources.mason, } M.mason_lspconfig = { - automatic_installation = true, + automatic_installation = true, } return M diff --git a/.config/nvim/lua/getchoo/lsp/config/null_ls.lua b/.config/nvim/lua/getchoo/lsp/config/null_ls.lua index 5fded8d..42cd30e 100644 --- a/.config/nvim/lua/getchoo/lsp/config/null_ls.lua +++ b/.config/nvim/lua/getchoo/lsp/config/null_ls.lua @@ -16,23 +16,23 @@ end local augroup = vim.api.nvim_create_augroup("LspFormatting", {}) local formatting_on_attach = function(client, bufnr) - if client.supports_method("textDocument/formatting") then - vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr }) - vim.api.nvim_create_autocmd("BufWritePre", { - group = augroup, - buffer = bufnr, - callback = function() - -- local params = require("vim.lsp.util").make_formatting_params({}) - -- client.request("textDocument/formatting", params, nil, bufnr) - lsp_formatting(bufnr) -- neovim >= 8 - end, - }) - end + if client.supports_method("textDocument/formatting") then + vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr }) + vim.api.nvim_create_autocmd("BufWritePre", { + group = augroup, + buffer = bufnr, + callback = function() + -- local params = require("vim.lsp.util").make_formatting_params({}) + -- client.request("textDocument/formatting", params, nil, bufnr) + lsp_formatting(bufnr) -- neovim >= 8 + end, + }) + end end M.config = { - on_attach = formatting_on_attach, - sources = sources.null_ls, + on_attach = formatting_on_attach, + sources = sources.null_ls, } return M diff --git a/.config/nvim/lua/getchoo/lsp/config/sources.lua b/.config/nvim/lua/getchoo/lsp/config/sources.lua index 7281508..1898870 100644 --- a/.config/nvim/lua/getchoo/lsp/config/sources.lua +++ b/.config/nvim/lua/getchoo/lsp/config/sources.lua @@ -3,25 +3,25 @@ local diagnostics = null_ls.builtins.diagnostics local formatting = null_ls.builtins.formatting local M = { - lsp_servers = { "rust_analyzer", "pyright", "bashls" }, - null_ls = { - diagnostics.alex, - diagnostics.codespell, - diagnostics.flake8, - formatting.black, - formatting.codespell, - formatting.prettier, - formatting.rustfmt, - formatting.stylua, - }, - mason = { - "alex", - "black", - "codespell", - "flake8", - "prettier", - "stylua", - }, + lsp_servers = { "rust_analyzer", "pyright", "bashls" }, + null_ls = { + diagnostics.alex, + diagnostics.codespell, + diagnostics.flake8, + formatting.black, + formatting.codespell, + formatting.prettier, + formatting.rustfmt, + formatting.stylua, + }, + mason = { + "alex", + "black", + "codespell", + "flake8", + "prettier", + "stylua", + }, } return M diff --git a/.config/nvim/lua/getchoo/lsp/keymap.lua b/.config/nvim/lua/getchoo/lsp/keymap.lua index 0a93db8..9f34ffa 100644 --- a/.config/nvim/lua/getchoo/lsp/keymap.lua +++ b/.config/nvim/lua/getchoo/lsp/keymap.lua @@ -4,7 +4,7 @@ local opts = { noremap = true, silent = true } local set = function(mode, key, cmd) - vim.keymap.set(mode, key, cmd, opts) + vim.keymap.set(mode, key, cmd, opts) end set("n", "<space>e", vim.diagnostic.open_float) @@ -13,9 +13,9 @@ set("n", "]d", vim.diagnostic.goto_next) set("n", "<space>q", vim.diagnostic.setloclist) set("n", "<space>f", function() - vim.cmd("Telescope") + vim.cmd("Telescope") end) set("n", "<space>t", function() - vim.cmd("TroubleToggle") + vim.cmd("TroubleToggle") end) diff --git a/.config/nvim/lua/getchoo/lsp/server.lua b/.config/nvim/lua/getchoo/lsp/server.lua index c4ff20b..325e1c7 100644 --- a/.config/nvim/lua/getchoo/lsp/server.lua +++ b/.config/nvim/lua/getchoo/lsp/server.lua @@ -8,15 +8,15 @@ local null_ls = require("null-ls") local config = require("getchoo.lsp.config") if vim.g.use_mason then - require("mason").setup() - require("mason-lspconfig").setup(config.mason_lspconfig) - require("mason-tool-installer").setup(config.mason_tool_installer) - vim.opt.runtimepath:append("~/.local/share/nvim/mason/bin/") + require("mason").setup() + require("mason-lspconfig").setup(config.mason_lspconfig) + require("mason-tool-installer").setup(config.mason_tool_installer) + vim.opt.runtimepath:append("~/.local/share/nvim/mason/bin/") end null_ls.setup(config.null_ls) cmp.setup(config.cmp) for server, settings in pairs(config.lsp_servers) do - lspconfig[server].setup(settings) + lspconfig[server].setup(settings) end diff --git a/.config/nvim/lua/getchoo/plugins.lua b/.config/nvim/lua/getchoo/plugins.lua index fbf42a9..900e1c7 100644 --- a/.config/nvim/lua/getchoo/plugins.lua +++ b/.config/nvim/lua/getchoo/plugins.lua @@ -8,91 +8,107 @@ local cmd = vim.cmd local packer_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim" if fn.empty(fn.glob(packer_path)) > 0 then - Packer_bootstrap = fn.system({ - "git", - "clone", - "--depth", - "1", - "https://github.com/wbthomason/packer.nvim", - packer_path, - }) - cmd("packadd packer.nvim") + Packer_bootstrap = fn.system({ + "git", + "clone", + "--depth", + "1", + "https://github.com/wbthomason/packer.nvim", + packer_path, + }) + cmd("packadd packer.nvim") end require("packer").startup(function(use) - use("wbthomason/packer.nvim") - - -- comsetic plugins - use({ "nvim-lualine/lualine.nvim", requires = { "kyazdani42/nvim-web-devicons" } }) - - use("shaunsingh/nord.nvim") - - use({ "rose-pine/neovim", as = "rose-pine" }) - - -- general use plugins - use({ - "romgrk/barbar.nvim", - requires = { "kyazdani42/nvim-web-devicons" }, - }) - - use("ggandor/lightspeed.nvim") - use("kyazdani42/nvim-tree.lua") - - -- lsp plugins - if vim.g.use_lsp_plugins then - use("neovim/nvim-lspconfig") - - use({ - "jose-elias-alvarez/null-ls.nvim", - requires = { "nvim-lua/plenary.nvim" }, - }) - - if vim.g.use_mason then - use("williamboman/mason.nvim") - use("williamboman/mason-lspconfig") - use("whoissethdaniel/mason-tool-installer.nvim") - end - - use({ - "nvim-treesitter/nvim-treesitter", - run = function() - require("nvim-treesitter.install").update({ with_sync = true }) - end, - }) - - use("hrsh7th/nvim-cmp") - use("hrsh7th/cmp-nvim-lsp") - use("hrsh7th/cmp-buffer") - use("hrsh7th/cmp-path") - use("hrsh7th/cmp-vsnip") - use("hrsh7th/vim-vsnip") - use("L3MON4D3/LuaSnip") - use("saadparwaiz1/cmp_luasnip") - - use({ - "folke/trouble.nvim", - requires = { "kyazdani42/nvim-web-devicons" }, - }) - use({ - "nvim-telescope/telescope.nvim", - requires = { "nvim-lua/plenary.nvim" }, - }) - - use("lewis6991/gitsigns.nvim") - use("editorconfig/editorconfig-vim") - end - - if Packer_bootstrap then - require("packer").sync() - end + use("wbthomason/packer.nvim") + + -- comsetic plugins + use({ "nvim-lualine/lualine.nvim", requires = { "kyazdani42/nvim-web-devicons" } }) + + use({ + "catppuccin/nvim", + as = "catppuccin", + config = function() + require("catppuccin").setup({ + flavour = "frappe", -- mocha, macchiato, frappe, latte + integrations = { + barbar = true, + gitsigns = true, + lightspeed = true, + mason = true, + cmp = true, + nvimtree = true, + treesitter_context = true, + treesitter = true, + telescope = true, + lsp_trouble = true, + }, + }) + vim.api.nvim_command("colorscheme catppuccin") + end, + }) + + ---- use("shaunsingh/nord.nvim") + ---- use({ "rose-pine/neovim", as = "rose-pine" }) + + -- general use plugins + use({ + "romgrk/barbar.nvim", + requires = { "kyazdani42/nvim-web-devicons" }, + }) + + use("ggandor/lightspeed.nvim") + use("kyazdani42/nvim-tree.lua") + + -- lsp plugins + if vim.g.use_lsp_plugins then + use("neovim/nvim-lspconfig") + + use({ + "jose-elias-alvarez/null-ls.nvim", + requires = { "nvim-lua/plenary.nvim" }, + }) + + if vim.g.use_mason then + use("williamboman/mason.nvim") + use("williamboman/mason-lspconfig") + use("whoissethdaniel/mason-tool-installer.nvim") + end + + use({ + "nvim-treesitter/nvim-treesitter", + run = function() + require("nvim-treesitter.install").update({ with_sync = true }) + end, + }) + + use("hrsh7th/nvim-cmp") + use("hrsh7th/cmp-nvim-lsp") + use("hrsh7th/cmp-buffer") + use("hrsh7th/cmp-path") + use("hrsh7th/cmp-vsnip") + use("hrsh7th/vim-vsnip") + use("L3MON4D3/LuaSnip") + use("saadparwaiz1/cmp_luasnip") + + use({ + "folke/trouble.nvim", + requires = { "kyazdani42/nvim-web-devicons" }, + }) + use({ + "nvim-telescope/telescope.nvim", + requires = { "nvim-lua/plenary.nvim" }, + }) + + use("lewis6991/gitsigns.nvim") + use("editorconfig/editorconfig-vim") + end + + if Packer_bootstrap then + require("packer").sync() + end end) --- setup nord colorscheme -vim.g.nord_borders = true -vim.g.nord_disable_background = true -vim.g.nord_italic = false -require("nord").set() - local config = require("getchoo.config") require("bufferline").setup(config.bufferline) require("lualine").setup(config.lualine) diff --git a/.config/shell/aliases b/.config/shell/aliases index 3bca572..75ec0f7 100644 --- a/.config/shell/aliases +++ b/.config/shell/aliases @@ -1,2 +1,3 @@ alias ls='exa --icons' +alias diff='diff --color=auto' alias dotfiles='git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME' diff --git a/.config/shell/dir_colors b/.config/shell/dir_colors deleted file mode 100644 index 658e5b7..0000000 --- a/.config/shell/dir_colors +++ /dev/null @@ -1,256 +0,0 @@ -# Copyright (C) 2017-present Arctic Ice Studio <[email protected]> -# Copyright (C) 2017-present Sven Greb <[email protected]> - -# Project: Nord dircolors -# Version: 0.2.0 -# Repository: https://github.com/arcticicestudio/nord-dircolors -# License: MIT - -COLOR tty - -TERM alacritty -TERM alacritty-direct -TERM ansi -TERM *color* -TERM con[0-9]*x[0-9]* -TERM cons25 -TERM console -TERM cygwin -TERM dtterm -TERM dvtm -TERM dvtm-256color -TERM Eterm -TERM eterm-color -TERM fbterm -TERM gnome -TERM gnome-256color -TERM hurd -TERM jfbterm -TERM konsole -TERM konsole-256color -TERM kterm -TERM linux -TERM linux-c -TERM mlterm -TERM putty -TERM putty-256color -TERM rxvt* -TERM rxvt-unicode -TERM rxvt-256color -TERM rxvt-unicode256 -TERM screen* -TERM screen-256color -TERM st -TERM st-256color -TERM terminator -TERM tmux* -TERM tmux-256color -TERM vt100 -TERM xterm* -TERM xterm-color -TERM xterm-88color -TERM xterm-256color -TERM xterm-kitty - -#+-----------------+ -#+ Global Defaults + -#+-----------------+ -NORMAL 00 -RESET 0 - -FILE 00 -DIR 01;34 -LINK 36 -MULTIHARDLINK 04;36 - -FIFO 04;01;36 -SOCK 04;33 -DOOR 04;01;36 -BLK 01;33 -CHR 33 - -ORPHAN 31 -MISSING 01;37;41 - -EXEC 01;36 - -SETUID 01;04;37 -SETGID 01;04;37 -CAPABILITY 01;37 - -STICKY_OTHER_WRITABLE 01;37;44 -OTHER_WRITABLE 01;04;34 -STICKY 04;37;44 - -#+-------------------+ -#+ Extension Pattern + -#+-------------------+ -#+--- Archives ---+ -.7z 01;32 -.ace 01;32 -.alz 01;32 -.arc 01;32 -.arj 01;32 -.bz 01;32 -.bz2 01;32 -.cab 01;32 -.cpio 01;32 -.deb 01;32 -.dz 01;32 -.ear 01;32 -.gz 01;32 -.jar 01;32 -.lha 01;32 -.lrz 01;32 -.lz 01;32 -.lz4 01;32 -.lzh 01;32 -.lzma 01;32 -.lzo 01;32 -.rar 01;32 -.rpm 01;32 -.rz 01;32 -.sar 01;32 -.t7z 01;32 -.tar 01;32 -.taz 01;32 -.tbz 01;32 -.tbz2 01;32 -.tgz 01;32 -.tlz 01;32 -.txz 01;32 -.tz 01;32 -.tzo 01;32 -.tzst 01;32 -.war 01;32 -.xz 01;32 -.z 01;32 -.Z 01;32 -.zip 01;32 -.zoo 01;32 -.zst 01;32 - -#+--- Audio ---+ -.aac 32 -.au 32 -.flac 32 -.m4a 32 -.mid 32 -.midi 32 -.mka 32 -.mp3 32 -.mpa 32 -.mpeg 32 -.mpg 32 -.ogg 32 -.opus 32 -.ra 32 -.wav 32 - -#+--- Customs ---+ -.3des 01;35 -.aes 01;35 -.gpg 01;35 -.pgp 01;35 - -#+--- Documents ---+ -.doc 32 -.docx 32 -.dot 32 -.odg 32 -.odp 32 -.ods 32 -.odt 32 -.otg 32 -.otp 32 -.ots 32 -.ott 32 -.pdf 32 -.ppt 32 -.pptx 32 -.xls 32 -.xlsx 32 - -#+--- Executables ---+ -.app 01;36 -.bat 01;36 -.btm 01;36 -.cmd 01;36 -.com 01;36 -.exe 01;36 -.reg 01;36 - -#+--- Ignores ---+ -*~ 02;37 -.bak 02;37 -.BAK 02;37 -.log 02;37 -.log 02;37 -.old 02;37 -.OLD 02;37 -.orig 02;37 -.ORIG 02;37 -.swo 02;37 -.swp 02;37 - -#+--- Images ---+ -.bmp 32 -.cgm 32 -.dl 32 -.dvi 32 -.emf 32 -.eps 32 -.gif 32 -.jpeg 32 -.jpg 32 -.JPG 32 -.mng 32 -.pbm 32 -.pcx 32 -.pgm 32 -.png 32 -.PNG 32 -.ppm 32 -.pps 32 -.ppsx 32 -.ps 32 -.svg 32 -.svgz 32 -.tga 32 -.tif 32 -.tiff 32 -.xbm 32 -.xcf 32 -.xpm 32 -.xwd 32 -.xwd 32 -.yuv 32 - -#+--- Video ---+ -.anx 32 -.asf 32 -.avi 32 -.axv 32 -.flc 32 -.fli 32 -.flv 32 -.gl 32 -.m2v 32 -.m4v 32 -.mkv 32 -.mov 32 -.MOV 32 -.mp4 32 -.mpeg 32 -.mpg 32 -.nuv 32 -.ogm 32 -.ogv 32 -.ogx 32 -.qt 32 -.rm 32 -.rmvb 32 -.swf 32 -.vob 32 -.webm 32 -.wmv 32 diff --git a/.config/shell/profile b/.config/shell/profile index 53c7fd8..33b7b5f 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -17,7 +17,3 @@ export RUSTUP_HOME="${XDG_DATA_HOME}/rustup" export LESSHISTFILE="${XDG_STATE_HOME}/less/history" export NPM_CONFIG_USERCONFIG="${XDG_CONFIG_HOME}/npm/npmrc" export VIMINIT='let $MYVIMRC = !has("nvim") ? "$XDG_CONFIG_HOME/vim/vimrc" : "$XDG_CONFIG_HOME/nvim/init.lua" | so $MYVIMRC' - -dir_colors="${XDG_CONFIG_HOME}/shell/dir_colors" -[[ -f "$dir_colors" ]] && eval $(dircolors "$dir_colors") -unset dir_colors diff --git a/.config/starship.toml b/.config/starship.toml index 7fbdec7..a0c8235 100644 --- a/.config/starship.toml +++ b/.config/starship.toml @@ -1,100 +1,21 @@ -add_newline = false - -[buf] -format = "via [$symbol]($style)" - -[cmake] -format = "via [$symbol]($style)" - -[cobol] -format = "via [$symbol]($style)" - -[crystal] -format = "via [$symbol]($style)" - -[daml] -format = "via [$symbol]($style)" - -[dart] -format = "via [$symbol]($style)" - -[deno] -format = "via [$symbol]($style)" - -[dotnet] -format = "[$symbol(🎯 $tfm )]($style)" - -[elixir] -format = 'via [$symbol]($style)' - -[elm] -format = 'via [$symbol]($style)' - -[erlang] -format = 'via [$symbol]($style)' - -[golang] -format = 'via [$symbol]($style)' - -[helm] -format = 'via [$symbol]($style)' - -[julia] -format = 'via [$symbol]($style)' - -[kotlin] -format = 'via [$symbol]($style)' - -[lua] -format = 'via [$symbol]($style)' - -[nim] -format = 'via [$symbol]($style)' - -[nodejs] -format = 'via [$symbol]($style)' - -[ocaml] -format = 'via [$symbol(\($switch_indicator$switch_name\) )]($style)' - -[perl] -format = 'via [$symbol]($style)' - -[php] -format = 'via [$symbol]($style)' - -[pulumi] -format = 'via [$symbol$stack]($style)' - -[purescript] -format = 'via [$symbol]($style)' - -[python] -format = 'via [$symbol]($style)' - -[raku] -format = 'via [$symbol]($style)' - -[red] -format = 'via [$symbol]($style)' - -[rlang] -format = 'via [$symbol]($style)' - -[ruby] -format = 'via [$symbol]($style)' - -[rust] -format = 'via [$symbol]($style)' - -[swift] -format = 'via [$symbol]($style)' - -[vagrant] -format = 'via [$symbol]($style)' - -[vlang] -format = 'via [$symbol]($style)' - -[zig] -format = 'via [$symbol]($style)' +format = "" +$username\ +$hostname\ +$directory\ +$vcsh\ +$git_branch\ +$git_commit\ +$git_state\ +$git_metrics\ +$git_status\ +$docker_context\ +$nix_shell\ +$env_var\ +$sudo\ +$cmd_duration\ +$line_break\ +$jobs\ +$status\ +$container\ +$shell\ +$character""" diff --git a/.config/vim/vimrc b/.config/vim/vimrc index 47532d7..79856d1 100644 --- a/.config/vim/vimrc +++ b/.config/vim/vimrc @@ -17,4 +17,4 @@ set viminfofile=$XDG_STATE_HOME/vim/viminfo set tabstop=2 set shiftwidth=2 -set expandtab +set noexpandtab diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv index f547136..e63874b 100644 --- a/.config/zsh/.zshenv +++ b/.config/zsh/.zshenv @@ -8,8 +8,8 @@ source "${HOME}/.config/shell/profile" typeset -U path PATH if [[ -d "${HOME}/.local/bin" ]]; then - path=("${HOME}/.local/bin" "$path[@]") - export PATH + path=("${HOME}/.local/bin" "$path[@]") + export PATH fi zstyle ':antidote:bundle' use-friendly-names 'yes' # don't use ugly dirs diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 8f76874..fc8233d 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -3,16 +3,16 @@ # if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then - source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" + source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" fi -local zdump="${XDG_CACHE_HOME}/zsh/zcompdump" +local zdump="${XDG_CACHE_HOME}/zsh/zdump" local antidote_dir="${ZDOTDIR}/.antidote" # bootstrap antidote if [[ ! -e "$antidote_dir/antidote.zsh" ]] then - git clone --depth=1 https://github.com/mattmc3/antidote.git "$antidote_dir" + git clone --depth=1 https://github.com/mattmc3/antidote.git "$antidote_dir" fi source "${antidote_dir}/antidote.zsh" @@ -40,7 +40,7 @@ bashcompinit compinit -d "$zdump" if [[ ! "${zdump}.zwc" -nt "$zdump" ]] then - zcompile "$zdump" + zcompile "$zdump" fi unset zdump @@ -62,12 +62,12 @@ setopt share_history # clear backbuffer with ctrl-l function clear-screen-and-scrollback() { - echoti civis >"$TTY" - printf '%b' '\e[H\e[2J' >"$TTY" - zle .reset-prompt - zle -R - printf '%b' '\e[3J' >"$TTY" - echoti cnorm >"$TTY" + echoti civis >"$TTY" + printf '%b' '\e[H\e[2J' >"$TTY" + zle .reset-prompt + zle -R + printf '%b' '\e[3J' >"$TTY" + echoti cnorm >"$TTY" } zle -N clear-screen-and-scrollback |