pim/nixos-laptop
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Simplify tailscale configuration

Browse source
This commit is contained in:
Pim Kunis 2024-11-10 12:16:05 +01:00
parent 59b58faeb5
commit 51312397b5
5 changed files with 14 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
machines/gamepc/configuration.nix
View file

@ -10,7 +10,11 @@
facter.reportPath = ./facter.json; facter.reportPath = ./facter.json;
networking.hostName = "gamepc"; networking.hostName = "gamepc";
services.openssh.enable = true;
services = {
openssh.enable = true;
tailscale.enable = true;
};
users.users = { users.users = {
root.password = ""; root.password = "";

3
machines/sue/configuration.nix
View file

@ -6,11 +6,12 @@
gnome.enable = true; gnome.enable = true;
stylix.enable = true; stylix.enable = true;
wireguard.enable = true; wireguard.enable = true;
tailscale.enable = true;
compliance.enable = true; compliance.enable = true;
sops.enable = true; sops.enable = true;
}; };
services.tailscale.enable = true;
facter.reportPath = ./facter.json; facter.reportPath = ./facter.json;
networking.hostName = "xps-9315"; networking.hostName = "xps-9315";

7
nixos/default.nix
View file

@ -17,7 +17,6 @@
./stylix.nix ./stylix.nix
./wireguard.nix ./wireguard.nix
./gnome.nix ./gnome.nix
./tailscale.nix
./compliance.nix ./compliance.nix
./cinnamon.nix ./cinnamon.nix
./ssh.nix ./ssh.nix
@ -28,6 +27,7 @@
programs.ssh.startAgent = true; programs.ssh.startAgent = true;
services = { services = {
tailscale.useRoutingFeatures = "client";
xserver.enable = true; xserver.enable = true;
printing = { printing = {
@ -113,7 +113,10 @@
}; };
}; };
networking.useDHCP = lib.mkDefault true; networking = {
useDHCP = lib.mkDefault true;
networkmanager.unmanaged = lib.mkIf config.services.tailscale.enable ["tailscale0"];
};
virtualisation.docker = { virtualisation.docker = {
enable = true; enable = true;

3
nixos/gnome.nix
View file

@ -29,7 +29,8 @@ in {
window-is-ready-remover window-is-ready-remover
random-wallpaper random-wallpaper
workspaces-indicator-by-open-apps workspaces-indicator-by-open-apps
]); ])
++ lib.optional config.services.tailscale.enable pkgs.gnomeExtensions.tailscale-status;
gnome.excludePackages = gnome.excludePackages =
(with pkgs; [ (with pkgs; [

20
nixos/tailscale.nix
View file

@ -1,20 +0,0 @@
{
pkgs,
config,
lib,
...
}: let
cfg = config.pim.tailscale;
in {
options.pim.tailscale.enable = lib.mkEnableOption "tailscale";
config = lib.mkIf cfg.enable {
environment.systemPackages = [pkgs.gnomeExtensions.tailscale-status];
services.tailscale = {
enable = true;
useRoutingFeatures = "client";
};
networking.networkmanager.unmanaged = ["tailscale0"];
};
}