init for better maintainable versions and defaults

This commit is contained in:
twoneis 2025-03-23 21:44:25 +01:00
parent 94cf4c2005
commit 0733f4d2d1
6 changed files with 52 additions and 24 deletions

View file

@ -15,6 +15,7 @@ in {
};
email = {
enable = true;
domain = email-domain;
ports = {
smtp = 25;
@ -25,6 +26,7 @@ in {
};
website = {
enable = true;
domain = {
full = web-domain;
base = web-domain;
@ -32,15 +34,16 @@ in {
};
fedi = {
enable = true;
domain = {
full = "fedi.${web-domain}";
base = web-domain;
};
email = "akkoma@${email-domain}";
# iceshrimp.enable = false;
};
matrix = {
enable = true;
domain = {
full = "matrix.${web-domain}";
base = web-domain;
@ -50,6 +53,7 @@ in {
};
git = {
enable = true;
domain = {
full = "git.${web-domain}";
base = web-domain;

View file

@ -1,16 +1,14 @@
{pkgs, ...}: let
getFrom = url: hash: name: {
gtk.enable = true;
x11.enable = true;
name = name;
size = 24;
package = pkgs.runCommand "moveUp" {} ''
{
runCommand,
fetchzip,
name ? "BreezX-Rosepine-Cursor",
version,
...
}:
runCommand "rosepine-cursor" {} ''
mkdir -p $out/share/icons
ln -s ${pkgs.fetchzip {
url = url;
hash = hash;
ln -s ${fetchzip {
url = "https://github.com/rose-pine/cursor/releases/download/${version.version}/BreezeX-RosePine-Linux.tar.xz";
hash = version.hash;
}} $out/share/icons/${name}
'';
};
in
getFrom "https://github.com/rose-pine/cursor/releases/download/v1.1.0/BreezeX-RosePine-Linux.tar.xz" "sha256-t5xwAPGhuQUfGThedLsmtZEEp1Ljjo3Udhd5Ql3O67c=" "BreezX-RosePine-Linux"
''

View file

@ -5,7 +5,7 @@
...
}: let
inherit (lib) mkIf mkForce;
inherit (config) conf;
inherit (config) conf versions;
time = pkgs.makeDesktopItem {
name = "peaclock-desktop";
desktopName = "Time";
@ -115,7 +115,16 @@ in
};
};
pointerCursor = import ./cursor.nix pkgs;
pointerCursor = rec {
gtk.enable = true;
x11.enable = true;
name = "BreezX-RosePine-Linux";
size = 24;
package = pkgs.callPackage ./cursor.nix {
name = name;
version = versions.rosepine-cursor;
};
};
};
qt = {

View file

@ -107,7 +107,7 @@ in {
email = {
enable = mkOption {
type = bool;
default = conf.host == "server";
default = false;
};
domain = mkOption {
type = nullOr str;
@ -136,7 +136,7 @@ in {
website = {
enable = mkOption {
type = bool;
default = conf.host == "server";
default = false;
};
domain = {
full = mkOption {
@ -153,7 +153,7 @@ in {
fedi = {
enable = mkOption {
type = bool;
default = conf.host == "server";
default = false;
};
iceshrimp = {
enable = mkOption {
@ -180,7 +180,7 @@ in {
matrix = {
enable = mkOption {
type = bool;
default = conf.host == "server";
default = false;
};
domain = {
full = mkOption {
@ -201,7 +201,7 @@ in {
git = {
enable = mkOption {
type = bool;
default = conf.host == "server";
default = false;
};
domain = {
full = mkOption {

View file

@ -10,6 +10,7 @@
} @ inputs: let
modules = [
./options.nix
./versions.nix
./modules
lix.nixosModules.default
niri.nixosModules.niri

16
versions.nix Normal file
View file

@ -0,0 +1,16 @@
{lib, ...}: let
mkVersion = version:
lib.mkOption {
type = lib.types.str;
default = version;
};
in {
options = {
versions = {
rosepine-cursor = {
version = mkVersion "v1.0.1";
hash = mkVersion "sha256-t5xwAPGhuQUfGThedLsmtZEEp1Ljjo3Udhd5Ql3O67c=";
};
};
};
}