confctl 2.2.2 → 3.0.0

data/example-flake/cluster/vpsadminos-container/config.nix

@@ -0,0 +1,28 @@
+{
+  config,
+  pkgs,
+  lib,
+  inputs,
+  ...
+}:
+{
+  imports = [
+    ../../environments/base.nix
+    (inputs.vpsadminos + "/os/lib/nixos-container/vpsadminos.nix")
+  ];
+
+  networking.hostName = "vpsadminos-container";
+
+  environment.systemPackages = with pkgs; [
+    vim
+  ];
+
+  networking.useDHCP = false;
+  services.resolved.enable = false;
+  systemd.services.systemd-udev-trigger.enable = false;
+
+  documentation.enable = true;
+  documentation.nixos.enable = true;
+
+  system.stateVersion = "20.09";
+}

data/example-flake/cluster/vpsadminos-container/module.nix

@@ -0,0 +1,8 @@
+{ config, ... }:
+{
+  cluster."vpsadminos-container" = {
+    spin = "nixos";
+    inputs.channels = [ "vpsadminos" ];
+    host.target = "<ip address>";
+  };
+}

data/example-flake/cluster/vpsadminos-machine/config.nix

@@ -0,0 +1,27 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+  imports = [
+    ../../environments/base.nix
+    ./hardware.nix
+  ];
+
+  networking.hostName = "vpsadminos-machine";
+
+  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
+  # boot.loader.grub.device = "";
+
+  boot.supportedFilesystems = [ "zfs" ];
+  boot.kernelParams = [ "nolive" ];
+
+  boot.zfs.pools = {
+    # ZFS pool configuration
+  };
+
+  system.stateVersion = "20.09";
+}

data/example-flake/cluster/vpsadminos-machine/hardware.nix

@@ -0,0 +1,9 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+  # Your hardware-configuration.nix
+}

data/example-flake/cluster/vpsadminos-machine/module.nix

@@ -0,0 +1,8 @@
+{ config, ... }:
+{
+  cluster."vpsadminos-machine" = {
+    spin = "vpsadminos";
+    inputs.channels = [ "vpsadminos" ];
+    host.target = "<ip address>";
+  };
+}

data/example-flake/cluster/vpsfreecz-vps/config.nix

@@ -0,0 +1,31 @@
+{
+  config,
+  pkgs,
+  lib,
+  inputs,
+  ...
+}:
+{
+  imports = [
+    ../../environments/base.nix
+    (inputs.vpsadminos + "/os/lib/nixos-container/vpsadminos.nix")
+  ];
+
+  networking.hostName = "vpsfreecz-vps";
+
+  environment.systemPackages = with pkgs; [
+    vim
+  ];
+
+  networking.useDHCP = false;
+  services.resolved.enable = false;
+  systemd.extraConfig = ''
+    DefaultTimeoutStartSec=900s
+  '';
+  systemd.services.systemd-udev-trigger.enable = false;
+
+  documentation.enable = true;
+  documentation.nixos.enable = true;
+
+  system.stateVersion = "20.09";
+}

data/example-flake/cluster/vpsfreecz-vps/module.nix

@@ -0,0 +1,8 @@
+{ config, ... }:
+{
+  cluster."vpsfreecz-vps" = {
+    spin = "nixos";
+    inputs.channels = [ "vpsadminos" ];
+    host.target = "<ip address>";
+  };
+}

data/example-flake/configs/confctl.nix

@@ -0,0 +1,10 @@
+{ config, ... }:
+{
+  confctl = {
+    # listColumns = {
+    #   "name"
+    #   "spin"
+    #   "host.fqdn"
+    # };
+  };
+}

data/example-flake/data/default.nix

@@ -0,0 +1,5 @@
+{ lib }:
+{
+  # Place to load custom data sets
+  sshKeys = import ./ssh-keys.nix;
+}

data/example-flake/data/ssh-keys.nix

@@ -0,0 +1,7 @@
+rec {
+  admins = [
+    # someone
+  ];
+
+  someone = "...ssh public key...";
+}

data/example-flake/environments/base.nix

@@ -0,0 +1,18 @@
+{
+  config,
+  pkgs,
+  confData,
+  ...
+}:
+{
+  time.timeZone = "Europe/Amsterdam";
+
+  services.openssh.enable = true;
+
+  environment.systemPackages = with pkgs; [
+    vim
+    screen
+  ];
+
+  users.users.root.openssh.authorizedKeys.keys = with confData.sshKeys; admins;
+}

data/example-flake/flake.lock

@@ -0,0 +1,75 @@
+{
+  "nodes": {
+    "confctl": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "path": "..",
+        "type": "path"
+      },
+      "original": {
+        "path": "..",
+        "type": "path"
+      },
+      "parent": []
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1771008912,
+        "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "a82ccc39b39b621151d6732718e3e250109076fa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1771008912,
+        "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "a82ccc39b39b621151d6732718e3e250109076fa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "confctl": "confctl",
+        "nixpkgs": "nixpkgs_2",
+        "vpsadminos": "vpsadminos"
+      }
+    },
+    "vpsadminos": {
+      "locked": {
+        "lastModified": 1771582184,
+        "narHash": "sha256-gWttuL99qq18bQkLIM0TJiNnERvbyiosZvlb8hmslIo=",
+        "owner": "vpsfreecz",
+        "repo": "vpsadminos",
+        "rev": "b48e737b40d58d9cdd2f1fef4491b83e463ce554",
+        "type": "github"
+      },
+      "original": {
+        "owner": "vpsfreecz",
+        "ref": "staging",
+        "repo": "vpsadminos",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

data/example-flake/flake.nix

@@ -0,0 +1,36 @@
+{
+  description = "confctl example (flake)";
+
+  inputs = {
+    confctl.url = "path:..";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    vpsadminos.url = "github:vpsfreecz/vpsadminos/staging";
+  };
+
+  outputs =
+    inputs@{ self, confctl, ... }:
+    let
+      channels = {
+        nixos = {
+          nixpkgs = "nixpkgs";
+        };
+        vpsadminos = {
+          nixpkgs = "nixpkgs";
+          vpsadminos = "vpsadminos";
+        };
+      };
+
+      confctlOutputs = confctl.lib.mkConfctlOutputs {
+        confDir = ./.;
+        inherit inputs channels;
+      };
+    in
+    {
+      confctl = confctlOutputs;
+
+      devShells.x86_64-linux.default = confctl.lib.mkConfigDevShell {
+        system = "x86_64-linux";
+        mode = "minimal";
+      };
+    };
+}

data/example-flake/modules/module-list.nix

@@ -0,0 +1,13 @@
+rec {
+  shared = [
+    # Modules not dependent on spin
+  ];
+
+  nixos = shared ++ [
+    # Modules only for NixOS
+  ];
+
+  vpsadminos = shared ++ [
+    # Modules only for vpsAdminOS
+  ];
+}

data/example-flake/shell.nix

@@ -0,0 +1,11 @@
+# When a part of confctl repository
+import ../shell.nix
+
+# When copied elsewhere
+# if builtins.pathExists ../confctl/shell.nix then
+#   import ../confctl/shell.nix
+# else if builtins.pathExists ../../confctl/shell.nix then
+#   import ../../confctl/shell.nix
+# else if builtins.pathExists /where-is-your-confctl/shell.nix then
+#   import /where-is-your-confctl/shell.nix
+# else builtins.abort "Unable to find confctl shell"

data/flake.lock

@@ -0,0 +1,159 @@
+{
+  "nodes": {
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "vpsadminos",
+          "impermanence",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1768598210,
+        "narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "c47b2cc64a629f8e075de52e4742de688f930dc6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "impermanence": {
+      "inputs": {
+        "home-manager": "home-manager",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1769548169,
+        "narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=",
+        "owner": "nix-community",
+        "repo": "impermanence",
+        "rev": "7b1d382faf603b6d264f58627330f9faa5cba149",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "impermanence",
+        "type": "github"
+      }
+    },
+    "netlinkrb": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1562850306,
+        "narHash": "sha256-0bXTWUdUDr2XP+bEIfIbxXap8Niva/IoPXTxFeXXImg=",
+        "owner": "vpsfreecz",
+        "repo": "netlinkrb",
+        "rev": "d9de53d843d2586ffa5b7b404887fa801c697ddf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "vpsfreecz",
+        "repo": "netlinkrb",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1768564909,
+        "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgsUnstable": {
+      "locked": {
+        "lastModified": 1786106723,
+        "narHash": "sha256-zDSUbpoeo/9ZmD2+wXnzxoo1+uhL8vxc0b8yuYMKYq0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "f13ff45afd1bb73e640eaa08a7066dbed07e3238",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1786201459,
+        "narHash": "sha256-CiOTEjmwAmG2AWnaIno9YaCJJmpca2FXPhMAsnrolCg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "8b8c811c7c2541c30382c5de7ed26be055569c60",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-26.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": [
+          "vpsadminos",
+          "nixpkgs"
+        ],
+        "vpsadminos": "vpsadminos"
+      }
+    },
+    "ruby-lxc": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1780499941,
+        "narHash": "sha256-guAdOSP9MyCL3BQ1LGXAhcCoXgEU1fUE69d2ATMqUGE=",
+        "owner": "vpsfreecz",
+        "repo": "ruby-lxc",
+        "rev": "004bf35eb90d41ba60b347b5b1e73d868a4f95d9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "vpsfreecz",
+        "ref": "2026-06-03-nixos-26-05-port",
+        "repo": "ruby-lxc",
+        "type": "github"
+      }
+    },
+    "vpsadminos": {
+      "inputs": {
+        "impermanence": "impermanence",
+        "netlinkrb": "netlinkrb",
+        "nixpkgs": "nixpkgs_2",
+        "nixpkgsUnstable": "nixpkgsUnstable",
+        "ruby-lxc": "ruby-lxc"
+      },
+      "locked": {
+        "lastModified": 1786367885,
+        "narHash": "sha256-HOL3ACMUyRFhA4Cd2zk5qhnUf0zaEifHsQv86hwHgSc=",
+        "owner": "vpsfreecz",
+        "repo": "vpsadminos",
+        "rev": "67fcc17372d175b036706a1459a8b471bfc225e0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "vpsfreecz",
+        "repo": "vpsadminos",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

data/flake.nix

@@ -0,0 +1,189 @@
+{
+  description = "confctl";
+
+  inputs = {
+    vpsadminos.url = "github:vpsfreecz/vpsadminos";
+    nixpkgs.follows = "vpsadminos/nixpkgs";
+  };
+
+  outputs =
+    {
+      self,
+      nixpkgs,
+      vpsadminos,
+    }:
+    let
+      systems = [
+        "x86_64-linux"
+        "aarch64-linux"
+      ];
+      testSystems = [ "x86_64-linux" ];
+      forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system);
+      forTestSystems = f: nixpkgs.lib.genAttrs testSystems (system: f system);
+      hasTestRunner = system: builtins.elem system testSystems;
+
+      mkConfigDevShell = import ./nix/flake/mk-config-devshell.nix { inherit self nixpkgs; };
+      mkConfctlDevShell = import ./nix/flake/mk-confctl-devshell.nix { inherit nixpkgs; };
+      mkConfctlPackage = import ./nix/package.nix;
+
+      mkRspecCheck =
+        system:
+        let
+          pkgs = import nixpkgs { inherit system; };
+          ruby = if pkgs ? ruby_3_4 then pkgs.ruby_3_4 else pkgs.ruby;
+          deps = pkgs.bundlerEnv {
+            name = "confctl-rspec-deps";
+            inherit ruby;
+            gemdir = self.outPath;
+            lockfile = "${self.outPath}/Gemfile.lock";
+            groups = [
+              "default"
+              "development"
+              "test"
+            ];
+          };
+          runtimePath = pkgs.lib.makeBinPath [
+            pkgs.git
+            pkgs.openssh
+            pkgs.nix
+            pkgs.nix-prefetch-git
+          ];
+          gemBin = "${deps}/${ruby.gemPath}/bin";
+        in
+        pkgs.stdenv.mkDerivation {
+          pname = "confctl-rspec";
+          version = self.shortRev or (self.dirtyShortRev or "dev");
+          src = self;
+          dontUnpack = true;
+          dontBuild = true;
+          nativeBuildInputs = [
+            pkgs.git
+            pkgs.nix
+            pkgs.openssh
+            pkgs.nix-prefetch-git
+          ];
+          installPhase = ''
+            export HOME="$TMPDIR/home"
+            mkdir -p "$HOME"
+            export GEM_HOME="${deps}/${ruby.gemPath}"
+            export GEM_PATH="${deps}/${ruby.gemPath}"
+            export RUBYLIB="$src/lib"
+            export PATH="${gemBin}:${runtimePath}:$PATH"
+            export CONFCTL_TTY=0
+            export NO_COLOR=1
+            export PAGER=
+            export CONFCTL_BIN="${self.packages.${system}.confctl}/bin/confctl"
+            export NIX_PATH="nixpkgs=${nixpkgs.outPath}"
+            export CONFCTL_TEST_NIXPKGS="${nixpkgs.outPath}"
+            export CONFCTL_RSPEC_SANDBOX=1
+            export CONFCTL_MAX_JOBS=auto
+
+            cd "$src"
+            ${ruby}/bin/ruby -S rspec
+
+            mkdir -p "$out"
+            echo ok > "$out/result"
+          '';
+        };
+
+      mkTests =
+        system:
+        vpsadminos.lib.testFramework.mkTests {
+          inherit system;
+          pkgsPath = nixpkgs.outPath;
+          testsRoot = ./tests;
+          suiteArgs = {
+            confctlSrc = self.outPath;
+            confctlPackage = self.packages.${system}.confctl;
+          };
+        };
+
+      mkTestsMeta =
+        system:
+        vpsadminos.lib.testFramework.mkTestsMeta {
+          inherit system;
+          pkgsPath = nixpkgs.outPath;
+          testsRoot = ./tests;
+          suiteArgs = {
+            confctlSrc = self.outPath;
+            confctlPackage = self.packages.${system}.confctl;
+          };
+        };
+    in
+    {
+      lib.mkConfctlOutputs = import ./nix/flake/mk-confctl-outputs.nix;
+
+      # Dev shells for cluster configuration repos.
+      lib.mkConfigDevShell = mkConfigDevShell;
+
+      # Dev shell for working on confctl itself.
+      lib.mkConfctlDevShell = mkConfctlDevShell;
+
+      devShells = forAllSystems (system: {
+        default = mkConfctlDevShell { inherit system; };
+      });
+
+      packages = forAllSystems (
+        system:
+        let
+          pkgs = import nixpkgs { inherit system; };
+        in
+        {
+          confctl = mkConfctlPackage {
+            inherit pkgs;
+            src = self.outPath;
+          };
+        }
+        // nixpkgs.lib.optionalAttrs (hasTestRunner system) {
+          test-runner = vpsadminos.packages.${system}.test-runner;
+        }
+      );
+
+      apps = forAllSystems (
+        system:
+        nixpkgs.lib.optionalAttrs (hasTestRunner system) {
+          test-runner = {
+            type = "app";
+            program = "${vpsadminos.packages.${system}.test-runner}/bin/test-runner";
+          };
+        }
+      );
+
+      tests = forTestSystems (system: mkTests system);
+
+      testsMeta = forTestSystems (system: mkTestsMeta system);
+
+      checks = forAllSystems (
+        system:
+        {
+          rspec = mkRspecCheck system;
+        }
+        // nixpkgs.lib.optionalAttrs (hasTestRunner system) (mkTests system)
+      );
+
+      checksMeta = forAllSystems (
+        system:
+        nixpkgs.lib.optionalAttrs (hasTestRunner system) {
+          tests = mkTestsMeta system;
+        }
+      );
+
+      nixosModules = {
+        generations = import ./nix/modules/confctl/generations.nix;
+        cli = import ./nix/modules/confctl/cli.nix;
+        nix = import ./nix/modules/confctl/nix.nix;
+        swpins = import ./nix/modules/confctl/swpins.nix;
+        inputs-info = import ./nix/modules/confctl/inputs-info.nix;
+        configuration-info = import ./nix/modules/confctl/configuration-info.nix;
+        default = {
+          imports = [
+            (import ./nix/modules/confctl/generations.nix)
+            (import ./nix/modules/confctl/cli.nix)
+            (import ./nix/modules/confctl/nix.nix)
+            (import ./nix/modules/confctl/inputs-info.nix)
+            (import ./nix/modules/confctl/configuration-info.nix)
+          ];
+        };
+      };
+    };
+}