From 83d4bc1e92bd417de0aa54bb9d2a7462d40ab863 Mon Sep 17 00:00:00 2001 From: Dave Gallant Date: Sun, 6 Apr 2025 22:03:10 -0400 Subject: [PATCH] Use vpngate's flake.nix --- flake.lock | 71 +++++++++++++++++++++++++- flake.nix | 4 +- justfile | 2 +- machines/hephaestus/configuration.nix | 2 + overlays/default.nix | 1 - overlays/vpngate/default.nix | 28 ---------- packages.nix | 1 - nix-flake-update.sh => update-flake.sh | 0 8 files changed, 76 insertions(+), 33 deletions(-) delete mode 100644 overlays/vpngate/default.nix rename nix-flake-update.sh => update-flake.sh (100%) diff --git a/flake.lock b/flake.lock index 13d3203..53bbde1 100644 --- a/flake.lock +++ b/flake.lock @@ -354,6 +354,24 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "fromYaml": { "flake": false, "locked": { @@ -807,6 +825,22 @@ "type": "github" } }, + "nixpkgs_7": { + "locked": { + "lastModified": 1743814133, + "narHash": "sha256-drDyYyUmjeYGiHmwB9eOPTQRjmrq3Yz26knwmMPLZFk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "250b695f41e0e2f5afbf15c6b12480de1fe0001b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": "devshell", @@ -868,7 +902,8 @@ "nixpkgs": "nixpkgs_5", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", - "stylix": "stylix" + "stylix": "stylix", + "vpngate": "vpngate" } }, "rust-analyzer-src": { @@ -951,6 +986,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { @@ -1021,6 +1071,25 @@ "repo": "treefmt-nix", "type": "github" } + }, + "vpngate": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_7" + }, + "locked": { + "lastModified": 1743991336, + "narHash": "sha256-6A+EMHqSVIsdH9A/h21Y1agDJsW/7RK2mQQcDxfRNcY=", + "owner": "davegallant", + "repo": "vpngate", + "rev": "30aecfc5c8113523fa571b90ed47c93979b3ceeb", + "type": "github" + }, + "original": { + "owner": "davegallant", + "repo": "vpngate", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index e9abdc1..a4cebcd 100644 --- a/flake.nix +++ b/flake.nix @@ -15,8 +15,8 @@ url = "github:nix-community/nixvim/nixos-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; - # stylix.url = "https://flakehub.com/f/danth/stylix/*"; stylix.url = "github:danth/stylix/release-24.11"; + vpngate.url = "github:davegallant/vpngate"; }; outputs = @@ -28,6 +28,7 @@ nixpkgs, nixpkgs-unstable, stylix, + vpngate, ... }@inputs: { @@ -43,6 +44,7 @@ specialArgs = { inherit fh; inherit unstable; + inherit vpngate; }; modules = [ ./fonts.nix diff --git a/justfile b/justfile index 686545f..82588f0 100644 --- a/justfile +++ b/justfile @@ -18,7 +18,7 @@ channel-update: sudo nix-channel --update update: - @./nix-flake-update.sh + @./update-flake.sh fmt: nixfmt . diff --git a/machines/hephaestus/configuration.nix b/machines/hephaestus/configuration.nix index bff159e..fe90b15 100644 --- a/machines/hephaestus/configuration.nix +++ b/machines/hephaestus/configuration.nix @@ -5,6 +5,7 @@ modulesPath, pkgs, unstable, + vpngate, ... }: let @@ -107,6 +108,7 @@ in usbutils virt-manager vlc + vpngate.packages.x86_64-linux.default whois wine ] diff --git a/overlays/default.nix b/overlays/default.nix index 9007a0b..1c27ef6 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,4 +1,3 @@ final: prev: { cd-fzf = prev.callPackage ./cd-fzf { }; - vpngate = prev.callPackage ./vpngate { }; } diff --git a/overlays/vpngate/default.nix b/overlays/vpngate/default.nix deleted file mode 100644 index 7c89e7a..0000000 --- a/overlays/vpngate/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - fetchFromGitHub, - buildGoModule, -}: -buildGoModule rec { - pname = "vpngate"; - version = "v0.3.0"; - - vendorHash = "sha256-4JeVXLoiXdZoQM76cHOt5i31ZZGTId0rt8RkMH62/EM="; - - src = fetchFromGitHub { - owner = "davegallant"; - repo = "vpngate"; - rev = version; - sha256 = "sha256-P3eQvdUfjpq4a0Q2Hxby4zZ2uTSPjG1oXHxt8cW6fTQ="; - }; - - doCheck = false; - - meta = with lib; { - homepage = "https://www.vpngate.net"; - description = "a client for vpngate.net"; - license = licenses.gpl3; - maintainers = with maintainers; [ davegallant ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/packages.nix b/packages.nix index dc1ac77..2e6c08b 100644 --- a/packages.nix +++ b/packages.nix @@ -88,7 +88,6 @@ in openssl openvpn tcpdump - vpngate # rice fastfetch diff --git a/nix-flake-update.sh b/update-flake.sh similarity index 100% rename from nix-flake-update.sh rename to update-flake.sh