mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-12-24 20:10:43 -06:00
Compare commits
2 commits
2e4fdc4805
...
643d4799bc
Author | SHA1 | Date | |
---|---|---|---|
643d4799bc | |||
63490a3fdf |
3 changed files with 18 additions and 21 deletions
|
@ -11,13 +11,24 @@ mkOizysModule config "vpn" {
|
||||||
];
|
];
|
||||||
|
|
||||||
services.openvpn.servers = {
|
services.openvpn.servers = {
|
||||||
express-ny = {
|
# subscription expired
|
||||||
|
# express-ny = {
|
||||||
|
# config = ''
|
||||||
|
# config /home/daylin/.config/openvpn/express-ny/config.ovpn
|
||||||
|
# auth-user-pass /home/daylin/.config/openvpn/express-ny/credentials
|
||||||
|
# '';
|
||||||
|
# autoStart = false;
|
||||||
|
# updateResolvConf = true;
|
||||||
|
# };
|
||||||
|
#
|
||||||
|
|
||||||
|
mullvad-chi = {
|
||||||
config = ''
|
config = ''
|
||||||
config /home/${config.oizys.user}/.config/openvpn/express-ny/config.ovpn
|
config /home/daylin/.config/openvpn/mullvad-chi/mullvad_us_chi.conf
|
||||||
auth-user-pass /home/${config.oizys.user}/.config/openvpn/express-ny/credentials
|
|
||||||
'';
|
'';
|
||||||
autoStart = false;
|
autoStart = false;
|
||||||
updateResolvConf = true;
|
updateResolvConf = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,17 +1,15 @@
|
||||||
{ ... }:
|
{ ... }:
|
||||||
(final: prev: {
|
(final: prev: {
|
||||||
nimble = prev.nimble.overrideNimAttrs {
|
nimble = prev.nimble.overrideNimAttrs rec {
|
||||||
version = "0.14.2-5e7901760e89108476a4e21976a0ef783403e8fe";
|
version = "0.16.0";
|
||||||
requiredNimVersion = 2;
|
requiredNimVersion = 2;
|
||||||
buildInputs = [ prev.pkgs.openssl ];
|
buildInputs = [ prev.pkgs.openssl ];
|
||||||
|
|
||||||
src = final.fetchFromGitHub {
|
src = final.fetchFromGitHub {
|
||||||
owner = "nim-lang";
|
owner = "nim-lang";
|
||||||
repo = "nimble";
|
repo = "nimble";
|
||||||
|
rev = "v${version}";
|
||||||
# most recent commit 2024-03-11
|
hash = "sha256-nsQAUe+soRkWAFPYP5LftBCvQdkC1SpiIORscDsPQB4=";
|
||||||
rev = "5e7901760e89108476a4e21976a0ef783403e8fe";
|
|
||||||
hash = "sha256-8b5yKvEl7c7wA/8cpdaN2CSvawQJzuRce6mULj3z/mI=";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|
|
@ -1,12 +0,0 @@
|
||||||
{ ... }:
|
|
||||||
(final: prev: {
|
|
||||||
nimlsp = prev.nimlsp.overrideNimAttrs {
|
|
||||||
requiredNimVersion = 2;
|
|
||||||
nimFlags = [
|
|
||||||
"--threads:on"
|
|
||||||
""
|
|
||||||
"-d:explicitSourcePath=${final.srcOnly final.pkgs.nim-unwrapped-2}"
|
|
||||||
"-d:tempDir=/tmp"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
})
|
|
Loading…
Reference in a new issue