From 5f99d8a0f4b843a7209087737ec22593fbdbb40d Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Thu, 6 Jun 2024 12:04:18 +0200
Subject: [PATCH 1/4] Revert "Flake: pin catppucin input"

This reverts commit 8d8b118b36c47bdd10e7507f87caff43f81e16fd.

Revert "Flake: actually downgrade catppuccin input"

This reverts commit aeed860735f1b705fd4fef9af9ef50c67f3260bc.
---
 flake.lock | 7 +++----
 flake.nix  | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/flake.lock b/flake.lock
index 83f4976..e6d8efe 100644
--- a/flake.lock
+++ b/flake.lock
@@ -25,17 +25,16 @@
     },
     "catppuccin": {
       "locked": {
-        "lastModified": 1713895615,
-        "narHash": "sha256-SVkxhcL0/IN5fNI2dqr702wXOnzktsm0LCEVGRAJQcY=",
+        "lastModified": 1714607657,
+        "narHash": "sha256-AnmN+JOzrpHv7Uw7JSPJ9JEjuqF7gjhx29UuuldNpas=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "a48e70a31616cb63e4794fd3465bff1835cc4246",
+        "rev": "b0dc7f3181063daa6532dc5f757ded1a605dfbd5",
         "type": "github"
       },
       "original": {
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "a48e70a31616cb63e4794fd3465bff1835cc4246",
         "type": "github"
       }
     },
diff --git a/flake.nix b/flake.nix
index b323ae0..60128b1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -67,7 +67,7 @@
 
     nur.url = "github:nix-community/NUR";
 
-    catppuccin.url = "github:catppuccin/nix/a48e70a31616cb63e4794fd3465bff1835cc4246";
+    catppuccin.url = "github:catppuccin/nix";
   };
 
   outputs = {...} @ inputs:

From 7e3da29f972121cf053f447dd8e0e7d34b4fcefb Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Thu, 6 Jun 2024 12:16:20 +0200
Subject: [PATCH 2/4] Flake: update catppuccin

I had to change flavour into flavor in the configs
---
 flake.lock                     | 6 +++---
 roles/common/configuration.nix | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/flake.lock b/flake.lock
index e6d8efe..d9abef9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -25,11 +25,11 @@
     },
     "catppuccin": {
       "locked": {
-        "lastModified": 1714607657,
-        "narHash": "sha256-AnmN+JOzrpHv7Uw7JSPJ9JEjuqF7gjhx29UuuldNpas=",
+        "lastModified": 1717565621,
+        "narHash": "sha256-uU6GeSbzopVcPga+Fy5n3tKfzUhuw4FVMv7h61/13XY=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "b0dc7f3181063daa6532dc5f757ded1a605dfbd5",
+        "rev": "0cdfa29b902976fc2941468d326325d24e148437",
         "type": "github"
       },
       "original": {
diff --git a/roles/common/configuration.nix b/roles/common/configuration.nix
index f599cd2..8fb05cf 100755
--- a/roles/common/configuration.nix
+++ b/roles/common/configuration.nix
@@ -95,7 +95,7 @@
     )
   ];
 
-  catppuccin.flavour = "mocha";
+  catppuccin.flavor = "mocha";
 
   home-manager = {
     backupFileExtension = "hm-backup";
@@ -103,7 +103,7 @@
     verbose = true;
     sharedModules = [flakeSelf.inputs.catppuccin.homeManagerModules.catppuccin];
     users.toast = {osConfig, ...}: {
-      catppuccin.flavour = osConfig.catppuccin.flavour;
+      catppuccin.flavor = osConfig.catppuccin.flavor;
       home.stateVersion = "24.05";
       xdg = {
         enable = true;

From 4f61147f8d436da82989a43e25908dd4dbf9c04c Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Thu, 6 Jun 2024 12:33:16 +0200
Subject: [PATCH 3/4] Common: set catppuccin accent

---
 roles/common/configuration.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/roles/common/configuration.nix b/roles/common/configuration.nix
index 8fb05cf..7092f16 100755
--- a/roles/common/configuration.nix
+++ b/roles/common/configuration.nix
@@ -95,7 +95,10 @@
     )
   ];
 
-  catppuccin.flavor = "mocha";
+  catppuccin = {
+    flavor = "mocha";
+    accent = "mauve";
+  };
 
   home-manager = {
     backupFileExtension = "hm-backup";
@@ -104,6 +107,7 @@
     sharedModules = [flakeSelf.inputs.catppuccin.homeManagerModules.catppuccin];
     users.toast = {osConfig, ...}: {
       catppuccin.flavor = osConfig.catppuccin.flavor;
+      catppuccin.accent = osConfig.catppuccin.accent;
       home.stateVersion = "24.05";
       xdg = {
         enable = true;

From b7a9debd3b7435d42d97893d44ecedb05c7aef91 Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Thu, 6 Jun 2024 12:37:03 +0200
Subject: [PATCH 4/4] Common/fish: enable catppuccin

---
 roles/common/programs/fish.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/roles/common/programs/fish.nix b/roles/common/programs/fish.nix
index 79a6648..25c43cd 100644
--- a/roles/common/programs/fish.nix
+++ b/roles/common/programs/fish.nix
@@ -6,6 +6,7 @@
   home-manager.users.toast = {
     programs.fish = {
       enable = true;
+      catppuccin.enable = true;
     };
   };
 }