From f7ff7efe7c21e5510e599fe6c656be016a3c6dc1 Mon Sep 17 00:00:00 2001 From: Julia Lange Date: Thu, 9 Jan 2025 10:04:32 -0800 Subject: [PATCH] Neovim, add catppuccin theme --- hmModules/apps/neovim/app.nix | 34 +++++++++++++++++++++++++++++---- hosts/jibril/users/pan/user.nix | 1 + 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/hmModules/apps/neovim/app.nix b/hmModules/apps/neovim/app.nix index e4ef676..4a1ddfd 100644 --- a/hmModules/apps/neovim/app.nix +++ b/hmModules/apps/neovim/app.nix @@ -9,6 +9,9 @@ nix.enable = lib.mkEnableOption "Enables nix support"; rust.enable = lib.mkEnableOption "Enables rust support"; }; + themes = { + catppuccin.enable = lib.mkEnableOption "Enables catppuccin theme"; + }; plugins = { comments.enable = lib.mkEnableOption "Enables nvim-comment"; fugitive.enable = lib.mkEnableOption "Enables git-fugitive"; @@ -59,6 +62,7 @@ lopts = lib.lists.optionals; cfgp = config.neovim.plugins; cfgl = config.neovim.languages; + cfgt = config.neovim.themes; comments = lopts cfgp.comments.enable (with pkgs.vimPlugins; [ { @@ -83,9 +87,14 @@ plugin = lualine-nvim; type = "lua"; config = '' - require("lualine").setup({ - icons_enabled = true, - }) + require("lualine").setup { + options = { + icons_enabled = true, + '' + lib.strings.optionalString cfgt.catppuccin.enable '' + theme = "catppuccin" + '' + '' + } + } ''; } nvim-web-devicons @@ -103,6 +112,23 @@ go-nvim ]); + catppuccin-pkg = lopts cfgt.catppuccin.enable (with pkgs.vimPlugins; [ + { + plugin = catppuccin-nvim; + type = "lua"; + config = '' + vim.cmd.colorscheme "catppuccin-mocha" + require('catppuccin').setup({ + integrations = { + '' + lib.strings.optionalString cfgp.wiki.enable '' + vimwiki = true + '' + '' + } + }) + ''; + } + ]); + wiki = lopts cfgp.wiki.enable (with pkgs.vimPlugins; [ { plugin = vimwiki; @@ -120,7 +146,7 @@ } ]); in comments ++ fugitive ++ luasnip-pkg ++ lualine ++ - nix-pkg ++ rust-pkg ++ go-pkg ++ wiki; + nix-pkg ++ rust-pkg ++ go-pkg ++ wiki ++ catppuccin-pkg; }; }; } diff --git a/hosts/jibril/users/pan/user.nix b/hosts/jibril/users/pan/user.nix index c534af4..02195dd 100644 --- a/hosts/jibril/users/pan/user.nix +++ b/hosts/jibril/users/pan/user.nix @@ -89,6 +89,7 @@ treesitter.enable = true; wiki.enable = true; }; + neovim.themes.catppuccin.enable = true; lf.enable = true; lf.hiddenfiles = [