From a1874a4dafa029b2d16050c5e51a96c8f804b5c1 Mon Sep 17 00:00:00 2001 From: gwg313 Date: Tue, 8 Apr 2025 14:38:09 -0400 Subject: [PATCH] some updates --- common/nixos/ssh/ssh.nix | 9 +++++++-- common/nixos/ssh/ssh_client.nix | 1 - home-manager/modules/hyprland/default.nix | 2 +- hosts/candlekeep/syncthing.nix | 12 ------------ hosts/grymforge/syncthing.nix | 11 ----------- 5 files changed, 8 insertions(+), 27 deletions(-) diff --git a/common/nixos/ssh/ssh.nix b/common/nixos/ssh/ssh.nix index 00864b1..273e758 100644 --- a/common/nixos/ssh/ssh.nix +++ b/common/nixos/ssh/ssh.nix @@ -3,7 +3,8 @@ lib, user, ... -}: { +}: +{ options = { ssh.enable = lib.mkEnableOption "enable ssh settings"; }; @@ -45,7 +46,7 @@ ########## Authentication ########## - AllowUsers = ["${user}"]; + AllowUsers = [ "${user}" ]; # Use keys only. Remove if you want to SSH using password (not recommended) PasswordAuthentication = false; @@ -145,6 +146,10 @@ ########## Connection Preferences ########## # disable reverse DNS lookups UseDNS no + + ########## Disable GSS ########## + + GSSAPIAuthentication no ''; }; }; diff --git a/common/nixos/ssh/ssh_client.nix b/common/nixos/ssh/ssh_client.nix index 27226a3..ad5fa89 100644 --- a/common/nixos/ssh/ssh_client.nix +++ b/common/nixos/ssh/ssh_client.nix @@ -50,7 +50,6 @@ # disable unnecessary authentication methods ChallengeResponseAuthentication no - GSSAPIAuthentication no HostbasedAuthentication no # define authentication methods to be used diff --git a/home-manager/modules/hyprland/default.nix b/home-manager/modules/hyprland/default.nix index ef4ad52..bf895a9 100644 --- a/home-manager/modules/hyprland/default.nix +++ b/home-manager/modules/hyprland/default.nix @@ -20,7 +20,7 @@ in ./animations.nix ./bindings.nix ./polkitagent.nix - ./hyprspace.nix + # ./hyprspace.nix ]; home.packages = with pkgs; [ diff --git a/hosts/candlekeep/syncthing.nix b/hosts/candlekeep/syncthing.nix index 9854813..327b514 100644 --- a/hosts/candlekeep/syncthing.nix +++ b/hosts/candlekeep/syncthing.nix @@ -62,18 +62,6 @@ }; }; }; - "ssh-keys" = { - path = "/home/gwg313/.ssh"; - devices = [ "grymforge" ]; - versioning = { - type = "staggered"; - params = { - cleanInterval = "3600"; - maxAge = "15768000"; - }; - }; - }; - }; }; }; diff --git a/hosts/grymforge/syncthing.nix b/hosts/grymforge/syncthing.nix index fc8f3e2..1b39931 100644 --- a/hosts/grymforge/syncthing.nix +++ b/hosts/grymforge/syncthing.nix @@ -62,17 +62,6 @@ }; }; }; - "ssh-keys" = { - path = "/home/gwg313/.ssh"; - devices = [ "candlekeep" ]; - versioning = { - type = "staggered"; - params = { - cleanInterval = "3600"; - maxAge = "15768000"; - }; - }; - }; }; }; };