private: remove

[sourcephile-nix.git] / hosts / carotte / users.nix

diff --git a/hosts/carotte/users.nix b/hosts/carotte/users.nix
index 9446bd685900b495557c1a7f5652226c5c3c4aed..e11ce2f8e2f9deb8c31f1089ba379b677a00fe02 100644 (file)
--- a/hosts/carotte/users.nix
+++ b/hosts/carotte/users.nix
@@ -1,14 +1,13 @@
 { inputs, pkgs, lib, config, ... }:
 let
-  inherit (config.security) gnupg;
   inherit (config.users) users;
 in
 {
 imports = [
-  ../../members/julm.nix
+  ../../users/julm.nix
 ];
 
-nix.trustedUsers = [
+nix.settings.trusted-users = [
   users."julm".name
 ];
 
@@ -20,12 +19,6 @@ users = {
         users."julm".openssh.authorizedKeys.keys;
       hashedPassword = "!";
     };
-    /*
-    gnupg = {
-      openssh.authorizedKeys.keys =
-        users."root".openssh.authorizedKeys.keys;
-    };
-    */
   };
   groups = {
     /*
@@ -38,24 +31,4 @@ users = {
   };
 };
 
-#security.gnupg.secrets."/root/.ssh/id_ed25519" = {
-#  gpg = "${gnupg.store}/ssh/root.ssh-ed25519.gpg";
-#};
-
-/*
-networking.nftables.ruleset = lib.concatMapStringsSep "\n"
-  (rule: "add rule inet filter fw2net meta skuid ${users.julm.name} " + rule) [
-  ''tcp dport {25,465} counter accept comment "SMTP"''
-  ''tcp dport 43 counter accept comment "Whois"''
-  ''tcp dport 993 counter accept comment "IMAPS"''
-  ''tcp dport 6697 counter accept comment "IRCS"''
-  ''tcp dport 2222 counter accept comment "SSH(boot)"''
-  ''tcp dport 5222 counter accept comment "XMPP"''
-  ''tcp dport 11371 counter accept comment "HKP"''
-  ''tcp dport {9009,9010,9011,9012,9013} counter accept comment "croc"''
-  ''udp dport 33434-33523 counter accept comment "traceroute"''
-  ''udp dport 60000-61000 counter accept comment "Mosh"''
-  #''ip protocol tcp counter accept comment "all"''
-];
-*/
 }