diff --git a/machines/fischer/default.nix b/machines/fischer/default.nix index 21105b9..b5ae961 100644 --- a/machines/fischer/default.nix +++ b/machines/fischer/default.nix @@ -1,4 +1,9 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: { imports = [ ./hardware.nix @@ -32,16 +37,15 @@ # no need to redefine it in your config for now) #media-session.enable = true; wireplumber.enable = true; - }; networking.hostName = "fischer"; - - services.blueman.enable = true; hardware.bluetooth.enable = true; - environment.sessionVariables = { LIBSEAT_BACKEND = "logind"; }; + environment.sessionVariables = { + LIBSEAT_BACKEND = "logind"; + }; services.tailscale.enable = true; networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. @@ -103,34 +107,9 @@ security.polkit.enable = true; security.tpm2.enable = true; - security.tpm2.pkcs11.enable = - true; # expose /run/current-system/sw/lib/libtpm2_pkcs11.so - security.tpm2.tctiEnvironment.enable = - true; # TPM2TOOLS_TCTI and TPM2_PKCS11_TCTI env variables - users.users.julien.extraGroups = - [ "tss" ]; # tss group has access to TPM devices - - services.syncthing = { - enable = true; - user = "julien"; - group = "users"; - settings.options.urAccepted = -1; - overrideDevices = true; - overrideFolders = true; - settings = { - devices = { - "tower" = { id = "XEPZZIP-GX73OKE-KNGZA47-XWWGI5G-LNXPU57-BMLXK5M-VNGS5UQ-ZFIZSAK"; }; - }; - folders = { - "dev" = { - path = "/home/julien/dev"; - devices = [ "tower" ]; - }; - }; - }; - }; - - systemd.services.syncthing.serviceConfig.StateDirectory = "syncthing"; + security.tpm2.pkcs11.enable = true; # expose /run/current-system/sw/lib/libtpm2_pkcs11.so + security.tpm2.tctiEnvironment.enable = true; # TPM2TOOLS_TCTI and TPM2_PKCS11_TCTI env variables + users.users.julien.extraGroups = [ "tss" ]; # tss group has access to TPM devices services.postgresql.enable = true; @@ -154,13 +133,11 @@ Encryption Required User jmalka ''; - }; - environment.variables = - { - CUPS_USER = "jmalka"; - }; + environment.variables = { + CUPS_USER = "jmalka"; + }; security.pam.services.swaylock = { }; @@ -176,5 +153,4 @@ ''; system.stateVersion = "23.05"; - } diff --git a/machines/tower/default.nix b/machines/tower/default.nix index 70dcbce..9445279 100644 --- a/machines/tower/default.nix +++ b/machines/tower/default.nix @@ -155,30 +155,6 @@ }; }; - services.syncthing = { - enable = true; - user = "julien"; - group = "users"; - overrideDevices = true; - overrideFolders = true; - settings = { - devices = { - "fischer" = { - id = "MHV2PGN-GAHQMV5-ITXGNQS-IRJC3XL-OQIHVUX-JVKBZ6Z-33XHE7H-NC6H5AE"; - }; - }; - folders = { - "dev" = { - # Name of folder in Syncthing, also the folder ID - path = "/home/julien/dev"; # Which folder to add to Syncthing - devices = [ "fischer" ]; # Which devices to share the folder with - }; - }; - }; - }; - - systemd.services.syncthing.serviceConfig.StateDirectory = "syncthing"; - networking.firewall.allowedTCPPorts = [ 80 443