use base16 in neovim and starship

5 files changed, 34 insertions, 36 deletions

diff --git a/files/config/nvim/init.lua b/files/config/nvim/init.lua
index 1fd0926..50d50c8 100644
--- a/files/config/nvim/init.lua
+++ b/files/config/nvim/init.lua
@@ -3,7 +3,6 @@
 -- global config for iris configuration
 config = {
 	-- colorscheme for nvim
-	colorscheme = "catppuccin",
 	flavour = "mocha",
 	-- indentation
 	tab_width = 4,
@@ -61,10 +60,6 @@ config = {
 	},
 };
 
---[[ IMPORTS ]]--
-
-local catppuccin = require('catppuccin')
-
 --[[ VIM ]]--
 
 vim.opt.tabstop = config.tab_width
@@ -90,30 +85,11 @@ vim.api.nvim_create_autocmd({ "BufWritePre" }, {
 
 --[[ THEME ]]--
 
-catppuccin.setup({
-	flavour = config.flavour,
-	transparent_background = true,
-	integrations = {
-		cmp = true,
-		illuminate = {
-			enabled = true,
-			lsp = false
-		},
-		nvimtree = true,
-		nvim_surround = true,
-		lsp_trouble = true,
-		telescope = {
-			enabled = true,
-		},
-		treesitter = true,
-	},
-})
-
-vim.cmd('colorscheme ' .. config.colorscheme)
-vim.o.background = "dark"
 vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
 vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
 vim.api.nvim_set_hl(0, "NvimTreeNormal", { bg = "none" })
+vim.api.nvim_set_hl(0, "Comment", { fg = colorscheme.colors.base04 })
+vim.api.nvim_set_hl(0, "@comment", { link = "Comment" })
 
 --[[ LINES ]]--
 
diff --git a/modules/programs/gnupg/default.nix b/modules/programs/gnupg/default.nix
index 67be4bc..a386bef 100644
--- a/modules/programs/gnupg/default.nix
+++ b/modules/programs/gnupg/default.nix
@@ -1,7 +1,7 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
-  config = {
+  config = lib.mkIf config.system.enable {
 
     programs.gnupg.agent = {
       enable = true;
diff --git a/modules/programs/neovim/default.nix b/modules/programs/neovim/default.nix
index 823d0e4..4c59c09 100644
--- a/modules/programs/neovim/default.nix
+++ b/modules/programs/neovim/default.nix
@@ -13,7 +13,31 @@
         viAlias = true;
         vimAlias = true;
 
-        extraLuaConfig = lib.fileContents ../../../files/config/nvim/init.lua;
+        extraLuaConfig = let
+          cfg = lib.fileContents ../../../files/config/nvim/init.lua;
+          colorscheme = ''
+            local colorscheme = require('base16-colorscheme')
+
+            colorscheme.setup({
+              base00 = '#${config.theme.colors.base00}',
+              base01 = '#${config.theme.colors.base01}',
+              base02 = '#${config.theme.colors.base02}',
+              base03 = '#${config.theme.colors.base03}',
+              base04 = '#${config.theme.colors.base04}',
+              base05 = '#${config.theme.colors.base05}',
+              base06 = '#${config.theme.colors.base06}',
+              base07 = '#${config.theme.colors.base07}',
+              base08 = '#${config.theme.colors.base08}',
+              base09 = '#${config.theme.colors.base09}',
+              base0A = '#${config.theme.colors.base0A}',
+              base0B = '#${config.theme.colors.base0B}',
+              base0C = '#${config.theme.colors.base0C}',
+              base0D = '#${config.theme.colors.base0D}',
+              base0E = '#${config.theme.colors.base0E}',
+              base0F = '#${config.theme.colors.base0F}',
+            })'';
+          in
+            colorscheme + cfg;
 
         plugins = with pkgs.vimPlugins; [
           # Deoendencies
@@ -29,8 +53,6 @@
           undotree # undo menu
           trouble-nvim # error menu
           telescope-nvim # grep/find menus
-          # Integrations
-          vim-fugitive # git
           # Snippets
           vim-vsnip
           vim-vsnip-integ
@@ -42,11 +64,11 @@
           cmp-vsnip
           nvim-surround # delimiter
           # Lsp
+          base16-nvim # colorscheme
           nerdcommenter # comment functions
           nvim-treesitter.withAllGrammars # hilighting
           vim-illuminate # hilighting
           todo-comments-nvim # todo comments
-          catppuccin-nvim # theme
           nvim-lspconfig # lsp server
           fidget-nvim # notifications
           indent-o-matic # auto indentation
diff --git a/modules/programs/starship/default.nix b/modules/programs/starship/default.nix
index a22909f..946a393 100644
--- a/modules/programs/starship/default.nix
+++ b/modules/programs/starship/default.nix
@@ -20,8 +20,8 @@
           ];
 
           username = {
-            style_user = "bold purple";
-            style_root = "bold purple";
+            style_user = "bold cyan";
+            style_root = "bold red";
             format = "[$user]($style) ";
             disabled = false;
             show_always = true;
@@ -41,7 +41,7 @@
           };
 
           git_branch = {
-            style = "bold fg:97";
+            style = "bold purple";
             format = "at [$symbol$branch(:$remote_branch)]($style) ";
           };
         };
diff --git a/modules/themes/catppuccin/mocha.nix b/modules/themes/catppuccin/mocha.nix
index 950bf3c..aee42b6 100644
--- a/modules/themes/catppuccin/mocha.nix
+++ b/modules/themes/catppuccin/mocha.nix
@@ -16,6 +16,6 @@
 	base0B = "a6e3a1"; # green
 	base0C = "94e2d5"; # teal
 	base0D = "89b4fa"; # blue
-	base0E = "f5c2e7"; # pink
+	base0E = "cba6f7"; # mauve
 	base0F = "f2cdcd"; # flamingo
 }