diff --git a/home-manager-modules/sway/default.nix b/home-manager-modules/sway/default.nix index 78d8901..3aaf7fe 100644 --- a/home-manager-modules/sway/default.nix +++ b/home-manager-modules/sway/default.nix @@ -127,5 +127,7 @@ with lib; }; + security.pam.services.swaylock = { }; + }; } diff --git a/machines/tower/default.nix b/machines/tower/default.nix index dcaeec8..7ea4b02 100644 --- a/machines/tower/default.nix +++ b/machines/tower/default.nix @@ -7,13 +7,11 @@ ./home-julien.nix ]; - # Bootloader. boot.loader.grub.enable = true; boot.loader.grub.device = "/dev/sda"; boot.loader.grub.useOSProber = true; - services.resolved.enable = true; - networking.hostName = "tower"; # Define your hostname. + networking.hostName = "tower"; networking.networkmanager.enable = true; @@ -26,11 +24,6 @@ services.tailscale.enable = true; - nix.extraOptions = '' - allow-import-from-derivation = true - experimental-features = nix-command flakes - ''; - services.openssh.extraConfig = '' HostCertificate /etc/ssh/ssh_host_ed25519_key-cert.pub HostKey /etc/ssh/ssh_host_ed25519_key @@ -45,17 +38,8 @@ console.keyMap = "fr"; - users.users.julien = { - isNormalUser = true; - description = "Julien"; - extraGroups = [ "networkmanager" "wheel" ]; - packages = [ ]; - }; - services.openssh.enable = true; - boot.binfmt.emulatedSystems = [ "i686-linux" ]; - programs.ssh.knownHosts."darwin-build-box.winter.cafe".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB0io9E0eXiDIEHvsibXOxOPveSjUPIr1RnNKbUkw3fD"; diff --git a/machines/x2100/default.nix b/machines/x2100/default.nix index 49cb874..36946fe 100644 --- a/machines/x2100/default.nix +++ b/machines/x2100/default.nix @@ -124,9 +124,6 @@ # for a WiFi printer services.avahi.openFirewall = true; - - security.pam.services.swaylock = { }; - programs.sway = { enable = true; wrapperFeatures.gtk = true;