mirror of
https://github.com/Jokiller230/puzzlevision.git
synced 2025-09-10 04:40:05 +00:00
feat(modules): add new GTK styles to Catppuccin config
fix(modules): update vaultwarden service hostname usage feat(flake): add sops-nix to flake feat: add .sops.yaml base, not quite ready just yet
This commit is contained in:
parent
b23bddaf71
commit
3cd04be672
18 changed files with 293 additions and 95 deletions
|
|
@ -7,7 +7,7 @@
|
|||
...
|
||||
}: with lib; with lib.${namespace};
|
||||
let
|
||||
cfg = config.${namespace}.apps.development.zed-editor;
|
||||
cfg = config.apps.zed-editor;
|
||||
|
||||
zed-fhs = pkgs.buildFHSUserEnv {
|
||||
name = "zed";
|
||||
|
|
@ -18,7 +18,7 @@ let
|
|||
runScript = "zed";
|
||||
};
|
||||
in {
|
||||
options.${namespace}.apps.zed-editor = { enable = mkEnableOption "zed-editor"; };
|
||||
options.apps.zed-editor = { enable = mkEnableOption "zed-editor"; };
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = [zed-fhs];
|
||||
|
|
|
|||
17
modules/home/palette/default.nix
Normal file
17
modules/home/palette/default.nix
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
{
|
||||
lib,
|
||||
namespace,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: with lib; with lib.${namespace};
|
||||
let
|
||||
palette = (pkgs.lib.importJSON (config.catppuccin.sources.palette + "/palette.json")).${config.catppuccin.flavor}.colors;
|
||||
in
|
||||
{
|
||||
options.palette = mkOption { type = types.attrsOf types.raw; };
|
||||
|
||||
config = {
|
||||
inherit palette;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,47 +1,169 @@
|
|||
{
|
||||
lib,
|
||||
namespace,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
gtk = {
|
||||
enable = true;
|
||||
}: with lib; with lib.${namespace};
|
||||
let
|
||||
# Stolen from Oli @ git.gay, basically just themes default libadwaita components.
|
||||
css = pkgs.writeTextFile {
|
||||
name = "gtk-css";
|
||||
text = ''
|
||||
@define-color accent_color ${config.palette.blue.hex};
|
||||
@define-color accent_bg_color ${config.palette.blue.hex};
|
||||
@define-color accent_fg_color ${config.palette.base.hex};
|
||||
@define-color destructive_color ${config.palette.red.hex};
|
||||
@define-color destructive_bg_color ${config.palette.red.hex};
|
||||
@define-color destructive_fg_color ${config.palette.base.hex};
|
||||
@define-color success_color ${config.palette.green.hex};
|
||||
@define-color success_bg_color ${config.palette.green.hex};
|
||||
@define-color success_fg_color ${config.palette.base.hex};
|
||||
@define-color warning_color ${config.palette.mauve.hex};
|
||||
@define-color warning_bg_color ${config.palette.mauve.hex};
|
||||
@define-color warning_fg_color ${config.palette.base.hex};
|
||||
@define-color error_color ${config.palette.red.hex};
|
||||
@define-color error_bg_color ${config.palette.red.hex};
|
||||
@define-color error_fg_color ${config.palette.base.hex};
|
||||
@define-color window_bg_color ${config.palette.base.hex};
|
||||
@define-color window_fg_color ${config.palette.text.hex};
|
||||
@define-color view_bg_color ${config.palette.base.hex};
|
||||
@define-color view_fg_color ${config.palette.text.hex};
|
||||
@define-color headerbar_bg_color ${config.palette.mantle.hex};
|
||||
@define-color headerbar_fg_color ${config.palette.text.hex};
|
||||
@define-color headerbar_border_color rgba(${builtins.toString config.palette.base.rgb.r}, ${builtins.toString config.palette.base.rgb.g}, ${builtins.toString config.palette.base.rgb.b}, 0.7);
|
||||
@define-color headerbar_backdrop_color @window_bg_color;
|
||||
@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
|
||||
@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
|
||||
@define-color sidebar_bg_color ${config.palette.mantle.hex};
|
||||
@define-color sidebar_fg_color ${config.palette.text.hex};
|
||||
@define-color sidebar_backdrop_color @window_bg_color;
|
||||
@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
|
||||
@define-color secondary_sidebar_bg_color @sidebar_bg_color;
|
||||
@define-color secondary_sidebar_fg_color @sidebar_fg_color;
|
||||
@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
|
||||
@define-color secondary_sidebar_shade_color @sidebar_shade_color;
|
||||
@define-color card_bg_color ${config.palette.mantle.hex};
|
||||
@define-color card_fg_color ${config.palette.text.hex};
|
||||
@define-color card_shade_color rgba(0, 0, 0, 0.07);
|
||||
@define-color dialog_bg_color ${config.palette.mantle.hex};
|
||||
@define-color dialog_fg_color ${config.palette.text.hex};
|
||||
@define-color popover_bg_color ${config.palette.mantle.hex};
|
||||
@define-color popover_fg_color ${config.palette.text.hex};
|
||||
@define-color popover_shade_color rgba(0, 0, 0, 0.07);
|
||||
@define-color shade_color rgba(0, 0, 0, 0.07);
|
||||
@define-color scrollbar_outline_color ${config.palette.surface0.hex};
|
||||
@define-color blue_1 ${config.palette.blue.hex};
|
||||
@define-color blue_2 ${config.palette.blue.hex};
|
||||
@define-color blue_3 ${config.palette.blue.hex};
|
||||
@define-color blue_4 ${config.palette.blue.hex};
|
||||
@define-color blue_5 ${config.palette.blue.hex};
|
||||
@define-color green_1 ${config.palette.green.hex};
|
||||
@define-color green_2 ${config.palette.green.hex};
|
||||
@define-color green_3 ${config.palette.green.hex};
|
||||
@define-color green_4 ${config.palette.green.hex};
|
||||
@define-color green_5 ${config.palette.green.hex};
|
||||
@define-color yellow_1 ${config.palette.yellow.hex};
|
||||
@define-color yellow_2 ${config.palette.yellow.hex};
|
||||
@define-color yellow_3 ${config.palette.yellow.hex};
|
||||
@define-color yellow_4 ${config.palette.yellow.hex};
|
||||
@define-color yellow_5 ${config.palette.yellow.hex};
|
||||
@define-color orange_1 ${config.palette.peach.hex};
|
||||
@define-color orange_2 ${config.palette.peach.hex};
|
||||
@define-color orange_3 ${config.palette.peach.hex};
|
||||
@define-color orange_4 ${config.palette.peach.hex};
|
||||
@define-color orange_5 ${config.palette.peach.hex};
|
||||
@define-color red_1 ${config.palette.red.hex};
|
||||
@define-color red_2 ${config.palette.red.hex};
|
||||
@define-color red_3 ${config.palette.red.hex};
|
||||
@define-color red_4 ${config.palette.red.hex};
|
||||
@define-color red_5 ${config.palette.red.hex};
|
||||
@define-color purple_1 ${config.palette.mauve.hex};
|
||||
@define-color purple_2 ${config.palette.mauve.hex};
|
||||
@define-color purple_3 ${config.palette.mauve.hex};
|
||||
@define-color purple_4 ${config.palette.mauve.hex};
|
||||
@define-color purple_5 ${config.palette.mauve.hex};
|
||||
@define-color brown_1 ${config.palette.flamingo.hex};
|
||||
@define-color brown_2 ${config.palette.flamingo.hex};
|
||||
@define-color brown_3 ${config.palette.flamingo.hex};
|
||||
@define-color brown_4 ${config.palette.flamingo.hex};
|
||||
@define-color brown_5 ${config.palette.flamingo.hex};
|
||||
@define-color light_1 ${config.palette.mantle.hex};
|
||||
@define-color light_2 ${config.palette.mantle.hex};
|
||||
@define-color light_3 ${config.palette.mantle.hex};
|
||||
@define-color light_4 ${config.palette.mantle.hex};
|
||||
@define-color light_5 ${config.palette.mantle.hex};
|
||||
@define-color dark_1 ${config.palette.mantle.hex};
|
||||
@define-color dark_2 ${config.palette.mantle.hex};
|
||||
@define-color dark_3 ${config.palette.mantle.hex};
|
||||
@define-color dark_4 ${config.palette.mantle.hex};
|
||||
@define-color dark_5 ${config.palette.mantle.hex};
|
||||
'';
|
||||
};
|
||||
|
||||
font = {
|
||||
name = "Cantarell";
|
||||
size = 12;
|
||||
package = pkgs.cantarell-fonts;
|
||||
};
|
||||
cfg = config.themes.catppuccin.gtk;
|
||||
in
|
||||
{
|
||||
options.themes.catppuccin.gtk = { enable = mkEnableOption "Enable the Catppuccin theme for GTK"; };
|
||||
|
||||
catppuccin = {
|
||||
icon = {
|
||||
enable = true;
|
||||
accent = "blue";
|
||||
flavor = "macchiato";
|
||||
};
|
||||
};
|
||||
|
||||
theme = {
|
||||
name = "Colloid-Dark-Catppuccin";
|
||||
package = pkgs.colloid-gtk-theme.override {
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [
|
||||
(colloid-gtk-theme.override {
|
||||
themeVariants = ["default"];
|
||||
colorVariants = ["dark"];
|
||||
sizeVariants = ["standard"];
|
||||
tweaks = ["catppuccin"];
|
||||
})
|
||||
];
|
||||
|
||||
gtk = {
|
||||
enable = true;
|
||||
|
||||
font = {
|
||||
name = "Ubuntu";
|
||||
size = 12;
|
||||
package = pkgs.ubuntu-sans;
|
||||
};
|
||||
|
||||
catppuccin = {
|
||||
icon = {
|
||||
enable = true;
|
||||
accent = "blue";
|
||||
flavor = "macchiato";
|
||||
};
|
||||
};
|
||||
|
||||
theme = {
|
||||
name = "adw-gtk3-dark";
|
||||
package = pkgs.adw-gtk3;
|
||||
};
|
||||
|
||||
gtk3 = {
|
||||
extraCss = ''@import url("${css}");'';
|
||||
extraConfig = {
|
||||
gtk-application-prefer-dark-theme = 1;
|
||||
};
|
||||
};
|
||||
|
||||
gtk4 = {
|
||||
extraCss = ''@import url("${css}");'';
|
||||
};
|
||||
};
|
||||
|
||||
dconf.settings = {
|
||||
"org/gnome/shell/extensions/user-theme" = {
|
||||
name = "Colloid-Dark-Catppuccin";
|
||||
};
|
||||
|
||||
"org/gnome/desktop/background" = {
|
||||
picture-uri = lib.snowfall.fs.get-file "resources/wallpapers/blossoms.png";
|
||||
picture-uri-dark = lib.snowfall.fs.get-file "resources/wallpapers/blossoms.png";
|
||||
};
|
||||
|
||||
"org/gnome/desktop/interface" = {
|
||||
color-scheme = "prefer-dark";
|
||||
cursor-theme = "catppuccin-macchiato-blue-cursors";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
dconf.settings = {
|
||||
"org/gnome/shell/extensions/user-theme" = {
|
||||
name = "Colloid-Dark-Catppuccin";
|
||||
};
|
||||
|
||||
"org/gnome/desktop/background" = {
|
||||
picture-uri = lib.snowfall.fs.get-file "resources/wallpapers/catppuccin_blue_cat.png";
|
||||
picture-uri-dark = lib.snowfall.fs.get-file "resources/wallpapers/catppuccin_blue_cat.png";
|
||||
};
|
||||
|
||||
"org/gnome/desktop/interface" = {
|
||||
color-scheme = "prefer-dark";
|
||||
cursor-theme = "catppuccin-macchiato-blue-cursors";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@ in {
|
|||
locale.enable = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# Enable SSH for remote login
|
||||
services.openssh.enable = true;
|
||||
}
|
||||
# Enable SSH for remote login
|
||||
services.openssh.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
lib,
|
||||
namespace,
|
||||
hostname,
|
||||
config,
|
||||
...
|
||||
}: with lib; with lib.${namespace};
|
||||
|
|
@ -98,4 +98,4 @@ in {
|
|||
# Todo: continue with "traefik" configuration and test it on a running system
|
||||
# Todo: setup sops-nix for secret management
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{
|
||||
lib,
|
||||
namespace,
|
||||
hostname,
|
||||
config,
|
||||
host,
|
||||
...
|
||||
}: with lib; with lib.${namespace};
|
||||
let
|
||||
|
|
@ -13,8 +14,8 @@ in {
|
|||
virtualisation.oci-containers.containers.vaultwarden = {
|
||||
image = "vaultwarden/server";
|
||||
autoStart = true;
|
||||
hostname = hostname;
|
||||
hostname = host;
|
||||
# Todo: continue writing vaultwarden config
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue