overlays/systems/users: tidy up random stuff

8 files changed, 48 insertions, 68 deletions

diff --git a/overlays/default.nix b/overlays/default.nix
index 6a2acff..36986a5 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,10 +1,12 @@
 {
   flake.overlays.default = final: prev:
-    prev.lib.composeManyExtensions [
-      (import ./btop.nix)
-      (import ./discord.nix)
-      (import ./fish.nix)
-    ]
+    prev.lib.composeManyExtensions
+    (
+      let
+        files = prev.lib.filterAttrs (n: _: n != "default.nix") (builtins.readDir ./.);
+      in
+        prev.lib.mapAttrsToList (n: _: import ./${n}) files
+    )
     final
     prev;
 }
diff --git a/overlays/discord.nix b/overlays/discord.nix
index dfb0cae..cb651cd 100644
--- a/overlays/discord.nix
+++ b/overlays/discord.nix
@@ -10,6 +10,7 @@ _: prev: let
       else "Discord";
 
     flags = "--enable-gpu-rasterization --enable-zero-copy --enable-gpu-compositing --enable-native-gpu-memory-buffers --enable-oop-rasterization --enable-features=UseSkiaRenderer,WaylandWindowDecorations";
+
     desktopItem = prev.makeDesktopItem {
       name = pname;
       exec = "${builtins.replaceStrings [" "] [""] desktopName} ${flags}";
@@ -22,9 +23,7 @@ _: prev: let
   in
     if prev.stdenv.isLinux
     then d'.overrideAttrs (_: {inherit desktopItem;})
-    else if (pname == "discord" && prev.stdenv.isDarwin)
-    then d'
-    else d;
+    else d';
 in {
   discord = mkOverride prev.discord;
   discord-canary = mkOverride prev.discord-canary;
diff --git a/systems/default.nix b/systems/default.nix
index 6807a71..31e9004 100644
--- a/systems/default.nix
+++ b/systems/default.nix
@@ -9,15 +9,16 @@
   basic nixosSystem/darwinSystem wrapper; can override
   the exact builder by supplying an argument
   */
-  mapSystems = builder:
-    lib.mapAttrs (name: args:
-      (args.builder or builder) (
-        (lib.filterAttrs (n: _: n != "builder") args) # use builder but don't include it in output
-        // {
-          modules = args.modules ++ [./${name}];
-          specialArgs = {inherit inputs self;};
-        }
-      ));
+  toSystem = builder: name: args:
+    (args.builder or builder) (
+      (builtins.removeAttrs args ["builder"])
+      // {
+        modules = args.modules ++ [./${name}];
+        specialArgs = {inherit inputs self;};
+      }
+    );
+
+  mapSystems = builder: lib.mapAttrs (toSystem builder);
 
   mapDarwin = mapSystems inputs.darwin.lib.darwinSystem;
   mapNixOS = mapSystems inputs.nixpkgs.lib.nixosSystem;
diff --git a/users/default.nix b/users/default.nix
index 9209724..c654583 100644
--- a/users/default.nix
+++ b/users/default.nix
@@ -4,31 +4,29 @@
   self,
   ...
 }: let
-  inherit (inputs.hm.lib) homeManagerConfiguration;
-
   /*
   basic homeManagerConfiguration wrapper. defaults to x86_64-linux
   and gives basic, nice defaults
   */
-  mapUsers = lib.mapAttrs (
-    name: args:
-      homeManagerConfiguration (args
-        // {
-          modules =
-            [
-              ./${name}/home.nix
+  mkUser = name: args:
+    inputs.hm.lib.homeManagerConfiguration (args
+      // {
+        modules =
+          [
+            ./${name}/home.nix
+
+            {
+              _module.args.osConfig = {};
+              programs.home-manager.enable = true;
+            }
+          ]
+          ++ (args.modules or []);
 
-              {
-                _module.args.osConfig = {};
-                programs.home-manager.enable = true;
-              }
-            ]
-            ++ (args.modules or []);
+        extraSpecialArgs = {inherit inputs self;};
+        pkgs = args.pkgs or inputs.nixpkgs.legacyPackages."x86_64-linux";
+      });
 
-          extraSpecialArgs = {inherit inputs self;};
-          pkgs = args.pkgs or inputs.nixpkgs.legacyPackages."x86_64-linux";
-        })
-  );
+  mapUsers = lib.mapAttrs mkUser;
 in {
   flake.homeConfigurations = mapUsers {
     seth = {};
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
diff --git a/users/seth/home.nix b/users/seth/home.nix
index 5dfc062..1f89641 100644
--- a/users/seth/home.nix
+++ b/users/seth/home.nix
@@ -1,17 +1,18 @@
 {
+  config,
   pkgs,
   inputs,
   ...
 }: {
   imports = [./.];
 
-  home = rec {
+  home = {
     username = "seth";
     homeDirectory =
       if pkgs.stdenv.isDarwin
-      then "/Users/${username}"
-      else "/home/${username}";
+      then "/Users/${config.home.username}"
+      else "/home/${config.home.username}";
   };
 
-  nixpkgs.overlays = with inputs; [nur.overlay getchoo.overlays.default];
+  nixpkgs.overlays = with inputs; [nur.overlay getchoo.overlays.default self.overlays.default];
 }