modules/*: Remove all `mkDefaultEnabled` calls

There is no nice way to make this work with the merged config, as we
would now need to differentiate between the host being evaluated for.

24 files changed, 79 insertions, 53 deletions

diff --git a/modules/by-name/al/alacritty/module.nix b/modules/by-name/al/alacritty/module.nix
index 74b938ec..f7e4629c 100644
--- a/modules/by-name/al/alacritty/module.nix
+++ b/modules/by-name/al/alacritty/module.nix
@@ -17,7 +17,7 @@
   cfg = config.soispha.programs.alacritty;
 in {
   options.soispha.programs.alacritty = {
-    enable = extra_lib.options.mkDefaultEnabled "alacritty";
+    enable = lib.mkEnableOption "alacritty";
 
     package = lib.mkPackageOption pkgs "alacritty" {};
   };
diff --git a/modules/by-name/au/ausweisapp/module.nix b/modules/by-name/au/ausweisapp/module.nix
index ee3e8917..0156989f 100644
--- a/modules/by-name/au/ausweisapp/module.nix
+++ b/modules/by-name/au/ausweisapp/module.nix
@@ -7,7 +7,7 @@
   cfg = config.soispha.programs.ausweisapp;
 in {
   options.soispha.programs.ausweisapp = {
-    enable = extra_lib.options.mkDefaultEnabled "AusweisApp";
+    enable = lib.mkEnableOption "AusweisApp";
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/modules/by-name/ca/calibre/module.nix b/modules/by-name/ca/calibre/module.nix
index f56c8490..caef8070 100644
--- a/modules/by-name/ca/calibre/module.nix
+++ b/modules/by-name/ca/calibre/module.nix
@@ -16,7 +16,7 @@
   cfg = config.soispha.programs.calibre;
 in {
   options.soispha.programs.calibre = {
-    enable = extra_lib.options.mkDefaultEnabled "calibre";
+    enable = lib.mkEnableOption "calibre";
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/modules/by-name/ca/cargo/module.nix b/modules/by-name/ca/cargo/module.nix
index a4216020..06fd8a72 100644
--- a/modules/by-name/ca/cargo/module.nix
+++ b/modules/by-name/ca/cargo/module.nix
@@ -16,7 +16,7 @@
   cfg = config.soispha.programs.cargo;
 in {
   options.soispha.programs.cargo = {
-    enable = extra_lib.options.mkDefaultEnabled "cargo";
+    enable = lib.mkEnableOption "cargo";
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/modules/by-name/fo/foot/module.nix b/modules/by-name/fo/foot/module.nix
index d0189e21..9e294968 100644
--- a/modules/by-name/fo/foot/module.nix
+++ b/modules/by-name/fo/foot/module.nix
@@ -14,10 +14,10 @@
   pkgs,
   ...
 }: let
-  cfg = config.soispha.foot;
+  cfg = config.soispha.programs.foot;
 in {
-  options.soispha.foot = {
-    enable = extra_lib.options.mkDefaultEnabled "foot terminal";
+  options.soispha.programs.foot = {
+    enable = lib.mkEnableOption "foot terminal";
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/modules/by-name/gt/gtk/module.nix b/modules/by-name/gt/gtk/module.nix
index cfb000a0..14aeba9a 100644
--- a/modules/by-name/gt/gtk/module.nix
+++ b/modules/by-name/gt/gtk/module.nix
@@ -20,7 +20,7 @@
   homeConfig = config.home-manager.users.soispha;
 in {
   options.soispha.gtk = {
-    enable = extra_lib.options.mkDefaultEnabled "gtk themes";
+    enable = lib.mkEnableOption "gtk themes";
   };
 
   config.home-manager.users.soispha = lib.mkIf cfg.enable {
diff --git a/modules/by-name/hl/lhedger/module.nix b/modules/by-name/hl/hledger/module.nix
index 2a9a9e3a..1739b809 100644
--- a/modules/by-name/hl/lhedger/module.nix
+++ b/modules/by-name/hl/hledger/module.nix
@@ -14,11 +14,11 @@
   extra_lib,
   ...
 }: let
-  cfg = config.soispha.hledger;
+  cfg = config.soispha.programs.hledger;
   ledgerFile = "${config.home-manager.users.soispha.xdg.dataHome}/hledger/2025.journal";
 in {
-  options.soispha.hledger = {
-    enable = extra_lib.options.mkDefaultEnabled "hledger";
+  options.soispha.programs.hledger = {
+    enable = lib.mkEnableOption "hledger";
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/modules/by-name/ia/iamb/module.nix b/modules/by-name/ia/iamb/module.nix
index ee466d4e..2ee9d9ad 100644
--- a/modules/by-name/ia/iamb/module.nix
+++ b/modules/by-name/ia/iamb/module.nix
@@ -16,7 +16,7 @@
   cfg = config.soispha.programs.iamb;
 in {
   options.soispha.programs.iamb = {
-    enable = extra_lib.options.mkDefaultEnabled "iamb";
+    enable = lib.mkEnableOption "iamb";
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/modules/by-name/lu/lutris/module.nix b/modules/by-name/lu/lutris/module.nix
index bc0cc04b..ad4a4037 100644
--- a/modules/by-name/lu/lutris/module.nix
+++ b/modules/by-name/lu/lutris/module.nix
@@ -19,7 +19,7 @@
   inherit (config.home-manager.users.soispha.home) homeDirectory;
 in {
   options.soispha.programs.lutris = {
-    enable = extra_lib.options.mkDefaultEnabled "Lutris";
+    enable = lib.mkEnableOption "Lutris";
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/modules/by-name/ma/mandb/module.nix b/modules/by-name/ma/mandb/module.nix
index a2467070..013dbc0f 100644
--- a/modules/by-name/ma/mandb/module.nix
+++ b/modules/by-name/ma/mandb/module.nix
@@ -16,7 +16,7 @@
   cfg = config.soispha.services.mandb;
 in {
   options.soispha.services.mandb = {
-    enable = extra_lib.options.mkDefaultEnabled "mandb";
+    enable = lib.mkEnableOption "mandb";
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/modules/by-name/me/mergiraf/module.nix b/modules/by-name/me/mergiraf/module.nix
index e1048ca1..4ff94d89 100644
--- a/modules/by-name/me/mergiraf/module.nix
+++ b/modules/by-name/me/mergiraf/module.nix
@@ -16,7 +16,7 @@
   cfg = config.soispha.programs.mergiraf;
 in {
   options.soispha.programs.mergiraf = {
-    enable = extra_lib.options.mkDefaultEnabled "mergiraf";
+    enable = lib.mkEnableOption "mergiraf";
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/modules/by-name/mp/mpdpopm/module.nix b/modules/by-name/mp/mpdpopm/module.nix
index 03529095..93bce634 100644
--- a/modules/by-name/mp/mpdpopm/module.nix
+++ b/modules/by-name/mp/mpdpopm/module.nix
@@ -19,7 +19,7 @@
   settingsFormat = pkgs.formats.json {};
 in {
   options.soispha.services.mpdpopm = {
-    enable = extra_lib.options.mkDefaultEnabled "mpdpopm";
+    enable = lib.mkEnableOption "mpdpopm";
 
     settings = lib.mkOption {
       # Setting this type allows for correct merging behavior
diff --git a/modules/by-name/ni/nix/module.nix b/modules/by-name/ni/nix/module.nix
index 5fd10541..6e98ecd4 100644
--- a/modules/by-name/ni/nix/module.nix
+++ b/modules/by-name/ni/nix/module.nix
@@ -56,7 +56,7 @@
   cfg = config.soispha.nix;
 in {
   options.soispha.nix = {
-    enable = extra_lib.options.mkDefaultEnabled "nix";
+    enable = lib.mkEnableOption "nix";
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/modules/by-name/ni/nixos-option/module.nix b/modules/by-name/ni/nixos-option/module.nix
index 3e41bd34..e5cc9f12 100644
--- a/modules/by-name/ni/nixos-option/module.nix
+++ b/modules/by-name/ni/nixos-option/module.nix
@@ -7,7 +7,7 @@
   cfg = config.soispha.programs.nixos-option;
 in {
   options.soispha.programs.nixos-option = {
-    enable = extra_lib.options.mkDefaultEnabled "nixos-option";
+    enable = lib.mkEnableOption "nixos-option";
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/modules/by-name/op/openssh/module.nix b/modules/by-name/op/openssh/module.nix
index e1464338..19538854 100644
--- a/modules/by-name/op/openssh/module.nix
+++ b/modules/by-name/op/openssh/module.nix
@@ -7,7 +7,7 @@
   cfg = config.vhack.openssh;
 in {
   options.vhack.openssh = {
-    enable = extra_lib.options.mkDefaultEnabled "openssh";
+    enable = lib.mkEnableOption "openssh";
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/modules/by-name/pi/pipewire/module.nix b/modules/by-name/pi/pipewire/module.nix
index 5bec816d..79456c8f 100644
--- a/modules/by-name/pi/pipewire/module.nix
+++ b/modules/by-name/pi/pipewire/module.nix
@@ -13,10 +13,10 @@
   extra_lib,
   ...
 }: let
-  cfg = config.soispha.pipewire;
+  cfg = config.soispha.services.pipewire;
 in {
-  options.soispha.pipewire = {
-    enable = extra_lib.options.mkDefaultEnabled "pipewire and wireplumber";
+  options.soispha.services.pipewire = {
+    enable = lib.mkEnableOption "pipewire and wireplumber";
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/modules/by-name/pl/plymouth/module.nix b/modules/by-name/pl/plymouth/module.nix
index f64c9464..8465cd8a 100644
--- a/modules/by-name/pl/plymouth/module.nix
+++ b/modules/by-name/pl/plymouth/module.nix
@@ -17,7 +17,7 @@
   cfg = config.soispha.services.plymouth;
 in {
   options.soispha.services.plymouth = {
-    enable = extra_lib.options.mkDefaultEnabled "plymouth";
+    enable = lib.mkEnableOption "plymouth";
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/modules/by-name/ro/rofi/module.nix b/modules/by-name/ro/rofi/module.nix
index b447ca1e..5ac94781 100644
--- a/modules/by-name/ro/rofi/module.nix
+++ b/modules/by-name/ro/rofi/module.nix
@@ -16,7 +16,7 @@
   cfg = config.soispha.programs.rofi;
 in {
   options.soispha.programs.rofi = {
-    enable = extra_lib.options.mkDefaultEnabled "rofi";
+    enable = lib.mkEnableOption "rofi";
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/modules/by-name/si/signal/module.nix b/modules/by-name/si/signal/module.nix
index 4506517f..526a952c 100644
--- a/modules/by-name/si/signal/module.nix
+++ b/modules/by-name/si/signal/module.nix
@@ -4,10 +4,10 @@
   extra_lib,
   ...
 }: let
-  cfg = config.soispha.signal;
+  cfg = config.soispha.programs.signal;
 in {
-  options.soispha.signal = {
-    enable = extra_lib.options.mkDefaultEnabled "signal";
+  options.soispha.programs.signal = {
+    enable = lib.mkEnableOption "signal";
   };
   config = lib.mkIf cfg.enable {
     vhack.persist.userDirectories.soispha = [
diff --git a/modules/by-name/so/sound/module.nix b/modules/by-name/so/sound/module.nix
index 732a78e2..8b56a50c 100644
--- a/modules/by-name/so/sound/module.nix
+++ b/modules/by-name/so/sound/module.nix
@@ -13,10 +13,10 @@
   lib,
   ...
 }: let
-  cfg = config.soispha.sound;
+  cfg = config.soispha.services.sound;
 in {
-  options.soispha.sound = {
-    enable = extra_lib.options.mkDefaultEnabled "sound based on pipewire";
+  options.soispha.services.sound = {
+    enable = lib.mkEnableOption "sound based on pipewire";
   };
 
   config = lib.mkIf cfg.enable {
@@ -28,7 +28,6 @@ in {
       alsa.enable = true;
       alsa.support32Bit = true;
       pulse.enable = true;
-      jack.enable = true;
     };
 
     users = {
diff --git a/modules/by-name/st/starship/module.nix b/modules/by-name/st/starship/module.nix
index 903f97b6..c6b050ac 100644
--- a/modules/by-name/st/starship/module.nix
+++ b/modules/by-name/st/starship/module.nix
@@ -17,7 +17,7 @@
   cfg = config.soispha.programs.starship;
 in {
   options.soispha.programs.starship = {
-    enable = extra_lib.options.mkDefaultEnabled "starship";
+    enable = lib.mkEnableOption "starship";
 
     showBattery = lib.mkOption {
       type = lib.types.bool;
diff --git a/modules/by-name/sw/swaybg/module.nix b/modules/by-name/sw/swaybg/module.nix
index 216a0c59..03a82b6f 100644
--- a/modules/by-name/sw/swaybg/module.nix
+++ b/modules/by-name/sw/swaybg/module.nix
@@ -17,7 +17,7 @@
   cfg = config.soispha.programs.swaybg;
 in {
   options.soispha.programs.swaybg = {
-    enable = extra_lib.options.mkDefaultEnabled "swaybg";
+    enable = lib.mkEnableOption "swaybg";
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/modules/by-name/sw/swayidle/module.nix b/modules/by-name/sw/swayidle/module.nix
index 953ec83f..a1eb48ba 100644
--- a/modules/by-name/sw/swayidle/module.nix
+++ b/modules/by-name/sw/swayidle/module.nix
@@ -18,7 +18,7 @@
   swaylock = lib.getExe pkgs.swaylock;
 in {
   options.soispha.programs.swayidle = {
-    enable = extra_lib.options.mkDefaultEnabled "swayidle";
+    enable = lib.mkEnableOption "swayidle";
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/modules/common/soispha/default.nix b/modules/common/soispha/default.nix
index 99970929..b24b938e 100644
--- a/modules/common/soispha/default.nix
+++ b/modules/common/soispha/default.nix
@@ -25,6 +25,7 @@
   };
 
   vhack = {
+    openssh.enable = true;
     persist = {
       enable = true;
 
@@ -52,25 +53,10 @@
   };
 
   soispha = {
-    age.enable = true;
-    boot.enable = true;
-    cleanup.enable = true;
-    documentation.enable = true;
-
-    fonts = {
-      enable = true;
-      enableEmoji = true;
-    };
-
-    hardware = {
-      enable = lib.mkDefault true;
-    };
-    home-manager.enable = true;
-
-    polkit.enable = true;
-    xdg.enable = true;
-
     services = {
+      mandb.enable = true;
+      mpdpopm.enable = true;
+
       adb = {
         enable = true;
         user = "soispha";
@@ -127,9 +113,29 @@
           "~/repos"
         ];
       };
-    };
 
+      pipewire.enable = true;
+      plymouth.enable = true;
+      sound.enable = true;
+    };
     programs = {
+      hledger.enable = true;
+
+      starship.enable = true;
+      rofi.enable = true;
+      nixos-option.enable = true;
+      swayidle.enable = true;
+      swaybg.enable = true;
+      foot.enable = true;
+      ausweisapp.enable = true;
+      signal.enable = true;
+      alacritty.enable = true;
+      cargo.enable = true;
+      calibre.enable = true;
+      iamb.enable = true;
+      mergiraf.enable = true;
+      lutris.enable = true;
+
       i3bar-river.enable = true;
       i3status-rust.enable = true;
 
@@ -238,6 +244,27 @@
       fish.enable = true;
     };
 
+    gtk.enable = true;
+    nix.enable = true;
+
+    age.enable = true;
+    boot.enable = true;
+    cleanup.enable = true;
+    documentation.enable = true;
+
+    fonts = {
+      enable = true;
+      enableEmoji = true;
+    };
+
+    hardware = {
+      enable = lib.mkDefault true;
+    };
+    home-manager.enable = true;
+
+    polkit.enable = true;
+    xdg.enable = true;
+
     version.enable = true;
   };
 }