Fixing all warnings
This commit is contained in:
parent
32720ae712
commit
169912a47b
15 changed files with 124 additions and 92 deletions
72
flake.lock
generated
72
flake.lock
generated
|
|
@ -47,11 +47,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772008782,
|
"lastModified": 1772605780,
|
||||||
"narHash": "sha256-cjfHydg0gwFatbISETt2HbCsBBQ7FmRFxlmEH+V/NGE=",
|
"narHash": "sha256-p7IzkFmB1kCtl16+bvLKP1hdP61EFQxj+VSKX2lOWgE=",
|
||||||
"owner": "9001",
|
"owner": "9001",
|
||||||
"repo": "copyparty",
|
"repo": "copyparty",
|
||||||
"rev": "00ab7888d765e124ccd7c61792d264d598077d20",
|
"rev": "00e821db231d143169236971b50b85b9c9edd298",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -109,11 +109,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1771881364,
|
"lastModified": 1772699110,
|
||||||
"narHash": "sha256-A5uE/hMium5of/QGC6JwF5TGoDAfpNtW00T0s9u/PN8=",
|
"narHash": "sha256-jkyo/9fZVB3F/PHk3fVK1ImxJBZ71DCOYZvAz4R4v4E=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "a4cb7bf73f264d40560ba527f9280469f1f081c6",
|
"rev": "42affa9d33750ac0a0a89761644af20d8d03e6ee",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -182,11 +182,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769939035,
|
"lastModified": 1772665116,
|
||||||
"narHash": "sha256-Fok2AmefgVA0+eprw2NDwqKkPGEI5wvR+twiZagBvrg=",
|
"narHash": "sha256-XmjUDG/J8Z8lY5DVNVUf5aoZGc400FxcjsNCqHKiKtc=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "a8ca480175326551d6c4121498316261cbb5b260",
|
"rev": "39f53203a8458c330f61cc0759fe243f0ac0d198",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -245,11 +245,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1771851181,
|
"lastModified": 1772807318,
|
||||||
"narHash": "sha256-gFgE6mGUftwseV3DUENMb0k0EiHd739lZexPo5O/sdQ=",
|
"narHash": "sha256-Qjw6ILt8cb2HQQpCmWNLMZZ63wEo1KjTQt+1BcQBr7k=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "9a4b494b1aa1b93d8edf167f46dc8e0c0011280c",
|
"rev": "daa2c221320809f5514edde74d0ad0193ad54ed8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -267,11 +267,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1771756436,
|
"lastModified": 1772330611,
|
||||||
"narHash": "sha256-Tl2I0YXdhSTufGqAaD1ySh8x+cvVsEI1mJyJg12lxhI=",
|
"narHash": "sha256-UZjPc/d5XRxvjDbk4veAO4XFdvx6BUum2l40V688Xq8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "5bd3589390b431a63072868a90c0f24771ff4cbb",
|
"rev": "58fd7ff0eec2cda43e705c4c0585729ec471d400",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -288,11 +288,11 @@
|
||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770659507,
|
"lastModified": 1772763116,
|
||||||
"narHash": "sha256-RVZno9CypFN3eHxfULKN1K7mb/Cq0HkznnWqnshxpWY=",
|
"narHash": "sha256-5NUtdVWnEflm829QI0BIj2rDhI+pfagt+cxIARJEhi8=",
|
||||||
"owner": "simple-nixos-mailserver",
|
"owner": "simple-nixos-mailserver",
|
||||||
"repo": "nixos-mailserver",
|
"repo": "nixos-mailserver",
|
||||||
"rev": "781e833633ebc0873d251772a74e4400a73f5d78",
|
"rev": "c04152fa90ba5079f4517aa24383245937e43ab8",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -383,11 +383,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1771848320,
|
"lastModified": 1772624091,
|
||||||
"narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
|
"narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "2fc6539b481e1d2569f25f8799236694180c0993",
|
"rev": "80bdc1e5ce51f56b19791b52b2901187931f5353",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -399,11 +399,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770650459,
|
"lastModified": 1772732342,
|
||||||
"narHash": "sha256-hGeOnueXorzwDD1V9ldZr+y+zad4SNyqMnQsa/mIlvI=",
|
"narHash": "sha256-GcO/uW4b6lb0X8eIluact8YLA4uOgEjNh8pYsu7ozCk=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "fff0554c67696d76a0cdd9cfe14403fbdbf1f378",
|
"rev": "d2acf504d602c98f5ec2518dacea4f35e5a4e50f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -415,11 +415,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1771848320,
|
"lastModified": 1772624091,
|
||||||
"narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
|
"narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "2fc6539b481e1d2569f25f8799236694180c0993",
|
"rev": "80bdc1e5ce51f56b19791b52b2901187931f5353",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -431,11 +431,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1771369470,
|
"lastModified": 1772198003,
|
||||||
"narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
|
"narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "0182a361324364ae3f436a63005877674cf45efb",
|
"rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -577,11 +577,11 @@
|
||||||
"vicinae": "vicinae"
|
"vicinae": "vicinae"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1771358594,
|
"lastModified": 1772621016,
|
||||||
"narHash": "sha256-KwNv+THKbNUey10q26NZPDMSzYTObRHaSDr81QP9CPY=",
|
"narHash": "sha256-XwYTdsSBv3/ipe8Nsn/JwdQ+3P52vDXz4/bkHdLWyZw=",
|
||||||
"owner": "vicinaehq",
|
"owner": "vicinaehq",
|
||||||
"repo": "extensions",
|
"repo": "extensions",
|
||||||
"rev": "cf30b80f619282d45b1748eb76e784a4f875bb01",
|
"rev": "09eb29ed953c3ae0fe7f782d56819f75b588e358",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -596,11 +596,11 @@
|
||||||
"nixpkgs": "nixpkgs_4"
|
"nixpkgs": "nixpkgs_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772005916,
|
"lastModified": 1772772172,
|
||||||
"narHash": "sha256-aFYnT0gStcu1PVTh2Xzd0n8PIEKmqvTgrVkpv49qc6M=",
|
"narHash": "sha256-OCEb6jXTvhnMTMqMLleYChekDO/zh+VtunBAS0WevPM=",
|
||||||
"owner": "0xc000022070",
|
"owner": "0xc000022070",
|
||||||
"repo": "zen-browser-flake",
|
"repo": "zen-browser-flake",
|
||||||
"rev": "044299e83752f78f9fc5d6a648f7f3dd84bb3b18",
|
"rev": "5f8f34c0dd56808ecbfa35697353c455e4a416b3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
# Kernel
|
# Kernel
|
||||||
boot.kernelPackages = pkgs.linuxPackages_6_18;
|
boot.kernelPackages = pkgs.linuxPackages_6_19;
|
||||||
|
|
||||||
# Boot
|
# Boot
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
|
|
@ -74,12 +74,12 @@
|
||||||
|
|
||||||
# Tweaking failing packages
|
# Tweaking failing packages
|
||||||
nixpkgs.overlays = [ (final: prev: {
|
nixpkgs.overlays = [ (final: prev: {
|
||||||
dfu-programmer = prev.dfu-programmer.overrideAttrs (_: { env.NIX_CFLAGS_COMPILE = "-std=gnu17"; });
|
# dfu-programmer = final.dfu-programmer.overrideAttrs (_: { env.NIX_CFLAGS_COMPILE = "-std=gnu17"; });
|
||||||
# upower = prev.upower.overrideAttrs (_: { doCheck = false; });
|
# upower = final.upower.overrideAttrs (_: { doCheck = false; });
|
||||||
# gxml = prev.gxml.overrideAttrs (_: { doCheck = false; });
|
# gxml = final.gxml.overrideAttrs (_: { doCheck = false; });
|
||||||
# # orc = prev.orc.overrideAttrs (_: { doCheck = false; });
|
# # orc = final.orc.overrideAttrs (_: { doCheck = false; });
|
||||||
# # gsl = prev.gsl.overrideAttrs (_: { doCheck = false; });
|
# # gsl = final.gsl.overrideAttrs (_: { doCheck = false; });
|
||||||
# fprintd = prev.fprintd.overrideAttrs (super: {
|
# fprintd = final.fprintd.overrideAttrs (super: {
|
||||||
# # doCheck = false;
|
# # doCheck = false;
|
||||||
# # buildInputs = super.buildInputs or [ ] ++ (with pkgs; [ libpam-wrapper (pkgs.python3.withPackages (python-pkgs: [ python-pkgs.pycairo python-pkgs.dbus-python python-pkgs.python-dbusmock ])) ]);
|
# # buildInputs = super.buildInputs or [ ] ++ (with pkgs; [ libpam-wrapper (pkgs.python3.withPackages (python-pkgs: [ python-pkgs.pycairo python-pkgs.dbus-python python-pkgs.python-dbusmock ])) ]);
|
||||||
# mesonCheckFlags = [
|
# mesonCheckFlags = [
|
||||||
|
|
@ -87,7 +87,7 @@
|
||||||
# "--no-suite" "fprintd"
|
# "--no-suite" "fprintd"
|
||||||
# ];
|
# ];
|
||||||
# });
|
# });
|
||||||
# libsrtp = prev.libsrtp.overrideAttrs (_: {
|
# libsrtp = final.libsrtp.overrideAttrs (_: {
|
||||||
# mesonFlags = [
|
# mesonFlags = [
|
||||||
# "-Dcrypto-library=openssl"
|
# "-Dcrypto-library=openssl"
|
||||||
# "-Dcrypto-library-kdf=disabled"
|
# "-Dcrypto-library-kdf=disabled"
|
||||||
|
|
@ -95,8 +95,8 @@
|
||||||
# "-Dtests=disabled"
|
# "-Dtests=disabled"
|
||||||
# ];
|
# ];
|
||||||
# });
|
# });
|
||||||
# # # haskellPackages.crypton = pkgs.haskell.lib.overrideCabal prev.crypton (_: { doCheck = false; });
|
# # # haskellPackages.crypton = pkgs.haskell.lib.overrideCabal final.crypton (_: { doCheck = false; });
|
||||||
# # # haskellPackages.cryptonite = pkgs.haskell.lib.overrideCabal prev.cryptonite (_: { doCheck = false; });
|
# # # haskellPackages.cryptonite = pkgs.haskell.lib.overrideCabal final.cryptonite (_: { doCheck = false; });
|
||||||
}) ];
|
}) ];
|
||||||
|
|
||||||
# nixpkgs.config.packageOverrides = pkgs: {
|
# nixpkgs.config.packageOverrides = pkgs: {
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
locations."/" = {
|
locations."/" = {
|
||||||
proxyPass = "https://${config.services.kanidm.serverSettings.bindaddress}";
|
proxyPass = "https://${config.services.kanidm.server.settings.bindaddress}";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
# 44301
|
# 44301
|
||||||
|
|
|
||||||
|
|
@ -16,21 +16,21 @@
|
||||||
# Unstable
|
# Unstable
|
||||||
(final: prev: {
|
(final: prev: {
|
||||||
unstable = import nixpkgs-unstable {
|
unstable = import nixpkgs-unstable {
|
||||||
system = prev.system;
|
system = final.stdenv.hostPlatform.system;
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|
||||||
# Stable
|
# Stable
|
||||||
(final: prev: {
|
(final: prev: {
|
||||||
stable = import nixpkgs-stable {
|
stable = import nixpkgs-stable {
|
||||||
system = prev.system;
|
system = final.stdenv.hostPlatform.system;
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|
||||||
# Pins
|
# Pins
|
||||||
(final: prev: {
|
(final: prev: {
|
||||||
pin = {
|
pin = {
|
||||||
factorio = import pin-factorio { system = prev.system; config.allowUnfree = true; };
|
factorio = import pin-factorio { system = final.stdenv.hostPlatform.system; config.allowUnfree = true; };
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
programs.gamemode.enable = true;
|
programs.gamemode.enable = true;
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
wineWowPackages.waylandFull
|
wineWow64Packages.waylandFull
|
||||||
mangohud
|
mangohud
|
||||||
protonup-ng
|
protonup-ng
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -20,18 +20,20 @@
|
||||||
|
|
||||||
services.resolved = {
|
services.resolved = {
|
||||||
enable = false;
|
enable = false;
|
||||||
dnssec = "true";
|
settings = {
|
||||||
domains = [ "~." ];
|
Resolve = {
|
||||||
fallbackDns = [
|
DNSOverTLS = true;
|
||||||
"9.9.9.9"
|
DNSSEC = true;
|
||||||
"149.112.112.112"
|
Domains = [ "~." ];
|
||||||
"1.1.1.1"
|
FallbackDns = [
|
||||||
"1.0.0.1"
|
"9.9.9.9"
|
||||||
"2620:fe::fe"
|
"149.112.112.112"
|
||||||
"2620:fe::9"
|
"1.1.1.1"
|
||||||
];
|
"1.0.0.1"
|
||||||
settings.Resolve = {
|
"2620:fe::fe"
|
||||||
DNSOverTLS = true;
|
"2620:fe::9"
|
||||||
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
services.nextcloud = {
|
services.nextcloud = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.nextcloud32;
|
package = pkgs.nextcloud33;
|
||||||
hostName = "cloud.lyes.eu";
|
hostName = "cloud.lyes.eu";
|
||||||
https = true;
|
https = true;
|
||||||
configureRedis = true;
|
configureRedis = true;
|
||||||
|
|
@ -15,7 +15,8 @@
|
||||||
|
|
||||||
extraAppsEnable = true;
|
extraAppsEnable = true;
|
||||||
extraApps = {
|
extraApps = {
|
||||||
inherit (config.services.nextcloud.package.packages.apps) mail calendar contacts cospend user_oidc notes richdocuments tasks news dav_push repod gpoddersync phonetrack music;
|
inherit (config.services.nextcloud.package.packages.apps) mail calendar contacts cospend user_oidc notes richdocuments tasks dav_push repod gpoddersync phonetrack music;
|
||||||
|
# inherit (config.services.nextcloud.package.packages.apps) mail calendar contacts cospend user_oidc notes richdocuments tasks news dav_push repod gpoddersync phonetrack music;
|
||||||
# gpoddersync = pkgs.fetchNextcloudApp {
|
# gpoddersync = pkgs.fetchNextcloudApp {
|
||||||
# hash = "sha256-EQVs1fe0ierjqFZ5+KVc1Yj67zrwjLBAzY5A+QsC7AU=";
|
# hash = "sha256-EQVs1fe0ierjqFZ5+KVc1Yj67zrwjLBAzY5A+QsC7AU=";
|
||||||
# url = "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.13.2r/gpoddersync.tar.gz";
|
# url = "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.13.2r/gpoddersync.tar.gz";
|
||||||
|
|
|
||||||
|
|
@ -42,6 +42,8 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
networking.vpn-netns.encapsulatedServices.suwayomi-server.enable = true;
|
||||||
|
|
||||||
age.secrets = {
|
age.secrets = {
|
||||||
suwayomi-pass = {
|
suwayomi-pass = {
|
||||||
file = ../../../secrets/zora/services/lanayru-pass.age;
|
file = ../../../secrets/zora/services/lanayru-pass.age;
|
||||||
|
|
|
||||||
|
|
@ -2,12 +2,13 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
services.kanidm = {
|
services.kanidm = {
|
||||||
package = pkgs.kanidmWithSecretProvisioning_1_8;
|
package = pkgs.kanidmWithSecretProvisioning_1_9;
|
||||||
|
|
||||||
enableClient = true;
|
client = {
|
||||||
|
enable = true;
|
||||||
clientSettings = {
|
settings = {
|
||||||
uri = "https://auth.lyes.eu";
|
uri = "https://auth.lyes.eu";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,19 +13,21 @@ in
|
||||||
services.kanidm = {
|
services.kanidm = {
|
||||||
# package = pkgs.kanidmWithSecretProvisioning_1_7;
|
# package = pkgs.kanidmWithSecretProvisioning_1_7;
|
||||||
|
|
||||||
enableServer = true;
|
server = {
|
||||||
serverSettings = {
|
enable = true;
|
||||||
bindaddress = "127.0.0.1:${port}";
|
settings = {
|
||||||
ldapbindaddress = "0.0.0.0:636";
|
bindaddress = "127.0.0.1:${port}";
|
||||||
domain = hostname;
|
ldapbindaddress = "0.0.0.0:636";
|
||||||
origin = "https://${hostname}";
|
domain = hostname;
|
||||||
tls_chain = "/var/lib/acme/${hostname}/cert.pem";
|
origin = "https://${hostname}";
|
||||||
tls_key = "/var/lib/acme/${hostname}/key.pem";
|
tls_chain = "/var/lib/acme/${hostname}/cert.pem";
|
||||||
|
tls_key = "/var/lib/acme/${hostname}/key.pem";
|
||||||
|
|
||||||
online_backup = {
|
online_backup = {
|
||||||
path = "/var/data/backups/kanidm";
|
path = "/var/data/backups/kanidm";
|
||||||
schedule = "00 06 * * *";
|
schedule = "00 06 * * *";
|
||||||
versions = 5;
|
versions = 5;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,8 @@ let
|
||||||
} forwardedServices;
|
} forwardedServices;
|
||||||
|
|
||||||
serviceList = lib.mapAttrsToList (name: _: name + ".service") forwardedServices;
|
serviceList = lib.mapAttrsToList (name: _: name + ".service") forwardedServices;
|
||||||
|
encServicesList = lib.mapAttrsToList (name: _: name + ".service") cfg.encapsulatedServices;
|
||||||
|
|
||||||
in
|
in
|
||||||
lib.mkIf (forwardedServices != { } && cfg.portForwarding.enable) {
|
lib.mkIf (forwardedServices != { } && cfg.portForwarding.enable) {
|
||||||
assertions = [
|
assertions = [
|
||||||
|
|
@ -49,8 +51,8 @@ lib.mkIf (forwardedServices != { } && cfg.portForwarding.enable) {
|
||||||
services.natpmpc-lease = {
|
services.natpmpc-lease = {
|
||||||
description = "Request VPN port forwarding leases.";
|
description = "Request VPN port forwarding leases.";
|
||||||
|
|
||||||
wantedBy = serviceList;
|
# wantedBy = serviceList;
|
||||||
after = [ "wireguard.target" ];
|
after = [ "wireguard.target" ] ++ encServicesList;
|
||||||
wants = [ "wireguard.target" ];
|
wants = [ "wireguard.target" ];
|
||||||
|
|
||||||
# preStart = "sleep 3";
|
# preStart = "sleep 3";
|
||||||
|
|
|
||||||
|
|
@ -3,8 +3,14 @@
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
cmake,
|
cmake,
|
||||||
curl,
|
curl,
|
||||||
qt6,
|
libxml2,
|
||||||
libxml2
|
qtbase,
|
||||||
|
wrapQtAppsHook,
|
||||||
|
qtscxml,
|
||||||
|
qtquicktimeline,
|
||||||
|
qtquickeffectmaker,
|
||||||
|
qtnetworkauth,
|
||||||
|
qttools,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation (final: {
|
stdenv.mkDerivation (final: {
|
||||||
|
|
@ -18,10 +24,20 @@ stdenv.mkDerivation (final: {
|
||||||
hash = "sha256-hqoUkzPNxAIvC/7DL9YIMPmUZqAreqCbG8NKidVtSDM=";
|
hash = "sha256-hqoUkzPNxAIvC/7DL9YIMPmUZqAreqCbG8NKidVtSDM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
buildInputs = [ qtbase ];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
curl
|
curl
|
||||||
qt6.full
|
# qt6.env
|
||||||
|
qtscxml
|
||||||
|
# qtquick3d
|
||||||
|
# qtquick3dphysics
|
||||||
|
qtquicktimeline
|
||||||
|
qtquickeffectmaker
|
||||||
|
qtnetworkauth
|
||||||
|
qttools
|
||||||
libxml2
|
libxml2
|
||||||
|
wrapQtAppsHook
|
||||||
];
|
];
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,6 @@
|
||||||
{
|
{
|
||||||
quadcastrgb = pkgs.callPackage ./quadcastrgb { };
|
quadcastrgb = pkgs.callPackage ./quadcastrgb { };
|
||||||
ens-intel-unite = pkgs.callPackage ./ens-intel-unite { };
|
ens-intel-unite = pkgs.callPackage ./ens-intel-unite { };
|
||||||
KhinsiderDownloader = pkgs.callPackage ./KhinsiderDownloader { };
|
KhinsiderDownloader = pkgs.qt6Packages.callPackage ./KhinsiderDownloader { };
|
||||||
amy-mono = pkgs.callPackage ./amy-mono { };
|
amy-mono = pkgs.callPackage ./amy-mono { };
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -24,4 +24,9 @@
|
||||||
via
|
via
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Fixing launch issues with some desktops (sway...)
|
||||||
|
# systemd.user.extraConfig = ''
|
||||||
|
# DefaultEnvironment="PATH=/run/current-system/sw/bin"
|
||||||
|
# '';
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@ in {
|
||||||
helvum
|
helvum
|
||||||
local.quadcastrgb
|
local.quadcastrgb
|
||||||
euphonica
|
euphonica
|
||||||
#local.KhinsiderDownloader
|
local.KhinsiderDownloader
|
||||||
|
|
||||||
# Games
|
# Games
|
||||||
heroic
|
heroic
|
||||||
|
|
@ -99,6 +99,7 @@ in {
|
||||||
vscodium
|
vscodium
|
||||||
# zed-editor
|
# zed-editor
|
||||||
gcc
|
gcc
|
||||||
|
gnumake
|
||||||
rustup
|
rustup
|
||||||
python3
|
python3
|
||||||
zola
|
zola
|
||||||
|
|
@ -112,7 +113,7 @@ in {
|
||||||
nodejs
|
nodejs
|
||||||
nil
|
nil
|
||||||
nixd
|
nixd
|
||||||
nixfmt-rfc-style
|
nixfmt
|
||||||
protege # LogIA Course
|
protege # LogIA Course
|
||||||
haskellPackages.Agda
|
haskellPackages.Agda
|
||||||
agdaPackages.standard-library
|
agdaPackages.standard-library
|
||||||
|
|
@ -197,13 +198,13 @@ in {
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
# Version pins
|
# Version pins
|
||||||
(final: prev: {
|
(final: prev: {
|
||||||
# factorio = prev.factorio.overrideAttrs (super: {
|
# factorio = final.factorio.overrideAttrs (super: {
|
||||||
# version = "2.0.42";
|
# version = "2.0.42";
|
||||||
# # src.name = "factorio_alpha_x64-2.0.42.tar.xz";
|
# # src.name = "factorio_alpha_x64-2.0.42.tar.xz";
|
||||||
# # src.sha256 = "1zq6wcqkmn9bzys27v0jlk9m9m1jhaai1mybdv8hz7p2si4l76n9";
|
# # src.sha256 = "1zq6wcqkmn9bzys27v0jlk9m9m1jhaai1mybdv8hz7p2si4l76n9";
|
||||||
# src = "/nix/store/b9y0dwgxa6hpddrd8nn0g2fizxl3xss7-factorio_alpha_x64-2.0.42.tar.xz";
|
# src = "/nix/store/b9y0dwgxa6hpddrd8nn0g2fizxl3xss7-factorio_alpha_x64-2.0.42.tar.xz";
|
||||||
# });
|
# });
|
||||||
# factorio = prev.factorio.overrideAttrs (super: {
|
# factorio = final.factorio.overrideAttrs (super: {
|
||||||
# username = "ntlyes";
|
# username = "ntlyes";
|
||||||
# token = "";
|
# token = "";
|
||||||
# src =
|
# src =
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue