about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--configuration.nix41
-rw-r--r--vpsadminos.nix6
2 files changed, 15 insertions, 32 deletions
diff --git a/configuration.nix b/configuration.nix
index 09039d3..e94e52c 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -68,35 +68,22 @@
 
   time.timeZone = "UTC";
 
-  users = {
-    groups.git = {};
-
-    users = {
-      ckie = {
-        isNormalUser = true;
-        openssh.authorizedKeys.keyFiles = [ "/etc/ssh/ckie.pub" ];
-      };
-
-      cnx = {
-        extraGroups = [ "wheel" ];
-        isNormalUser = true;
-        openssh.authorizedKeys.keyFiles = [ "/etc/ssh/cnx.pub" ];
-        packages = with pkgs; [ stow ];
-      };
+  users.users = {
+    ckie = {
+      isNormalUser = true;
+      openssh.authorizedKeys.keyFiles = [ "/etc/ssh/ckie.pub" ];
+    };
 
-      git = {
-        createHome = true;
-        home = "/var/lib/git";
-        group = "git";
-        isSystemUser = true;
-        openssh.authorizedKeys.keyFiles = [ "/etc/ssh/cnx.pub" ];
-        shell = "${pkgs.git}/bin/git-shell";
-      };
+    cnx = {
+      extraGroups = [ "wheel" ];
+      isNormalUser = true;
+      openssh.authorizedKeys.keyFiles = [ "/etc/ssh/cnx.pub" ];
+      packages = with pkgs; [ stow ];
+    };
 
-      xarvos = {
-        isNormalUser = true;
-        openssh.authorizedKeys.keyFiles = [ "/etc/ssh/xarvos.pub" ];
-      };
+    xarvos = {
+      isNormalUser = true;
+      openssh.authorizedKeys.keyFiles = [ "/etc/ssh/xarvos.pub" ];
     };
   };
 }
diff --git a/vpsadminos.nix b/vpsadminos.nix
index e804746..f03e488 100644
--- a/vpsadminos.nix
+++ b/vpsadminos.nix
@@ -8,11 +8,7 @@
 
 { config, pkgs, lib, ... }:
 with lib;
-let
-  nameservers = [
-    "9.9.9.9"
-    "2620:fe::fe"
-  ];
+let nameservers = [ "9.9.9.9" "2620:fe::fe" ];
 in {
   networking.nameservers = mkDefault nameservers;
   services.resolved = mkDefault { fallbackDns = nameservers; };