From 57372c8d28dd2a01f7b0f8d4fa591e7d55565e76 Mon Sep 17 00:00:00 2001 From: Toast Date: Tue, 9 Apr 2024 10:40:18 +0200 Subject: [PATCH 1/9] Common: add catpuccin modules --- flake.lock | 16 ++++++++++++++++ flake.nix | 7 +++++++ roles/common/configuration.nix | 1 + 3 files changed, 24 insertions(+) diff --git a/flake.lock b/flake.lock index cd441ac..02e25cf 100644 --- a/flake.lock +++ b/flake.lock @@ -23,6 +23,21 @@ "type": "github" } }, + "catppuccin": { + "locked": { + "lastModified": 1712482981, + "narHash": "sha256-LJOOpTey9Y29C/TK4h9KP7v4HvqDL3mLyT9hSWCfFlI=", + "owner": "catppuccin", + "repo": "nix", + "rev": "4043beb6c792a40e9c513aa261f4ba10601a4457", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "repo": "nix", + "type": "github" + } + }, "catppuccin-vsc": { "inputs": { "nixpkgs": [ @@ -340,6 +355,7 @@ "root": { "inputs": { "agenix": "agenix", + "catppuccin": "catppuccin", "catppuccin-vsc": "catppuccin-vsc", "home-manager": "home-manager_2", "home-manager-unstable": "home-manager-unstable", diff --git a/flake.nix b/flake.nix index 81171bf..90defdb 100644 --- a/flake.nix +++ b/flake.nix @@ -68,6 +68,8 @@ nix-flatpak.url = "github:gmodena/nix-flatpak/main"; nur.url = "github:nix-community/NUR"; + + catppuccin.url = "github:catppuccin/nix"; }; outputs = {...} @ inputs: @@ -131,6 +133,7 @@ agenix.nixosModules.default home-manager-unstable.nixosModule nix-index-db-unstable.nixosModules.nix-index + catppuccin.nixosModules.catppuccin ./roles/common ./roles/desktop ./roles/kde @@ -151,6 +154,7 @@ home-manager-unstable.nixosModule nixos-hardware.nixosModules.microsoft-surface-go nix-index-db-unstable.nixosModules.nix-index + catppuccin.nixosModules.catppuccin ./roles/common ./roles/desktop ./roles/kde @@ -169,6 +173,7 @@ jovian.nixosModules.default home-manager-unstable.nixosModule nix-index-db-unstable.nixosModules.nix-index + catppuccin.nixosModules.catppuccin ./roles/common ./roles/desktop ./roles/kde @@ -190,6 +195,7 @@ home-manager-unstable.nixosModule nix-index-db-unstable.nixosModules.nix-index nixos-hardware.nixosModules.gpd-win-max-2-2023 + catppuccin.nixosModules.catppuccin ./roles/common ./roles/desktop ./roles/kde @@ -209,6 +215,7 @@ agenix.nixosModules.default home-manager.nixosModule nix-index-db.nixosModules.nix-index + catppuccin.nixosModules.catppuccin ./roles/common ./roles/server ./machines/Everest diff --git a/roles/common/configuration.nix b/roles/common/configuration.nix index 53fa7ba..480d8ad 100755 --- a/roles/common/configuration.nix +++ b/roles/common/configuration.nix @@ -95,6 +95,7 @@ useGlobalPkgs = true; verbose = true; users.toast = {...}: { + sharedModules = [flakeSelf.inputs.catppuccin.homeManagerModules.catppuccin]; home.stateVersion = "23.11"; xdg = { userDirs = { -- 2.51.2 From 317aa3800a8f9ae14bbc6eec1dc79e23b2d48018 Mon Sep 17 00:00:00 2001 From: Toast Date: Tue, 9 Apr 2024 10:40:57 +0200 Subject: [PATCH 2/9] Common: set catppuccin flavour --- roles/common/configuration.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/roles/common/configuration.nix b/roles/common/configuration.nix index 480d8ad..35bd5fe 100755 --- a/roles/common/configuration.nix +++ b/roles/common/configuration.nix @@ -90,12 +90,15 @@ ) ]; + catppuccin.flavour = "mocha"; + home-manager = { backupFileExtension = "hm-backup"; useGlobalPkgs = true; verbose = true; - users.toast = {...}: { sharedModules = [flakeSelf.inputs.catppuccin.homeManagerModules.catppuccin]; + users.toast = {osConfig, ...}: { + catppuccin.flavour = osConfig.catppuccin.flavour; home.stateVersion = "23.11"; xdg = { userDirs = { -- 2.51.2 From 72a94a71c1d77fad48cc85e7ba81c6dd767b108d Mon Sep 17 00:00:00 2001 From: Toast Date: Tue, 9 Apr 2024 10:54:22 +0200 Subject: [PATCH 3/9] Common/bat: use catppuccin module --- roles/common/programs/bat.nix | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/roles/common/programs/bat.nix b/roles/common/programs/bat.nix index 021d531..cce65c9 100644 --- a/roles/common/programs/bat.nix +++ b/roles/common/programs/bat.nix @@ -1,25 +1,8 @@ -{ - config, - pkgs, - ... -}: let - themeName = - if config.system.nixos.release == "23.11" - then "Catppuccin-mocha" - else "Catppuccin Mocha"; -in { +{...}: { home-manager = { users.toast.programs.bat = { enable = true; - config = { - theme = "catppuccin-mocha"; - }; - themes = { - catppuccin-mocha = { - src = pkgs.catppuccin; - file = "bat/${themeName}.tmTheme"; - }; - }; + catppuccin.enable = true; }; }; } -- 2.51.2 From cd48978f981104810747affd01e0802e7d22c458 Mon Sep 17 00:00:00 2001 From: Toast Date: Tue, 9 Apr 2024 16:17:07 +0200 Subject: [PATCH 4/9] Common: use grub catppuccin module --- roles/common/configuration.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/roles/common/configuration.nix b/roles/common/configuration.nix index 35bd5fe..84d20be 100755 --- a/roles/common/configuration.nix +++ b/roles/common/configuration.nix @@ -117,11 +117,7 @@ ]; }; - boot.loader.grub = { - theme = "${pkgs.catppuccin}/grub"; - backgroundColor = "#1E1E2E"; - splashImage = "${pkgs.catppuccin}/grub/background.png"; - }; + boot.loader.grub.catppuccin.enable = true; /* I used to keep the host keys in the repo as a secret, but since I use the -- 2.51.2 From 8062c8ad5af9ddcb06c2bdeb0e8e39a87a7facff Mon Sep 17 00:00:00 2001 From: Toast Date: Tue, 9 Apr 2024 16:32:23 +0200 Subject: [PATCH 5/9] Common/git: use delta catppuccin module --- roles/common/programs/git.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/roles/common/programs/git.nix b/roles/common/programs/git.nix index 3b125df..f9f2b4e 100644 --- a/roles/common/programs/git.nix +++ b/roles/common/programs/git.nix @@ -1,11 +1,4 @@ -{pkgs, ...}: let - catppuccinDelta = pkgs.fetchFromGitHub { - owner = "catppuccin"; - repo = "delta"; - rev = "main"; - hash = "sha256-0QQLkfLBVuB2re6tjtPNuOQZNK0MDBAIFgNGHZM8afs="; - }; -in { +{...}: { home-manager.users.toast = { programs.git = { enable = true; @@ -13,12 +6,8 @@ in { userEmail = "toast003@tutamail.com"; delta = { enable = true; - options = { - syntax-theme = "catppuccin-mocha"; - features = "catppuccin-mocha"; - }; + catppuccin.enable = true; }; - includes = [{path = "${catppuccinDelta}/themes/mocha.gitconfig";}]; extraConfig = { init.defaultBranch = "main"; diff.colorMoved = "default"; -- 2.51.2 From 89eb9e4b712f5f3e1cd075f6bf986831dc9bb2ee Mon Sep 17 00:00:00 2001 From: Toast Date: Wed, 10 Apr 2024 09:36:48 +0200 Subject: [PATCH 6/9] Common/btop: use catppuccin module --- roles/common/programs/btop.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/roles/common/programs/btop.nix b/roles/common/programs/btop.nix index c0bf0de..1e25cbe 100644 --- a/roles/common/programs/btop.nix +++ b/roles/common/programs/btop.nix @@ -1,14 +1,9 @@ -{pkgs, ...}: { +{...}: { home-manager = { users.toast = { programs.btop = { enable = true; - settings = { - color_theme = "catppuccin_mocha"; - }; - }; - xdg.configFile = { - "btop/themes".source = "${pkgs.catppuccin}/btop"; + catppuccin.enable = true; }; }; }; -- 2.51.2 From 13b2e5ef6fd3f02b81f6f2da446dbfa07407ff69 Mon Sep 17 00:00:00 2001 From: Toast Date: Wed, 10 Apr 2024 09:45:50 +0200 Subject: [PATCH 7/9] Common/helix: use catppuccin module --- roles/common/programs/helix.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/roles/common/programs/helix.nix b/roles/common/programs/helix.nix index 70fa320..c5ea603 100644 --- a/roles/common/programs/helix.nix +++ b/roles/common/programs/helix.nix @@ -7,8 +7,11 @@ nixpkgs-fmt nil ]; + catppuccin = { + enable = true; + useItalics = true; + }; settings = { - theme = "catppuccin_mocha"; editor = { mouse = true; cursorline = true; -- 2.51.2 From 3ecc3456ecc5628611b56fb5007f498b0f52ea90 Mon Sep 17 00:00:00 2001 From: Toast Date: Wed, 10 Apr 2024 10:43:44 +0200 Subject: [PATCH 8/9] Common: enable management of xdg directories --- roles/common/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/common/configuration.nix b/roles/common/configuration.nix index 84d20be..8af3482 100755 --- a/roles/common/configuration.nix +++ b/roles/common/configuration.nix @@ -101,6 +101,7 @@ catppuccin.flavour = osConfig.catppuccin.flavour; home.stateVersion = "23.11"; xdg = { + enable = true; userDirs = { enable = true; createDirectories = true; -- 2.51.2 From 16d47d521476a8380ea17a229b8fa938c64cbb25 Mon Sep 17 00:00:00 2001 From: Toast Date: Wed, 10 Apr 2024 10:50:42 +0200 Subject: [PATCH 9/9] Common/starship: setup using home manager and use catppuccin modue --- roles/common/programs/starship.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/roles/common/programs/starship.nix b/roles/common/programs/starship.nix index 8e60667..527034a 100644 --- a/roles/common/programs/starship.nix +++ b/roles/common/programs/starship.nix @@ -49,4 +49,13 @@ in { } ]; }; + # The catppuccin module only works for home-manager, so this + # sets up starship with home-manager using the system config + home-manager.users.toast = {osConfig, ...}: { + programs.starship = { + enable = true; + catppuccin.enable = true; + settings = osConfig.programs.starship.settings; + }; + }; } -- 2.51.2