From 042a3406151fa6cc02b5d81a219ea8f53c6889b8 Mon Sep 17 00:00:00 2001 From: Ethan Reece Date: Sun, 13 Jul 2025 02:27:24 -0500 Subject: [PATCH] Add Catppuccin theme --- README.md | 3 ++- flake.lock | 53 +++++++++++++++++++++++++++++++++++++-------- flake.nix | 2 ++ home/home.nix | 16 +++++++++++--- languages/en-us.nix | 1 + 5 files changed, 62 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 50cdc68..163a384 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,8 @@ for this Flake. by Nix with each language's configuration in its own file. - 🤖 **AI**: Uses Nix home-manager integrations for Codex and `aichat` for querying Large Language Models (LLMs) in the CLI and in Git repositories. -- 🎨 **Theming**: Uses Stylix for consistent theming across applications. +- 🎨 **Theming**: Uses Catppuccin and Stylix for consistent theming across + applications. - 📝 **Language tools**: Checks for grammatical and styling issues using Vale, Harper, LTeX, and Typos, centralizing the custom dictionary for these tools in the Nix configuration. diff --git a/flake.lock b/flake.lock index c1e7b1d..1d81092 100644 --- a/flake.lock +++ b/flake.lock @@ -67,10 +67,28 @@ "type": "github" } }, - "devshell": { + "catppuccin": { "inputs": { "nixpkgs": "nixpkgs" }, + "locked": { + "lastModified": 1752227483, + "narHash": "sha256-eetITGJfURryoHY5gfuE9/4sEV9aSgzhPxgsQgofNa8=", + "owner": "catppuccin", + "repo": "nix", + "rev": "5f431aac1a4038c385e6de2d2384d943e4802d61", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "repo": "nix", + "type": "github" + } + }, + "devshell": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, "locked": { "lastModified": 1741473158, "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=", @@ -250,7 +268,7 @@ "inputs": { "flake-compat": "flake-compat", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1750779888, @@ -381,6 +399,22 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1750776420, + "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1722073938, "narHash": "sha256-OpX0StkL8vpXyWOGUD6G+MA26wAXK6SpT94kLJXo6B4=", @@ -396,7 +430,7 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_3": { "locked": { "lastModified": 1730768919, "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", @@ -412,7 +446,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1751949589, "narHash": "sha256-mgFxAPLWw0Kq+C8P3dRrZrOYEQXOtKuYVlo9xvPntt8=", @@ -428,7 +462,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1751984180, "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", @@ -444,7 +478,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1747958103, "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=", @@ -463,7 +497,7 @@ "nur": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1752315995, @@ -506,13 +540,14 @@ }, "root": { "inputs": { + "catppuccin": "catppuccin", "devshell": "devshell", "flake-parts": "flake-parts", "git-hooks-nix": "git-hooks-nix", "home-manager": "home-manager", "lix-module": "lix-module", "nixgl": "nixgl", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nur": "nur", "sops-nix": "sops-nix", "stylix": "stylix", @@ -701,7 +736,7 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1752055615, diff --git a/flake.nix b/flake.nix index 5c0374f..3619aea 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,7 @@ { description = "Home Manager configuration"; inputs = { + catppuccin.url = "github:catppuccin/nix"; devshell.url = "github:numtide/devshell"; flake-parts = { url = "github:hercules-ci/flake-parts"; @@ -53,6 +54,7 @@ extraSpecialArgs = { inherit inputs pkgs; }; modules = [ ./home/home.nix + inputs.catppuccin.homeManagerModules.catppuccin inputs.lix-module.nixosModules.default inputs.sops-nix.homeManagerModules.sops inputs.stylix.homeModules.stylix diff --git a/home/home.nix b/home/home.nix index af57400..3312c0c 100644 --- a/home/home.nix +++ b/home/home.nix @@ -21,9 +21,13 @@ in defaultSopsFile = ./secrets/secrets.yaml; age.keyFile = /home/${username}/.config/sops/age/keys.txt; }; + catppuccin = { + enable = true; + flavor = "mocha"; + }; stylix = { enable = true; - base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; image = config.lib.stylix.pixel "base0A"; polarity = "dark"; fonts = { @@ -44,7 +48,13 @@ in name = "OpenMoji Color"; }; }; - targets.floorp.profileNames = [ "main" ]; + targets = { + bat.enable = false; + floorp.profileNames = [ "default" ]; + fzf.enable = false; + helix.enable = false; + starship.enable = false; + }; }; nixGL = { packages = import inputs.nixgl { @@ -461,7 +471,7 @@ in DisplayBookmarksToolbar = "newtab"; RequestedLocales = "eo,en-US"; }; - profiles.main = { + profiles.default = { extensions = { force = true; packages = with pkgs; [ diff --git a/languages/en-us.nix b/languages/en-us.nix index 2e649aa..2f29155 100644 --- a/languages/en-us.nix +++ b/languages/en-us.nix @@ -2,6 +2,7 @@ let dictionary = [ "Asahi" + "Catppuccin" "LLMs" "LTeX" "NixOS"