gui/sway: port to module system

flake.nix

@@ -66,6 +66,7 @@
         specialArgs = { inherit home-manager; inherit nurpkgs; secrets = import ./secrets/default.nix; };
         modules = [
           ./configuration.nix
+          ./modules
           ./machines/${name}
           (import ./helpers/set-hostname.nix name)
           (self.overlaysModule system)

helpers/gui/sway.nix

@@ -1,35 +0,0 @@
-{ pkgs, lib, ... }:
- 
-# docs: https://nixos.wiki/wiki/Sway
-{
-  programs.sway = {
-    # we configure sway with home-manager, but this enable gets us e.g. opengl and fonts
-    enable = true;
-  };
-
-  # TODO: should be able to use SDDM to get interactive login
-  services.greetd = {
-    enable = true;
-    settings = rec {
-      initial_session = {
-        command = "${pkgs.sway}/bin/sway";
-        user = "colin";
-      };
-      default_session = initial_session;
-    };
-  };
-
-  # unlike other DEs, sway configures no audio stack
-  # administer with pw-cli, pw-mon, pw-top commands
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;  # ??
-    pulse.enable = true;
-  };
-
-  networking.useDHCP = false;
-  networking.networkmanager.enable = true;
-  networking.wireless.enable = lib.mkForce false;
-}
-

machines/desko/default.nix

@@ -5,7 +5,6 @@
     ./../../helpers/hardware-x86_64.nix
     # ./../../helpers/gui/gnome.nix
     #./../../helpers/gui/i3.nix
-    ./../../helpers/gui/sway.nix
     ./fs.nix
   ];
 
@@ -20,6 +19,8 @@
     ];
   };
 
+  colinsane.gui.sway.enable = true;
+
   # docs: https://nixos.org/manual/nixos/stable/options.html#opt-system.stateVersion
   system.stateVersion = "21.05";
 }

machines/lappy/default.nix

@@ -4,7 +4,6 @@
     ./../../helpers/universal
     ./../../helpers/hardware-x86_64.nix
     # ./../../helpers/gui/gnome.nix
-    ./../../helpers/gui/sway.nix
     ./fs.nix
   ];
 
@@ -15,6 +14,8 @@
     gui = "sway";
   };
 
+  colinsane.gui.sway.enable = true;
+
   # docs: https://nixos.org/manual/nixos/stable/options.html#opt-system.stateVersion
   system.stateVersion = "21.05";
 }

modules/default.nix

@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+  imports = [
+    ./gui
+  ];
+}

modules/gui/default.nix

@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+  imports = [
+    ./sway.nix
+  ];
+}

modules/gui/sway.nix

@@ -0,0 +1,47 @@
+{ pkgs, lib, config, ... }:
+ 
+# docs: https://nixos.wiki/wiki/Sway
+with lib;
+let
+  cfg = config.colinsane.gui.sway;
+in
+{
+  options = {
+    colinsane.gui.sway.enable = mkOption {
+      default = false;
+      type = types.bool;
+    };
+  };
+  config = mkIf cfg.enable {
+    programs.sway = {
+      # we configure sway with home-manager, but this enable gets us e.g. opengl and fonts
+      enable = true;
+    };
+
+    # TODO: should be able to use SDDM to get interactive login
+    services.greetd = {
+      enable = true;
+      settings = rec {
+        initial_session = {
+          command = "${pkgs.sway}/bin/sway";
+          user = "colin";
+        };
+        default_session = initial_session;
+      };
+    };
+
+    # unlike other DEs, sway configures no audio stack
+    # administer with pw-cli, pw-mon, pw-top commands
+    services.pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;  # ??
+      pulse.enable = true;
+    };
+
+    networking.useDHCP = false;
+    networking.networkmanager.enable = true;
+    networking.wireless.enable = lib.mkForce false;
+  };
+}
+