idk a bunch of things

got the merge working

hosts/myputer/default.nix

@@ -1,6 +1,7 @@
 {
   pkgs,
   upkgs,
+  lib,
   ...
 }: {
   imports = [
@@ -26,29 +27,7 @@
     flatpak.enable = true;
   };
 
-  # ------- USERS -------
-  security.sudo.wheelNeedsPassword = false;
-  users = {
-    users = {
-      # just me fr (personal account)
-      me = {
-        isNormalUser = true;
-        extraGroups = ["wheel" "netdev" "docker"];
-        shell = pkgs.bash;
-        packages = with pkgs; [
-          firefox
-          nitch
-          starfetch
-
-          colmena-latest
-
-          gitkraken
-          # NOTE: downloadthing this causes my PC to freak!! ("too many open files" error)
-          #keyguard # bitwarden client app
-        ];
-      };
-    };
-  };
+  security.sudo.wheelNeedsPassword = lib.mkForce false;
 
   # ---- SYSTEM PACKAGES -----
   environment.systemPackages = with pkgs; [