Compare commits

..

No commits in common. "643d4799bc7ee3bdcc23f3931ee877cb5e508859" and "2e4fdc480559c3500057907c9e295397c22712b3" have entirely different histories.

3 changed files with 21 additions and 18 deletions

View file

@ -11,24 +11,13 @@ mkOizysModule config "vpn" {
]; ];
services.openvpn.servers = { services.openvpn.servers = {
# subscription expired express-ny = {
# 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/daylin/.config/openvpn/mullvad-chi/mullvad_us_chi.conf config /home/${config.oizys.user}/.config/openvpn/express-ny/config.ovpn
auth-user-pass /home/${config.oizys.user}/.config/openvpn/express-ny/credentials
''; '';
autoStart = false; autoStart = false;
updateResolvConf = true; updateResolvConf = true;
}; };
}; };
} }

View file

@ -1,15 +1,17 @@
{ ... }: { ... }:
(final: prev: { (final: prev: {
nimble = prev.nimble.overrideNimAttrs rec { nimble = prev.nimble.overrideNimAttrs {
version = "0.16.0"; version = "0.14.2-5e7901760e89108476a4e21976a0ef783403e8fe";
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}";
hash = "sha256-nsQAUe+soRkWAFPYP5LftBCvQdkC1SpiIORscDsPQB4="; # most recent commit 2024-03-11
rev = "5e7901760e89108476a4e21976a0ef783403e8fe";
hash = "sha256-8b5yKvEl7c7wA/8cpdaN2CSvawQJzuRce6mULj3z/mI=";
}; };
}; };
}) })

View file

@ -0,0 +1,12 @@
{ ... }:
(final: prev: {
nimlsp = prev.nimlsp.overrideNimAttrs {
requiredNimVersion = 2;
nimFlags = [
"--threads:on"
""
"-d:explicitSourcePath=${final.srcOnly final.pkgs.nim-unwrapped-2}"
"-d:tempDir=/tmp"
];
};
})