diff --git a/containers/citrine/configuration.nix b/containers/citrine/configuration.nix
index b7106a1..fccb236 100644
--- a/containers/citrine/configuration.nix
+++ b/containers/citrine/configuration.nix
@@ -1,4 +1,4 @@
-{ config, ... }: {
+{ config, lib, ... }: {
system.stateVersion = "25.11";
networking.firewall.allowedTCPPorts = [ 3000 ];
networking.firewall.allowedUDPPorts = [ 3000 ];
@@ -17,10 +17,25 @@
ROOT_URL = "https://garden.lava.moe/";
HTTP_PORT = 3000;
};
+ ui = lib.mkForce {
+ DEFAULT_THEME = "catppuccin-maroon-auto";
+ THEMES = lib.strings.concatMapStringsSep "," (x: "${x}-auto") [
+ "catppuccin-pink"
+ "catppuccin-maroon"
+ "catppuccin-flamingo"
+ "catppuccin-rosewater"
+ "forgejo"
+ "gitea"
+ ];
+ };
+ api.ENABLE_SWAGGER = false;
+ other.SHOW_FOOTER_TEMPLATE_LOAD_TIME = false;
service.DISABLE_REGISTRATION = true;
};
stateDir = "/persist/forgejo";
};
+ catppuccin.forgejo.enable = true;
+
environment.systemPackages = [ config.services.forgejo.package ];
}
diff --git a/containers/citrine/flake.lock b/containers/citrine/flake.lock
index 88ab73f..d627614 100644
--- a/containers/citrine/flake.lock
+++ b/containers/citrine/flake.lock
@@ -1,6 +1,40 @@
{
"nodes": {
+ "catppuccin": {
+ "inputs": {
+ "nixpkgs": "nixpkgs"
+ },
+ "locked": {
+ "lastModified": 1773403535,
+ "narHash": "sha256-47MZaFrHxNO8tVUAmtVnerXUw2WWVluBOiU9MulN/yM=",
+ "owner": "catppuccin",
+ "repo": "nix",
+ "rev": "d45b5665cc638bad1b794350de02f4dd41b0bb47",
+ "type": "github"
+ },
+ "original": {
+ "owner": "catppuccin",
+ "repo": "nix",
+ "type": "github"
+ }
+ },
"nixpkgs": {
+ "locked": {
+ "lastModified": 1773122722,
+ "narHash": "sha256-FIqHByVqxCprNjor1NqF80F2QQoiiyqanNNefdlvOg4=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "62dc67aa6a52b4364dd75994ec00b51fbf474e50",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_2": {
"locked": {
"lastModified": 1773282481,
"narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
@@ -18,7 +52,8 @@
},
"root": {
"inputs": {
- "nixpkgs": "nixpkgs"
+ "catppuccin": "catppuccin",
+ "nixpkgs": "nixpkgs_2"
}
}
},
diff --git a/containers/citrine/flake.nix b/containers/citrine/flake.nix
index bb4c1f4..72ff573 100644
--- a/containers/citrine/flake.nix
+++ b/containers/citrine/flake.nix
@@ -1,10 +1,17 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+ catppuccin.url = "github:catppuccin/nix";
};
- outputs = { nixpkgs, ... }: {
+ outputs = { nixpkgs, catppuccin, ... }:
+ let
+ modules = [
+ ./configuration.nix
+ catppuccin.nixosModules.catppuccin
+ ];
+ in {
nixosConfigurations.container = nixpkgs.lib.nixosSystem {
- modules = [ ./configuration.nix ];
+ inherit modules;
};
nixosModule = { ... }:
let
@@ -26,7 +33,7 @@
# privateUsers = "pick";
nixpkgs = nixpkgs;
ephemeral = true;
- config = { imports = [ ./configuration.nix ]; };
+ config = { imports = modules; };
bindMounts."persist" = {
hostPath = "/persist/containers/${name}";
diff --git a/containers/citrine/templates/base/footer_content.tmpl b/containers/citrine/templates/base/footer_content.tmpl
new file mode 100644
index 0000000..a9238c3
--- /dev/null
+++ b/containers/citrine/templates/base/footer_content.tmpl
@@ -0,0 +1,31 @@
+
diff --git a/containers/citrine/templates/home.tmpl b/containers/citrine/templates/home.tmpl
index 853077a..d460caf 100644
--- a/containers/citrine/templates/home.tmpl
+++ b/containers/citrine/templates/home.tmpl
@@ -3,17 +3,17 @@
{{end}}
-
-
-

-
-
-
{{ctx.Locale.Tr "startpage.app_desc"}}
-
-
-
- {{template "home_forgejo" .}}
+
+
+

+
+
+
{{ctx.Locale.Tr "startpage.app_desc"}}
+
+
+
+ {{template "home_forgejo" .}}
{{template "base/footer" .}}
diff --git a/flake.lock b/flake.lock
index cd62ccb..1484f08 100644
--- a/flake.lock
+++ b/flake.lock
@@ -73,7 +73,8 @@
},
"c-citrine": {
"inputs": {
- "nixpkgs": "nixpkgs_5"
+ "catppuccin": "catppuccin",
+ "nixpkgs": "nixpkgs_6"
},
"locked": {
"path": "./containers/citrine",
@@ -87,28 +88,19 @@
},
"catppuccin": {
"inputs": {
- "catppuccin-v1_1": "catppuccin-v1_1",
- "catppuccin-v1_2": "catppuccin-v1_2",
- "home-manager": "home-manager_2",
- "home-manager-stable": "home-manager-stable",
- "nixpkgs": [
- "nixpkgs"
- ],
- "nixpkgs-stable": "nixpkgs-stable",
- "nuscht-search": "nuscht-search"
+ "nixpkgs": "nixpkgs_5"
},
"locked": {
- "lastModified": 1736069220,
- "narHash": "sha256-76MaB3COao55nlhWmSmq9PKgu2iGIs54C1cAE0E5J6Y=",
+ "lastModified": 1773403535,
+ "narHash": "sha256-47MZaFrHxNO8tVUAmtVnerXUw2WWVluBOiU9MulN/yM=",
"owner": "catppuccin",
"repo": "nix",
- "rev": "8eada392fd6571a747e1c5fc358dd61c14c8704e",
+ "rev": "d45b5665cc638bad1b794350de02f4dd41b0bb47",
"type": "github"
},
"original": {
"owner": "catppuccin",
"repo": "nix",
- "rev": "8eada392fd6571a747e1c5fc358dd61c14c8704e",
"type": "github"
}
},
@@ -156,6 +148,33 @@
"url": "https://flakehub.com/f/catppuccin/nix/1.2.%2A.tar.gz"
}
},
+ "catppuccin_2": {
+ "inputs": {
+ "catppuccin-v1_1": "catppuccin-v1_1",
+ "catppuccin-v1_2": "catppuccin-v1_2",
+ "home-manager": "home-manager_2",
+ "home-manager-stable": "home-manager-stable",
+ "nixpkgs": [
+ "nixpkgs"
+ ],
+ "nixpkgs-stable": "nixpkgs-stable",
+ "nuscht-search": "nuscht-search"
+ },
+ "locked": {
+ "lastModified": 1736069220,
+ "narHash": "sha256-76MaB3COao55nlhWmSmq9PKgu2iGIs54C1cAE0E5J6Y=",
+ "owner": "catppuccin",
+ "repo": "nix",
+ "rev": "8eada392fd6571a747e1c5fc358dd61c14c8704e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "catppuccin",
+ "repo": "nix",
+ "rev": "8eada392fd6571a747e1c5fc358dd61c14c8704e",
+ "type": "github"
+ }
+ },
"darwin": {
"inputs": {
"nixpkgs": [
@@ -472,7 +491,7 @@
"nix-gaming": {
"inputs": {
"flake-parts": "flake-parts_2",
- "nixpkgs": "nixpkgs_6"
+ "nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1770778188,
@@ -604,6 +623,22 @@
}
},
"nixpkgs_5": {
+ "locked": {
+ "lastModified": 1773122722,
+ "narHash": "sha256-FIqHByVqxCprNjor1NqF80F2QQoiiyqanNNefdlvOg4=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "62dc67aa6a52b4364dd75994ec00b51fbf474e50",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_6": {
"locked": {
"lastModified": 1773282481,
"narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
@@ -619,7 +654,7 @@
"type": "github"
}
},
- "nixpkgs_6": {
+ "nixpkgs_7": {
"locked": {
"lastModified": 1770537093,
"narHash": "sha256-pF1quXG5wsgtyuPOHcLfYg/ft/QMr8NnX0i6tW2187s=",
@@ -635,7 +670,7 @@
"type": "github"
}
},
- "nixpkgs_7": {
+ "nixpkgs_8": {
"locked": {
"lastModified": 1770562336,
"narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=",
@@ -651,7 +686,7 @@
"type": "github"
}
},
- "nixpkgs_8": {
+ "nixpkgs_9": {
"locked": {
"lastModified": 1770019141,
"narHash": "sha256-VKS4ZLNx4PNrABoB0L8KUpc1fE7CLpQXQs985tGfaCU=",
@@ -709,7 +744,7 @@
"pastel": {
"inputs": {
"flake-utils": "flake-utils_2",
- "nixpkgs": "nixpkgs_8",
+ "nixpkgs": "nixpkgs_9",
"pnpm2nix": "pnpm2nix"
},
"locked": {
@@ -772,7 +807,7 @@
"c-amethyst": "c-amethyst",
"c-beryllium": "c-beryllium",
"c-citrine": "c-citrine",
- "catppuccin": "catppuccin",
+ "catppuccin": "catppuccin_2",
"catppuccin-palette": "catppuccin-palette",
"fast-syntax-highlighting": "fast-syntax-highlighting",
"home-manager": "home-manager_3",
@@ -780,7 +815,7 @@
"neovim-nightly": "neovim-nightly",
"nix-gaming": "nix-gaming",
"nix-index-database": "nix-index-database",
- "nixpkgs": "nixpkgs_7",
+ "nixpkgs": "nixpkgs_8",
"nvim-treesitter": "nvim-treesitter",
"pastel": "pastel",
"pure": "pure",
diff --git a/hosts/anemone/default.nix b/hosts/anemone/default.nix
index aa4c81b..1d0bdab 100644
--- a/hosts/anemone/default.nix
+++ b/hosts/anemone/default.nix
@@ -30,6 +30,8 @@
snapper
wireguard
+ inputs.c-citrine.nixosModule
+
./filesystem.nix
./kernel.nix
./networking.nix