Add nixosConfiguration-awareness to the homemanager module

modules/graphical.nix

@@ -69,6 +69,7 @@ with lib; {
       environment.systemPackages = with pkgs; [
         firefox
         thunderbird # v102 has various starting time issues - so back to stable
+        ungoogled-chromium
         okular
         texlive.combined.scheme-full
         usbutils

modules/sway.nix

@@ -71,6 +71,7 @@ with lib; {
       environment.systemPackages = with pkgs; [
         gnome3.adwaita-icon-theme
         wl-clipboard
+        wl-mirror
         networkmanagerapplet
         pavucontrol
         pamixer

users/ellmau/autorandr.nix

@@ -1,5 +1,11 @@
-{ config, pkgs, lib, ...}:
+{ config, pkgs, lib, nixosConfig, ... }:
-{
+with lib; {
+  config =
+    let
+      cfg = nixosConfig.elss.graphical.i3;
+    in
+    mkIf cfg.enable {
+
       programs.autorandr = {
         enable = true;
         profiles = {
@@ -117,4 +123,5 @@
           "polybar" = "systemctl --user restart polybar.service";
         };
       };
+    };
 }

users/ellmau/default.nix

@@ -1,15 +1,15 @@
 { config, lib, pkgs, ... }:
 {
   imports = [
-#    ./autorandr.nix
+    ./autorandr.nix
-#    ./dunst.nix
+    ./dunst.nix
     ./git.nix
     ./gpg.nix
     ./i3.nix
     ./kanshi.nix
     ./mako.nix
     ./nextcloud.nix
-#    ./polybar.nix
+    ./polybar.nix
     ./zsh.nix
 
     ./sway.nix

users/ellmau/dunst.nix

@@ -1,5 +1,10 @@
-{ config, pkgs, ...}:
+{ config, pkgs, lib, nixosConfig, ... }:
-{
+with lib; {
+  config =
+    let
+      cfg = nixosConfig.elss.graphical.i3;
+    in
+    mkIf cfg.enable {
       services.dunst = {
         iconTheme = {
           package = pkgs.numix-icon-theme;
@@ -34,4 +39,5 @@
           };
         };
       };
+    };
 }

users/ellmau/i3.nix

@@ -1,9 +1,15 @@
-{ config, pkgs, lib, ...}:
+{ config, pkgs, lib, nixosConfig, ... }:
-{
+with lib; {
+  config =
+    let
+      cfg = nixosConfig.elss.graphical;
+    in
+    mkIf cfg.enable {
       xdg = {
         configFile."i3" = {
           source = conf/i3;
           recursive = true;
         };
       };
+    };
 }

users/ellmau/kanshi.nix

@@ -1,5 +1,10 @@
-{ config, pkgs, ...}:
+{ config, pkgs, lib, nixosConfig, ... }:
-{
+with lib; {
+  config =
+    let
+      cfg = nixosConfig.elss.graphical.sway;
+    in
+    mkIf cfg.enable {
       services.kanshi = {
         enable = true;
         profiles = {
@@ -24,4 +29,5 @@
           };
         };
       };
+    };
 }

users/ellmau/mako.nix

@@ -1,6 +1,11 @@
+{ config, pkgs, lib, nixosConfig, ... }:
+with lib; {
+  config =
+    let
+      cfg = nixosConfig.elss.graphical.sway;
+    in
+    mkIf cfg.enable {
 
-{ config, pkgs, ...}:
-{
       programs.mako = {
         enable = true;
         iconPath = "${pkgs.numix-icon-theme}";
@@ -11,4 +16,5 @@
       };
 
       home.packages = [ pkgs.numix-icon-theme ];
+    };
 }

users/ellmau/nextcloud.nix

@@ -1,7 +1,13 @@
-{ pkgs, ... }:
+{ config, pkgs, lib, nixosConfig, ... }:
-{
+with lib; {
+  config =
+    let
+      cfg = nixosConfig.elss.graphical;
+    in
+    mkIf cfg.enable {
       services.nextcloud-client = {
         enable = true;
         startInBackground = true;
       };
+    };
 }

users/ellmau/polybar.nix

@@ -1,5 +1,10 @@
-{ config, pkgs, ...}:
+{ config, pkgs, lib, nixosConfig, ... }:
-{
+with lib; {
+  config =
+    let
+      cfg = nixosConfig.elss.graphical.i3;
+    in
+    mkIf cfg.enable {
       services.polybar = {
         enable = true;
         package = pkgs.polybarFull;
@@ -114,7 +119,7 @@
               format.volume = "<ramp-volume> <label-volume>";
               label.muted.text = "🔇";
               label.muted.foreground = "#666";
-              ramp.volume = ["🔈" "🔉" "🔊"];
+              ramp.volume = [ "🔈" "🔉" "🔊" ];
               click.right = "${pkgs.pavucontrol}/bin/pavucontrol &";
               # format-volume-underline = Base2;
               # format-muted-underline = Base2;
@@ -137,7 +142,7 @@
               #;label-focused-background = ${colors.background-alt}
               #;label-focused-background = #9f78e1
               label-focused-background = foreground_col;
-              label-focused-underline= foreground_col;
+              label-focused-underline = foreground_col;
               label-focused-foreground = background_col;
               label-focused-padding = "2";
 
@@ -241,12 +246,12 @@
               adapter = "ADP1";
               full-at = "98";
 
-              format-charging-background= "#689d6a";
+              format-charging-background = "#689d6a";
               format-charging-prefix = ''" "'';
               format-charging = "<label-charging>";
               format-discharging-prefix = ''" "'';
               format-discharging = "<label-discharging>";
-              format-discharging-background= "#689d6a";
+              format-discharging-background = "#689d6a";
               format-full-prefix = ''" "'';
 
               format-charging-underline = "#ffaa55";
@@ -352,4 +357,5 @@
           done;
         '';
       };
+    };
 }

users/ellmau/sway.nix

@@ -1,5 +1,10 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, nixosConfig, ... }:
-{
+with lib; {
+  config =
+    let
+      cfg = nixosConfig.elss.graphical.sway;
+    in
+    mkIf cfg.enable {
       services = {
         blueman-applet.enable = true;
         swayidle = {
@@ -108,4 +113,5 @@
           }
         '';
       };
+    };
 }

users/ellmau/waybar.nix

@@ -1,5 +1,10 @@
-{ config, pkgs, llib, ... }:
+{ config, pkgs, lib, nixosConfig, ... }:
-{
+with lib; {
+  config =
+    let
+      cfg = nixosConfig.elss.graphical.sway;
+    in
+    mkIf cfg.enable {
       xdg.configFile."waybar/style.css" = {
         source = conf/waybar/style.css;
       };
@@ -81,5 +86,6 @@
           };
         };
       };
+    };
 }