From 838a2d21117b27229601f315c550cd8088d75373 Mon Sep 17 00:00:00 2001
From: Leon Wilzer <git@komu.boo>
Date: Wed, 25 Dec 2024 13:24:35 +0100
Subject: [PATCH] theming

---
 common.nix | 88 +++++++++++++++++++++++++++++++++++++++++++-----------
 flake.lock | 16 ++++++++++
 flake.nix  |  4 +++
 3 files changed, 90 insertions(+), 18 deletions(-)

diff --git a/common.nix b/common.nix
index e2339fc..9fb95e6 100644
--- a/common.nix
+++ b/common.nix
@@ -341,7 +341,7 @@ in
     home.sessionVariables = {
       PAGER = "less -RFX --tabs=4";
       MANPAGER = "nvim +'setl filetype=terminal' +'Man!'";
-      QT_QPA_PLATFORMTHEME = "qt5ct";
+      #QT_QPA_PLATFORMTHEME = "qt5ct";
     };
 
     xdg.mimeApps = {
@@ -476,12 +476,37 @@ in
       nixfmt-rfc-style # official nix formatter
       ripgrep # some nice grep alternative
       netcat-openbsd # socket debugging
-      libsForQt5.qtstyleplugin-kvantum # qt theme
-      libsForQt5.qt5ct # qt theme
+      #libsForQt5.qtstyleplugin-kvantum # qt theme
+      #libsForQt5.qt5ct # qt theme
       virtiofsd # virtiofs drivers
       filezilla # FTP client
     ];
 
+    catppuccin = {
+      accent = "blue";
+      enable = true;
+      zed.enable = false;
+      cursors = {
+        enable = true;
+        accent = "dark";
+      };
+    };
+
+    fonts.fontconfig = {
+      enable = true;
+      defaultFonts = {
+        monospace = [ "Fira Code" ];
+        sansSerif = [ "Fira Sans" ];
+      };
+    };
+
+    home.pointerCursor = {
+      gtk.enable = true;
+      hyprcursor.enable = true;
+      x11.enable = true;
+      size = 16;
+    };
+
     programs = {
       zsh = {
         enable = true;
@@ -498,7 +523,7 @@ in
       bash.enable = true;
       kitty = {
         enable = true;
-        themeFile = "Catppuccin-Mocha";
+        #themeFile = "Catppuccin-Mocha";
         font = {
           name = "Fira Code";
           package = pkgs.fira-code;
@@ -605,7 +630,6 @@ in
                     set tabstop=4
                     set softtabstop=0 noexpandtab
                     set shiftwidth=4
-                    colorscheme catppuccin-mocha
           		  hi Normal guibg=NONE ctermbg=NONE
 
                     " VimTex
@@ -621,7 +645,6 @@ in
         plugins = with pkgs.vimPlugins; [
           vimtex
           vim-latex-live-preview
-          catppuccin-nvim
           nvim-terminal-lua
         ];
       };
@@ -651,9 +674,25 @@ in
           withExternalGnupg = true;
         };
       };
-
+      zed-editor = {
+        enable = true;
+        userSettings = {
+          vim_mode = true;
+          auto_install_extensions = { };
+          theme = {
+            mode = "system";
+            light = "Catppuccin Latte (Blue Blur+)";
+            dark = "Catppuccin Mocha (Blue Blur+)";
+          };
+          features = {
+            copilot = false;
+          };
+          telemetry = {
+            metrics = false;
+          };
+        };
+      };
       hyprlock.enable = true;
-      zed-editor.enable = true;
       # Let Home Manager install and manage itself.
       home-manager.enable = true;
     };
@@ -664,17 +703,26 @@ in
 
     gtk = {
       enable = true;
-      theme = {
-        name = "Catppuccin Mocha";
-        package = pkgs.catppuccin-gtk;
+      #theme = {
+      #  name = "Catppuccin Mocha";
+      #  package = pkgs.catppuccin-gtk;
+      #};
+      font = {
+        package = pkgs.fira;
+        name = "Fira Sans";
+      };
+      iconTheme = {
+        name = "catppuccin-papirus-folders";
+        package = pkgs.catppuccin-papirus-folders;
       };
     };
+
     qt = {
       enable = true;
-      platformTheme.name = "qt5ct";
+      platformTheme.name = "kvantum";
       style = {
-        name = "Catppuccin Mocha";
-        package = pkgs.catppuccin;
+        name = "kvantum";
+        #  package = pkgs.catppuccin;
       };
     };
 
@@ -701,10 +749,14 @@ in
 
       ssh-agent.enable = false;
     };
-    dconf.settings = {
-      "org/virt-manager/virt-manager/connections" = {
-        autoconnect = [ "qemu:///system" ];
-        uris = [ "qemu:///system" ];
+    dconf = {
+      enable = true;
+      settings = {
+        "org/virt-manager/virt-manager/connections" = {
+          autoconnect = [ "qemu:///system" ];
+          uris = [ "qemu:///system" ];
+        };
+        "org/gnome/desktop/interface".color-scheme = "prefer-dark";
       };
     };
 
diff --git a/flake.lock b/flake.lock
index c9dbdba..ad4da9d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,20 @@
 {
   "nodes": {
+    "catppuccin": {
+      "locked": {
+        "lastModified": 1735028008,
+        "narHash": "sha256-crbQNRVQgPH0hX5vZk8xL9JStXo74Es7zDBjRcc4i+A=",
+        "owner": "catppuccin",
+        "repo": "nix",
+        "rev": "bfd20bcf45f1de0e97b551be51495abf8a727f1a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "catppuccin",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -128,6 +143,7 @@
     },
     "root": {
       "inputs": {
+        "catppuccin": "catppuccin",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
         "pre-commit-hooks": "pre-commit-hooks"
diff --git a/flake.nix b/flake.nix
index 81b3a26..9a1ecd2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,6 +9,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     pre-commit-hooks.url = "github:cachix/git-hooks.nix";
+    catppuccin.url = "github:catppuccin/nix";
   };
 
   outputs =
@@ -16,6 +17,7 @@
       self,
       nixpkgs,
       home-manager,
+      catppuccin,
       ...
     }@inputs:
     let
@@ -54,6 +56,7 @@
         # the path to your home.nix.
         modules = [
           ./work.nix
+          catppuccin.homeManagerModules.catppuccin
         ];
 
         # Optionally use extraSpecialArgs
@@ -65,6 +68,7 @@
 
         modules = [
           ./home.nix
+          catppuccin.homeManagerModules.catppuccin
         ];
       };
     };