Refactor home modules into config + options

home/modules/audio/default.nix

@@ -12,10 +12,10 @@ with mylib.modules; let
   cfgfp = config.modules.flatpak;
 in {
   imports = [
-    ../flatpak.nix
+    ../flatpak
   ];
 
-  options.modules.audio = import ./options.nix { inherit lib; };
+  options.modules.audio = import ./options.nix { inherit lib mylib; };
 
   config = mkIf cfg.enable {
     assertions = [

home/modules/audio/options.nix

@@ -1,7 +1,9 @@
 {
   lib,
+  mylib
 }:
 with lib;
+with mylib.modules;
 {
   enable = mkEnableOpt "Audio module";
 

home/modules/default.nix

@@ -8,20 +8,20 @@
   ...
 }: {
   imports = [
-    ./audio/default.nix
+    ./audio
-    ./emacs/default.nix
+    ./emacs
-    ./email/default.nix
+    ./email
-    ./firefox/default.nix
+    ./firefox
-    ./fish/default.nix
+    ./fish
-    ./flatpak/default.nix
+    ./flatpak
-    ./gaming/default.nix
+    ./gaming
-    ./gnome/default.nix
+    ./gnome
-    ./hyprland/default.nix
+    ./hyprland
-    ./kitty/default.nix
+    ./kitty
-    ./misc/default.nix
+    ./misc
-    ./neovim/default.nix
+    ./neovim
-    ./nextcloud/default.nix
+    ./nextcloud
-    ./plasma/default.nix
+    ./plasma
-    ./ranger/default.nix
+    ./ranger
   ];
 }

home/modules/emacs/default.nix

@@ -18,7 +18,7 @@ in {
 
   # Options is a vector of options this module defines
   # This module defines only the "emacs" option and suboptions "enable" and "doom"
-  options.modules.emacs = import ./options.nix { inherit lib; };
+  options.modules.emacs = import ./options.nix { inherit lib mylib; };
 
   # Config is the merged set of all module configurations
   # Here we define what happens to the config if the module is active (but only if the module is active)

home/modules/emacs/options.nix

@@ -1,7 +1,9 @@
 {
-  lib
+  lib,
+  mylib
 }:
 with lib;
+with mylib.modules;
 {
   enable = mkEnableOpt "Emacs module";
 

home/modules/email/default.nix

@@ -14,7 +14,7 @@ with lib;
 with mylib.modules; let
   cfg = config.modules.email;
 in {
-  options.modules.email = import ./options.nix { inherit lib; };
+  options.modules.email = import ./options.nix { inherit lib mylib; };
 
   # TODO: Add Maildir to nextcloud sync
   config = mkIf cfg.enable {

home/modules/email/options.nix

@@ -1,7 +1,9 @@
 {
-  lib
+  lib,
+  mylib
 }:
 with lib;
+with mylib.modules;
 {
   enable = mkEnableOpt "Email";
   autosync = mkEnableOpt "Automatically call \"notmuch new\" via systemd timer";

home/modules/firefox/default.nix

@@ -12,7 +12,7 @@ with lib;
 with mylib.modules; let
   cfg = config.modules.firefox;
 in {
-  options.modules.firefox = import ./options.nix { inherit lib; };
+  options.modules.firefox = import ./options.nix { inherit lib mylib; };
 
   config = mkIf cfg.enable {
     home.packages = with pkgs;

home/modules/firefox/options.nix

@@ -1,7 +1,9 @@
 {
-  lib
+  lib,
+  mylib
 }:
 with lib;
+with mylib.modules;
 {
   enable = mkEnableOpt "Firefox";
   wayland = mkBoolOpt false "Enable firefox wayland support";

home/modules/fish/default.nix

@@ -10,7 +10,7 @@ with lib;
 with mylib.modules; let
   cfg = config.modules.fish;
 in {
-  options.modules.fish = import ./options.nix { inherit lib; };
+  options.modules.fish = import ./options.nix { inherit lib mylib; };
 
   config = mkIf cfg.enable {
     programs.fish = {

home/modules/fish/options.nix

@@ -1,7 +1,9 @@
 {
-  lib
+  lib,
+  mylib
 }:
 with lib;
+with mylib.modules;
 {
   enable = mkEnableOpt "Fish";
 }

home/modules/flatpak/default.nix

@@ -14,7 +14,7 @@ with mylib.modules;
   let
     cfg = config.modules.flatpak;
   in {
-    options.modules.flatpak = import ./options.nix { inherit lib; };
+    options.modules.flatpak = import ./options.nix { inherit lib mylib; };
 
     config = mkIf cfg.enable {
       assertions = [

home/modules/flatpak/options.nix

@@ -1,7 +1,9 @@
 {
-  lib
+  lib,
+  mylib
 }:
 with lib;
+with mylib.modules;
 {
   enable = mkEnableOpt "Flatpak module";
   fontFix = mkBoolOpt true "Link fonts to ~/.local/share/fonts so flatpak apps can find them";

home/modules/gaming/default.nix

@@ -12,14 +12,14 @@ with mylib.modules; let
 in {
   imports = [
     # NOTE: I don't know if this is the right approach or if I should use config.modules.flatpak
-    ./flatpak.nix
+    ../flatpak
   ];
 
   # TODO: Enable flatpak MangoHud, there are multiple versions, Steam.Utility.MangoHud works but can't be configured (in ~/.config/MangoHud), other versions don't even work (need to figure that out as Steam.Utility.MangoHud is EOL...)
   # TODO: SteamTinkerLaunch option
   # TODO: Dolphin + SteamRomManager option
 
-  options.modules.gaming = import ./options.nix { inherit lib; };
+  options.modules.gaming = import ./options.nix { inherit lib mylib; };
 
   config = mkIf cfg.enable {
     assertions = [

home/modules/gaming/options.nix

@@ -1,7 +1,9 @@
 {
-  lib
+  lib,
+  mylib
 }:
 with lib;
+with mylib.modules;
 {
   enable = mkEnableOpt "Gaming module";
 

home/modules/gnome/default.nix

@@ -10,7 +10,7 @@ with lib;
 with mylib.modules; let
   cfg = config.modules.gnome;
 in {
-  options.modules.gnome = import ./options.nix { inherit lib; };
+  options.modules.gnome = import ./options.nix { inherit lib mylib; };
 
   config = mkIf cfg.enable {
     assertions = [

home/modules/gnome/options.nix

@@ -1,7 +1,9 @@
 {
-  lib
+  lib,
+  mylib
 }:
 with lib;
+with mylib.modules;
 {
     enable = mkEnableOpt "Gnome Desktop";
     # TODO: Add option for dash-to-dock

home/modules/hyprland/default.nix

@@ -10,7 +10,7 @@ with lib;
 with mylib.modules; let
   cfg = config.modules.hyprland;
 in {
-  options.modules.hyprland = import ./options.nix { inherit lib; };
+  options.modules.hyprland = import ./options.nix { inherit lib mylib; };
 
   config = let
     # Taken from https://github.com/Ruixi-rebirth/flakes/blob/main/modules/programs/wayland/waybar/workspace-patch.nix

home/modules/hyprland/options.nix

@@ -1,7 +1,9 @@
 {
-  lib
+  lib,
+  mylib
 }:
 with lib;
+with mylib.modules;
 {
   enable = mkEnableOpt "Hyprland Window Manager + Compositor";
 

home/modules/kitty/default.nix

@@ -11,7 +11,7 @@ with mylib.modules; let
   cfg = config.modules.kitty;
   # cfgnv = config.modules.neovim;
 in {
-  options.modules.kitty = import ./options.nix { inherit lib; };
+  options.modules.kitty = import ./options.nix { inherit lib mylib; };
 
   config = mkIf cfg.enable {
     programs.kitty = {

home/modules/kitty/options.nix

@@ -1,7 +1,9 @@
 {
-  lib
+  lib,
+  mylib
 }:
 with lib;
+with mylib.modules;
 {
   enable = mkEnableOpt "Kitty";
 }

home/modules/misc/default.nix

@@ -10,7 +10,7 @@ with lib;
 with mylib.modules; let
   cfg = config.modules.misc;
 in {
-  options.modules.misc = import ./options.nix { inherit lib; };
+  options.modules.misc = import ./options.nix { inherit lib mylib; };
 
   config = mkIf cfg.enable {
     home.packages = with pkgs;

home/modules/misc/options.nix

@@ -1,7 +1,9 @@
 {
-  lib
+  lib,
+  mylib
 }:
 with lib;
+with mylib.modules;
 {
   enable = mkEnableOpt "Misc module";
 

home/modules/neovim/default.nix

@@ -10,7 +10,7 @@ with lib;
 with mylib.modules; let
   cfg = config.modules.neovim;
 in {
-  options.modules.neovim = import ./options.nix { inherit lib; };
+  options.modules.neovim = import ./options.nix { inherit lib mylib; };
 
   config = mkIf cfg.enable {
     # TODO: Configure by option

home/modules/neovim/options.nix

@@ -1,7 +1,9 @@
 {
-  lib
+  lib,
+  mylib
 }:
 with lib;
+with mylib.modules;
 {
   enable = mkEnableOpt "NeoVim";
   alias = mkBoolOpt false "Link nvim to vim/vi";

home/modules/nextcloud/default.nix

@@ -13,7 +13,7 @@ with lib;
 with mylib.modules; let
   cfg = config.modules.nextcloud;
 in {
-  options.modules.nextcloud = import ./options.nix { inherit lib; };
+  options.modules.nextcloud = import ./options.nix { inherit lib mylib; };
 
   config = mkIf cfg.enable {
     assertions = [

home/modules/nextcloud/options.nix

@@ -1,7 +1,9 @@
 {
-  lib
+  lib,
+  mylib
 }:
 with lib;
+with mylib.modules;
 {
   enable = mkEnableOpt "Nextcloud Client";
   autostart = mkBoolOpt false "Autostart the Nextcloud client (systemd)";

home/modules/plasma/default.nix

@@ -11,7 +11,7 @@ with lib;
 with mylib.modules; let
   cfg = config.modules.plasma;
 in {
-  options.modules.plasma = import ./options.nix { inherit lib; };
+  options.modules.plasma = import ./options.nix { inherit lib mylib; };
 
   config = mkIf cfg.enable {
     assertions = [

home/modules/plasma/options.nix

@@ -1,7 +1,9 @@
 {
-  lib
+  lib,
+  mylib
 }:
 with lib;
+with mylib.modules;
 {
   enable = mkEnableOpt "Plasma Desktop";
 }

home/modules/ranger/default.nix

@@ -10,7 +10,7 @@ with lib;
 with mylib.modules; let
   cfg = config.modules.ranger;
 in {
-  options.modules.ranger = import ./options.nix { inherit lib; };
+  options.modules.ranger = import ./options.nix { inherit lib mylib; };
 
   config = mkIf cfg.enable {
     home.packages = with pkgs;

home/modules/ranger/options.nix

@@ -1,7 +1,9 @@
 {
-  lib
+  lib,
+  mylib
 }:
 with lib;
+with mylib.modules;
 {
   enable = mkEnableOpt "Ranger";
   preview = mkBoolOpt false "Enable Ranger image preview";