328 current 1970-01-01 01:00:00 23.11.20240518.e7cc617 6.6.30-rt30 *

modules/home/sway/default.nix

@@ -4,7 +4,7 @@
   lib,
   ...
 }: let
-  cfg = config.sway;
+  cfg = config.myConfig.sway;
 
   rotate_lisgd = pkgs.writeShellScriptBin "rotate_lisgd" ''
     # PREV_ORIENTATION and ORIENTATION are given by rot8
@@ -44,19 +44,21 @@
 in {
   imports = [./kanshi.nix ./waybar.nix ./theme.nix ./mako.nix];
 
-  options = {
-    sway.enable = lib.mkEnableOption "sway, a lightweight window manager";
-    sway.laptop = lib.mkEnableOption "laptop config";
+  options.myConfig.sway = {
+    enable = lib.mkEnableOption "sway, a lightweight window manager";
+    laptop = lib.mkEnableOption "laptop config";
   };
 
   config = lib.mkIf cfg.enable {
-    sway.kanshi.enable = lib.mkDefault true;
-    sway.waybar.enable = lib.mkDefault true;
-    sway.theming.enable = lib.mkDefault true;
-    sway.mako.enable = lib.mkDefault true;
-    sway.waybar.battery = lib.mkIf cfg.laptop (lib.mkDefault true);
-    sway.waybar.backlight = lib.mkIf cfg.laptop (lib.mkDefault true);
-    sway.waybar.squeekboard = lib.mkIf cfg.laptop (lib.mkDefault true);
+    myConfig.sway = {
+      kanshi.enable = lib.mkDefault true;
+      waybar.enable = lib.mkDefault true;
+      theming.enable = lib.mkDefault true;
+      mako.enable = lib.mkDefault true;
+      waybar.battery = lib.mkIf cfg.laptop (lib.mkDefault true);
+      waybar.backlight = lib.mkIf cfg.laptop (lib.mkDefault true);
+      waybar.squeekboard = lib.mkIf cfg.laptop (lib.mkDefault true);
+    };
 
     home.packages = with pkgs; [
       swaylock # screen locking

modules/home/sway/kanshi.nix

@@ -4,11 +4,11 @@
   pkgs,
   ...
 }: let
-  cfg = config.sway.kanshi;
+  cfg = config.myConfig.sway.kanshi;
 in {
-  options = {
-    sway.kanshi.enable = lib.mkEnableOption "kanshi, a dynamic display recognizer";
-    sway.kanshi.laptop = lib.mkEnableOption "laptop workspaces";
+  options.myConfig.sway.kanshi = {
+    enable = lib.mkEnableOption "kanshi, a dynamic display recognizer";
+    laptop = lib.mkEnableOption "laptop workspaces";
   };
 
   config = lib.mkIf cfg.enable {

modules/home/sway/mako.nix

@@ -3,10 +3,10 @@
   config,
   ...
 }: let
-  cfg = config.sway.mako;
+  cfg = config.myConfig.sway.mako;
 in {
-  options = {
-    sway.mako.enable = lib.mkEnableOption "mako, a notification deamon";
+  options.myConfig.sway.mako = {
+    enable = lib.mkEnableOption "mako, a notification deamon";
   };
 
   config = lib.mkIf cfg.enable {

modules/home/sway/theme.nix

@@ -4,7 +4,7 @@
   pkgs,
   ...
 }: let
-  cfg = config.sway.theming;
+  cfg = config.myConfig.sway.theming;
 
   # currently, there is some friction between sway and gtk:
   # https://github.com/swaywm/sway/wiki/GTK-3-settings-on-Wayland
@@ -13,8 +13,8 @@
     gsettings set $gnome_schema gtk-theme 'Dracula'
   '';
 in {
-  options = {
-    sway.theming.enable = lib.mkEnableOption "theming for sway";
+  options.myConfig.sway.theming = {
+    enable = lib.mkEnableOption "theming for sway";
   };
 
   config = lib.mkIf cfg.enable {

modules/home/sway/waybar.nix

@@ -4,7 +4,7 @@
   pkgs,
   ...
 }: let
-  cfg = config.sway.waybar;
+  cfg = config.myConfig.sway.waybar;
 
   schema = "org.gnome.desktop.a11y.applications";
   key = "screen-keyboard-enabled";
@@ -25,12 +25,12 @@
     fi
   '';
 in {
-  options = {
-    sway.waybar.enable = lib.mkEnableOption "waybar, a status bar for wayland compositors";
-    sway.waybar.squeekboard = lib.mkEnableOption "squeekboard";
-    sway.waybar.mpd = lib.mkEnableOption "mpd";
-    sway.waybar.battery = lib.mkEnableOption "battery";
-    sway.waybar.backlight = lib.mkEnableOption "backlight";
+  options.myConfig.sway.waybar = {
+    enable = lib.mkEnableOption "waybar, a status bar for wayland compositors";
+    squeekboard = lib.mkEnableOption "squeekboard";
+    mpd = lib.mkEnableOption "mpd";
+    battery = lib.mkEnableOption "battery";
+    backlight = lib.mkEnableOption "backlight";
   };
 
   config = lib.mkIf cfg.enable {