diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 354eabd..688c4c0 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -1,6 +1,5 @@ eval (/opt/homebrew/bin/brew shellenv) -source /opt/homebrew/opt/asdf/libexec/asdf.fish -direnv hook fish | source +source ~/.asdf/asdf.fish if status is-interactive fish_vi_key_bindings @@ -31,3 +30,5 @@ abbr -a gst git status abbr -a gca git commit -a abbr -a fug nvim +Git +only + +abbr -a nr npm run diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index 273cf94..bfde4ad 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -8,4 +8,4 @@ disable_ligatures always confirm_os_window_close 0 -include dracula.conf +include frappe.conf diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 901f491..22bd5d7 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -11,9 +11,6 @@ set expandtab set mouse=a -colorscheme dracula - - au BufRead,BufNewFile *.ex,*.exs set filetype=elixir au BufRead,BufNewFile *.eex,*.heex,*.leex,*.sface,*.lexs set filetype=eelixir au BufRead,BufNewFile mix.lock set filetype=elixir diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua index 4cfab50..20111fa 100644 --- a/.config/nvim/lua/plugins.lua +++ b/.config/nvim/lua/plugins.lua @@ -75,14 +75,22 @@ return require('packer').startup(function(use) 'hrsh7th/cmp-buffer', 'hrsh7th/cmp-path', 'hrsh7th/cmp-cmdline', + 'hrsh7th/cmp-vsnip', + 'hrsh7th/vim-vsnip', }, config = function() local cmp = require('cmp') cmp.setup({ + snippet = { + expand = function(args) + vim.fn['vsnip#anonymous'](args.body) + end, + }, mapping = cmp.mapping.preset.insert({}), sources = cmp.config.sources({ { name = 'nvim_lsp' }, + { name = 'vsnip' }, }, { { name = 'buffer' }, }) @@ -151,7 +159,13 @@ return require('packer').startup(function(use) end } - use { 'dracula/vim', as = 'dracula' } + use { + 'catppuccin/nvim', + as = 'catppuccin', + config = function() + vim.cmd.colorscheme 'catppuccin-frappe' + end + } -- Automatically set up your configuration after cloning packer.nvim -- Put this at the end after all plugins diff --git a/.tmux.conf b/.tmux.conf index 22984a3..5971d40 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -1,18 +1,9 @@ set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'tmux-plugins/tmux-sensible' set -g @plugin 'tmux-plugins/tmux-prefix-highlight' -set -g @plugin 'dracula/tmux' - -set -g @dracula-plugins "git cpu-usage ram-usage weather" -set -g @dracula-show-powerline true - -# available colors: white, gray, dark_gray, light_purple, dark_purple, cyan, green, orange, red, pink, yellow -# set -g @dracula-[plugin-name]-colors "[background] [foreground]" -set -g @dracula-weather-colors "cyan dark_gray" -set -g @dracula-ram-usage-colors "dark_purple white" -set -g @dracula-cpu-usage-colors "pink dark_gray" -set -g @dracula-git-colors "green dark_gray" +set -g @plugin 'catppuccin/tmux' +set -g @catppuccin_flavour 'frappe' unbind C-b set-option -g prefix C-a