awesome: modularise properly

hosts/gendry.jakehillion-terminals.ts.hillion.co.uk/default.nix

@@ -3,7 +3,6 @@
 {
   imports = [
     ../../modules/common/default.nix
-    ../../modules/desktop/awesome/default.nix
     ../../modules/spotify/default.nix
     ./bluetooth.nix
     ./hardware-configuration.nix
@@ -19,6 +18,9 @@
     boot.loader.systemd-boot.enable = true;
     boot.loader.efi.canTouchEfiVariables = true;
 
+    ## Desktop
+    custom.desktop.awesome.enable = true;
+
     ## Resilio
     custom.resilio.enable = true;
 

modules/default.nix

@@ -2,6 +2,7 @@
 
 {
   imports = [
+    ./desktop/awesome/default.nix
     ./resilio.nix
     ./tailscale.nix
     ./www/global.nix

modules/desktop/awesome/default.nix

@@ -1,29 +1,40 @@
 { config, pkgs, lib, ... }:
 
+let
+  cfg = config.custom.desktop.awesome;
+in
 {
-  services.xserver = {
+  options.custom.desktop.awesome = {
-    enable = true;
+    enable = lib.mkEnableOption "awesome";
-    windowManager.awesome.enable = true;
   };
 
-  home-manager.users.jake.xdg.configFile."awesome/rc.lua" =
+  config = lib.mkIf cfg.enable {
-    let
+    services.xserver = {
-      awesomeConfig = ''
+      enable = true;
-        -- Configure paths filled in by Nix
+      windowManager.awesome.enable = true;
-        terminal = "${pkgs.alacritty}/bin/alacritty"
-        tmux = "${pkgs.tmux}/bin/tmux"
-      '' + builtins.readFile ./rc.lua;
-    in
-    {
-      text = awesomeConfig;
-      onChange = with pkgs; "echo 'awesome.restart()' | ${awesome}/bin/awesome-client";
     };
 
-  home-manager.users.jake.programs.alacritty = {
+    home-manager.users."${config.custom.user}" = {
-    enable = true;
+      xdg.configFile."awesome/rc.lua" =
-    settings = {
+        let
-      font = {
+          awesomeConfig = ''
-        size = 8.0;
+            -- Configure paths filled in by Nix
+            terminal = "${pkgs.alacritty}/bin/alacritty"
+            tmux = "${pkgs.tmux}/bin/tmux"
+          '' + builtins.readFile ./rc.lua;
+        in
+        {
+          text = awesomeConfig;
+          onChange = with pkgs; "echo 'awesome.restart()' | ${awesome}/bin/awesome-client";
+        };
+
+      programs.alacritty = {
+        enable = true;
+        settings = {
+          font = {
+            size = 8.0;
+          };
+        };
       };
     };
   };