From 24cda84b1228c65a2fecf90e94e01e8de53b87da Mon Sep 17 00:00:00 2001 From: Superredstone Date: Fri, 6 Feb 2026 08:27:22 +0100 Subject: [PATCH] Removed catppuccin global theme --- flake.lock | 47 ++++--------------------------- flake.nix | 7 ++--- home/catppuccin.nix | 8 ------ home/default.nix | 4 +-- lib/mksystem.nix | 2 -- modules/nix-config/catppuccin.nix | 8 ------ modules/nix-config/default.nix | 1 - 7 files changed, 9 insertions(+), 68 deletions(-) delete mode 100644 home/catppuccin.nix delete mode 100644 modules/nix-config/catppuccin.nix diff --git a/flake.lock b/flake.lock index af4f540..467bacd 100644 --- a/flake.lock +++ b/flake.lock @@ -67,24 +67,6 @@ "type": "github" } }, - "catppuccin": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1769946009, - "narHash": "sha256-cjPsPx3qlP7RW78lcGJoTP/B6yqY6BJJjwT7QUg8ByY=", - "owner": "catppuccin", - "repo": "nix", - "rev": "ff59ad5085b7d71705ea1f019c02b08dfe40d9c8", - "type": "github" - }, - "original": { - "owner": "catppuccin", - "repo": "nix", - "type": "github" - } - }, "curl-src": { "flake": false, "locked": { @@ -307,7 +289,7 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "hyprwire": "hyprwire", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems", "xdph": "xdph" @@ -657,7 +639,7 @@ "minhook-src": "minhook-src", "mini-src": "mini-src", "minizip-src": "minizip-src", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "re2-src": "re2-src", "websocketpp-src": "websocketpp-src", "zlib-src": "zlib-src" @@ -763,22 +745,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1769461804, - "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1767379071, "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", @@ -794,7 +760,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1770141374, "narHash": "sha256-yD4K/vRHPwXbJf5CK3JkptBA6nFWUKNX/jlFp2eKEQc=", @@ -810,7 +776,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1768875095, "narHash": "sha256-dYP3DjiL7oIiiq3H65tGIXXIT1Waiadmv93JS0sS+8A=", @@ -851,7 +817,7 @@ "nixvim_2": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "systems": "systems_3" }, "locked": { @@ -931,11 +897,10 @@ }, "root": { "inputs": { - "catppuccin": "catppuccin", "home-manager": "home-manager", "hyprland": "hyprland", "millennium": "millennium", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixvim": "nixvim", "nur": "nur" } diff --git a/flake.nix b/flake.nix index cd3b905..42a4e69 100644 --- a/flake.nix +++ b/flake.nix @@ -16,10 +16,9 @@ }; millennium.url = "github:SteamClientHomebrew/Millennium?dir=packages/nix"; hyprland.url = "github:hyprwm/Hyprland"; - catppuccin.url = "github:catppuccin/nix"; }; - outputs = { self, nixpkgs, home-manager, nixvim, millennium, hyprland, nur, catppuccin, ... }@inputs: + outputs = { self, nixpkgs, home-manager, nixvim, millennium, hyprland, nur, ... }@inputs: let overlays = [ millennium.overlays.default @@ -35,8 +34,7 @@ nur inputs nixpkgs - home-manager - catppuccin; + home-manager; }; in { @@ -48,7 +46,6 @@ # Currently supported: plasma, gnome, hyprland and none desktopEnvironment = "gnome"; additionalModules = [ - catppuccin.nixosModules.catppuccin ]; }; nixosConfigurations.workstation = mkSystem "workstation" { diff --git a/home/catppuccin.nix b/home/catppuccin.nix deleted file mode 100644 index c3c5545..0000000 --- a/home/catppuccin.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ ... }: -{ - catppuccin = { - enable = true; - flavor = "mocha"; - accent = "mauve"; - }; -} diff --git a/home/default.nix b/home/default.nix index 6d9ffc1..307dd37 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,7 +1,6 @@ -{ currentSystemUser, currentSystemDe, pkgs, catppuccin, ... }: +{ currentSystemUser, currentSystemDe, pkgs, ... }: { imports = [ - ./catppuccin.nix ./fish.nix ./git.nix ./gnome.nix @@ -9,7 +8,6 @@ ./mangohud.nix ./tmux.nix ./zoxide.nix - catppuccin.homeModules.catppuccin ] ++ (if currentSystemDe == "hyprland" then [ ./hyprland ] else [] diff --git a/lib/mksystem.nix b/lib/mksystem.nix index 361ac40..7b3c7ca 100644 --- a/lib/mksystem.nix +++ b/lib/mksystem.nix @@ -7,7 +7,6 @@ inputs, nixpkgs, home-manager, - catppuccin, }: name: { @@ -42,7 +41,6 @@ let nur = nur; inputs = inputs; additionalModules = additionalModules; - catppuccin = catppuccin; }; in nixpkgs.lib.nixosSystem { diff --git a/modules/nix-config/catppuccin.nix b/modules/nix-config/catppuccin.nix deleted file mode 100644 index 209a2dd..0000000 --- a/modules/nix-config/catppuccin.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ catppuccin, ... }: -{ - catppuccin = { - enable = true; - accent = "mauve"; - flavor = "mocha"; - }; -} diff --git a/modules/nix-config/default.nix b/modules/nix-config/default.nix index fc4a961..9054fff 100644 --- a/modules/nix-config/default.nix +++ b/modules/nix-config/default.nix @@ -5,7 +5,6 @@ ./security.nix ./services.nix ] ++ (if (currentSystemDe != "none") then [ - ./catppuccin.nix ./de.nix ./fonts.nix ./sound.nix