feat: overhaul overlays

This commit is contained in:
Leon Schwarzäugl 2026-03-05 23:01:13 +01:00
parent 91f4393800
commit 130444f5d7
Signed by: swarsel
GPG key ID: 26A54C31F2A4FD84
23 changed files with 406 additions and 246 deletions

View file

@ -10,7 +10,7 @@
virtualisation.podman = {
enable = true;
dockerCompat = true;
package = pkgs.stable.podman;
package = pkgs.podman;
};
};
}

View file

@ -33,7 +33,7 @@
bluetooth = lib.mkIf config.swarselsystems.hasBluetooth {
enable = true;
package = pkgs.stable.bluez;
package = pkgs.bluez;
powerOnBoot = true;
settings = {
General = {

View file

@ -82,8 +82,7 @@
pipewire
pixman
speex
# stable.cc.cc
stable25_05.steam-fhsenv-without-steam
steam-fhsenv-without-steam
systemd
tbb
vulkan-loader

View file

@ -6,7 +6,7 @@
services.pipewire = {
enable = true;
package = pkgs.stable.pipewire;
package = pkgs.pipewire;
pulse.enable = true;
jack.enable = true;
audio.enable = true;

View file

@ -2,8 +2,8 @@
{
options.swarselmodules.swayosd = lib.mkEnableOption "swayosd settings";
config = lib.mkIf config.swarselmodules.swayosd {
environment.systemPackages = [ pkgs.dev.swayosd ];
services.udev.packages = [ pkgs.dev.swayosd ];
environment.systemPackages = [ pkgs.swayosd ];
services.udev.packages = [ pkgs.swayosd ];
systemd.services.swayosd-libinput-backend = {
description = "SwayOSD LibInput backend for listening to certain keys like CapsLock, ScrollLock, VolumeUp, etc.";
documentation = [ "https://github.com/ErikReider/SwayOSD" ];
@ -14,7 +14,7 @@
serviceConfig = {
Type = "dbus";
BusName = "org.erikreider.swayosd";
ExecStart = "${pkgs.dev.swayosd}/bin/swayosd-libinput-backend";
ExecStart = "${pkgs.swayosd}/bin/swayosd-libinput-backend";
Restart = "on-failure";
};
};

View file

@ -122,6 +122,8 @@ in
nixpkgs = {
overlays = [
outputs.overlays.default
outputs.overlays.stables
outputs.overlays.modifications
] ++ lib.optionals withHomeManager [
(final: prev:
let

View file

@ -12,7 +12,11 @@ in
nix.settings.experimental-features = "nix-command flakes";
nixpkgs = {
hostPlatform = "x86_64-darwin";
overlays = [ outputs.overlays.default ];
overlays = [
outputs.overlays.default
outputs.overlays.stables
outputs.overlays.modifications
];
config = {
allowUnfree = true;
};

View file

@ -8,7 +8,7 @@
enable = true;
enableKvm = true;
addNetworkInterface = lib.mkIf config.virtualisation.virtualbox.host.enableKvm false;
package = pkgs.stable.virtualbox;
package = pkgs.virtualbox;
enableExtensionPack = true;
};
# leaving this here for future notice. setting guest.enable = true will make 'restarting sysinit-reactivation.target' take till timeout on nixos-rebuild switch

View file

@ -160,7 +160,7 @@ in
environment.systemPackages = with pkgs; [
remmina
# gp-onsaml-gui
stable24_11.python39
python39
qemu
packer
gnumake

View file

@ -174,19 +174,19 @@ in
domain = {
settings.ERLANG_DISTRIBUTION_PORT = domainPort;
package = pkgs.dev.firezone-server-domain;
package = pkgs.firezone-server-domain;
};
api = {
externalUrl = "https://${serviceDomain}/api/";
address = "0.0.0.0";
port = apiPort;
package = pkgs.dev.firezone-server-api;
package = pkgs.firezone-server-api;
};
web = {
externalUrl = "https://${serviceDomain}/";
address = "0.0.0.0";
port = webPort;
package = pkgs.dev.firezone-server-web;
package = pkgs.firezone-server-web;
};
};
@ -199,7 +199,7 @@ in
publicIpv4 = proxyAddress4;
publicIpv6 = proxyAddress6;
openFirewall = lib.mkIf (!isProxied) true;
package = pkgs.dev.firezone-relay;
package = pkgs.firezone-relay;
};
};
# systemd.services.firezone-initialize =

View file

@ -165,14 +165,14 @@ in
services = {
${serviceName} = {
enable = true;
package = pkgs.dev.oauth2-proxy;
package = pkgs.update.oauth2-proxy;
cookie = {
domain = ".${mainDomain}";
secure = true;
expire = "900m";
secret = null; # set by service EnvironmentFile
secretFile = null;
};
clientSecret = null; # set by service EnvironmentFile
clientSecretFile = null;
reverseProxy = true;
httpAddress = "0.0.0.0:${builtins.toString servicePort}";
redirectURL = "https://${serviceDomain}/oauth2/callback";

View file

@ -103,11 +103,11 @@ in
gotenberg = {
enable = true;
package = pkgs.stable.gotenberg;
package = pkgs.gotenberg;
port = gotenbergPort;
bindIP = "127.0.0.1";
timeout = "600s";
chromium.package = pkgs.stable.chromium;
chromium.package = pkgs.chromium;
};
};