idk a bunch of things

got the merge working

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