Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/nixpkgs-settings.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
};
overlays = [
(final: prev: {
dnclient = prev.callPackage ../pkgs/dnclient { };
nixdiff = prev.callPackage ../pkgs/nixdiff { };
})
];
Expand Down
1 change: 1 addition & 0 deletions modules/genebean/nixos/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
./programs/thunderbird.nix
./programs/xfce4-terminal.nix
./services/chromium-kiosk.nix
./services/dnclient.nix
./services/flatpak.nix
./services/kiosk-backups.nix
./services/restic.nix
Expand Down
31 changes: 31 additions & 0 deletions modules/genebean/nixos/services/dnclient.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
config,
lib,
pkgs,
...
}:
let
cfg = config.genebean.services.dnclient;
in
{
options.genebean.services.dnclient = {
enable = lib.mkEnableOption "dnclient managed Nebula VPN";
};

config = lib.mkIf cfg.enable {
environment.systemPackages = [ pkgs.dnclient ];

systemd.services.dnclient = {
description = "DNClient Nebula VPN";
after = [ "network-online.target" ];
wants = [ "network-online.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Type = "simple";
ExecStart = "${pkgs.dnclient}/bin/dnclient run";
Restart = "always";
RestartSec = "5s";
};
};
};
}
2 changes: 2 additions & 0 deletions modules/hosts/nixos/nixnuc/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ in
mtr.enable = true;
};

genebean.services.dnclient.enable = true;

# List services that you want to enable:
services = {
atuin = {
Expand Down
8 changes: 7 additions & 1 deletion pkgs/default.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
{ inputs, pkgs }:
let
deploy-with-retry = pkgs.callPackage ./deploy-with-retry { inherit inputs; };
dnclient = pkgs.callPackage ./dnclient { };
nixdiff = pkgs.callPackage ./nixdiff { };
rpi4-installer = pkgs.callPackage ./rpi4-installer { inherit inputs; };
in
{
inherit deploy-with-retry nixdiff rpi4-installer;
inherit
deploy-with-retry
dnclient
nixdiff
rpi4-installer
;
default = nixdiff;
}
32 changes: 32 additions & 0 deletions pkgs/dnclient/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
lib,
stdenv,
fetchurl,
}:
let
version = "0.9.6";
in
stdenv.mkDerivation {
pname = "dnclient";
inherit version;

src = fetchurl {
url = "https://dl.defined.net/10c23c2d/v${version}/linux/amd64/dnclient";
hash = "sha256-Z/uvC89Dt8r5crkahkUhrCnSj7Ae8N54B5TZvgchtPA=";
};

dontUnpack = true;
dontBuild = true;

installPhase = ''
install -Dm755 $src $out/bin/dnclient
'';

meta = {
description = "Managed Nebula VPN client from Defined Networking";
homepage = "https://defined.net";
platforms = [ "x86_64-linux" ];
license = lib.licenses.unfree;
mainProgram = "dnclient";
};
}
Loading