From b11add852543b7820c405a21622f62308d82544e Mon Sep 17 00:00:00 2001 From: DannyDannyDanny Date: Wed, 20 May 2026 20:13:44 +0200 Subject: [PATCH] Revert "Merge add-catppuccin-forgejo: Catppuccin theme on Forgejo" This reverts commit 1b0eb5835ddef99d159b6d6fb20ce9853c30eab5, reversing changes made to 5d4f2048a63ddae41c3a92d3fe37435c7a13983b. --- flake-modules/clan.nix | 1 - flake.lock | 21 --------------------- flake.nix | 6 ------ nixos/hosts/phantom-ship.nix | 8 -------- 4 files changed, 36 deletions(-) diff --git a/flake-modules/clan.nix b/flake-modules/clan.nix index 2207db4..30fe4c9 100644 --- a/flake-modules/clan.nix +++ b/flake-modules/clan.nix @@ -166,7 +166,6 @@ in { } clanHostsModule inputs.nix-openclaw.nixosModules.openclaw-gateway - inputs.catppuccin.nixosModules.catppuccin ../nixos/hosts/phantom-ship.nix config.flake.nixosModules.server-debug-tools config.flake.nixosModules.monitoring-node-exporter diff --git a/flake.lock b/flake.lock index 6ae35fc..c524fd2 100644 --- a/flake.lock +++ b/flake.lock @@ -1,25 +1,5 @@ { "nodes": { - "catppuccin": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1779125773, - "narHash": "sha256-F34zmAgMQXHwvFb9SpCilX4cAIfF4+KvpzrJqnkNLJE=", - "owner": "catppuccin", - "repo": "nix", - "rev": "86996e2c4ee6a091fddb10de56dd21a1a5972bcb", - "type": "github" - }, - "original": { - "owner": "catppuccin", - "repo": "nix", - "type": "github" - } - }, "clan-community": { "inputs": { "clan-core": [ @@ -520,7 +500,6 @@ }, "root": { "inputs": { - "catppuccin": "catppuccin", "clan-community": "clan-community", "clan-core": "clan-core", "disko": "disko_2", diff --git a/flake.nix b/flake.nix index b0b6579..30e7d71 100644 --- a/flake.nix +++ b/flake.nix @@ -25,12 +25,6 @@ nix-openclaw.url = "github:openclaw/nix-openclaw"; nix-openclaw.inputs.nixpkgs.follows = "nixpkgs"; - # Catppuccin NixOS module — used for theming Forgejo (and any future - # NixOS-level services). Home-manager/neovim/alacritty Catppuccin lives - # outside this input (separate nixpkgs packages). - catppuccin.url = "github:catppuccin/nix"; - catppuccin.inputs.nixpkgs.follows = "nixpkgs"; - clan-core.url = "https://git.clan.lol/clan/clan-core/archive/main.tar.gz"; clan-core.inputs.nixpkgs.follows = "nixpkgs"; clan-core.inputs.flake-parts.follows = "flake-parts"; diff --git a/nixos/hosts/phantom-ship.nix b/nixos/hosts/phantom-ship.nix index d91e229..4e71c54 100644 --- a/nixos/hosts/phantom-ship.nix +++ b/nixos/hosts/phantom-ship.nix @@ -581,14 +581,6 @@ in }; }; - # Catppuccin theme for Forgejo — module wired in via clan.nix's - # phantom-ship.imports (inputs.catppuccin.nixosModules.catppuccin). - catppuccin.forgejo = { - enable = true; - flavor = "mocha"; - accent = "mauve"; - }; - # Auto-rebuild service/timer + safe.directory provided by the # shared dotfiles-rebuild NixOS module (see nixos/modules/dotfiles-rebuild.nix). }