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.

1 files changed, 46 insertions, 19 deletions

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;
   };
 }