frappix: bump default_thai_company to 68f0817 (main)

Package git.b4l.co.th/newedge/default_thai_company as a frappix app
    (pkgs/frappix/default-thai-company.nix) and expose it through a new
    frappixAppsOverlay that extends the pkgs.frappix scope. Install it on
    the poyerp.newedge.house site on deneb.

flake.lock

@@ -135,11 +135,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781517972,
-        "narHash": "sha256-G8bIXFqifs/y62GNPwg20Ksf71raYwzmyN99gf1tXak=",
+        "lastModified": 1788346295,
+        "narHash": "sha256-k9Ol++FFhQuPya6ZNQwVhqZZkMvE1ytLtbdrbH5zkrI=",
         "ref": "refs/heads/main",
-        "rev": "7fc62d0c25c7a97d7027a9c248e21c97c9b3acc1",
-        "revCount": 14604,
+        "rev": "b15797faeca7494a7fe5fde2691d93affa3d3e37",
+        "revCount": 15239,
         "type": "git",
         "url": "https://git.clan.lol/clan/clan-core"
       },
@@ -164,11 +164,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778718524,
-        "narHash": "sha256-pXLoI6Ax0EnUK6r34UM1vibVC7CfTu6j72R2692ZzPs=",
-        "rev": "12c552ad547d87254f33f33bddd1a2cdbeac754d",
+        "lastModified": 1788308203,
+        "narHash": "sha256-dCOb9YIJv9I2udjqukvjlGiTyOvGnO7zVbot0PxjBGk=",
+        "rev": "644c49bbf121b3e256bc83ce10b5d97813d9181d",
         "type": "tarball",
-        "url": "https://git.clan.lol/api/v1/repos/clan/data-mesher/archive/12c552ad547d87254f33f33bddd1a2cdbeac754d.tar.gz"
+        "url": "https://git.clan.lol/api/v1/repos/clan/data-mesher/archive/644c49bbf121b3e256bc83ce10b5d97813d9181d.tar.gz"
       },
       "original": {
         "type": "tarball",
@@ -357,11 +357,11 @@
         "std": "std"
       },
       "locked": {
-        "lastModified": 1782964989,
-        "narHash": "sha256-pU2Gye+1f+nvFleBTgXdeQfrQnKaJEuO2LT7PnsJ1p0=",
+        "lastModified": 1787631179,
+        "narHash": "sha256-l+Zt5XNTD0f0ChkzDJURfQlFAgANIMrGYrk51SZEJKU=",
         "owner": "kurogeek",
         "repo": "frappix",
-        "rev": "ac5e2814fc1aca188080bf6b50504cd329790e56",
+        "rev": "fcb797886ae753b26a6e4415a7f2c19ba6adcf3b",
         "type": "github"
       },
       "original": {
@@ -416,11 +416,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781557312,
-        "narHash": "sha256-QOIRYSUFSq7L5mY3dZymaVhcnne3tPgoR9riB0WocjA=",
+        "lastModified": 1788355065,
+        "narHash": "sha256-gAz5oTI7ur34CfuakQduiQd/2ZhO62Bn2XXg08nZYYQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c03e4752899e55705dfa63979abd885c582a5c48",
+        "rev": "d9d750e4fc11c10cab2da677bdd31e427f3a3a71",
         "type": "github"
       },
       "original": {
@@ -547,11 +547,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781242433,
-        "narHash": "sha256-bchLZZ3sRn740zyvD2icZSnNoTaanN0nw7l6fjVXO+E=",
+        "lastModified": 1786845137,
+        "narHash": "sha256-oQFip+v0luP8NIxJzmiW4Wu8bILsbFWom5l0zonl8hQ=",
         "owner": "nix-darwin",
         "repo": "nix-darwin",
-        "rev": "aabb2037edfc0f210723b72cd5f528aab5dd3f0b",
+        "rev": "4cff07de74b50e64bdd68cd4e722ab5b6b35ee48",
         "type": "github"
       },
       "original": {
@@ -707,11 +707,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1781359544,
-        "narHash": "sha256-iUuzKQcyXvopYDDzFpMK5eQKP3WIJExYny2kJtbgUcE=",
+        "lastModified": 1788775869,
+        "narHash": "sha256-JRf1lSypbvKj6AzUZHpUA6YC1DirVuitZWOnRwcm+Ww=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9f11f828c213641c2369a9f1fa31fe31557e3156",
+        "rev": "58973d74f1893afe13f5902919803a0e99da0ca4",
         "type": "github"
       },
       "original": {
@@ -752,16 +752,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1708640854,
-        "narHash": "sha256-EpcAmvIS4ErqhXtVEfd2GPpU/E/s8CCRSfYzk6FZ/fY=",
+        "lastModified": 1787579760,
+        "narHash": "sha256-WGhIEINOICx7bhV3WrSz0QTzv8uzaaa9AXvD1clIWpc=",
         "owner": "paisano-nix",
         "repo": "core",
-        "rev": "adcf742bc9463c08764ca9e6955bd5e7dcf3a3fe",
+        "rev": "88739c84d308876714322eb9844ede6597c1a580",
         "type": "github"
       },
       "original": {
         "owner": "paisano-nix",
-        "ref": "0.2.0",
         "repo": "core",
         "type": "github"
       }
@@ -830,11 +829,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780547341,
-        "narHash": "sha256-Gq8KNx5A7hBB3uGJaj6eQfLDIz5YdLu92gqBcvHvoUo=",
+        "lastModified": 1788337237,
+        "narHash": "sha256-gkSH8VUtCo6hnysNmb9DbTuDepH2t5pv+QWjP75xKAk=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "9ed65852b6257fbeae4355bc24ecfea307ca759a",
+        "rev": "fbf759290e0cb0a98dfc813a4eb7d53ad1dacb57",
         "type": "github"
       },
       "original": {

inventories/default.nix

@@ -46,6 +46,12 @@
           "bosona"
           "canopus"
         ];
+
+        dm-pull-deploy = [
+          "rana"
+          "rigel"
+          "vega"
+        ];
       };
 
       instances = {
@@ -182,7 +188,7 @@
               }
             )
           ];
-          roles.default.tags = [ "all" ];
+          roles.default.tags = [ "dm-pull-deploy" ];
           roles.default.settings.action = "switch";
         };
 
@@ -314,13 +320,28 @@
           };
           roles.server.machines."alasia".settings = {
             public_url = "tailvpn.public.newedge.house";
-            base_domain = "tailnet.newedge.house";
             advertise_routes = [ "10.0.10.0/24" ];
-            nameservers = [
-              "10.0.10.82"
-              "1.1.1.1"
-              "8.8.8.8"
-            ];
+            dns = {
+              magic_dns = true;
+              base_domain = "tailvpn.newedge.house";
+              nameservers = [
+                "10.0.10.82"
+                "1.1.1.1"
+                "8.8.8.8"
+              ];
+              extra_records = [
+                {
+                  name = "poyerp.newedge.house";
+                  type = "A";
+                  value = "10.0.10.1";
+                }
+                {
+                  name = "glomerp.newedge.house";
+                  type = "A";
+                  value = "10.0.10.1";
+                }
+              ];
+            };
           };
         };
 
@@ -493,21 +514,45 @@
             buna.settings = {
               exporters.smartctl = { };
             };
-          };
-        };
-
-        wifi = {
-          module.name = "wifi";
-          module.input = "clan-community";
-
-          roles.default = {
-            machines."buna" = {
-              settings.networks.home = { };
-              settings.networks.glom = { };
+            mirach.settings = {
+              exporters.smartctl = { };
+            };
+            almach.settings = {
+              exporters.smartctl = { };
             };
           };
         };
 
+        wifi =
+          let
+            networks = {
+              home = { };
+              glom = { };
+            };
+          in
+          {
+            module.name = "wifi";
+            module.input = "clan-community";
+
+            roles.default = {
+              machines."buna".settings = { inherit networks; };
+
+              extraModules = [
+                (
+                  { lib, ... }:
+                  {
+                    # profile names match the network attr names above;
+                    # 0 = retry forever for both (defaults: 4 autoconnect attempts, 3 auth attempts)
+                    networking.networkmanager.ensureProfiles.profiles = lib.mapAttrs (_: _: {
+                      connection.autoconnect-retries = 0;
+                      connection.auth-retries = 0;
+                    }) networks;
+                  }
+                )
+              ];
+            };
+          };
+
       };
     };
   };

machines/deneb/configuration.nix

@@ -25,6 +25,7 @@ in
     inputs.self.overlays.frappixLibsOverlay
     inputs.self.overlays.frappixPythonOverlay
     inputs.self.overlays.frappixToolsOverlay
+    inputs.self.overlays.frappixAppsOverlay
   ];
 
   fonts.packages = [ pkgs.tlwg ];
@@ -59,6 +60,7 @@ in
       pkgs.frappix.hrms
       pkgs.frappix.crm
       pkgs.frappix.posprinter
+      pkgs.frappix.default_thai_company
     ];
     sites = {
       "${sitename}" = {
@@ -69,6 +71,7 @@ in
           "hrms"
           "crm"
           "posprinter"
+          "default_thai_company"
         ];
       };
     };

machines/sirius/configuration.nix

@@ -5,8 +5,6 @@
 }:
 {
   imports = [
-    self.nixosModules.common
-
     ./hardware-configuration.nix
   ];
 
@@ -23,6 +21,9 @@
   nixpkgs.hostPlatform = {
     system = "aarch64-linux";
   };
+  nixpkgs.buildPlatform = {
+    system = "x86_64-linux";
+  };
 
   system.stateVersion = "25.11";
 

modules/clan/headscale/default.nix

@@ -19,12 +19,6 @@
             description = "Public URL for accessing the instance";
           };
 
-          base_domain = lib.mkOption {
-            type = with lib.types; str;
-            default = "";
-            description = "Defines the base domain to create the hostnames for MagicDNS in Headscale. `base_domain` must be a FQDN, without the trailing dot. The FQDN of the hosts will be `hostname.base_domain (e.g. myhost.tailnet.example.com)";
-          };
-
           advertise_routes = lib.mkOption {
             type = with lib.types; listOf str;
             default = [ ];
@@ -32,14 +26,57 @@
             example = [ "192.168.1.0/24" ];
           };
 
-          nameservers = lib.mkOption {
-            type = with lib.types; listOf str;
-            default = [
-              "1.1.1.1"
-              "8.8.8.8"
-            ];
-            description = "List of nameservers to pass to Tailscale clients";
-            example = [ "10.0.10.1" ];
+          dns = {
+            base_domain = lib.mkOption {
+              type = with lib.types; str;
+              default = "";
+              description = "Defines the base domain to create the hostnames for MagicDNS in Headscale. `base_domain` must be a FQDN, without the trailing dot. The FQDN of the hosts will be `hostname.base_domain (e.g. myhost.tailnet.example.com)";
+            };
+
+            nameservers = lib.mkOption {
+              type = with lib.types; listOf str;
+              default = [
+                "1.1.1.1"
+                "8.8.8.8"
+              ];
+              description = "List of nameservers to pass to Tailscale clients";
+              example = [ "10.0.10.1" ];
+            };
+
+            magic_dns = lib.mkOption {
+              type = with lib.types; bool;
+              default = true;
+              description = "Whether to enable MagicDNS";
+            };
+
+            extra_records = lib.mkOption {
+              type =
+                with lib.types;
+                nullOr (
+                  listOf (submodule {
+                    options = {
+                      name = lib.mkOption {
+                        type = lib.types.str;
+                        description = "DNS record name.";
+                        example = "grafana.tailnet.example.com";
+                      };
+                      type = lib.mkOption {
+                        type = lib.types.enum [
+                          "A"
+                          "AAAA"
+                        ];
+                        description = "DNS record type.";
+                        example = "A";
+                      };
+                      value = lib.mkOption {
+                        type = lib.types.str;
+                        description = "DNS record value (IP address).";
+                        example = "100.64.0.3";
+                      };
+                    };
+                  })
+                );
+            };
           };
         };
       };
@@ -170,10 +207,11 @@
               settings.server_url = "https://${settings.public_url}";
 
               settings.dns = {
-                base_domain = settings.base_domain;
+                base_domain = settings.dns.base_domain;
                 override_local_dns = true;
-                nameservers.global = settings.nameservers;
-                magic_dns = false;
+                nameservers.global = settings.dns.nameservers;
+                magic_dns = settings.dns.magic_dns;
+                extra_records = settings.dns.extra_records;
               };
             };
 

modules/clan/home-profiles/home-user/home.nix

@@ -11,7 +11,7 @@
     homeDirectory = lib.mkForce "/home/${username}";
     stateVersion = osConfig.system.stateVersion;
     packages = with pkgs; [
-      libreoffice-fresh
+      libreoffice-stable
       element-desktop
       signal-desktop
       brave

modules/clan/personal-computer/boot.nix

@@ -0,0 +1,5 @@
+{
+  boot.supportedFilesystems = {
+    ntfs = true;
+  };
+}

modules/clan/stirling-pdf/default.nix

@@ -14,11 +14,6 @@
         ...
       }:
       {
-        nixpkgs.overlays = [
-          (final: prev: {
-            libreoffice = prev.libreoffice-fresh;
-          })
-        ];
 
         services.stirling-pdf = {
           enable = lib.mkDefault true;

modules/clan/stirling-pdf/flake-module.nix

@@ -10,10 +10,10 @@ in
   perSystem =
     { ... }:
     {
-      clan.nixosTests.service-stirling-pdf = {
-        imports = [ ./tests/vm/default.nix ];
-
-        clan.modules."@clan/stirling-pdf" = module;
-      };
+      # clan.nixosTests.service-stirling-pdf = {
+      #   imports = [ ./tests/vm/default.nix ];
+      #
+      #   clan.modules."@clan/stirling-pdf" = module;
+      # };
     };
 }

overlays/default.nix

@@ -7,5 +7,6 @@
     frappixLibsOverlay = inputs.frappix.libsOverlay.x86_64-linux;
     frappixPythonOverlay = inputs.frappix.pythonOverlay.x86_64-linux;
     frappixToolsOverlay = inputs.frappix.toolsOverlay.x86_64-linux;
+    frappixAppsOverlay = import ../pkgs/frappix/overlay.nix;
   };
 }

pkgs/frappix/default-thai-company.nix

@@ -0,0 +1,35 @@
+{
+  buildPythonPackage,
+  pythonRelaxDepsHook,
+  flit-core,
+  mkAssets,
+  fetchFromGitea,
+}:
+let
+  version = "0.0.1";
+  src = fetchFromGitea {
+    domain = "git.b4l.co.th";
+    owner = "newedge";
+    repo = "default_thai_company";
+    rev = "68f08171252099920d52f5c47800d65ddf4689b3";
+    sha256 = "sha256-9UomP8G5K+nkAMCfn+gXbBNivLlDo0c/36FYZgHm2Cw=";
+  };
+in
+buildPythonPackage (finalAttrs: {
+  # pname doubles as the frappe app name (services.frappe reads app.pname)
+  pname = "default_thai_company";
+  inherit version;
+
+  pyproject = true;
+
+  src = mkAssets {
+    inherit (finalAttrs) pname version;
+    inherit src;
+    yarnHash = "sha256-oZgyP0hTU9bxszOVg3Bmiu6yos2d2Inc1Do8To4z8GQ=";
+  };
+
+  nativeBuildInputs = [
+    pythonRelaxDepsHook
+    flit-core
+  ];
+})

pkgs/frappix/overlay.nix

@@ -0,0 +1,9 @@
+# Extends the frappix app scope with in-house frappe apps.
+# Must be applied after frappixFrappeOverlay (needs prev.frappix).
+final: prev: {
+  frappix = prev.frappix.overrideScope (
+    ffinal: _fprev: {
+      default_thai_company = ffinal.callPackage ./default-thai-company.nix { };
+    }
+  );
+}