From 80b2e542bf13c5348ee5573cd68da325c7809e54 Mon Sep 17 00:00:00 2001 From: Ismo Vuorinen Date: Sun, 25 Dec 2022 01:44:53 +0200 Subject: [PATCH] Changed theme --- config/nvim/init.lua | 19 +++++++++++++++---- zshrc | 3 ++- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index d52e9a4..87b0fac 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -57,13 +57,16 @@ require('packer').startup(function(use) -- Fuzzy Finder Algorithm which requires local dependencies to be built. Only load if `make` is available use { 'nvim-telescope/telescope-fzf-native.nvim', run = 'make', cond = vim.fn.executable 'make' == 1 } + -- catppuccin theme + use { "catppuccin/nvim", as = "catppuccin" } + use { "folke/which-key.nvim", config = function() require("which-key").setup { -- your configuration comes here -- or leave it empty to use the default settings - -- refer to the configuration section below + -- refer to the configuration section in the docs } end } @@ -128,7 +131,8 @@ vim.wo.signcolumn = 'yes' -- Set colorscheme vim.o.termguicolors = true -vim.cmd.colorscheme('palenight') +--vim.cmd.colorscheme('palenight') +vim.cmd.colorscheme('catppuccin-macchiato') -- Set completeopt to have a better completion experience vim.o.completeopt = 'menuone,noselect' @@ -162,7 +166,7 @@ vim.api.nvim_create_autocmd('TextYankPost', { require('lualine').setup { options = { icons_enabled = false, - theme = 'onedark', + theme = 'catppuccin-macchiato', component_separators = '|', section_separators = '', }, @@ -350,7 +354,14 @@ require('mason').setup() -- Enable the following language servers -- Feel free to add/remove any LSPs that you want here. They will automatically be installed -local servers = { 'clangd', 'rust_analyzer', 'pyright', 'tsserver', 'sumneko_lua', 'gopls' } +local servers = { + 'clangd', + 'rust_analyzer', + 'pyright', + 'tsserver', + 'sumneko_lua', + 'gopls' +} -- Ensure the servers above are installed require('mason-lspconfig').setup { diff --git a/zshrc b/zshrc index d72257b..4b82084 100644 --- a/zshrc +++ b/zshrc @@ -5,7 +5,7 @@ autoload -U colors zsh/terminfo colors -export PATH="/opt/homebrew/bin:/usr/local/sbin:$PATH" +export PATH="/opt/homebrew/opt/ruby/bin:/opt/homebrew/bin:/usr/local/sbin:$PATH" if [ command -v brew &> /dev/null ]; then BREW_BIN=$(brew --prefix)/bin @@ -77,6 +77,7 @@ if command -v antigen &> /dev/null; then hash php 2>/dev/null && antigen bundle php hash nvm 2>/dev/null && antigen bundle nvm hash docker 2>/dev/null && antigen bundle docker + hash ruby 2>/dev/null && antigen bundle ruby hash nvm 2>/dev/null && antigen bundle Sparragus/zsh-auto-nvm-use hash python 2>/dev/null && antigen bundle MichaelAquilina/zsh-autoswitch-virtualenv