Added power (plus minor refactor)

modules/applications/firefox.nix

@@ -15,11 +15,9 @@ in with lib; {
   config = mkIf cfg.enable {
     environment.sessionVariables = {
       MOZ_USE_XINPUT2 = "1";
-    } // (if graphical.protocol == "Wayland" then {
+    } // optionals (graphical.protocol == "Wayland") {
       MOZ_ENABLE_WAYLAND = "1";
-    } else
-      { })
-      // (if sway_cfg.enable then { XDG_CURRENT_DESKTOP = "sway"; } else { });
+    } // optionals (sway_cfg.enable) { XDG_CURRENT_DESKTOP = "sway"; };
 
     home-manager.users.james = {
       programs.firefox = {

modules/applications/gnome-common.nix

@@ -1,9 +1,12 @@
 { config, lib, pkgs, ... }:
-let graphical = config.this.graphical;
+let
+  graphical = config.this.graphical;
+  power = config.this.system.power;
 in with lib; {
   config = mkIf graphical.enable {
     home-manager.users.james = {
-      home.packages = with pkgs.gnome; [
+      home.packages = with pkgs.gnome;
+        [
           #gnome-common
           cheese
           file-roller
@@ -21,14 +24,13 @@ in with lib; {
           gnome-keyring
           gnome-maps
           gnome-music
-        gnome-power-manager # conditioanl if upower is used
           iagno
           libgnome-keyring
           nautilus
           pomodoro
           seahorse
           sushi
-      ];
+        ] ++ optionals (power.enable) [ gnome-power-manager ];
     };
   };
 }

modules/profiles/graphical.nix

@@ -6,7 +6,10 @@
     ./minimal.nix
   ];
 
-  this.graphical.enable = true;
+  this = {
+    graphical.enable = true;
+    system.power.enable = true;
+  };
 
   # Enable sound.
   sound.enable = true;

modules/system/default.nix

@@ -6,6 +6,7 @@
     ./flatpak.nix
     ./fonts.nix
     ./gtk.nix
+    ./power.nix
     ./xdg.nix
     ./zfs.nix
   ];