fix theming

This commit is contained in:
Vivian 2024-03-23 20:43:29 +01:00
parent edfe487b8a
commit 39c8317c93
11 changed files with 467 additions and 126 deletions

View file

@ -1,26 +1,35 @@
{ config, pkgs, lib, ... }:
{
config,
pkgs,
lib,
...
}:
with lib;
let
cfg = config.themes.v.catppuccin;
in {
options.themes.v.catppuccin = { enable = mkEnableOption "catppuccin"; };
config = let
theme = "Catppuccin-Frappe-Pink-Dark";
cursorTheme = config.home.pointerCursor.name;
in mkIf cfg.enable {
in
{
options.themes.v.catppuccin = {
enable = mkEnableOption "catppuccin";
};
config = mkIf cfg.enable {
home.pointerCursor = {
name = "Bibata_Ghost";
size = 24;
package = pkgs.bibata-cursors-translucent;
};
programs.kitty.theme = "Catppuccin-Frappe";
programs.kitty.font.name = "DejaVuSansMono Nerd Font";
programs.kitty = {
theme = "Catppuccin-Frappe";
font.name = "DejaVuSansMono Nerd Font";
};
# home.sessionVariables.GTK_USE_PORTAL = "1";
gtk = {
enable = true;
theme = {
name = theme;
name = "Catppuccin-Frappe-Standard-Pink-Dark";
package = pkgs.catppuccin-gtk.override {
accents = [ "pink" ];
variant = "frappe";
@ -32,8 +41,25 @@ in {
package = pkgs.papirus-icon-theme.override { color = "violet"; };
};
cursorTheme = {
name = cursorTheme;
inherit (config.home.pointerCursor) package size;
inherit (config.home.pointerCursor) name package size;
};
};
xdg.configFile = {
"gtk-4.0/assets".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/assets";
"gtk-4.0/gtk.css".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/gtk.css";
"gtk-4.0/gtk-dark.css".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/gtk-dark.css";
};
qt = {
enable = true;
platformTheme = "qtct";
style = {
name = "Catppuccin-Frappe-Pink";
package = pkgs.catppuccin-kde.override {
flavour = [ "frappe" ];
accents = [ "pink" ];
};
};
};
@ -43,4 +69,3 @@ in {
};
};
}

View file

@ -115,7 +115,7 @@ with lib;
{
mode = "n";
key = "<leader>q";
action = ":bd<R>"; # Delete buffer
action = ":bd<CR>"; # Delete buffer
}
{
mode = "n";
@ -187,13 +187,13 @@ with lib;
nvim-nio
];
extraConfigLua = "";
colorschemes.catppuccin = {
enable = true;
flavour = "frappe";
};
extraConfigLua = "";
plugins = {
image = {
enable = true;
@ -220,7 +220,7 @@ with lib;
}
{
name = "notes";
path = "~/src/notes";
path = "~/cloud/Notes";
}
];
completion = {
@ -278,10 +278,12 @@ with lib;
surround.enable = true;
fugitive.enable = true;
gitgutter.enable = true;
lualine = {
enable = true;
theme = "catppuccin";
};
telescope = {
enable = true;
defaults.preview.ls_short = true;
@ -354,7 +356,14 @@ with lib;
lspkind.enable = true;
lspsaga = {
enable = true;
lightbulb.virtualText = false;
lightbulb.enable = false;
};
nvim-lightbulb = {
enable = true;
settings = {
autocmd.enabled = true;
number.enabled = true;
};
};
vimtex.enable = true;
floaterm.enable = true;

View file

@ -10,6 +10,10 @@ for key, _ in pairs(obsidian_commands) do
table.insert(results, string.sub(key, 9))
end
Local = 100
local Local = 3
print(Local)
local obsidian_picker = function(opts)
opts = opts or require("telescope.themes").get_dropdown{}
pickers.new(opts, {