upgrade to 23.11

This commit is contained in:
2023-11-27 12:07:19 +02:00
parent 6084f3d570
commit 3c3758b852
5 changed files with 19 additions and 52 deletions

View File

@@ -5,8 +5,6 @@
}: {
config = {
hardware.bluetooth.enable = true;
services.blueman.enable = true;
services.udev.packages = [pkgs.yubikey-personalization];
programs = {
firefox.enable = true;
@@ -16,6 +14,8 @@
mj.base.users.passwd.motiejus.extraGroups = ["adbusers" "networkmanager" "wireshark"];
services = {
blueman.enable = true;
udev.packages = [pkgs.yubikey-personalization];
acpid.enable = true;
pcscd.enable = true;
printing = {
@@ -24,13 +24,8 @@
};
openssh.settings.X11Forwarding = true;
# TODO post-23.11
#logind.powerKey = "suspend";
#logind.powerKeyLongPress = "poweroff";
logind.extraConfig = ''
HandlePowerKey=suspend
HandlePowerKeyLongPress=poweroff
'';
logind.powerKey = "suspend";
logind.powerKeyLongPress = "poweroff";
xserver = {
enable = true;

View File

@@ -31,9 +31,7 @@
oidc = {
issuer = "https://git.jakstys.lt/";
client_id = "e25c15ea-41ca-4bf0-9ebf-2be9f2d1ccea";
# TODO 23.11 from https://github.com/NixOS/nixpkgs/pull/249101/files
#client_secret_path = "\${CREDENTIALS_DIRECTORY}/oidc-client-secret";
client_secret_path = "/run/credentials/headscale.service/oidc-client-secret";
client_secret_path = "\${CREDENTIALS_DIRECTORY}/oidc-client-secret";
};
};
};

View File

@@ -2,7 +2,6 @@
config,
lib,
myData,
pkgs,
...
}: let
cfg = config.mj.services.tailscale;
@@ -20,7 +19,6 @@ in {
config = mkIf cfg.enable (mkMerge [
{
services.tailscale.enable = true;
services.tailscale.package = pkgs.pkgs-unstable.tailscale;
networking.firewall.checkReversePath = "loose";
networking.firewall.allowedUDPPorts = [myData.ports.tailscale];
}