bit more ricing

common/default.nix

@@ -51,13 +51,13 @@
         "https://nix-community.cachix.org"
         "https://nixpkgs-review-bot.cachix.org"
         "https://cachix.cachix.org"
-        "https://cosmic.cachix.org"
+        "https://hyprland.cachix.org"
       ];
       trusted-public-keys = [
         "cachix.cachix.org-1:eWNHQldwUO7G2VkjpnjDbWwy4KQ/HNxht7H4SSoMckM="
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
         "nixpkgs-review-bot.cachix.org-1:eppgiDjPk7Hkzzz7XlUesk3rcEHqNDozGOrcLc8IqwE="
-        "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="
+        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
       ];
     };
     optimise = {

common/desktop/home.nix

@@ -109,7 +109,6 @@ in
 
   xdg.autoStart = {
     packages = with pkgs; [
-      obsidian
       element-desktop
       firefox
       discord

common/hm-modules/catppuccin/default.nix

@@ -6,20 +6,7 @@
 }:
 with lib;
 let
-  inherit (builtins) fromTOML readFile;
   cfg = config.themes.v.catppuccin;
-  mako = pkgs.fetchFromGitHub {
-    owner = "catppuccin";
-    repo = "mako";
-    rev = "9dd088aa5f4529a3dd4d9760415e340664cb86df";
-    sha256 = "sha256-nUzWkQVsIH4rrCFSP87mXAka6P+Td2ifNbTuP7NM/SQ=";
-  };
-  starship = pkgs.fetchFromGitHub {
-    owner = "catppuccin";
-    repo = "starship";
-    rev = "5629d2356f62a9f2f8efad3ff37476c19969bd4f";
-    sha256 = "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0=";
-  };
 in
 {
   options.themes.v.catppuccin = {
@@ -27,8 +14,24 @@ in
   };
   config = mkIf cfg.enable {
     catppuccin = {
+      enable = true;
       flavor = "frappe";
       accent = "pink";
+
+      waybar.enable = false;
+
+      mako.enable = true;
+      rofi.enable = true;
+      # gtk = {
+      #   enable = true;
+      #   gnomeShellTheme = true;
+      #   icon.enable = false;
+      # };
+
+      hyprland.enable = true;
+      kitty.enable = true;
+
+      kvantum.enable = true;
     };
 
     home.pointerCursor = {
@@ -38,21 +41,12 @@ in
     };
 
     programs.kitty = {
-      themeFile = "Catppuccin-Frappe";
+      # themeFile = "Catppuccin-Frappe";
       font.name = "DejaVuSansMono Nerd Font";
     };
 
     gtk = {
       enable = true;
-      # theme = {
-      #   name = "Catppuccin-Frappe-Standard-Pink-Dark";
-      #   package = pkgs.catppuccin-gtk.override {
-      #     accents = [ "pink" ];
-      #     variant = "frappe";
-      #     size = "standard";
-      #   };
-      # };
-
       iconTheme = {
         name = "Papirus-Dark";
         package = pkgs.papirus-icon-theme.override { color = "violet"; };
@@ -62,34 +56,12 @@ in
       };
     };
 
-    # qt = {
-    #   enable = true;
-    #   # platformTheme = "qtct";
-    #   style.name = "kvantum";
-    #   platformTheme.name = "kvantum";
-    # };
-
-    # xdg.configFile = {
-    #   "Kvantum/kvantum.kvconfig".text = ''
-    #     [General]
-    #     theme=Catppuccin-Frappe-Pink
-    #   '';
-    # };
-
-    home.packages = with pkgs; [
-      # (catppuccin-kvantum.override {
-      #   accent = "Pink";
-      #   variant = "Frappe";
-      # })
-    ];
-
-    services.mako.catppuccin.enable = true;
-    # programs.mako.extraConfig = readFile "${mako}/src/frappe";
-    #
-    # programs.starship.settings = {
-    #   palette = "catppuccin_frappe";
-    # } //fromTOML (readFile "${starship}/palettes/frappe.toml");
-    #
+    qt = {
+      enable = true;
+      # platformTheme = "qtct";
+      style.name = "kvantum";
+      platformTheme.name = "kvantum";
+    };
 
     programs.vscode = {
       userSettings."workbench.colorTheme" = "Catppuccin Frappé";