Wrap oeg in an option

lib/mk_computer.nix

@@ -41,6 +41,7 @@ custom.inputs.nixpkgs.lib.nixosSystem
 
       # Common configuration
       (import "${custom.inputs.self}/modules/common-x86" { inherit custom; })
+      (import "${custom.inputs.self}/modules/default.nix" { inherit custom; })
 
       custom.inputs.agenix.nixosModules.age
       { environment.systemPackages = [ custom.inputs.agenix.packages.${system}.default ]; }

modules/default.nix

@@ -0,0 +1,6 @@
+{ custom }: { ... }:
+{
+  imports = [
+    (import ./eog { inherit custom; })
+  ];
+}

modules/desktop/default.nix

@@ -3,7 +3,6 @@
   imports = [
     (import "${custom.inputs.self}/modules/docker" { inherit custom; })
     (import "${custom.inputs.self}/modules/email" { inherit custom; })
-    (import "${custom.inputs.self}/modules/eog" { inherit custom; })
     "${custom.inputs.self}/modules/hunspell"
     (import "${custom.inputs.self}/modules/libimobiledevice" { inherit custom; })
     (import "${custom.inputs.self}/modules/nix-direnv" { inherit custom; })
@@ -53,6 +52,9 @@
   # Enable dconf to be able to save Nautilus settings
   programs.dconf.enable = true;
 
+  # Gnome Image Viewer
+  programs.eog.enable = true;
+
   # Enable Flatpack
   services.flatpak.enable = true;
   xdg = {

modules/eog/default.nix

@@ -1,19 +1,27 @@
-{ custom }: { pkgs, ... }:
+{ custom }: { config, lib, pkgs, ... }:
+let
+  cfg = config.programs.eog;
+in
 {
-  environment.systemPackages = with pkgs; [
-    gnome.eog
-  ];
+  options = {
+    programs.eog.enable = lib.mkEnableOption "Gnome Image Viewer";
+  };
 
-  home-manager.users.${custom.username} = {
-    xdg.mimeApps = {
-      enable = true;
-      associations.added = {
-        "image/png" = [ "org.gnome.eog.desktop" ];
-        "image/jpeg" = [ "org.gnome.eog.desktop" ];
-      };
-      defaultApplications = {
-        "image/png" = [ "org.gnome.eog.desktop" ];
-        "image/jpeg" = [ "org.gnome.eog.desktop" ];
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      gnome.eog
+    ];
+    home-manager.users.${custom.username} = {
+      xdg.mimeApps = {
+        enable = true;
+        associations.added = {
+          "image/png" = [ "org.gnome.eog.desktop" ];
+          "image/jpeg" = [ "org.gnome.eog.desktop" ];
+        };
+        defaultApplications = {
+          "image/png" = [ "org.gnome.eog.desktop" ];
+          "image/jpeg" = [ "org.gnome.eog.desktop" ];
+        };
       };
     };
   };