From 3e569821daa53fd0e87b52f852c99a8e0e15d8c7 Mon Sep 17 00:00:00 2001 From: uku Date: Sun, 24 Dec 2023 08:13:53 +0100 Subject: [PATCH] use ctp-nix for gtk theme --- flake.lock | 16 ++++++++++++++++ flake.nix | 2 ++ systems/default.nix | 1 + systems/desktop.nix | 19 ++++++++++++++----- 4 files changed, 33 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 44b60e2..b6e9500 100644 --- a/flake.lock +++ b/flake.lock @@ -22,6 +22,21 @@ "type": "github" } }, + "catppuccin": { + "locked": { + "lastModified": 1702771919, + "narHash": "sha256-l6zkit3WPXuukWrQDpaNVNEQ2Y0lq1K+7OQmvtqFIJU=", + "owner": "Stonks3141", + "repo": "ctp-nix", + "rev": "4a76ba2815b6db301597630d14e4e40f4fb5fb0f", + "type": "github" + }, + "original": { + "owner": "Stonks3141", + "repo": "ctp-nix", + "type": "github" + } + }, "crane": { "inputs": { "nixpkgs": [ @@ -290,6 +305,7 @@ "root": { "inputs": { "agenix": "agenix", + "catppuccin": "catppuccin", "flake-parts": "flake-parts", "home-manager": "home-manager_2", "lanzaboote": "lanzaboote", diff --git a/flake.nix b/flake.nix index 345064f..1d7ddce 100644 --- a/flake.nix +++ b/flake.nix @@ -15,6 +15,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + catppuccin.url = "github:Stonks3141/ctp-nix"; + lanzaboote = { url = "github:nix-community/lanzaboote"; inputs = { diff --git a/systems/default.nix b/systems/default.nix index 4552892..a42c645 100644 --- a/systems/default.nix +++ b/systems/default.nix @@ -32,6 +32,7 @@ ./desktop.nix lanzaboote.nixosModules.lanzaboote home-manager.nixosModules.home-manager + catppuccin.nixosModules.catppuccin ] ++ nixos; in { diff --git a/systems/desktop.nix b/systems/desktop.nix index d210a4a..929d16d 100644 --- a/systems/desktop.nix +++ b/systems/desktop.nix @@ -3,6 +3,7 @@ pkgs, config, agenix, + catppuccin, ... }: let username = "leo"; @@ -120,6 +121,10 @@ in { }; hm = { + imports = [ + catppuccin.homeManagerModules.catppuccin + ]; + home.packages = with pkgs; let inherit (pkgs.stdenv.hostPlatform) system; in [ @@ -143,11 +148,6 @@ in { sccache shotcut vesktop - - (catppuccin-gtk.override { - variant = "macchiato"; - accents = ["sky" "sapphire"]; - }) ]; services = { @@ -156,6 +156,15 @@ in { pinentryFlavor = "gnome3"; }; }; + + gtk = { + enable = true; + catppuccin = { + enable = true; + flavour = "macchiato"; + accent = "sky"; + }; + }; }; nixpkgs = {