From a9b24989ac25c0d022c3dc3c73e943cf7adea50c Mon Sep 17 00:00:00 2001 From: 514fpv Date: Mon, 24 Jun 2024 09:56:31 +0800 Subject: [PATCH] feat(gui): switch to catppuccin module --- flake.nix | 1 + home/btop/home.nix | 88 ------------------ home/catppuccin/flake.png | Bin 0 -> 47817 bytes home/catppuccin/home.nix | 59 ++++++++++++ home/{gui => }/catppuccin/nixos.nix | 30 ++++--- home/{gui => }/catppuccin/solid.png | Bin 29882 -> 33649 bytes home/gui/catppuccin/flake.png | Bin 50243 -> 0 bytes home/gui/catppuccin/home.nix | 135 ---------------------------- home/gui/catppuccin/palette.nix | 117 ------------------------ home/gui/home.nix | 14 +-- home/gui/nixos.nix | 2 - home/profile.nix | 5 +- spec/default.nix | 1 + 13 files changed, 91 insertions(+), 361 deletions(-) create mode 100644 home/catppuccin/flake.png create mode 100644 home/catppuccin/home.nix rename home/{gui => }/catppuccin/nixos.nix (68%) rename home/{gui => }/catppuccin/solid.png (68%) delete mode 100644 home/gui/catppuccin/flake.png delete mode 100644 home/gui/catppuccin/home.nix delete mode 100644 home/gui/catppuccin/palette.nix diff --git a/flake.nix b/flake.nix index 50b13ca2..df435879 100644 --- a/flake.nix +++ b/flake.nix @@ -12,6 +12,7 @@ plasma-manager.url = "github:pjones/plasma-manager"; plasma-manager.inputs.nixpkgs.follows = "nixpkgs"; plasma-manager.inputs.home-manager.follows = "home-manager"; + catppuccin.url = "github:catppuccin/nix"; lanzaboote.url = "github:nix-community/lanzaboote/v0.3.0"; lanzaboote.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/btop/home.nix b/home/btop/home.nix index ade22460..f435fee1 100644 --- a/home/btop/home.nix +++ b/home/btop/home.nix @@ -7,95 +7,7 @@ in mkIf cfg.enable { programs.btop = { enable = true; settings = { - color_theme = "catppuccin"; theme_background = false; }; }; - - home.file."${config.xdg.configHome}/btop/themes/catppuccin.theme".text = with (import ../gui/catppuccin/palette.nix) - .${config.passthrough.catppuccin.palette}; '' - # Main background, empty for terminal default, need to be empty if you want transparent background - theme[main_bg]="${base}" - - # Main text color - theme[main_fg]="${text}" - - # Title color for boxes - theme[title]="${text}" - - # Highlight color for keyboard shortcuts - theme[hi_fg]="${blue}" - - # Background color of selected item in processes box - theme[selected_bg]="${surface1}" - - # Foreground color of selected item in processes box - theme[selected_fg]="${blue}" - - # Color of inactive/disabled text - theme[inactive_fg]="${overlay1}" - - # Color of text appearing on top of graphs, i.e uptime and current network graph scaling - theme[graph_text]="${rosewater}" - - # Background color of the percentage meters - theme[meter_bg]="${surface1}" - - # Misc colors for processes box including mini cpu graphs, details memory graph and details status text - theme[proc_misc]="${rosewater}" - - # CPU, Memory, Network, Proc box outline colors - theme[cpu_box]="${mauve}" #Mauve - theme[mem_box]="${green}" #Green - theme[net_box]="${maroon}" #Maroon - theme[proc_box]="${blue}" #Blue - - # Box divider line and small boxes line color - theme[div_line]="${overlay0}" - - # Temperature graph color (Green -> Yellow -> Red) - theme[temp_start]="${green}" - theme[temp_mid]="${yellow}" - theme[temp_end]="${red}" - - # CPU graph colors (Teal -> Lavender) - theme[cpu_start]="${teal}" - theme[cpu_mid]="${sapphire}" - theme[cpu_end]="${lavender}" - - # Mem/Disk free meter (Mauve -> Lavender -> Blue) - theme[free_start]="${mauve}" - theme[free_mid]="${lavender}" - theme[free_end]="${blue}" - - # Mem/Disk cached meter (Sapphire -> Lavender) - theme[cached_start]="${sapphire}" - theme[cached_mid]="${blue}" - theme[cached_end]="${lavender}" - - # Mem/Disk available meter (Peach -> Red) - theme[available_start]="${peach}" - theme[available_mid]="${maroon}" - theme[available_end]="${red}" - - # Mem/Disk used meter (Green -> Sky) - theme[used_start]="${green}" - theme[used_mid]="${teal}" - theme[used_end]="${sky}" - - # Download graph colors (Peach -> Red) - theme[download_start]="${peach}" - theme[download_mid]="${maroon}" - theme[download_end]="${red}" - - # Upload graph colors (Green -> Sky) - theme[upload_start]="${green}" - theme[upload_mid]="${teal}" - theme[upload_end]="${sky}" - - # Process box color gradient for threads, mem and cpu usage (Sapphire -> Mauve) - theme[process_start]="${sapphire}" - theme[process_mid]="${lavender}" - theme[process_end]="${mauve}" - ''; } diff --git a/home/catppuccin/flake.png b/home/catppuccin/flake.png new file mode 100644 index 0000000000000000000000000000000000000000..ea098e877f2b249cca7f90a70e342ef21948cbad GIT binary patch literal 47817 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 literal 0 HcmV?d00001 diff --git a/home/catppuccin/home.nix b/home/catppuccin/home.nix new file mode 100644 index 00000000..b72fbd75 --- /dev/null +++ b/home/catppuccin/home.nix @@ -0,0 +1,59 @@ +{ pkgs +, lib +, config +, ... }: with lib; let + cfg = config.passthrough.catppuccin; + palette = (import ./palette.nix).${cfg.palette}; +in mkIf cfg.enable { + catppuccin = { + enable = true; + accent = "pink"; + flavor = "mocha"; + }; + + gtk.theme = { inherit (cfg.gtk) package name; }; + home.pointerCursor = { inherit (cfg.cursor) package name; }; + + # sway colour palette override + wayland.windowManager.sway.config = { + colors = { + focused = { border = "$lavender"; background = "$base"; text = "$text"; indicator = "$rosewater"; childBorder = "$lavender"; }; + focusedInactive = { border = "$overlay0"; background = "$base"; text = "$text"; indicator = "$rosewater"; childBorder = "$overlay0"; }; + unfocused = { border = "$overlay0"; background = "$base"; text = "$text"; indicator = "$rosewater"; childBorder = "$overlay0"; }; + urgent = { border = "$peach"; background = "$base"; text = "$peach"; indicator = "$overlay0"; childBorder = "$peach"; }; + placeholder = { border = "$overlay0"; background = "$base"; text = "$text"; indicator = "$overlay0"; childBorder = "$overlay0"; }; + background = "$base"; + }; + + bars = mkForce [ { + colors = { + background = "$base"; + statusline = "$text"; + focusedStatusline = "$text"; + focusedSeparator = "$base"; + focusedWorkspace = { border = "$base"; background = "$base"; text = "$green"; }; + activeWorkspace = { border = "$base"; background = "$base"; text = "$blue"; }; + inactiveWorkspace = { border = "$base"; background = "$base"; text = "$surface1"; }; + urgentWorkspace = { border = "$base"; background = "$base"; text = "$surface1"; }; + bindingMode = { border = "$base"; background = "$base"; text = "$surface1"; }; + }; + + mode = "dock"; + position = "bottom"; + workspaceButtons = true; + workspaceNumbers = true; + statusCommand = "${pkgs.i3status}/bin/i3status"; + fonts = { + names = [ "monospace" ]; + size = 8.0; + }; + trayOutput = "primary"; + } ]; + + output."*".bg = mkForce "${./flake.png} fill"; + gaps.inner = 12; + gaps.outer = 5; + # dodge the status bar + gaps.bottom = 0; + }; +} diff --git a/home/gui/catppuccin/nixos.nix b/home/catppuccin/nixos.nix similarity index 68% rename from home/gui/catppuccin/nixos.nix rename to home/catppuccin/nixos.nix index 4d360baa..cf470aa4 100644 --- a/home/gui/catppuccin/nixos.nix +++ b/home/catppuccin/nixos.nix @@ -8,26 +8,30 @@ in { options.home.catppuccin = { enable = mkEnableOption "catppuccin colour scheme" // { default = gui; }; - palette = mkOption { - type = with types; str; - default = "frappe"; - description = "colour palette in use"; - }; - gtk = { package = mkOption { type = with types; package; - default = pkgs.catppuccin-gtk.override { + default = (pkgs.catppuccin-gtk.overrideAttrs { + src = pkgs.fetchFromGitHub { + owner = "catppuccin"; + repo = "gtk"; + rev = "v1.0.3"; + fetchSubmodules = true; + hash = "sha256-q5/VcFsm3vNEw55zq/vcM11eo456SYE5TQA3g2VQjGc="; + }; + + postUnpack = ""; + }).override { accents = [ "pink" ]; size = "compact"; #tweaks = [ "rimless" "black" ]; - variant = "frappe"; + variant = "mocha"; }; description = "catppuccin gtk theme package"; }; name = mkOption { type = with types; str; - default = "Catppuccin-Frappe-Compact-Pink-Dark"; + default = "catppuccin-mocha-pink-compact+default"; description = "name of catppuccin gtk theme"; }; }; @@ -35,12 +39,12 @@ in { cursor = { package = mkOption { type = with types; package; - default = pkgs.catppuccin-cursors.frappeDark; + default = pkgs.catppuccin-cursors.mochaDark; description = "catppuccin cursor theme package"; }; name = mkOption { type = with types; str; - default = "Catppuccin-Frappe-Dark-Cursors"; + default = "catppuccin-mocha-dark-cursors"; description = "name of catppuccin cursor theme"; }; }; @@ -52,8 +56,10 @@ in { { passthrough.catppuccin = cfg; } ]; + catppuccin.enable = cfg.enable; + # gtk and cursor themes - environment.systemPackages = with cfg; mkIf cfg.enable [ + environment.systemPackages = with cfg; mkIf enable [ gtk.package cursor.package ]; diff --git a/home/gui/catppuccin/solid.png b/home/catppuccin/solid.png similarity index 68% rename from home/gui/catppuccin/solid.png rename to home/catppuccin/solid.png index 2c512dd6394541a9e2c3c5b5b44eeb870f5b098f..81bd01e2b7637f8ad16b5b80b0638bce52352982 100644 GIT binary patch literal 33649 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 diff --git a/home/gui/catppuccin/flake.png b/home/gui/catppuccin/flake.png deleted file mode 100644 index 97fb644a2a2db6ff6e867e552d8cb809a9ba98f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50243 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 bGkFJBs8zgka5n*}h8S+#re8pJ+WUV1az18g diff --git a/home/gui/catppuccin/home.nix b/home/gui/catppuccin/home.nix deleted file mode 100644 index 7853f5ea..00000000 --- a/home/gui/catppuccin/home.nix +++ /dev/null @@ -1,135 +0,0 @@ -{ pkgs -, lib -, config -, ... }: with lib; let - cfg = config.passthrough.catppuccin; - palette = (import ./palette.nix).${cfg.palette}; -in mkIf cfg.enable { - # cursor theme - home.pointerCursor = { inherit (cfg.cursor) package name; }; - gtk.cursorTheme = { inherit (cfg.cursor) package name; }; - - # gtk theme - gtk.theme = { inherit (cfg.gtk) package name; }; - gtk.iconTheme = { - package = pkgs.catppuccin-papirus-folders.override { - flavor = cfg.palette; - accent = "pink"; - }; - name = "Papirus-Dark"; - }; - - # sway colour palette override - wayland.windowManager.sway.config = { - colors = with palette; { - focused = { border = lavender; background = base; text = text; indicator = rosewater; childBorder = lavender; }; - focusedInactive = { border = overlay0; background = base; text = text; indicator = rosewater; childBorder = overlay0; }; - unfocused = { border = overlay0; background = base; text = text; indicator = rosewater; childBorder = overlay0; }; - urgent = { border = peach; background = base; text = peach; indicator = overlay0; childBorder = peach; }; - placeholder = { border = overlay0; background = base; text = text; indicator = overlay0; childBorder = overlay0; }; - background = base; - }; - - bars = mkForce [ { - colors = let - p = palette; - in { - background = p.base; - statusline = p.text; - focusedStatusline = p.text; - focusedSeparator = p.base; - focusedWorkspace = { border = p.base; background = p.base; text = p.green; }; - activeWorkspace = { border = p.base; background = p.base; text = p.blue; }; - inactiveWorkspace = { border = p.base; background = p.base; text = p.surface1; }; - urgentWorkspace = { border = p.base; background = p.base; text = p.surface1; }; - bindingMode = { border = p.base; background = p.base; text = p.surface1; }; - }; - - mode = "dock"; - position = "bottom"; - workspaceButtons = true; - workspaceNumbers = true; - statusCommand = "${pkgs.i3status}/bin/i3status"; - fonts = { - names = [ "monospace" ]; - size = 8.0; - }; - trayOutput = "primary"; - } ]; - - output."*".bg = mkForce "${./flake.png} fill"; - gaps.inner = 12; - gaps.outer = 5; - # dodge the status bar - gaps.bottom = 0; - }; - - # swaylock colour palette override - programs.swaylock.settings = with palette; let - transparent = "00000000"; - in { - color = base; - bs-hl-color = rosewater; - caps-lock-bs-hl-color = rosewater; - caps-lock-key-hl-color = green; - inside-color = transparent; - inside-clear-color = transparent; - inside-caps-lock-color = transparent; - inside-ver-color = transparent; - inside-wrong-color = transparent; - key-hl-color = green; - layout-bg-color = transparent; - layout-border-color = transparent; - layout-text-color = text; - line-color = transparent; - line-clear-color = transparent; - line-caps-lock-color = transparent; - line-ver-color = transparent; - line-wrong-color = transparent; - ring-color = lavender; - ring-clear-color = rosewater; - ring-caps-lock-color = peach; - ring-ver-color = blue; - ring-wrong-color = maroon; - separator-color = transparent; - text-color = text; - text-clear-color = rosewater; - text-caps-lock-color = peach; - text-ver-color = blue; - text-wrong-color = maroon; - }; - - # i3status colour palette override - programs.i3status.general = with palette; { - color_good = lavender; - color_degraded = yellow; - color_bad = red; - }; - - # mako colour palette override - services.mako = with palette; { - backgroundColor = base; - textColor = text; - borderColor = blue; - progressColor = "over ${surface0}"; - extraConfig = '' - [urgency=high] - border-color=${peach} - ''; - }; - - # foot colour palette override - programs.foot.settings.colors = with palette; let - c = substring 1 7; - in { - foreground = c text; background = c base; - regular0 = c overlay2; regular1 = c red; - regular2 = c green; regular3 = c yellow; - regular4 = c blue; regular5 = c pink; - regular6 = c teal; regular7 = c surface2; - bright0 = c subtext0; bright1 = c red; - bright2 = c green; bright3 = c yellow; - bright4 = c blue; bright5 = c pink; - bright6 = c teal; bright7 = c surface1; - }; -} diff --git a/home/gui/catppuccin/palette.nix b/home/gui/catppuccin/palette.nix deleted file mode 100644 index 1e330574..00000000 --- a/home/gui/catppuccin/palette.nix +++ /dev/null @@ -1,117 +0,0 @@ -{ - latte = { - rosewater = "#dc8a78"; - flamingo = "#dd7878"; - pink = "#ea76cb"; - mauve = "#8839ef"; - red = "#d20f39"; - maroon = "#e64553"; - peach = "#fe640b"; - yellow = "#df8e1d"; - green = "#40a02b"; - teal = "#179299"; - sky = "#04a5e5"; - sapphire = "#209fb5"; - blue = "#1e66f5"; - lavender = "#7287fd"; - text = "#4c4f69"; - subtext1 = "#5c5f77"; - subtext0 = "#6c6f85"; - overlay2 = "#7c7f93"; - overlay1 = "#8c8fa1"; - overlay0 = "#9ca0b0"; - surface2 = "#acb0be"; - surface1 = "#bcc0cc"; - surface0 = "#ccd0da"; - base = "#eff1f5"; - mantle = "#e6e9ef"; - crust = "#dce0e8"; - }; - - frappe = { - rosewater = "#f2d5cf"; - flamingo = "#eebebe"; - pink = "#f4b8e4"; - mauve = "#ca9ee6"; - red = "#e78284"; - maroon = "#ea999c"; - peach = "#ef9f76"; - yellow = "#e5c890"; - green = "#a6d189"; - teal = "#81c8be"; - sky = "#99d1db"; - sapphire = "#85c1dc"; - blue = "#8caaee"; - lavender = "#babbf1"; - text = "#c6d0f5"; - subtext1 = "#b5bfe2"; - subtext0 = "#a5adce"; - overlay2 = "#949cbb"; - overlay1 = "#838ba7"; - overlay0 = "#737994"; - surface2 = "#626880"; - surface1 = "#51576d"; - surface0 = "#414559"; - base = "#303446"; - mantle = "#292c3c"; - crust = "#232634"; - }; - - macchiato = { - rosewater = "#f4dbd6"; - flamingo = "#f0c6c6"; - pink = "#f5bde6"; - mauve = "#c6a0f6"; - red = "#ed8796"; - maroon = "#ee99a0"; - peach = "#f5a97f"; - yellow = "#eed49f"; - green = "#a6da95"; - teal = "#8bd5ca"; - sky = "#91d7e3"; - sapphire = "#7dc4e4"; - blue = "#8aadf4"; - lavender = "#b7bdf8"; - text = "#cad3f5"; - subtext1 = "#b8c0e0"; - subtext0 = "#a5adcb"; - overlay2 = "#939ab7"; - overlay1 = "#8087a2"; - overlay0 = "#6e738d"; - surface2 = "#5b6078"; - surface1 = "#494d64"; - surface0 = "#363a4f"; - base = "#24273a"; - mantle = "#1e2030"; - crust = "#181926"; - }; - - mocha = { - rosewater = "#f5e0dc"; - flamingo = "#f2cdcd"; - pink = "#f5c2e7"; - mauve = "#cba6f7"; - red = "#f38ba8"; - maroon = "#eba0ac"; - peach = "#fab387"; - yellow = "#f9e2af"; - green = "#a6e3a1"; - teal = "#94e2d5"; - sky = "#89dceb"; - sapphire = "#74c7ec"; - blue = "#89b4fa"; - lavender = "#b4befe"; - text = "#cdd6f4"; - subtext1 = "#bac2de"; - subtext0 = "#a6adc8"; - overlay2 = "#9399b2"; - overlay1 = "#7f849c"; - overlay0 = "#6c7086"; - surface2 = "#585b70"; - surface1 = "#45475a"; - surface0 = "#313244"; - base = "#1e1e2e"; - mantle = "#181825"; - crust = "#11111b"; - }; -} diff --git a/home/gui/home.nix b/home/gui/home.nix index 52eac590..f8423161 100644 --- a/home/gui/home.nix +++ b/home/gui/home.nix @@ -1,15 +1,17 @@ { pkgs , lib , config -, ... }: with lib; { - imports = [ ./catppuccin/home.nix ]; - +, ... }: with lib; let + catppuccin = config.passthrough.catppuccin.enable; +in { config = mkIf config.passthrough.gui { # cursor theme - home.pointerCursor = mkDefault { - package = pkgs.bibata-cursors; - name = "Bibata-Modern-Classic"; + home.pointerCursor = { + package = mkDefault pkgs.bibata-cursors; + name = mkDefault "Bibata-Modern-Classic"; size = 24; + x11.enable = true; + gtk.enable = true; }; # gtk theme diff --git a/home/gui/nixos.nix b/home/gui/nixos.nix index 82012777..6b1fccd3 100644 --- a/home/gui/nixos.nix +++ b/home/gui/nixos.nix @@ -5,8 +5,6 @@ gui = with config.global.gpu; enable && session; catppuccin = config.home.catppuccin; in { - imports = [ ./catppuccin/nixos.nix ]; - config = { users.homeModules = [ # this module passes gui configuration to home-manager diff --git a/home/profile.nix b/home/profile.nix index 4a00bf32..6cf374df 100644 --- a/home/profile.nix +++ b/home/profile.nix @@ -1,6 +1,7 @@ { pkgs , lib , config +, inputs , ... }: with lib; let cfg = config.users; in { @@ -137,7 +138,9 @@ in { (filterAttrs (n: _: n != "root") config.users.profiles); home-manager.users = mapAttrs (name: opts: { - imports = cfg.homeModules; + imports = with inputs; cfg.homeModules ++ [ + catppuccin.homeManagerModules.catppuccin + ]; home.file.".face" = mkIf (opts.picture != null) { source = opts.picture; }; diff --git a/spec/default.nix b/spec/default.nix index fe88c033..021aa4c1 100644 --- a/spec/default.nix +++ b/spec/default.nix @@ -12,6 +12,7 @@ ./channel.nix impermanence.nixosModules.impermanence home-manager.nixosModules.home-manager + catppuccin.nixosModules.catppuccin { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true;