diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 87b0fac..c29d0e5 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -57,20 +57,6 @@ 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 in the docs - } - end - } - -- Add custom plugins to packer from ~/.config/nvim/lua/custom/plugins.lua local has_plugins, plugins = pcall(require, 'custom.plugins') if has_plugins then @@ -109,8 +95,9 @@ vim.api.nvim_create_autocmd('BufWritePost', { -- Set highlight on search vim.o.hlsearch = false --- Make line numbers default +-- Make line numbers default, enabled relative linenumbers vim.wo.number = true +vim.opt.relativenumber = true -- Enable mouse mode vim.o.mouse = 'a' @@ -131,8 +118,7 @@ vim.wo.signcolumn = 'yes' -- Set colorscheme vim.o.termguicolors = true ---vim.cmd.colorscheme('palenight') -vim.cmd.colorscheme('catppuccin-macchiato') +-- vim.cmd.colorscheme('palenight') -- Set completeopt to have a better completion experience vim.o.completeopt = 'menuone,noselect' @@ -165,10 +151,10 @@ vim.api.nvim_create_autocmd('TextYankPost', { -- See `:help lualine.txt` require('lualine').setup { options = { - icons_enabled = false, - theme = 'catppuccin-macchiato', - component_separators = '|', - section_separators = '', + icons_enabled = true, + theme = 'auto', + component_separators = '|', + section_separators = '', }, } diff --git a/config/nvim/lua/custom/plugins.lua b/config/nvim/lua/custom/plugins.lua new file mode 100644 index 0000000..a2b330c --- /dev/null +++ b/config/nvim/lua/custom/plugins.lua @@ -0,0 +1,13 @@ +return function(use) + use({ + "folke/which-key.nvim", + config = function() + require("which-key").setup({}) + end + }) + + -- catppuccin theme + use { "catppuccin/nvim", as = "catppuccin" } + vim.cmd.colorscheme('catppuccin-latte') +end + diff --git a/config/nvim/plugin/packer_compiled.lua b/config/nvim/plugin/packer_compiled.lua index 38cc23b..4f6ab49 100644 --- a/config/nvim/plugin/packer_compiled.lua +++ b/config/nvim/plugin/packer_compiled.lua @@ -84,6 +84,11 @@ _G.packer_plugins = { path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/LuaSnip", url = "https://github.com/L3MON4D3/LuaSnip" }, + catppuccin = { + loaded = true, + path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/catppuccin", + url = "https://github.com/catppuccin/nvim" + }, ["cmp-nvim-lsp"] = { loaded = true, path = "/Users/ivuorinen/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", diff --git a/scripts/install-dotfiles.sh b/scripts/install-dotfiles.sh index e5bed2a..1ac0662 100644 --- a/scripts/install-dotfiles.sh +++ b/scripts/install-dotfiles.sh @@ -75,7 +75,9 @@ handle_file_ln "$HOME/.dotfiles/config/functions" "$HOME/.config/functions" handle_file_ln "$HOME/.dotfiles/config/gh/config.yml" "$HOME/.config/gh/config.yml" handle_file_ln "$HOME/.dotfiles/config/git/config" "$HOME/.config/git/config" handle_file_ln "$HOME/.dotfiles/config/git/gitignore" "$HOME/.config/git/gitignore" +handle_file_ln "$HOME/.dotfiles/config/nvim/after/plugin/defaults.lua" "$HOME/.config/nvim/after/plugin/defaults.lua" handle_file_ln "$HOME/.dotfiles/config/nvim/init.lua" "$HOME/.config/nvim/init.lua" +handle_file_ln "$HOME/.dotfiles/config/nvim/lua/custom/plugins.lua" "$HOME/.config/nvim/lua/custom/plugins.lua" handle_file_ln "$HOME/.dotfiles/config/nvim/plugin/packer_compiled.lua" "$HOME/.config/nvim/plugin/packer_compiled.lua" handle_file_ln "$HOME/.dotfiles/config/tmux/tmux.conf" "$HOME/.config/tmux/tmux.conf" handle_file_ln "$HOME/.dotfiles/config/wtf/config.yml" "$HOME/.config/wtf/config.yml"