Tuning/refactoring/etc

home/gui/default.nix

@@ -1,37 +1,30 @@
+{ pkgs, inputs, config, lib, osConfig ? null, ... }:
+with lib; 
 {
-  pkgs,
-  inputs,
-  config,
-  lib,
-  ...
-}:
-with lib; let
-  cfg = config.roles.gui;
-in {
-  options.roles.gui = {enable = mkEnableOption "roles gui";};
-  config = mkIf cfg.enable {
-    home-manager.users.don = {
-      imports = [
-        ./alacritty.nix
-        ./autostart.nix
-        # ./kde.nix
-        ./librewolf.nix
-        ./mpv.nix
-        ./qutebrowser.nix
-        ./services.nix
-        ./sway.nix
-        ./terminals.nix
-      ];
-      fonts = {fontconfig = {enable = true;};};
-      nixpkgs.config.allowUnfree = true;
-      nixpkgs.overlays = [
-        (final: prev: {
-          qutebrowser = prev.qutebrowser.override {
-            enableWideVine = true;
-          };
-        })
-      ];
-      home.packages = with pkgs; [
+  imports = [
+    ./alacritty.nix
+    ./autostart.nix
+    # ./kde.nix
+    ./librewolf.nix
+    ./mpv.nix
+    ./qutebrowser.nix
+    ./services.nix
+    ./sway.nix
+    ./terminals.nix
+    ./gnome-calendar.nix
+  ];
+
+  config = mkIf (osConfig != null && osConfig ? roles && osConfig.roles ? gui && osConfig.roles.gui.enable) {
+      fonts = { fontconfig = { enable = true; }; };
+    nixpkgs.config.allowUnfree = true;
+    nixpkgs.overlays = [
+      (final: prev: {
+        qutebrowser = prev.qutebrowser.override {
+          enableWideVine = true;
+        };
+      })
+    ];
+    home.packages = with pkgs; [
         # cura
         # poweralertd
         # prusa-slicer
@@ -159,6 +152,5 @@ in {
         };
         configFile = {"shikane/config.toml".source = files/shikane.toml;};
       };
-    };
   };
 }

home/gui/gnome-calenar.nix

@@ -1,21 +0,0 @@
-{ lib, config, pkgs, inputs, outputs, home-manager, ... }:
-with lib;
-let cfg = config.roles.gnome-calendar;
-in {
-  options.roles.gnome-calendar = {
-    enable = lib.mkEnableOption "gnome calendar";
-  };
-  config = mkIf cfg.enable {
-    home-manager.users.don.home.packages = with pkgs; [
-      gnome-calendar
-      gnome-control-center
-    ];
-    services = {
-      gnome = {
-        evolution-data-server = { enable = true; };
-        gnome-online-accounts = { enable = true; };
-        gnome-keyring = { enable = true; };
-      };
-    };
-  };
-}

home/gui/gnome-calendar.nix

@@ -0,0 +1,17 @@
+{ lib, config, pkgs, inputs, outputs, home-manager, osConfig ? null, ... }:
+with lib;
+let 
+  osConfigValue = if osConfig != null then osConfig else {};
+  cfg = if osConfigValue ? roles && builtins.hasAttr "gnome-calendar" osConfigValue.roles then osConfigValue.roles."gnome-calendar" else { enable = false; };
+in {
+  # options.roles.gnome-calendar = { enable = lib.mkEnableOption "gnome calendar"; };
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      gnome-calendar
+      gnome-control-center
+      evolution
+      evolution-data-server
+      gnome-keyring
+    ];
+  };
+}

home/gui/sway.nix

@@ -4,11 +4,10 @@
   hostname,
   outputs,
   config,
-  osConfig,
   ...
-}: {
+} @args: {
   xdg.configFile."sway/config".text = ''
-    # For ${osConfig.networking.hostName}
+    # For ${(if args ? osConfig then args.osConfig else args.config).networking.hostName}
     set $mod Mod1
     set $terminal_path /home/don/bin/mynewterm
     set $snd_sink alsa_output.usb-Corsair_CORSAIR_VOID_ELITE_Wireless_Gaming_Dongle-00.iec958-stereo
@@ -30,7 +29,7 @@
     workspace_auto_back_and_forth yes
 
     set $laptop eDP-1
-    output $laptop scale ${osConfig.variables.swayScale}
+    output $laptop scale ${(if args ? osConfig then args.osConfig else args.config).variables.swayScale}
     output * bg /home/don/nixos/hosts/fan-table-device-box-wallpaper.jpg fill
     bindswitch --reload --locked lid:on output $laptop disable
     bindswitch --reload --locked lid:off output $laptop enable