odin: Add temporary patch for Coral driver (gasket)

Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/c09c3a9639690f94ddff44c3dd25c85602e5aeb2?narHash=sha256-aXlifKr6Brg0SBUBgRNEBaZf3JLUeGhM9BX2gam%2Bvvo%3D' (2024-03-18)
  → 'github:nix-community/disko/e9875b969086a53dff5ec4677575ad3156fc875d?narHash=sha256-kFzpfZcInLhBFWHy452NlvFuzNr0BDEkz3w9Sgg2ypo%3D' (2024-03-20)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/ddc0d1e406566b0389f4e7f25d4b6aa59f98114e?narHash=sha256-G4sFKirxi49JaYi90Aq5Lo0jVSCJfYwYVTPhIt8zBT8%3D' (2024-03-18)
  → 'github:nix-community/emacs-overlay/a9216f7a1ec216e36e31c7d2ed42de4df89d918a?narHash=sha256-IbidJZykfjyGZ9totyhUIPHcDSqW1B3Pepgo3c9tDHI%3D' (2024-03-20)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/614b4613980a522ba49f0d194531beddbb7220d3?narHash=sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84%3D' (2024-03-17)
  → 'github:NixOS/nixpkgs/fa9f817df522ac294016af3d40ccff82f5fd3a63?narHash=sha256-RLvwdQSENKOaLdKhNie8XqHmTXzNm00/M/THj6zplQo%3D' (2024-03-19)
• Updated input 'eww':
    'github:elkowar/eww/4ce42455a4744b0dc00dd356ba9b32c1ca558a0e?narHash=sha256-M1MCbKXTI/Z7eWRi9jweloyUTIOMpqN33h5X6hOgeKU%3D' (2024-03-16)
  → 'github:elkowar/eww/f1ec00a1c9a24c0738fb5d5ac309d6af16e67415?narHash=sha256-O4zGpwaXhnD%2B01zTn6cQZDgU3HagGt4DBPpQyDbD6fk%3D' (2024-03-20)
• Updated input 'home-manager':
    'github:nix-community/home-manager/7b3fca5adcf6c709874a8f2e0c364fe9c58db989?narHash=sha256-eZCxuF58YWgaJMMRrn8oRkwRhxooe5kBS/s2wRVr9PA%3D' (2024-03-17)
  → 'github:nix-community/home-manager/022464438a85450abb23d93b91aa82e0addd71fb?narHash=sha256-2bNMraoRB4pdw/HtxgYTFeMhEekBZeQ53/a8xkqpbZc%3D' (2024-03-19)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/968952f950a59dee9ed1e8799dda38c6dfa1bad3?narHash=sha256-6zR642tXcZzzk3C8BHxlCrR0yh8z8zMXLiuXpWDIpX0%3D' (2024-03-16)
  → 'github:NixOS/nixos-hardware/1e679b9a9970780cd5d4dfe755a74a8f96d33388?narHash=sha256-eIsfu3c9JUBgm3cURSKTXLEI9Dlk1azo%2BMWKZVqrmkc%3D' (2024-03-18)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/c75037bbf9093a2acb617804ee46320d6d1fea5a?narHash=sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM%3D' (2024-03-16)
  → 'github:nixos/nixpkgs/b06025f1533a1e07b6db3e75151caa155d1c7eb3?narHash=sha256-qrxvLS888pNJFwJdK%2Bhf1wpRCSQcqA6W5%2BOx202NDa0%3D' (2024-03-19)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/5df5a70ad7575f6601d91f0efec95dd9bc619431?narHash=sha256-M%2BNg6%2BSePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM%3D' (2024-02-15)
  → 'github:cachix/pre-commit-hooks.nix/e611897ddfdde3ed3eaac4758635d7177ff78673?narHash=sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI%2BJMJuLo45aG3cKc%3D' (2024-03-20)
• Updated input 'pre-commit-hooks/gitignore':
    'github:hercules-ci/gitignore.nix/43e1aa1308018f37118e34d3a9cb4f5e75dc11d5?narHash=sha256-gGPa9qWNc6eCXT/%2BZ5/zMkyYOuRZqeFZBDbopNZQkuY%3D' (2023-12-29)
  → 'github:hercules-ci/gitignore.nix/637db329424fd7e46cf4185293b9cc8c88c95394?narHash=sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs%3D' (2024-02-28)
• Updated input 'pre-commit-hooks/nixpkgs-stable':
    'github:NixOS/nixpkgs/3dc440faeee9e889fe2d1b4d25ad0f430d449356?narHash=sha256-YWuCrtsty5vVZvu%2B7BchAxmcYzTMfolSPP5io8%2BWYCg%3D' (2024-01-10)
  → 'github:NixOS/nixpkgs/614b4613980a522ba49f0d194531beddbb7220d3?narHash=sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84%3D' (2024-03-17)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/a1b17cacfa7a6ed18f553a195a047f4e73e95da9?narHash=sha256-Ulsx%2Bt4SnRmjMJx4eF2Li%2B3rBGYhZp0XNShVjIheCfg%3D' (2024-03-18)
  → 'github:oxalica/rust-overlay/549f4db17b5c0c143b1308fcfe9620129c387472?narHash=sha256-PcHmHQvKIOdvAxlqxZ/DPmUMhUUvfp16pRtyW148u/0%3D' (2024-03-20)

flake.lock

@@ -147,11 +147,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710427903,
+        "lastModified": 1710906792,
-        "narHash": "sha256-sV0Q5ndvfjK9JfCg/QM/HX/fcittohvtq8dD62isxdM=",
+        "narHash": "sha256-kFzpfZcInLhBFWHy452NlvFuzNr0BDEkz3w9Sgg2ypo=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "21d89b333ca300bef82c928c856d48b94a9f997c",
+        "rev": "e9875b969086a53dff5ec4677575ad3156fc875d",
         "type": "github"
       },
       "original": {
@@ -171,11 +171,11 @@
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1710608587,
+        "lastModified": 1710954378,
-        "narHash": "sha256-7to4df2dUDd2LhPSp/XeH9rpONb2MtYDn1uFeVMolVc=",
+        "narHash": "sha256-IbidJZykfjyGZ9totyhUIPHcDSqW1B3Pepgo3c9tDHI=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "895a56e7294c2e5be4f84aa8e1cbc9e53e91307e",
+        "rev": "a9216f7a1ec216e36e31c7d2ed42de4df89d918a",
         "type": "github"
       },
       "original": {
@@ -195,11 +195,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710592392,
+        "lastModified": 1710935108,
-        "narHash": "sha256-M1MCbKXTI/Z7eWRi9jweloyUTIOMpqN33h5X6hOgeKU=",
+        "narHash": "sha256-O4zGpwaXhnD+01zTn6cQZDgU3HagGt4DBPpQyDbD6fk=",
         "owner": "elkowar",
         "repo": "eww",
-        "rev": "4ce42455a4744b0dc00dd356ba9b32c1ca558a0e",
+        "rev": "f1ec00a1c9a24c0738fb5d5ac309d6af16e67415",
         "type": "github"
       },
       "original": {
@@ -417,11 +417,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1703887061,
+        "lastModified": 1709087332,
-        "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=",
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
         "owner": "hercules-ci",
         "repo": "gitignore.nix",
-        "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
         "type": "github"
       },
       "original": {
@@ -468,11 +468,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710532761,
+        "lastModified": 1710820906,
-        "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=",
+        "narHash": "sha256-2bNMraoRB4pdw/HtxgYTFeMhEekBZeQ53/a8xkqpbZc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "206f457fffdb9a73596a4cb2211a471bd305243d",
+        "rev": "022464438a85450abb23d93b91aa82e0addd71fb",
         "type": "github"
       },
       "original": {
@@ -492,11 +492,11 @@
         "spectrum": "spectrum"
       },
       "locked": {
-        "lastModified": 1710327053,
+        "lastModified": 1710760349,
-        "narHash": "sha256-5S3jnObtWfXlTx00KzsPwpJtDoyfa1WpZnCrWnxovcw=",
+        "narHash": "sha256-yqGeSnAB3Yeg02jtitzSGIuE21kq7+pWAdeGK3F9/cY=",
         "owner": "astro",
         "repo": "microvm.nix",
-        "rev": "d535b9b6c9f6612e323d4504660ebbdcd1bd79bd",
+        "rev": "0e2223d8fd459725850bd9aff7e9d68ec329769a",
         "type": "github"
       },
       "original": {
@@ -575,11 +575,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1710622004,
+        "lastModified": 1710783728,
-        "narHash": "sha256-6zR642tXcZzzk3C8BHxlCrR0yh8z8zMXLiuXpWDIpX0=",
+        "narHash": "sha256-eIsfu3c9JUBgm3cURSKTXLEI9Dlk1azo+MWKZVqrmkc=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "968952f950a59dee9ed1e8799dda38c6dfa1bad3",
+        "rev": "1e679b9a9970780cd5d4dfe755a74a8f96d33388",
         "type": "github"
       },
       "original": {
@@ -640,11 +640,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1710420202,
+        "lastModified": 1710838473,
-        "narHash": "sha256-MvFKESbq4rUWuaf2RKPNYENaSZEw/jaCLo2gU6oREcM=",
+        "narHash": "sha256-RLvwdQSENKOaLdKhNie8XqHmTXzNm00/M/THj6zplQo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "878ef7d9721bee9f81f8a80819f9211ad1f993da",
+        "rev": "fa9f817df522ac294016af3d40ccff82f5fd3a63",
         "type": "github"
       },
       "original": {
@@ -656,11 +656,11 @@
     },
     "nixpkgs-stable_3": {
       "locked": {
-        "lastModified": 1704874635,
+        "lastModified": 1710695816,
-        "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=",
+        "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356",
+        "rev": "614b4613980a522ba49f0d194531beddbb7220d3",
         "type": "github"
       },
       "original": {
@@ -672,11 +672,11 @@
     },
     "nixpkgs-stable_4": {
       "locked": {
-        "lastModified": 1710033658,
+        "lastModified": 1710628718,
-        "narHash": "sha256-yiZiVKP5Ya813iYLho2+CcFuuHpaqKc/CoxOlANKcqM=",
+        "narHash": "sha256-y+l3eH53UlENaYa1lmnCBHusZb1kxBEFd2/c7lDsGpw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b17375d3bb7c79ffc52f3538028b2ec06eb79ef8",
+        "rev": "6dc11d9859d6a18ab0c5e5829a5b8e4810658de3",
         "type": "github"
       },
       "original": {
@@ -688,11 +688,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1710451336,
+        "lastModified": 1710806803,
-        "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=",
+        "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d691274a972b3165335d261cc4671335f5c67de9",
+        "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3",
         "type": "github"
       },
       "original": {
@@ -743,11 +743,11 @@
         "nixpkgs-stable": "nixpkgs-stable_3"
       },
       "locked": {
-        "lastModified": 1708018599,
+        "lastModified": 1710923068,
-        "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=",
+        "narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431",
+        "rev": "e611897ddfdde3ed3eaac4758635d7177ff78673",
         "type": "github"
       },
       "original": {
@@ -817,11 +817,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710555016,
+        "lastModified": 1710900660,
-        "narHash": "sha256-Lbdq3/TH4VrrR7A6FxIYwu5tFOcprYh8Q49Nc9s/i6c=",
+        "narHash": "sha256-PcHmHQvKIOdvAxlqxZ/DPmUMhUUvfp16pRtyW148u/0=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "42baa9e2e4713572d7481f917243b07dffdf54b8",
+        "rev": "549f4db17b5c0c143b1308fcfe9620129c387472",
         "type": "github"
       },
       "original": {
@@ -838,11 +838,11 @@
         "nixpkgs-stable": "nixpkgs-stable_4"
       },
       "locked": {
-        "lastModified": 1710433464,
+        "lastModified": 1710644594,
-        "narHash": "sha256-IXlPoWgIRovZ32mYvqqdBgOQln71LouE/HBhbKc1wcw=",
+        "narHash": "sha256-RquCuzxfy4Nr8DPbdp3D/AsbYep21JgQzG8aMH9jJ4A=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "6c32d3b9c7593f4b466ec5404e59fc09a803a090",
+        "rev": "83b68a0e8c94b72cdd0a6e547a14ca7eb1c03616",
         "type": "github"
       },
       "original": {

home-manager/modules/bat/default.nix

@@ -1,4 +1,9 @@
-{ config, lib, ... }:
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
 with lib;
 let
   cfg = config.eboskma.programs.bat;
@@ -11,8 +16,19 @@ in
   config = mkIf cfg.enable {
     programs.bat = {
       enable = true;
+      themes = {
+        catppuccin = {
+          src = pkgs.fetchFromGitHub {
+            owner = "catppuccin";
+            repo = "bat";
+            rev = "b19bea35a85a32294ac4732cad5b0dc6495bed32";
+            sha256 = "POoW2sEM6jiymbb+W/9DKIjDM1Buu1HAmrNP0yC2JPg=";
+          };
+          file = "themes/Catppuccin Mocha.tmTheme";
+        };
+      };
       config = {
-        theme = "Monokai Extended Bright";
+        theme = "catppuccin";
         pager = "less -FR";
         map-syntax = [ "*.heex:HTML (EEx)" ];
       };

home-manager/modules/emacs/config.org

@@ -409,15 +409,23 @@ I like the [[https://draculatheme.com][dracula theme]]
 #+begin_src emacs-lisp :tangle no
   (use-package dracula-theme
     :init
-    (load-theme 'dracula t))
+    (load-theme 'dracula :no-confirm))
 #+end_src
 
 [[https://github.com/belak/emacs-monokai-pro-theme][Monokai Pro]] is also pretty.
 
-#+begin_src emacs-lisp 
+#+begin_src emacs-lisp :tangle no
   (use-package monokai-pro-theme
     :init
-    (load-theme 'monokai-pro-spectrum t))
+    (load-theme 'monokai-pro-spectrum :no-confirm))
+#+end_src
+
+So is [[https://github.com/catppuccin/emacs][Catppuccin]]
+
+#+begin_src emacs-lisp
+  (use-package catppuccin-theme
+    :init
+    (load-theme 'catppuccin :no-confirm))
 #+end_src
 
 Set fonts.

home-manager/modules/neovim/config/init.lua

@@ -41,6 +41,9 @@ packer.startup(function()
   -- Monokai theme
   use 'tanvirtin/monokai.nvim'
 
+  -- Catppuccin theme
+  use { 'catppuccin/nvim', as = 'catppuccin' }
+
   -- Airline
   use 'vim-airline/vim-airline'
   use 'vim-airline/vim-airline-themes'

home-manager/modules/neovim/config/lua/settings.lua

@@ -36,13 +36,15 @@ local api = vim.api
 -- ]]]
 
 -- Theme [[[
-  cmd 'colorscheme monokai'
+  -- cmd 'colorscheme monokai'
-  o.termguicolors = true
+  -- o.termguicolors = true
-  o.background = 'dark'
+  -- o.background = 'dark'
+  cmd 'colorscheme catppuccin'
 -- ]]]
 
 -- Airline [[[
-  g.airline_theme = 'molokai'
+  -- g.airline_theme = 'molokai'
+  g.airline_theme = 'catppuccin'
   g.airline_powerline_fonts = 1
 -- ]]]
 

home-manager/modules/tmux/default.nix

@@ -25,18 +25,39 @@ in
         sensible
         tmux-fzf
         {
-          plugin = dracula;
+          plugin = catppuccin;
           extraConfig = ''
-            set -g @dracula-refresh-rate 10
+            set -g @catppuccin_window_left_separator "█"
-            set -g @dracula-show-powerline true
+            set -g @catppuccin_window_right_separator "█ "
-            set -g @dracula-show-fahrenheit false
+            set -g @catppuccin_window_number_position "right"
-            set -g @dracula-show-left-icon session
+            set -g @catppuccin_window_middle_separator "  █"
-            set -g @dracula-network-bandwith "enp4s0"
+
-            set -g @dracula-military-time true
+            set -g @catppuccin_window_default_fill "number"
-            set -g @dracula-day-month true
+
-            set -g @dracula-plugins "time cpu-usage ram-usage network network-bandwith"
+            set -g @catppuccin_window_current_fill "number"
+            set -g @catppuccin_window_current_text "#{pane_current_path}"
+
+            set -g @catppuccin_status_modules_right "application session date_time"
+            set -g @catppuccin_status_left_separator  ""
+            set -g @catppuccin_status_right_separator " "
+            set -g @catppuccin_status_right_separator_inverse "yes"
+            set -g @catppuccin_status_fill "all"
+            set -g @catppuccin_status_connect_separator "no"
           '';
         }
+        # {
+        #   plugin = dracula;
+        #   extraConfig = ''
+        #     set -g @dracula-refresh-rate 10
+        #     set -g @dracula-show-powerline true
+        #     set -g @dracula-show-fahrenheit false
+        #     set -g @dracula-show-left-icon session
+        #     set -g @dracula-network-bandwith "enp4s0"
+        #     set -g @dracula-military-time true
+        #     set -g @dracula-day-month true
+        #     set -g @dracula-plugins "time cpu-usage ram-usage network network-bandwith"
+        #   '';
+        # }
       ];
 
       extraConfig = ''

machines/odin/0001-fix-gasket.patch

@@ -0,0 +1,13 @@
+diff --git a/gasket_interrupt.c b/gasket_interrupt.c
+index 531d94e..8dba182 100644
+--- a/gasket_interrupt.c
++++ b/gasket_interrupt.c
+@@ -158,7 +158,7 @@ gasket_handle_interrupt(struct gasket_interrupt_data *interrupt_data,
+ 	read_lock(&interrupt_data->eventfd_ctx_lock);
+ 	ctx = interrupt_data->eventfd_ctxs[interrupt_index];
+ 	if (ctx)
+-		eventfd_signal(ctx, 1);
++		eventfd_signal(ctx);
+ 	read_unlock(&interrupt_data->eventfd_ctx_lock);
+ 
+ 	++(interrupt_data->interrupt_counts[interrupt_index]);

machines/odin/configuration.nix

@@ -79,7 +79,11 @@
     # From PVE: ro quiet intel_iommu=on i915.enable_gvt=1 cpufreq.default_governor=ondemand
     # kernelParams = [ "intel_iommu=on" "i915.enable_gvt=1" "cpufreq.default_governor=ondemand" ];
 
-    extraModulePackages = with config.boot.kernelPackages; [ gasket ];
+    extraModulePackages = with config.boot.kernelPackages; [
+      (gasket.overrideAttrs (prevAttrs: {
+        patches = (prevAttrs.patches or [ ]) ++ [ ./0001-fix-gasket.patch ];
+      }))
+    ];
 
     kernel.sysctl = {
       "net.core.rmem_max" = 2500000;

modules/keycloak/keycloak-admin-ui.nix

@@ -14,12 +14,12 @@ buildMavenPackage {
     owner = "keycloak";
     repo = "keycloak";
     rev = version;
-    sha256 = "XMRfFu7WQpFKv1VvRTDGrvClrdBGkKa3QNOZNvh2sKU=";
+    sha256 = "56JhP78pfWS21l9eTFoFTC+UX044nle79TAS21E0+80=";
   };
 
   sourceRoot = "source/integration/admin-client";
 
-  mvnHash = "sha256-wDulzZ/0mXXBb7kvjUaPA/38pS2Tw+bzOl83AR2TRtY=";
+  mvnHash = "sha256-Q9N/Ych7OFb25hifsfAoSTTBaZzd4WUcBhTsMpxJUkk=";
   # mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
 
   installPhase = ''

users/erwin/home.nix

@@ -11,11 +11,6 @@ let
   homeCfg = config.home-manager.users.erwin;
   bt = config.eboskma.bluetooth;
 
-  gtkTheme = {
-    name = "io.elementary.stylesheet.slate";
-    package = pkgs.pantheon.elementary-gtk-theme;
-  };
-
   ewwDaemon =
     let
       path = lib.makeBinPath (
@@ -265,8 +260,8 @@ in
           ]);
 
         pointerCursor = {
-          name = "elementary";
+          name = "Catppuccin-Mocha-Dark-Cursors";
-          package = gtkTheme.package;
+          package = pkgs.catppuccin-cursors.mochaDark;
           gtk.enable = true;
           x11.enable = true;
         };
@@ -313,10 +308,10 @@ in
           createDirectories = true;
         };
 
-        configFile."gtk-4.0/gtk.css" = lib.mkForce {
+        configFile = {
-          text = ''
+          "gtk-4.0/assets".source = "${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/assets";
-            @import url("file://${gtkTheme.package}/share/themes/${gtkTheme.name}/gtk-4.0/gtk-dark.css");
+          "gtk-4.0/gtk.css".source = "${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/gtk.css";
-          '';
+          "gtk-4.0/gtk-dark.css".source = "${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/gtk-dark.css";
         };
       };
 
@@ -337,7 +332,17 @@ in
 
       gtk = {
         enable = true;
-        theme = gtkTheme;
+        theme = {
+          name = "Catppuccin-Mocha-Compact-Dark";
+          package = pkgs.catppuccin-gtk.override {
+            size = "compact";
+            tweaks = [
+              "rimless"
+              "black"
+            ];
+            variant = "mocha";
+          };
+        };
 
         iconTheme = {
           name = "elementary";
@@ -348,13 +353,13 @@ in
           bookmarks = [ "file:///home/erwin/workspace" ];
           extraConfig = {
             gtk-application-prefer-dark-theme = 1;
-            gtk-cursor-theme-name = "elementary";
+            gtk-cursor-theme-name = "Catppuccin-Mocha-Dark-Cursors";
           };
         };
 
         gtk4.extraConfig = {
           gtk-application-prefer-dark-theme = 1;
-          gtk-cursor-theme-name = "elementary";
+          gtk-cursor-theme-name = "Catppuccin-Mocha-Dark-Cursors";
         };
       };
 

users/erwin/work.nix

@@ -9,11 +9,6 @@ with lib;
 let
   cfg = config.eboskma.users.erwin;
 
-  gtkTheme = {
-    name = "io.elementary.stylesheet.slate";
-    package = pkgs.pantheon.elementary-gtk-theme;
-  };
-
   ewwDaemon =
     let
       path = lib.makeBinPath (
@@ -305,8 +300,8 @@ in
           ]);
 
         pointerCursor = {
-          name = "elementary";
+          name = "Catppuccin-Mocha-Dark-Cursors";
-          package = gtkTheme.package;
+          package = pkgs.catppuccin-cursors.mochaDark;
           gtk.enable = true;
           x11.enable = true;
         };
@@ -348,10 +343,10 @@ in
           createDirectories = true;
         };
 
-        configFile."gtk-4.0/gtk.css" = lib.mkForce {
+        configFile = {
-          text = ''
+          "gtk-4.0/assets".source = "${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/assets";
-            @import url("file://${gtkTheme.package}/share/themes/${gtkTheme.name}/gtk-4.0/gtk-dark.css");
+          "gtk-4.0/gtk.css".source = "${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/gtk.css";
-          '';
+          "gtk-4.0/gtk-dark.css".source = "${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/gtk-dark.css";
         };
       };
 
@@ -363,7 +358,17 @@ in
 
       gtk = {
         enable = true;
-        theme = gtkTheme;
+        theme = {
+          name = "Catppuccin-Mocha-Compact-Dark";
+          package = pkgs.catppuccin-gtk.override {
+            size = "compact";
+            tweaks = [
+              "rimless"
+              "black"
+            ];
+            variant = "mocha";
+          };
+        };
 
         iconTheme = {
           name = "elementary";
@@ -374,14 +379,14 @@ in
           bookmarks = [ "file:///home/erwin/workspace" ];
           extraConfig = {
             gtk-application-prefer-dark-theme = 1;
-            # gtk-cursor-theme-name = "elementary";
+            gtk-cursor-theme-name = "Catppuccin-Mocha-Dark-Cursors";
           };
         };
 
         gtk4 = {
           extraConfig = {
             gtk-application-prefer-dark-theme = 1;
-            # gtk-cursor-theme-name = "elementary";
+            gtk-cursor-theme-name = "Catppuccin-Mocha-Dark-Cursors";
           };
         };
       };