nydragon/nix-da
1
Fork 0
Code Issues Pull requests Activity Actions 1

feat: add tailscale systray

Browse source
This commit is contained in:
Nydragon 2024-11-24 01:23:29 +01:00
parent dc8c0a821c
commit 9b7e3f77f0
Signed by: nydragon
SSH key fingerprint: SHA256:WcjW5NJPQ8Dx4uQDmoIlVPLWE27Od3fxoe0IUvuoPHE
3 changed files with 41 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pre-commit-config.yaml
View file

@ -4,7 +4,7 @@ default_install_hook_types:
repos: repos:
- repo: https://github.com/gitleaks/gitleaks - repo: https://github.com/gitleaks/gitleaks
rev: v8.18.2 rev: v8.21.2
hooks: hooks:
- id: gitleaks - id: gitleaks
stages: [pre-commit] stages: [pre-commit]

24
modules/system/polkit.nix
View file

@ -6,19 +6,17 @@
}: }:
{ {
config = lib.mkIf config.security.polkit.enable { config = lib.mkIf config.security.polkit.enable {
systemd = { systemd.user.services.polkit-gnome-authentication-agent-1 = {
user.services.polkit-gnome-authentication-agent-1 = { description = "polkit-gnome-authentication-agent-1";
description = "polkit-gnome-authentication-agent-1"; wantedBy = [ "graphical-session.target" ];
wantedBy = [ "graphical-session.target" ]; wants = [ "graphical-session.target" ];
wants = [ "graphical-session.target" ]; after = [ "graphical-session.target" ];
after = [ "graphical-session.target" ]; serviceConfig = {
serviceConfig = { Type = "simple";
Type = "simple"; ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"; Restart = "on-failure";
Restart = "on-failure"; RestartSec = 1;
RestartSec = 1; TimeoutStopSec = 10;
TimeoutStopSec = 10;
};
}; };
}; };
}; };

31
options/services/tailscale.nix
View file

@ -1,4 +1,9 @@
{ config, lib, ... }: {
config,
lib,
pkgs,
...
}:
let let
inherit (lib) inherit (lib)
mkIf mkIf
@ -22,6 +27,7 @@ in
server = mkOption { server = mkOption {
type = str; type = str;
default = "https://hs.ccnlc.eu"; default = "https://hs.ccnlc.eu";
description = "The coordination server tailscale should be using.";
}; };
isExitNode = mkOption { isExitNode = mkOption {
@ -48,6 +54,12 @@ in
type = listOf str; type = listOf str;
default = [ ]; default = [ ];
}; };
systemTray = mkOption {
type = bool;
default = true;
description = "Display a system tray icon to interact with tailscale.";
};
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
@ -69,6 +81,21 @@ in
]; ];
useRoutingFeatures = mkIf cfg.isExitNode "server"; useRoutingFeatures = mkIf cfg.isExitNode "server";
}; };
};
systemd.user.services.tailscale-system-tray = mkIf cfg.systemTray {
description = "tailscale system tray";
wantedBy = [ "graphical-session.target" ];
wants = [ "graphical-session.target" ];
after = [ "graphical-session.target" ];
path = [ pkgs.polkit ];
serviceConfig = {
Type = "simple";
ExecStart = "/bin/sh -lc ${pkgs.tailscale-systray}/bin/tailscale-systray";
Restart = "on-failure";
RestartSec = 1;
TimeoutStopSec = 10;
IPAddressDeny = "any";
};
};
};
} }