misc general changes / nixpkgs break fixes

modules/system.nix

@@ -11,35 +11,55 @@
 
   programs.dconf.enable = true;
 
-  #services.cpupower-gui.enable = true;
-
-  # power management
-  services.tlp.enable = true;
-
-  # battery status in ironbar
   services.upower.enable = true;
+  services.power-profiles-daemon.enable = true;
 
   environment.systemPackages = with pkgs; [
     git
+    git-lfs
     vim
   ];
 
+  services.ntp.enable = true;
+
   networking = {
     networkmanager = {
       enable = true;
-      dns = "systemd-resolved";
+      dns = lib.mkForce "systemd-resolved";
     };
 
     nameservers = [ "9.9.9.9" ];
+
+    useNetworkd = true;
   };
 
   services.resolved = {
     enable = true;
-    dnssec = "true";
-    fallbackDns = [ "9.9.9.9" ];
-    extraConfig = ''
-      DNSOverTLS=yes
-    '';
+    #fallbackDns = [ "no" ];
+    dnssec = "false";
+  };
+
+  services.dnsmasq = {
+    enable = true;
+    resolveLocalQueries = false;
+
+    settings = {
+      listen-address = "127.0.0.55";
+      bind-interfaces = true;
+      address = [ "/foo.site/127.1.0.1" ];
+      server = [ "9.9.9.9" ];
+    };
+  };
+
+  systemd.network = {
+    networks.wlp4s0 = {
+      matchConfig.Name = "wlp4s0";
+      networkConfig.DHCP = "yes";
+      dhcpV4Config.UseDNS = "no";
+      dhcpV6Config.UseDNS = "no";
+    };
+
+    wait-online.anyInterface = true;
   };
 
   # removable disks in file manager
@@ -47,4 +67,12 @@
 
   programs.adb.enable = true;
   users.users.${config.main-user}.extraGroups = [ "adbusers" ];
+
+  services.tailscale.enable = true;
+
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+    enableExtraSocket = true;
+  };
 }