vicinae: drop services.vicinae support and support fonts (#2375)

Link: https://github.com/nix-community/stylix/pull/2375

Tested-by: cswimr <cswimr@csw.im>
Reviewed-by: Noah Biewesch <dev@noahbiewesch.com>
Reviewed-by: 0xda157 <da157@voidq.com>

flake/dev/flake.lock

@@ -308,7 +308,6 @@
         "nvf": "nvf",
         "spicetify-nix": "spicetify-nix",
         "treefmt-nix": "treefmt-nix",
-        "vicinae": "vicinae",
         "zen-browser": "zen-browser"
       }
     },
@@ -355,29 +354,6 @@
         "type": "github"
       }
     },
-    "vicinae": {
-      "inputs": {
-        "nixpkgs": [
-          "dev-nixpkgs"
-        ],
-        "systems": [
-          "dev-systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1780277152,
-        "narHash": "sha256-P3YrDLnggsMsSoiX/ox3CS6GkZtY37XQVon/QR6Agw8=",
-        "owner": "vicinaehq",
-        "repo": "vicinae",
-        "rev": "67290dff5b2191a6cb6dd78b31d623eeef3acdec",
-        "type": "github"
-      },
-      "original": {
-        "owner": "vicinaehq",
-        "repo": "vicinae",
-        "type": "github"
-      }
-    },
     "zen-browser": {
       "inputs": {
         "home-manager": [

flake/dev/flake.nix

@@ -202,14 +202,6 @@
       inputs.nixpkgs.follows = "dev-nixpkgs";
     };
 
-    vicinae = {
-      url = "github:vicinaehq/vicinae";
-      inputs = {
-        nixpkgs.follows = "dev-nixpkgs";
-        systems.follows = "dev-systems";
-      };
-    };
-
     zen-browser = {
       url = "github:0xc000022070/zen-browser-flake";
       inputs = {

generated/all-maintainers.nix

@@ -109,6 +109,12 @@
     githubId = 8346803;
     name = "Cirios Santhiago";
   };
+  cswimr = {
+    email = "cswimr@csw.im";
+    github = "cswimr";
+    githubId = 102361830;
+    name = "cswimr";
+  };
   danth = {
     email = "danth@danth.me";
     github = "danth";

modules/vicinae/hm.nix

@@ -1,22 +1,25 @@
-{
-  mkTarget,
-  lib,
-  options,
-  ...
-}:
+{ mkTarget, ... }:
 mkTarget {
-  config =
-    let
-      eachConfig =
-        config:
-        lib.genAttrs [ "services" "programs" ] (
-          source: lib.optionalAttrs (options.${source} ? vicinae) { vicinae = config; }
-        );
-    in
-    [
-      (
-        { colors, polarity }:
-        eachConfig {
+  config = [
+    (
+      { opacity }:
+      {
+        programs.vicinae.settings.launcher_window.opacity = opacity.popups;
+      }
+    )
+    (
+      { fonts }:
+      {
+        programs.vicinae.settings.font.normal = {
+          family = fonts.sansSerif.name;
+          size = fonts.sizes.applications;
+        };
+      }
+    )
+    (
+      { colors, polarity }:
+      {
+        programs.vicinae = {
           settings.theme = {
             light.name = "stylix";
             dark.name = "stylix";
@@ -55,8 +58,8 @@ mkTarget {
               };
             };
           };
-        }
-      )
-      ({ opacity }: eachConfig { settings.launcher_window.opacity = opacity.popups; })
-    ];
+        };
+      }
+    )
+  ];
 }

modules/vicinae/meta.nix

@@ -2,5 +2,8 @@
 {
   name = "Vicinae";
   homepage = "https://docs.vicinae.com";
-  maintainers = [ lib.maintainers.da157 ];
+  maintainers = with lib.maintainers; [
+    cswimr
+    da157
+  ];
 }

modules/vicinae/testbeds/vicinae-standalone.nix

@@ -1,14 +0,0 @@
-{ lib, ... }:
-{
-  stylix.testbed.ui = {
-    graphicalEnvironment = "hyprland";
-    command.text = "sleep 5 && vicinae open";
-  };
-
-  home-manager.sharedModules = lib.singleton {
-    services.vicinae = {
-      enable = true;
-      systemd.enable = true;
-    };
-  };
-}

stylix/maintainers.nix

@@ -31,6 +31,12 @@
     github = "csanthiago";
     githubId = 8346803;
   };
+  cswimr = {
+    name = "cswimr";
+    email = "cswimr@csw.im";
+    github = "cswimr";
+    githubId = 102361830;
+  };
   gideonwolfe = {
     email = "wolfegideon@gmail.com";
     name = "Gideon Wolfe";

stylix/testbed/default.nix

@@ -57,10 +57,6 @@ let
 
               nvf = inputs.nvf.nixosModules.default;
 
-              vicinae.home-manager.sharedModules = [
-                inputs.vicinae.homeManagerModules.default
-              ];
-
               zen-browser.home-manager.sharedModules = [
                 inputs.zen-browser.homeModules.default
               ];