Revert "chore: remove manual catppuccin in favor of system wide configuration"

This reverts commit 1161933237.

flake.lock

@@ -1,20 +1,5 @@
 {
   "nodes": {
-    "catppuccin": {
-      "locked": {
-        "lastModified": 1720472194,
-        "narHash": "sha256-CYscFEts6tyvosc1T29nxhzIYJAj/1CCEkV3ZMzSN/c=",
-        "owner": "catppuccin",
-        "repo": "nix",
-        "rev": "d75d5803852fb0833767dc969a4581ac13204e22",
-        "type": "github"
-      },
-      "original": {
-        "owner": "catppuccin",
-        "repo": "nix",
-        "type": "github"
-      }
-    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -53,11 +38,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1721379653,
+        "lastModified": 1720957393,
-        "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=",
+        "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374",
+        "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb",
         "type": "github"
       },
       "original": {
@@ -69,7 +54,6 @@
     },
     "root": {
       "inputs": {
-        "catppuccin": "catppuccin",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
         "spicetify-nix": "spicetify-nix"
@@ -83,11 +67,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721448793,
+        "lastModified": 1721103144,
-        "narHash": "sha256-k3gP2K58IkxRZRbr17gNkIo36YnjBFmmokm6G2GC2yw=",
+        "narHash": "sha256-vHGUl/kagv0/QsPXMW+caSPyuvHvMUJSV80cbe+0/2M=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "f244c6e512a4ca4211414c2c37f5f7516cfbab24",
+        "rev": "085ddf8abc78a7f1682c99715584e8735f4903cf",
         "type": "github"
       },
       "original": {

flake.nix

@@ -13,29 +13,19 @@
       url = "github:Gerg-L/spicetify-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    catppuccin.url = "github:catppuccin/nix";
   };
 
   outputs =
-    {
+    { home-manager, nixpkgs, ... }@inputs:
-      home-manager,
-      nixpkgs,
-      catppuccin,
-      ...
-    }@inputs:
     let
       system = "x86_64-linux";
       pkgs = nixpkgs.legacyPackages.${system};
     in
     {
-      nixosConfigurations."wizdesk" =
+      nixosConfigurations."nixos" =
         let
           specialArgs = inputs;
-          modules = [
+          modules = [ ./nixos.nix ];
-            ./nixos.nix
-            catppuccin.nixosModules.catppuccin
-          ];
         in
         nixpkgs.lib.nixosSystem { inherit system specialArgs modules; };
 
@@ -43,10 +33,7 @@
         inherit pkgs;
 
         extraSpecialArgs = inputs;
-        modules = [
+        modules = [ ./home-manager.nix ];
-          ./home-manager.nix
-          catppuccin.homeManagerModules.catppuccin
-        ];
       };
 
       formatter."${system}" = pkgs.nixfmt-rfc-style;

home-manager.nix

@@ -19,8 +19,6 @@
     ./programs/spotify
     ./programs/tmux
     ./programs/waybar.nix
-    # Enable catppuccin theme everywhere
-    ./theming/catppuccin.nix
   ];
 
   # Home Manager needs a bit of information about you and the paths it should
@@ -168,11 +166,35 @@
   # Home Manager is pretty good at managing dotfiles. The primary way to manage
   # plain files is through 'home.file'.
   home.file = {
+    # Cattpuccin theme for fish shell.
+    ".config/fish/themes/Catppuccin-Frappe.theme".source = ./programs/fish/Catppuccin-Frappe.theme;
+
     # Configuration for gamemode, for running games with optimizations.
     ".config/gamemode.ini".source = ./programs/gamemode.ini;
 
     # Configuration for mako, a notification daemon.
     ".config/mako".source = ./programs/mako;
+
+    ## Kvantum's theme configuration.
+    ".config/Kvantum/Catppuccin-Frappe-Lavender" = {
+      source = "${
+        pkgs.catppuccin-kvantum.override {
+          accent = "Lavender";
+          variant = "Frappe";
+        }
+      }/share/Kvantum/Catppuccin-Frappe-Lavender";
+    };
+
+    ".config/Kvantum/kvantum.kvconfig".text = ''
+      [General]
+      theme=Catppuccin-Frappe-Lavender
+    '';
+    ##
+
+    ## Themeing configuration for qt5 and qt6
+    ".config/qt5ct/colors".source = ./theming/qt5ct;
+
+    ".config/qt6ct/colors".source = ./theming/qt5ct; # We use the qt5ct because it's the SAME spec
     ##
 
     # Configure pipewire for microphone noise supression.
@@ -265,8 +287,7 @@
   # Configure QT
   qt = {
     enable = true;
-    platformTheme.name = "kvantum";
+    platformTheme.name = "qtct";
-    style.name = "kvantum";
   };
 
   # Configure XDG

nixos.nix

@@ -16,8 +16,6 @@
     ./services/archi.nix
     ./services/caddy.nix
     ./services/jellyfin.nix
-    # Enable catppuccin theme everywhere
-    ./theming/catppuccin.nix
   ];
 
   # Enable experimental features
@@ -96,7 +94,7 @@
     fileSystems = [ "/" ];
   };
 
-  networking.hostName = "wizdesk"; # Define your hostname.
+  networking.hostName = "nixos"; # Define your hostname.
 
   # Enable networking
   networking.networkmanager.enable = true;
@@ -240,8 +238,8 @@
   # Enable SDDM.
   services.displayManager.sddm = {
     enable = true;
-    package = pkgs.kdePackages.sddm;
     wayland.enable = true;
+    theme = "${import ./theming/sddm { inherit pkgs; }}";
   };
 
   # Enable Hyprland

programs/alacritty.nix

@@ -1,9 +1,19 @@
 { pkgs, ... }:
 
+let
+  catppuccin-theme = pkgs.fetchFromGitHub {
+    owner = "catppuccin";
+    repo = "alacritty";
+    rev = "94800165c13998b600a9da9d29c330de9f28618e";
+    hash = "sha256-Pi1Hicv3wPALGgqurdTzXEzJNx7vVh+8B9tlqhRpR2Y=";
+  };
+in
 {
   programs.alacritty = {
     enable = true;
     settings = {
+      import = [ "${catppuccin-theme}/catppuccin-frappe.toml" ];
+
       font = {
         normal = {
           family = "FantasqueSansM Nerd Font";

programs/fish/Catppuccin-Frappe.theme

@@ -0,0 +1,30 @@
+# name: 'Catppuccin frappe'
+# 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

programs/mako/config

@@ -1,21 +1,32 @@
 anchor=bottom-right
-border-radius=30
+background-color=#282a36
-border-size=1
+border-color=#282a36
+border-radius=20
+border-size=2
 default-timeout=10000
 format=<span font="FantasqueSansMono NF weight=325 Italic" size="12288">%s</span>\n<span font="FantasqueSansMono NF weight=325" size="12288">%b</span>
 group-by=summary
-height=180
+height=125
 icon-location=right
 layer=top
-margin=0
+margin=0,20,15
 markup=1
 max-icon-size=48
-outer-margin=8
+padding=10,5,10
-padding=25
+text-color=#44475a
-width=375
+width=300
 
 [grouped]
 format=<span font="FantasqueSansMono NF weight=325 Italic" size="12288">%s</span>\n<span font="FantasqueSansMono NF weight=325" size="12288">%b</span>
 
 [mode=do-not-disturb]
 invisible=1
+
+[urgency=low]
+border-color=#282a36
+
+[urgency=normal]
+border-color=#f1fa8c
+
+[urgency=high]
+border-color=#ff5555

programs/rofi/default.nix

@@ -22,5 +22,7 @@
       sidebar-mode = true;
       terminal = "alacritty";
     };
+
+    theme = ./catppuccin-frappe.rasi;
   };
 }

programs/tmux/default.nix

@@ -4,5 +4,13 @@
   programs.tmux = {
     enable = true;
     clock24 = true;
+    plugins = with pkgs.tmuxPlugins; [
+      {
+        plugin = catppuccin;
+        extraConfig = ''
+          set -g @catppuccin_flavour 'frappe'
+        '';
+      }
+    ];
   };
 }

theming/catppuccin.nix

@@ -1,7 +0,0 @@
-{
-  catppuccin = {
-    enable = true;
-    accent = "lavender";
-    flavor = "frappe";
-  };
-}

theming/qt5ct/Catppuccin-Frappe.conf

@@ -0,0 +1,4 @@
+[ColorScheme]
+active_colors=#ffc6d0f5, #ff292c3c, #ffa5adce, #ff949cbb, #ff51576d, #ff737994, #ffc6d0f5, #ffc6d0f5, #ffc6d0f5, #ff303446, #ff292c3c, #ff838ba7, #ff8caaee, #ff303446, #ff8caaee, #ffe78284, #ff303446, #ffc6d0f5, #ff232634, #ffc6d0f5, #80838ba7
+disabled_colors=#ffa5adce, #ff292c3c, #ffa5adce, #ff949cbb, #ff51576d, #ff737994, #ffa5adce, #ffa5adce, #ffa5adce, #ff303446, #ff292c3c, #ff838ba7, #ff626880, #ffb5bfe2, #ff8caaee, #ffe78284, #ff303446, #ffc6d0f5, #ff232634, #ffc6d0f5, #80838ba7
+inactive_colors=#ffc6d0f5, #ff292c3c, #ffa5adce, #ff949cbb, #ff51576d, #ff737994, #ffc6d0f5, #ffc6d0f5, #ffc6d0f5, #ff303446, #ff292c3c, #ff838ba7, #ff414559, #ffa5adcb, #ff8caaee, #ffe78284, #ff303446, #ffc6d0f5, #ff232634, #ffc6d0f5, #80838ba7

theming/qt5ct/Catppuccin-Latte.conf

@@ -0,0 +1,4 @@
+[ColorScheme]
+active_colors=#ff4c4f69, #ffe6e9ef, #ff6c6f85, #ff7c7f93, #ffbcc0cc, #ff9ca0b0, #ff4c4f69, #ff4c4f69, #ff4c4f69, #ffeff1f5, #ffe6e9ef, #ff8c8fa1, #ff1e66f5, #ffeff1f5, #ff7287fd, #ffe64553, #ffeff1f5, #ff4c4f69, #ffdce0e8, #ff4c4f69, #808c8fa1
+disabled_colors=#ff6c6f85, #ffe6e9ef, #ff6c6f85, #ff7c7f93, #ffbcc0cc, #ff9ca0b0, #ff6c6f85, #ff6c6f85, #ff6c6f85, #ffeff1f5, #ffe6e9ef, #ff8c8fa1, #ff9ca0b0, #ff5c5f77, #ff7287fd, #ffe64553, #ffeff1f5, #ff4c4f69, #ffdce0e8, #ff4c4f69, #808c8fa1
+inactive_colors=#ff4c4f69, #ffe6e9ef, #ff6c6f85, #ff7c7f93, #ffbcc0cc, #ff9ca0b0, #ff4c4f69, #ff4c4f69, #ff4c4f69, #ffeff1f5, #ffe6e9ef, #ff8c8fa1, #ffccd0da, #ff6c6f85, #ff7287fd, #ffe64553, #ffeff1f5, #ff4c4f69, #ffdce0e8, #ff4c4f69, #808c8fa1

theming/qt5ct/Catppuccin-Macchiato.conf

@@ -0,0 +1,4 @@
+[ColorScheme]
+active_colors=#ffcad3f5, #ff1e2030, #ffa5adcb, #ff939ab7, #ff494d64, #ff6e738d, #ffcad3f5, #ffcad3f5, #ffcad3f5, #ff24273a, #ff1e2030, #ff8087a2, #ff8aadf4, #ff24273a, #ff8aadf4, #ffed8796, #ff24273a, #ffcad3f5, #ff181926, #ffcad3f5, #808087a2
+disabled_colors=#ffa5adcb, #ff1e2030, #ffa5adcb, #ff939ab7, #ff494d64, #ff6e738d, #ffa5adcb, #ffa5adcb, #ffa5adcb, #ff24273a, #ff1e2030, #ff8087a2, #ff8aadf4, #ff494d64, #ff8aadf4, #ffed8796, #ff24273a, #ffcad3f5, #ff181926, #ffcad3f5, #808087a2
+inactive_colors=#ffcdd6f4, #ff1e2030, #ffa5adcb, #ff939ab7, #ff494d64, #ff6e738d, #ffcad3f5, #ffcad3f5, #ffcad3f5, #ff24273a, #ff1e2030, #ff8087a2, #ff8aadf4, #ffa5adcb, #ff8aadf4, #ffed8796, #ff24273a, #ffcad3f5, #ff181926, #ffcad3f5, #808087a2

theming/qt5ct/Catppuccin-Mocha.conf

@@ -0,0 +1,4 @@
+[ColorScheme]
+active_colors=#ffcdd6f4, #ff1e1e2e, #ffa6adc8, #ff9399b2, #ff45475a, #ff6c7086, #ffcdd6f4, #ffcdd6f4, #ffcdd6f4, #ff1e1e2e, #ff181825, #ff7f849c, #ff89b4fa, #ff1e1e2e, #ff89b4fa, #fff38ba8, #ff1e1e2e, #ffcdd6f4, #ff11111b, #ffcdd6f4, #807f849c
+disabled_colors=#ffa6adc8, #ff1e1e2e, #ffa6adc8, #ff9399b2, #ff45475a, #ff6c7086, #ffa6adc8, #ffa6adc8, #ffa6adc8, #ff1e1e2e, #ff11111b, #ff7f849c, #ff89b4fa, #ff45475a, #ff89b4fa, #fff38ba8, #ff1e1e2e, #ffcdd6f4, #ff11111b, #ffcdd6f4, #807f849c
+inactive_colors=#ffcdd6f4, #ff1e1e2e, #ffa6adc8, #ff9399b2, #ff45475a, #ff6c7086, #ffcdd6f4, #ffcdd6f4, #ffcdd6f4, #ff1e1e2e, #ff181825, #ff7f849c, #ff89b4fa, #ffa6adc8, #ff89b4fa, #fff38ba8, #ff1e1e2e, #ffcdd6f4, #ff11111b, #ffcdd6f4, #807f849c

theming/sddm/default.nix

@@ -0,0 +1,21 @@
+{ pkgs }:
+
+let
+  image = ./Background.jpg;
+in
+pkgs.stdenv.mkDerivation {
+  name = "sddm-theme";
+  src = pkgs.fetchFromGitHub {
+    owner = "MarianArlt";
+    repo = "sddm-sugar-dark";
+    rev = "ceb2c455663429be03ba62d9f898c571650ef7fe";
+    sha256 = "0153z1kylbhc9d12nxy9vpn0spxgrhgy36wy37pk6ysq7akaqlvy";
+  };
+  installPhase = ''
+    mkdir -p $out
+    cp -R ./* $out/
+    cd $out/
+    rm Background.jpg
+    cp -r ${image} $out/Background.jpg
+  '';
+}