idk a bunch of things

got the merge working

groups/all/default.nix

@@ -0,0 +1,5 @@
+{lib, ...}: {
+  # NOTE: mkDefault is 1000 and mkForce is 50
+  # NOTE: so this is like a second mkDefault
+  security.sudo.wheelNeedsPassword = lib.mkOverride 900 true;
+}

groups/cryde/default.nix

@@ -12,7 +12,7 @@
     ../../hosts/modules/steam.nix
     ../../hosts/modules/obsidian.nix
 
-    inputs.nix-flatpak.nixosModules.nix-flatpak
+    # inputs.nix-flatpak.nixosModules.nix-flatpak
   ];
 
   boot.loader.grub2-theme = {
@@ -110,10 +110,10 @@
       NIXOS_OZONE_WL = "1";
     };
     systemPackages = with pkgs; [
-      (callPackage ../sddm-theme-corners.nix {}).sddm-theme-corners
+      sddm-theme-corners
       # dependencies for my sddm theme:
       # XXX: add these as a buildInput
-      pkgs.libsForQt5.qt5.qtgraphicaleffects
+      # pkgs.libsForQt5.qt5.qtgraphicaleffects
     ];
   };
 
@@ -130,8 +130,6 @@
           nitch
           starfetch
 
-          colmena-latest
-
           gitkraken
         ];
       };

groups/cryde/programs.nix

@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  upkgs,
+  ...
+}: {
   # ---- SYSTEM PACKAGES -----
   environment.systemPackages = with pkgs; [
     # User Environment

groups/server/default.nix

@@ -1,8 +1,4 @@
-{
-  lib,
-  sshPort ? 22,
-  ...
-}: {
+{lib, ...}: {
   networking = {
     networkmanager.enable = true;
 
@@ -15,7 +11,7 @@
     firewall = {
       enable = lib.mkDefault true;
       allowedTCPPorts = [
-        sshPort
+        22
       ];
     };
   };
@@ -41,7 +37,7 @@
   services = {
     openssh = {
       enable = true;
-      ports = [sshPort];
+      ports = [22];
       settings = {
         PasswordAuthentication = false;
         PermitRootLogin = "no";
@@ -51,4 +47,20 @@
       };
     };
   };
+
+  users = {
+    users = {
+      # primary user
+      cry = {
+        isNormalUser = true;
+        home = "/home/cry";
+        extraGroups = ["wheel"];
+        openssh.authorizedKeys.keys = lib.mkOverride 900 [
+          (throw ''
+            Hosts in the `server` group must set `users.users.cry.openssh.authorizedKeys.keys = [ ... ]`.
+          '')
+        ];
+      };
+    };
+  };
 }