diff --git a/devices/ellaca/options.nix b/devices/ellaca/options.nix index 9e702b4..105bffa 100644 --- a/devices/ellaca/options.nix +++ b/devices/ellaca/options.nix @@ -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; diff --git a/modules/apps/cursor.nix b/modules/apps/cursor.nix index ad5f1d1..6280fd2 100644 --- a/modules/apps/cursor.nix +++ b/modules/apps/cursor.nix @@ -1,16 +1,14 @@ -{pkgs, ...}: let - getFrom = url: hash: name: { - gtk.enable = true; - x11.enable = true; - name = name; - size = 24; - package = pkgs.runCommand "moveUp" {} '' - mkdir -p $out/share/icons - ln -s ${pkgs.fetchzip { - url = url; - hash = 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" +{ + runCommand, + fetchzip, + name ? "BreezX-Rosepine-Cursor", + version, + ... +}: +runCommand "rosepine-cursor" {} '' + mkdir -p $out/share/icons + 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} +'' diff --git a/modules/apps/default.nix b/modules/apps/default.nix index 08b2c9f..b5b61aa 100644 --- a/modules/apps/default.nix +++ b/modules/apps/default.nix @@ -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 = { diff --git a/options.nix b/options.nix index a6cff24..1ec1a6b 100644 --- a/options.nix +++ b/options.nix @@ -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 { diff --git a/outputs.nix b/outputs.nix index c3ec4a8..17f4e72 100644 --- a/outputs.nix +++ b/outputs.nix @@ -10,6 +10,7 @@ } @ inputs: let modules = [ ./options.nix + ./versions.nix ./modules lix.nixosModules.default niri.nixosModules.niri diff --git a/versions.nix b/versions.nix new file mode 100644 index 0000000..9bb7c76 --- /dev/null +++ b/versions.nix @@ -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="; + }; + }; + }; +}