mob next [ci-skip] [ci skip] [skip ci]

lastFile:modules/clan/zfs-snapshot-backup/default.nix

.gitignore

@@ -2,4 +2,4 @@
 # Ignore build outputs from performing a nix-build or `nix build` command
 result
 result-*
-run-vm-*
+

flake.lock

@@ -136,24 +136,6 @@
         "type": "github"
       }
     },
-    "liminix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1760426231,
-        "narHash": "sha256-r8c5PKtsxAvtQ/k17GH+WNvP47Lr+AbExLMPdLtvAKE=",
-        "ref": "refs/heads/fix-gl-ar750",
-        "rev": "3f1f7c08d440130cce9262a93ce78ed7969d93cd",
-        "revCount": 1574,
-        "type": "git",
-        "url": "https://git.b4l.co.th/newedge/liminix"
-      },
-      "original": {
-        "ref": "refs/heads/fix-gl-ar750",
-        "rev": "3f1f7c08d440130cce9262a93ce78ed7969d93cd",
-        "type": "git",
-        "url": "https://git.b4l.co.th/newedge/liminix"
-      }
-    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -225,7 +207,6 @@
         "devshell": "devshell",
         "flake-parts": "flake-parts",
         "import-tree": "import-tree",
-        "liminix": "liminix",
         "nixpkgs": "nixpkgs",
         "treefmt-nix": "treefmt-nix"
       }

flake.nix

@@ -21,10 +21,6 @@
       url = "github:numtide/treefmt-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    liminix = {
-      url = "git+https://git.b4l.co.th/newedge/liminix?ref=refs/heads/fix-gl-ar750&rev=3f1f7c08d440130cce9262a93ce78ed7969d93cd";
-      flake = false;
-    };
   };
   outputs =
     {
@@ -42,7 +38,6 @@
           ./shell.nix
 
           ./machines
-          ./routers
           ./inventories
           ./modules/clan/flake-module.nix
         ];

inventories/default.nix

@@ -5,8 +5,6 @@
       tags = {
         glom = [ "vega" ];
         b4l = [ "rigel" ];
-
-        fax-bridge = [ "b4l" ];
       };
 
       instances = {
@@ -32,6 +30,16 @@
           };
         };
 
+        borgbackup = {
+          module = {
+            name = "borgbackup";
+            input = "clan-core";
+          };
+          roles.client.machines."vega".settings = {
+
+          };
+        };
+
         glom-network = {
           module = {
             name = "zerotier";
@@ -50,14 +58,6 @@
           roles.peer.tags.b4l = { };
         };
 
-        yggdrasil = {
-          module = {
-            name = "yggdrasil";
-            input = "self";
-          };
-          roles.default.tags."fax-bridge" = { };
-        };
-
         pocket-id = {
           module = {
             name = "pocket-id";

modules/clan/yggdrasil/default.nix

@@ -1,24 +0,0 @@
-{ ... }:
-{
-  _class = "clan.service";
-  manifest.name = "yggdrasil";
-  manifest.description = "An in scalable routing as an encrypted IPv6 overlay network";
-  manifest.categories = [ "System" ];
-
-  roles.default = {
-    perInstance.nixosModule =
-      {
-        lib,
-        config,
-        pkgs,
-        ...
-      }:
-      {
-        clan.core.state.vikunja.folders = [
-        ];
-        services.yggdrasil = {
-          enable = lib.mkDefault true;
-        };
-      };
-  };
-}

modules/clan/yggdrasil/tests/vm/default.nix

@@ -1,39 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-{
-  name = "service-yggdrasil";
-
-  clan = {
-    directory = ./.;
-    inventory = {
-      machines.server = { };
-
-      instances = {
-        yggdrasil-test = {
-          module.name = "@clan/yggdrasil";
-          module.input = "self";
-          roles.default.machines."server".settings = { };
-        };
-      };
-    };
-  };
-
-  nodes = {
-    server = {
-      services.yggdrasil = {
-      };
-    };
-  };
-
-  testScript = ''
-    start_all()
-
-    server.wait_for_unit("yggdrasil")
-
-    # Check that garage is running
-    server.succeed("systemctl status yggdrasil")
-
-  '';
-}

modules/clan/zfs-snapshot-backup/default.nix

@@ -0,0 +1,19 @@
+{ ... }:
+{
+  _class = "clan.service";
+  manifest.name = "zfs-snapshot-backup";
+  manifest.description = "Service to backup ZFS Snapshot on a remote machines";
+  manifest.categories = [ "System" ];
+
+  roles.default = {
+    perInstance.nixosModule =
+      {
+        lib,
+        config,
+        ...
+      }:
+      {
+
+      };
+  };
+}

modules/clan/zfs-snapshot-backup/flake-module.nix

@@ -4,15 +4,15 @@ let
 in
 {
   clan.modules = {
-    yggdrasil = module;
+    zfs-snapshot-backup = module;
   };
   perSystem =
     { ... }:
     {
-      clan.nixosTests.yggdrasil = {
+      clan.nixosTests.zfs-snapshot-backup = {
         imports = [ ./tests/vm/default.nix ];
 
-        clan.modules."@clan/yggdrasil" = module;
+        clan.modules."@clan/zfs-snapshot-backup" = module;
       };
     };
 }

routers/default.nix

@@ -1,9 +0,0 @@
-{ inputs, ... }:
-{
-  flake.legacyPackages = {
-    whitehouse-router = import "${inputs.liminix}/default.nix" {
-      device = (import "${inputs.liminix}/devices/gl-ar750");
-      liminix-config = import ./white-house/configuration.nix { inherit inputs; };
-    };
-  };
-}

routers/white-house/configuration.nix

@@ -1,120 +0,0 @@
-{ inputs }:
-{
-  config,
-  pkgs,
-  modulesPath,
-  lib,
-  ...
-}:
-let
-  secrets = {
-    firewallRules = { };
-  }
-  // (import ./secrets.nix);
-  wirelessConfig = {
-    country_code = "TH";
-    inherit (secrets) wpa_passphrase;
-    wmm_enabled = 1;
-  };
-  svc = config.system.service;
-in
-{
-  imports = [
-    "${inputs.liminix}/modules/wlan.nix"
-    "${inputs.liminix}/modules/network"
-    "${inputs.liminix}/modules/vlan"
-    "${inputs.liminix}/modules/ssh"
-    "${inputs.liminix}/modules/bridge"
-    "${modulesPath}/profiles/gateway.nix"
-  ];
-
-  hostname = "whitehouse";
-  boot = {
-    tftp = {
-      freeSpaceBytes = 3 * 1024 * 1024;
-      serverip = "${secrets.lan.prefix}.148";
-      ipaddr = "${secrets.lan.prefix}.251";
-    };
-  };
-
-  services.sshd = svc.ssh.build {
-    authorizedKeys.root = secrets.root.openssh.authorizedKeys.keys;
-  };
-
-  users.root = secrets.root;
-
-  services.resolvconf = lib.mkForce (
-    pkgs.liminix.services.oneshot rec {
-      name = "resolvconf";
-      up = ''
-        ( in_outputs ${name}
-         echo "nameserver $(output ${config.services.wan} ns1)" > resolv.conf
-         echo "nameserver $(output ${config.services.wan} ns2)" >> resolv.conf
-         chmod 0444 resolv.conf
-        )
-      '';
-    }
-  );
-
-  profile.gateway = {
-    lan = {
-      interfaces = with config.hardware.networkInterfaces; [
-        wlan
-        wlan5
-        lan
-      ];
-      inherit (secrets.lan) prefix;
-      address = {
-        family = "inet";
-        address = "${secrets.lan.prefix}.1";
-        prefixLength = 24;
-      };
-      dhcp = {
-        start = 10;
-        end = 240;
-        hosts = { };
-        localDomain = "lan";
-      };
-    };
-    wan = {
-      interface = svc.pppoe.build {
-        interface = config.hardware.networkInterfaces.wan;
-        username = secrets.l2tp.name;
-        password = secrets.l2tp.password;
-      };
-
-      dhcp6.enable = true;
-    };
-    firewall = {
-      enable = true;
-      rules = secrets.firewallRules;
-    };
-    wireless.networks = {
-
-      "${secrets.ssid}" = {
-        interface = config.hardware.networkInterfaces.wlan;
-        hw_mode = "g";
-        channel = "2";
-        ieee80211n = 1;
-      }
-      // wirelessConfig;
-      "${secrets.ssid}-5" = rec {
-        interface = config.hardware.networkInterfaces.wlan5;
-        hw_mode = "a";
-        channel = 36;
-        ht_capab = "[HT40+]";
-        vht_oper_chwidth = 1;
-        vht_oper_centr_freq_seg0_idx = channel + 6;
-        ieee80211n = 1;
-        ieee80211ac = 1;
-      }
-      // wirelessConfig;
-    };
-  };
-  defaultProfile.packages = with pkgs; [
-    busybox
-    iw
-    iptables
-  ];
-
-}

routers/white-house/secrets.nix

@@ -1,20 +0,0 @@
-{
-  wpa_passphrase = "";
-  ssid = "WhiteHouse";
-  l2tp = {
-    name = "";
-    password = "";
-  };
-  root = {
-    openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEcZ/p1Ofa9liwIzPWzNtONhJ7+FUWd2lCz33r81t8+w kurogeek@kurogeek"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAB/raxJR8gASmquP63weHelbi+da2WBJR1DgzHPNz/f"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDuhpzDHBPvn8nv8RH1MRomDOaXyP4GziQm7r3MZ1Syk"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAmgyEGuY/r7SDlJgrzYmQqpcWS5W+fCzRi3OS59ne4W openpgp:0xFF687387"
-    ];
-  };
-
-  lan = {
-    prefix = "192.168.1";
-  };
-}