overlays/systems/users: tidy up random stuff

3 files changed, 7 insertions, 28 deletions

diff --git a/users/seth/desktop/budgie/default.nix b/users/seth/desktop/budgie/default.nix
index 2544edf..83fc2d7 100644
--- a/users/seth/desktop/budgie/default.nix
+++ b/users/seth/desktop/budgie/default.nix
@@ -1,35 +1,14 @@
 {
   lib,
-  pkgs,
   osConfig,
   ...
 }: let
-  cfg = osConfig.services.xserver.desktopManager.budgie or {enable = false;};
-
-  fromYaml = file: let
-    json = with pkgs;
-      runCommand "converted.json" {} ''
-        ${yj}/bin/yj < ${file} > $out
-      '';
-  in
-    builtins.fromJSON (builtins.readFile json);
+  enable = osConfig.services.xserver.desktopManager.budgie.enable or false;
 in {
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf enable {
     programs.alacritty = {
       enable = true;
-      settings = let
-        file =
-          pkgs.fetchFromGitHub {
-            owner = "catppuccin";
-            repo = "alacritty";
-            rev = "3c808cbb4f9c87be43ba5241bc57373c793d2f17";
-            sha256 = "sha256-w9XVtEe7TqzxxGUCDUR9BFkzLZjG8XrplXJ3lX6f+x0=";
-          }
-          + "/catppuccin-mocha.yml";
-      in
-        (fromYaml file)
-        // {
-        };
+      catppuccin.enable = true;
     };
 
     dconf = {
diff --git a/users/seth/desktop/gnome/default.nix b/users/seth/desktop/gnome/default.nix
index 8e5ef4c..277df62 100644
--- a/users/seth/desktop/gnome/default.nix
+++ b/users/seth/desktop/gnome/default.nix
@@ -4,9 +4,9 @@
   osConfig,
   ...
 }: let
-  cfg = osConfig.services.xserver.desktopManager.gnome or {enable = false;};
+  enable = osConfig.services.xserver.desktopManager.gnome.enable or false;
 in {
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf enable {
     home.packages = with pkgs;
       [
         adw-gtk3
diff --git a/users/seth/desktop/plasma/default.nix b/users/seth/desktop/plasma/default.nix
index 453ea65..e3735f1 100644
--- a/users/seth/desktop/plasma/default.nix
+++ b/users/seth/desktop/plasma/default.nix
@@ -5,10 +5,10 @@
   osConfig,
   ...
 }: let
-  cfg = osConfig.services.xserver.desktopManager.plasma5 or {enable = false;};
+  enable = osConfig.services.xserver.desktopManager.plasma5.enable or false;
   themeDir = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}";
 in {
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf enable {
     home.packages = with pkgs; [
       catppuccin-cursors
       (catppuccin-kde.override