mirror of
https://github.com/davegallant/nix-config
synced 2025-08-05 06:23:40 +00:00
Use vpngate's flake.nix
This commit is contained in:
71
flake.lock
generated
71
flake.lock
generated
@@ -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",
|
||||
|
@@ -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
|
||||
|
2
justfile
2
justfile
@@ -18,7 +18,7 @@ channel-update:
|
||||
sudo nix-channel --update
|
||||
|
||||
update:
|
||||
@./nix-flake-update.sh
|
||||
@./update-flake.sh
|
||||
|
||||
fmt:
|
||||
nixfmt .
|
||||
|
@@ -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
|
||||
]
|
||||
|
@@ -1,4 +1,3 @@
|
||||
final: prev: {
|
||||
cd-fzf = prev.callPackage ./cd-fzf { };
|
||||
vpngate = prev.callPackage ./vpngate { };
|
||||
}
|
||||
|
@@ -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;
|
||||
};
|
||||
}
|
@@ -88,7 +88,6 @@ in
|
||||
openssl
|
||||
openvpn
|
||||
tcpdump
|
||||
vpngate
|
||||
|
||||
# rice
|
||||
fastfetch
|
||||
|
Reference in New Issue
Block a user