vedirect-reader is packaged in its own flake

flake.lock

@@ -18,6 +18,24 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager-stable": {
       "inputs": {
         "nixpkgs": [
@@ -71,13 +89,30 @@
         "type": "github"
       }
     },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1717144377,
+        "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "home-manager-stable": "home-manager-stable",
         "nixpkgs": "nixpkgs",
         "stable": "stable",
         "tildefriends": "tildefriends",
-        "unstable": "unstable"
+        "unstable": "unstable",
+        "vedirect-reader": "vedirect-reader"
       }
     },
     "stable": {
@@ -111,6 +146,21 @@
         "type": "github"
       }
     },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "tildefriends": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -146,6 +196,25 @@
         "repo": "nixpkgs",
         "type": "github"
       }
+    },
+    "vedirect-reader": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1717238706,
+        "narHash": "sha256-kPQQm1LvQrHdJ1JyJxMC7JlZ5ZxUCqAm+A7jydGI3z0=",
+        "ref": "refs/heads/master",
+        "rev": "317c48664e411e9e8df052583172f3d1f3e74747",
+        "revCount": 34,
+        "type": "git",
+        "url": "https://gitea.com/tasiaiso/vedirect-reader"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://gitea.com/tasiaiso/vedirect-reader"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -19,6 +19,8 @@
 
     tildefriends.url = "git+https://dev.tildefriends.net/cory/tildefriends?ref=main";
 
+    vedirect-reader.url = "git+https://gitea.com/tasiaiso/vedirect-reader";
+
     # nixos-conf-editor.url = "github:snowfallorg/nixos-conf-editor";
     # nix-software-center.url = "github:snowfallorg/nix-software-center";
   };
@@ -30,6 +32,7 @@
     unstable,
     # home-manager,
     home-manager-stable,
+    vedirect-reader,
     # nixos-conf-editor,
     # nix-software-center,
     tildefriends,

hosts/enry/configuration.nix

@@ -1,6 +1,7 @@
 {
   pkgs,
   lib,
+  inputs,
   ...
 }: let
   sshKeys = import ../../crypto/ssh-keys.nix;
@@ -11,9 +12,9 @@ in {
 
     ../../common/hardware/raspberry-pi.nix
 
-    ../../modules/nixos/vedirect-reader.nix
-
     ../../common/components/enry.nix
+
+    inputs.vedirect-reader.nixosModules
   ];
 
   networking = {

hosts/phoenix/configuration.nix

@@ -26,8 +26,6 @@ in {
     ../../common/services/adguardhome.nix
     ../../common/services/syncthing.nix
 
-    ../../modules/nixos/vedirect-reader.nix
-
     ../../home/tasia-but-old-username/home.nix
   ];
 

hosts/yaseen/configuration.nix

@@ -38,8 +38,6 @@ in {
 
     ../../common/services/autoupgrade.nix
 
-    ../../modules/nixos/vedirect-reader.nix
-
     ../../home/tasia/home.nix
     ../../modules/nixos/tildefriends.nix
   ];

modules/nixos/default.nix

@@ -3,5 +3,4 @@
 {
   # List your module files here
   tildefriends = import ./tildefriends.nix;
-  vedirect-reader = import ./vedirect-reader.nix;
 }

modules/nixos/vedirect-reader.nix

@@ -1,30 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}:
-with lib; let
-  # WORK IN PROGRESS
-  # WORK IN PROGRESS
-  # WORK IN PROGRESS
-  # Shorter name to access final settings a
-  # user of hello.nix module HAS ACTUALLY SET.
-  # cfg is a typical convention.
-  cfg = config.services.vedirect-reader;
-in {
-  # Declare what settings a user of this "hello.nix" module CAN SET.
-  options.services.vedirect-reader = {
-    enable = mkEnableOption "vedirect-reader";
-  };
-
-  # Define what other settings, services and resources should be active IF
-  # a user of this "hello.nix" module ENABLED this module
-  # by setting "services.hello.enable = true;".
-  config = mkIf cfg.enable {
-    systemd.services.vedirect-reader = {
-      wantedBy = ["multi-user.target"];
-      serviceConfig.ExecStart = "${pkgs.nodejs_20}/bin/node ${pkgs.vedirect-reader}/lib/node_modules/vedirect-reader/main.js";
-    };
-  };
-}

pkgs/default.nix

@@ -6,5 +6,4 @@
   ...
 }: {
   # mkdocs-rss-plugin = pkgs.callPackage ./mkdocs-rss-plugin/default.nix {};
-  vedirect-reader = pkgs.callPackage ./vedirect-reader/default.nix {};
 }

pkgs/vedirect-reader/default.nix

@@ -1,23 +0,0 @@
-{
-  pkgs ? import <nixpkgs> {},
-  lib ? import <nixpkgs/lib>,
-}:
-pkgs.buildNpmPackage rec {
-  pname = "vedirect-reader";
-  version = "0.0.0";
-
-  src = pkgs.fetchFromGitea {
-    domain = "gitea.com";
-    owner = "tasiaiso";
-    repo = "vedirect-reader";
-    rev = "e9d9cdab95ede415496e70698b92cc30010d3f70";
-    hash = "sha256-dJA5ZuQNXWfzzv5qNx680TA2bbJcVCZIqk+vGwsyxas=";
-  };
-
-  npmDepsHash = "sha256-1wKf4aZwi3iakI11qGiWVeAymUSbe8pFJA5Np/BVACc=";
-  dontNpmBuild = true;
-
-  # nativeBuildInputs = with pkgs; [
-  #   nodejs
-  # ];
-}