fixup

1 files changed, 30 insertions, 1 deletions

diff --git a/profiles/core/configuration.nix b/profiles/core/configuration.nix
index 87403eb..b5f5262 100644
--- a/profiles/core/configuration.nix
+++ b/profiles/core/configuration.nix
@@ -6,18 +6,41 @@
 }: with lib; {
   imports = [ (mkAliasOptionModule [ "ivi" ] [ "users" "users" ivi.username ]) ];
 
+  services = optionalAttrs (builtins.hasAttr "resolved" config.services) {
+    resolved.fallbackDns = [
+      "1.1.1.1#one.one.one.one"
+      "1.0.0.1#one.one.one.one"
+      "2606:4700:4700::1111#one.one.one.one"
+      "2606:4700:4700::1001#one.one.one.one"
+    ];
+  };
+  security = optionalAttrs (builtins.hasAttr "sudo" config.security) {
+    sudo = {
+      wheelNeedsPassword = false;
+      extraConfig = ''
+        Defaults env_keep+="EDITOR"
+        Defaults env_keep+="SSH_CONNECTION SSH_CLIENT SSH_TTY"
+        Defaults env_keep+="http_proxy https_proxy"
+      '';
+    };
+  };
+
   time.timeZone = "Europe/Amsterdam";
   users.users = {
       ${ivi.username} = {
-        home = "/Users/ivi";
+        home = mkIf pkgs.stdenv.isDarwin "/Users/ivi";
         uid = 1000;
         description = ivi.realName;
         openssh.authorizedKeys.keys = ivi.sshKeys;
+      } // optionalAttrs (!pkgs.stdenv.isDarwin) {
+        extraGroups = ["wheel" "networkmanager" "docker" "transmission"];
+        isNormalUser = true;
       };
       root = {
         openssh.authorizedKeys.keys = config.ivi.openssh.authorizedKeys.keys;
       };
   };
+
   environment.systemPackages = with pkgs; [
     man-pages
     man-pages-posix
@@ -39,6 +62,12 @@
     zoxide
     binwalk
     unzip
+  ] ++ optionals (!pkgs.stdenv.isDarwin) [
+    pciutils
+    dnsutils
+    iputils
+    inetutils
+    usbutils
   ];
 
   nix.package = pkgs.nixUnstable;