From be1bbeb4d0a29a45b92751aaff369c756313ce40 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Mon, 24 Jun 2024 09:56:31 +0800 Subject: [PATCH] home(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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 UD#@7T;G<1EUHx3vIVCg!0M3Ac#sB~S 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 zcmeAS@N?(olHy`uVBq!ia0y~y;Adc9;3(i=Vqjp9zZ0X%z`!Vy8sVAd>8ZuQ!N9=4 z&A`CO!obMD09MHeWfyQTFfcJPGcYqSFic`#VBlk9Vi00rV3@(cz#zoP3|0@)BgM!H zX0KvkV33BgH!(0UXh79~^cylVG4L`lFzjMrU@&52Vh~|qU^v0Rz>wJvvG)$hZjd7x zI2bq>oQqNuOHxx5$}>wc6x=<10~r2jGB89lFu-Y$pn{Q}p@E*U1p|YTfsu)ofti(& ziGqQpm7#@|fiVLUL)#>F21y16hF=T}42%m9?uA+frZ8=aYh|`$U|?*`baoE#baqxK zD9TUE%t>WnsF+hb(bnT|fJm!<^j0NNL2Hr1j)1vu7Af^@<#JsikkuL{>l62j-B)Uo zh`9T~tq&fYPr7>WXk<8hxTC-y#=^3KppuC~@4dNnllFY5kbi!+xZ=Itf%_{AuD>KGR5h{v#{0&+EoIL{LKw1-fz41=U;{lxuQk<*3)+~Fz{AnhD4M^ z`1)8S=jZArrsOB3>Q&?xfFseyzM>#8IXksPAt^OIGtXA({qFrr3YjUkO5vuy2EGN( zsTr9bRYj@6RemAKRoTgwDN6QsTs9R}6}bhusU?XD6}dTi#a0!zN?>!X@`|lM!um=I zU?nBlwn`Dc0SeCfMX3rVdM0`Xx~>(OWkyPNTnaWtDQQ+gE^bgGic->Sl`=|73as?? z%gf94%8m8%i_-NCEiEne4UF`SjC6}q(sYX}^GXscbn}XpK}JB#a7isrF3Kz@$;{7F z0GXMXlwVq6tE9xGpr8OXydt;2*B5SlUNJNjlJj%*D-sLz4fPE4b942PbrhGlmX+Yw zQ5;fPkg6Y)TAW{6l$`2XmYP?hjBG?oGF*Q_X;BW?J1NQfsX3{+sd**E`i6RjC{}_p zCR_(72+}ii3&6T6atlyYmSm}AAQ`ZCkR4KyTL3o~MK#RtV8!4tvU15!E(JNy z)5TT^WWQBPesX4t6_{ycoMx14nQE?Um};7&Ym#VSq??#zlBSzvVwsw3ZfTmDn3{-W zlxJRXNn&1dD#)mc+ycGK%oHojv{aK+!&FOMOJh?*U6Vu;16>P~6hmDzQ`00914AS8 z#KaUNBm9dp(=+oDbC6vHGAboA#md+$)xtc{(nvSO$kiLFv*Zen_>enDP3SOOH_R*nIlwn|2N1_+UWoWzo}{Gwc2 zC7;Z^(h7t`NM>$oa7iL4G!4xSEe$OVEi8=9jZDqWjSz~$Qj3Z+^YcJvf{R$N3@BQx z{EISE^GXsy>C{%q5G-DiTVMq)NArt9^7C_Sl|W7c7tU~L-_(-Cl*E!mm&B4(TO~ws z9Re$^wGAw+3?R-28Rwgyl9^UXNVOd(bJ#$l+#|ENB)_N!KsB19)z2d2~w?~ zpa9MkR*A_FFBB)1r9vVLE|r{-n3tZKVygsAt}rc`SdxNSlBtD>L2{z5fkBdqu8B!n zs;)(vX^O6eX`+Q$T57Ucim^F36yT;8=ckpFCl;kTrl;nW*ebba<`#g%NTzEgG)M4 zsRuC-RO-+YL*s&$RwyWpT0&Czjt19gaFG-OBq<(EU8BK8QV5WwcrNS3%plsM<-f?DO6-TUxHK5+&H1qM$S$B>F!Z*DmXGAQsI zFmO1ba%R6x$rrte7s}tCkpuVjz(hlnI%wbl%w}K+NNiw(GC`vYJQolghc-qj1n-1_ z186J)Dj><00c9~TFen@b4^Kb^QY022%x~afHi3#WFfdFQwQMvP8AcNbgVAU{8!bUb z%SMLLDrU6u9BmeWrgKJHSEJ2>(PjYy!)UW$v{^9PEEw%mkB%0AhD}CC3x>jIK~34) z1{MYe28Rp(ufOFeY2ToTJX9vlgfs#+Dm5A!NW-Y3X=5~}fXaCY9xWV33y0Cd0g@LO z7#K#g!)SIG%?_j40Tu$IjU|GOrRSRxrD1CUAi*{oXaoaoG@w8sFk0J=*0!UyEhr~| z@o07!uuhtcdXnjJtn0gOkp!)SIG%?{wK03t@S!)SIG%?_ZP0LG))VKh68W(ROq z01-nlJ0xA_^8h)W= z5il{DHb!#_(m9Kxg~Mp!04^86#Ax9#S~!dr4&bZ+B1W^rXm%LQ4xpR>#-rI`G&_uD z2XIyZ5u@2*G&_uD2T)D`W8$*IU!Btj7#M^aKz9T%Ffa^k_j5(8wE}2$p}?2_rPfS$ z6~X=(J@18qVf3tq(X$$0nPK$!qtWazdW_`g$(e}qV6=7^tsM}lVf1{G0Xv^$v{)W3 xmJu0ov{)W3mJz98v{)W3mPb!fgXagd?7$dVE9kZHq}~sZ0#8>zmvv4FO#or2+^4YxWQNyy^X;w1@Ht!5I{KCbU_$9En{?r+xXDXVk_rI3* zGu(flWOMrez4@!-&qnibbQ~#6n_>2m?c?9XYe)d8hJ`q>ar}`O;K_mFKDTt(xWc)9G6B)X!q+YlD*4+Wq7{Tv?ks^L2=_ zN0OlT1O+EY-qer;Ww+gaU9I&dbJc7999|c%G~H>Pk%XmKKr7qLug(7tzP}mOy3$i$ za}L9oD2*M4GaFSzb*KJFL85WTm=u$MXj4T z3=9eko-U3dn;qkJu?Z-by=`D&U|?{#@c;T-j*|AxiABE!HYccBG6@`6Cp!UTI>)d7 zyJQ>R32bJx{KU%h;q%4s2qP>Vcm+CQtrZv<7#IY;{4cd;x~sUEF-VwaQ{Y@So+Ft{ zjTsn(8bQ`gKIq*f5U{(<0pwzZ7yn! 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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 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;