fix: repair GTK theme and gnome-shell theme

Signed-off-by: Jo <johannesreckers2006@gmail.com>

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "catppuccin": {
       "locked": {
-        "lastModified": 1716884128,
+        "lastModified": 1719915848,
-        "narHash": "sha256-hzTzcX/qIGf93WVvk2jlLL3N7IgIlWylOBQkgwfTq8w=",
+        "narHash": "sha256-zq+CMkdT8A9z74HonwspXp8HsX4OvP4uaVdD98AO6as=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "296adaf9331cd2c1eb479a25d5207508fbd06188",
+        "rev": "9345073d27d91ab66c1b6ab65df322906992aa59",
         "type": "github"
       },
       "original": {
@@ -17,11 +17,11 @@
     },
     "hardware": {
       "locked": {
-        "lastModified": 1716881121,
+        "lastModified": 1719895800,
-        "narHash": "sha256-oTf3enbe/lbiNzsyZ8ria+422hx4e/FB3xQcY2LPnJw=",
+        "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "806e9d4a933dd1e75592e88894d4bd2f296f5bbf",
+        "rev": "6e253f12b1009053eff5344be5e835f604bb64cd",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716908526,
+        "lastModified": 1719827439,
-        "narHash": "sha256-Zl6e/sEVDh07K47XxDGPsXTYT4nI6llUDbQ4xMIwp7k=",
+        "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "373ead20606efa9181cd15ba19a5deac7ead1492",
+        "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d",
         "type": "github"
       },
       "original": {
@@ -70,11 +70,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1716509168,
+        "lastModified": 1719848872,
-        "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=",
+        "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "bfb7a882678e518398ce9a31a881538679f6f092",
+        "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8",
         "type": "github"
       },
       "original": {
@@ -94,11 +94,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716902607,
+        "lastModified": 1719875930,
-        "narHash": "sha256-jShqpVupP/7ksp6gCBVG9/05zYSX8Q+z6eGe9HLYtUs=",
+        "narHash": "sha256-jQmdWLxRP6BzOxRF8hQEhDD7UKw7UrnYbmaAPOSaXWY=",
         "owner": "pjones",
         "repo": "plasma-manager",
-        "rev": "4a255e5ea6bf2c7815d893a693c5c801d835ba6b",
+        "rev": "7e062fcd669e261fb06cf54fe0ef2e46c3db8e83",
         "type": "github"
       },
       "original": {

flake.nix

@@ -71,6 +71,7 @@
         modules = [
           ./users/jo/home.nix
           nix-flatpak.homeManagerModules.nix-flatpak
+          catppuccin.homeManagerModules.catppuccin
         ];
       };
 

modules/home-manager/themes/catppuccin/global.nix

@@ -5,13 +5,13 @@
   lib,
   ...
 }: {
-  imports = [
-    inputs.catppuccin.homeManagerModules.catppuccin
-  ];
-
   catppuccin = {
     enable = true;
     accent = "blue";
     flavor = "frappe";
+
+    pointerCursor.enable = true;
+    pointerCursor.accent = "blue";
+    pointerCursor.flavor = "frappe";
   };
-}
+}

modules/home-manager/themes/catppuccin/gnome.nix

@@ -5,8 +5,30 @@
   lib,
   ...
 }: {
-  gtk = {
+  gtk = with pkgs; {
     enable = true;
+
+    font = {
+      name = "Cantarell";
+      size = 12;
+      package = cantarell-fonts;
+    };
+
+    catppuccin = {
+      icon.enable = true;
+      icon.accent = "blue";
+      icon.flavor = "frappe";
+    };
+
+    theme = {
+      name = "Colloid-Dark-Catppuccin";
+      package = colloid-gtk-theme.override {
+        themeVariants = ["default"];
+        colorVariants = ["dark"];
+        sizeVariants = ["standard"];
+        tweaks = ["catppuccin"];
+      };
+    };
   };
 
   dconf.settings = {
@@ -17,8 +39,8 @@
     };
 
     "org/gnome/shell/extensions/user-theme" = {
-      name = "Catppuccin-Frappe-Standard-Blue-Dark";
+      name = "Colloid-Dark-Catppuccin";
     };
     # ---------------------- Theming END
   };
-}
+}

pkgs/default.nix

@@ -9,8 +9,4 @@ pkgs: {
   gnomeExtensions = {
     rounded-window-corners = pkgs.callPackage ./gnomeExtensions/rounded-window-corners.nix { };
   };
-
-  kernelPackages = {
-    rtl8821ce = pkgs.callPackage ./kernelPackages/rtl8821ce.nix { };
-  };
 }

pkgs/kernelPackages/rtl8821ce.nix

@@ -1,45 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, kernel
-, bc
-}:
-
-stdenv.mkDerivation rec {
-  pname = "rtl8821ce";
-  version = "${kernel.version}-unstable-2024-03-26";
-
-  src = fetchFromGitHub {
-    owner = "tomaspinho";
-    repo = "rtl8821ce";
-    rev = "f119398d868b1a3395f40c1df2e08b57b2c882cd";
-    hash = "sha256-EfpKa5ZRBVM5T8EVim3cVX1PP1UM9CyG6tN5Br8zYww=";
-  };
-
-  hardeningDisable = [ "pic" ];
-
-  nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies;
-  makeFlags = kernel.makeFlags;
-
-  prePatch = ''
-    substituteInPlace ./Makefile \
-      --replace /lib/modules/ "${kernel.dev}/lib/modules/" \
-      --replace /sbin/depmod \# \
-      --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
-  '';
-
-  preInstall = ''
-    mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = with lib; {
-    description = "Realtek rtl8821ce driver";
-    homepage = "https://github.com/tomaspinho/rtl8821ce";
-    license = licenses.gpl2Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ hhm ivar ];
-    broken = stdenv.isAarch64 || ((lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened);
-  };
-}

resources/default.nix

@@ -1,3 +1,4 @@
 {
   wallpapers = ./wallpapers;
-}
+  app-files = ./programm-files;
+}

resources/programm-files/blackbox/Catppuccin-Macchiato.json

@@ -0,0 +1,35 @@
+{
+  "name": "Catppuccin-Macchiato",
+  "comment": "Soothing pastel theme for the high-spirited!",
+  "background-color": "#24273A",
+  "foreground-color": "#CAD3F5",
+  "badge-color": "#5B6078",
+  "bold-color": "#5B6078",
+  "cursor-background-color": "#F4DBD6",
+  "cursor-foreground-color": "#24273A",
+  "highlight-background-color": "#F4DBD6",
+  "highlight-foreground-color": "#24273A",
+  "palette": [
+    "#494D64",
+    "#ED8796",
+    "#A6DA95",
+    "#EED49F",
+    "#8AADF4",
+    "#F5BDE6",
+    "#8BD5CA",
+    "#B8C0E0",
+    "#5B6078",
+    "#ED8796",
+    "#A6DA95",
+    "#EED49F",
+    "#8AADF4",
+    "#F5BDE6",
+    "#8BD5CA",
+    "#A5ADCB"
+  ],
+  "use-badge-color": false,
+  "use-bold-color": false,
+  "use-cursor-color": true,
+  "use-highlight-color": true,
+  "use-theme-colors": false
+}

resources/programm-files/fish/Catppuccin Frappe.theme

@@ -0,0 +1,30 @@
+# name: 'Catppuccin Frappé'
+# url: 'https://github.com/catppuccin/fish'
+# preferred_background: 303446
+
+fish_color_normal c6d0f5
+fish_color_command 8caaee
+fish_color_param eebebe
+fish_color_keyword e78284
+fish_color_quote a6d189
+fish_color_redirection f4b8e4
+fish_color_end ef9f76
+fish_color_comment 838ba7
+fish_color_error e78284
+fish_color_gray 737994
+fish_color_selection --background=414559
+fish_color_search_match --background=414559
+fish_color_option a6d189
+fish_color_operator f4b8e4
+fish_color_escape ea999c
+fish_color_autosuggestion 737994
+fish_color_cancel e78284
+fish_color_cwd e5c890
+fish_color_user 81c8be
+fish_color_host 8caaee
+fish_color_host_remote a6d189
+fish_color_status e78284
+fish_pager_color_progress 737994
+fish_pager_color_prefix f4b8e4
+fish_pager_color_completion c6d0f5
+fish_pager_color_description 737994

users/jo/apps/blackbox.nix

@@ -0,0 +1,5 @@
+{
+  outputs,
+}: {
+  home.file.".local/share/blackbox/schemes/Catppuccin-Macchiato.json".source = "${outputs.resources.app-files}/blackbox/Catppuccin-Macchiato.json";
+}

users/jo/apps/fish.nix

@@ -0,0 +1,9 @@
+{
+  inputs,
+  pkgs,
+  outputs,
+  lib,
+  ...
+}: {
+  home.file.".config/fish/themes/Catppuccin\ Frappe.theme".source = "${outputs.resources.app-files}/fish/Catppuccin\ Frappe.theme";
+}

users/jo/desktop/gnome.nix

@@ -21,6 +21,7 @@
   dconf.settings = {
     "org/gnome/desktop/interface" = {
       color-scheme = "prefer-dark";
+      cursor-theme = "catppuccin-frappe-blue-cursors";
     };
 
     "org/gnome/shell" = {

users/jo/home.nix

@@ -8,6 +8,7 @@
 }: {
   imports = [
     ./desktop/gnome.nix
+    ./apps/fish.nix
     outputs.homeManagerModules.themes.catppuccin.global
     outputs.homeManagerModules.development.ssh
   ];
@@ -54,6 +55,10 @@
     git
     nodejs_22
     bun
+    termius
+    blackbox-terminal
+    forge-sparks
+    devenv
 
     # Work stuff for when I'm not actually working
     teams-for-linux
@@ -61,6 +66,9 @@
 
     # Notes and Organisation
     obsidian
+
+    # File synchronization
+    celeste
   ];
 
   # Enable home-manager