feat: finished migration

modules/darwin/profiles.nix

@@ -7,6 +7,8 @@ in {
       floorp = enabled;
       nh = enabled;
       phpstorm = enabled;
+      pidgin = enabled;
+      thunderbird = enabled;
       wezterm = enabled;
       wireguard = enabled;
     };

modules/darwin/programs/default.nix

@@ -4,6 +4,8 @@
     ./floorp.nix
     ./nh.nix
     ./phpstorm.nix
+    ./pidgin.nix
+    ./thunderbird.nix
     ./wezterm.nix
     ./wireguard.nix
   ];

modules/darwin/programs/pidgin.nix

@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.marleyos.programs.pidgin;
+in {
+  options.marleyos.programs.pidgin.enable = lib.mkEnableOption "pidgin";
+
+  config = lib.mkIf cfg.enable {
+    homebrew.casks = ["pidgin"];
+  };
+}

modules/darwin/programs/thunderbird.nix

@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.marleyos.programs.thunderbird;
+in {
+  options.marleyos.programs.thunderbird.enable = lib.mkEnableOption "thunderbird";
+
+  config = lib.mkIf cfg.enable {
+    homebrew.casks = ["thunderbird"];
+  };
+}

modules/darwin/programs/wezterm.nix

@@ -1,6 +1,6 @@
 {
-  lib,
   config,
+  lib,
   ...
 }: let
   cfg = config.marleyos.programs.wezterm;

modules/home/profiles.nix

@@ -61,8 +61,13 @@ in {
         neo = enabled;
         neovim = enabled;
         phpstorm = enabled;
+        pidgin = enabled;
         superfile = enabled;
         tea = enabled;
+        thunderbird = enabled;
+        vlc = enabled;
+        wezterm = enabled;
+        zathura = enabled;
       };
 
       services = {

modules/home/programs/default.nix

@@ -36,15 +36,20 @@
     ./neovim.nix
     ./nh.nix
     ./phpstorm
+    ./pidgin
     ./ripgrep.nix
     ./ssh.nix
     ./starship
     ./superfile.nix
     ./systemctl.nix
     ./tea.nix
+    ./thunderbird.nix
     ./tmux.nix
+    ./vlc.nix
     ./waybar.nix
+    ./wezterm.nix
     ./wget.nix
+    ./zathura.nix
     ./zoxide.nix
 
     # TODO: uncomment when swaylock is figured out

modules/home/programs/pidgin/default.nix

@@ -1,16 +1,22 @@
 {
-  lib,
+  marleylib,
   config,
+  osConfig,
+  lib,
   pkgs,
   ...
 }: let
+  inherit (marleylib.module) mkEnableOption';
+
   cfg = config.marleyos.programs.pidgin;
+  osCfg = osConfig.marleyos.programs.pidgin.enable or false;
 in {
-  options.marleyos.programs.pidgin.enable = lib.mkEnableOption "pidgin";
+  options.marleyos.programs.pidgin.enable = mkEnableOption' "pidgin" osCfg;
 
   config = lib.mkIf cfg.enable {
     programs.pidgin = {
       enable = true;
+      package = lib.mkIf pkgs.stdenv.isDarwin pkgs.emptyDirectory;
 
       plugins = with pkgs.pidginPackages; [
         pidgin-window-merge

modules/home/programs/thunderbird.nix

@@ -0,0 +1,31 @@
+{
+  marleylib,
+  config,
+  osConfig,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (marleylib.module) mkEnableOption';
+
+  cfg = config.marleyos.programs.thunderbird;
+  osCfg = osConfig.marleyos.programs.thunderbird.enable or false;
+in {
+  options.marleyos.programs.thunderbird.enable =
+    mkEnableOption' "thunderbird" osCfg;
+
+  config = lib.mkIf cfg.enable {
+    programs.thunderbird = {
+      enable = true;
+      package = lib.mkIf pkgs.stdenv.isDarwin pkgs.emptyDirectory;
+
+      settings = {
+        "privacy.donottrackheader.enabled" = true;
+      };
+
+      profiles."${config.marleycfg.my.name}" = {
+        isDefault = true;
+      };
+    };
+  };
+}

modules/home/programs/vlc.nix

@@ -8,7 +8,7 @@
 in {
   options.marleyos.programs.vlc.enable = lib.mkEnableOption "vlc";
 
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf (cfg.enable && pkgs.stdenv.isLinux) {
     home.packages = with pkgs; [
       vlc
     ];

modules/home/programs/wezterm.nix

@@ -0,0 +1,39 @@
+{
+  marleylib,
+  config,
+  osConfig,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (marleylib.module) mkEnableOption';
+
+  cfg = config.marleyos.programs.wezterm;
+  osCfg = osConfig.marleyos.programs.wezterm.enable or false;
+in {
+  options.marleyos.programs.wezterm.enable = mkEnableOption' "wezterm" osCfg;
+
+  config = lib.mkIf cfg.enable {
+    programs.wezterm = {
+      enable = true;
+      package = lib.mkIf pkgs.stdenv.isDarwin pkgs.emptyDirectory;
+
+      # TODO: create `local config` & return it separately, so other modules can
+      # insert config in the middle.
+      extraConfig =
+        # lua
+        ''
+          local config = wezterm.config_builder()
+
+          -- Fix color blocks instead of text issue.
+          config.front_end = "WebGpu"
+
+          config.freetype_load_flags = 'NO_HINTING'
+
+          config.enable_tab_bar = false
+
+          return config
+        '';
+    };
+  };
+}

modules/home/programs/zathura.nix

@@ -1,13 +1,14 @@
 {
-  lib,
   config,
+  lib,
+  pkgs,
   ...
 }: let
   cfg = config.marleyos.programs.zathura;
 in {
   options.marleyos.programs.zathura.enable = lib.mkEnableOption "zathura";
 
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf (cfg.enable && pkgs.stdenv.isLinux) {
     programs.zathura = {
       enable = true;
     };

snowflake/modules/home/bundles/desktop/default.nix

@@ -1,34 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.marleyos.bundles.desktop;
-
-  inherit (lib.marleyos) enabled;
-in {
-  options.marleyos.bundles.desktop.enable = lib.mkEnableOption "desktop";
-
-  config = lib.mkIf cfg.enable {
-    marleyos = {
-      isDesktop = true;
-
-      appearance = {
-        base = enabled;
-        gtk = enabled;
-        qt = enabled;
-      };
-
-      programs = {
-        cli = enabled;
-        tui = enabled;
-        gui = enabled;
-      };
-
-      services = {
-        # syncthing = enabled;
-        udiskie = enabled;
-      };
-    };
-  };
-}

snowflake/modules/home/bundles/mac/default.nix

@@ -1,29 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.marleyos.bundles.mac;
-
-  inherit (lib.marleyos) enabled disabled;
-in {
-  options.marleyos.bundles.mac.enable = lib.mkEnableOption "mac";
-
-  config = lib.mkIf cfg.enable {
-    marleyos = {
-      isDesktop = true;
-
-      programs = {
-        cli = enabled;
-        journalctl = disabled;
-        systemctl = disabled;
-
-        tui = enabled;
-        cava = disabled;
-        ncmpcpp = disabled;
-
-        wezterm = enabled;
-      };
-    };
-  };
-}

snowflake/modules/home/bundles/server/default.nix

@@ -1,28 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.marleyos.bundles.server;
-
-  inherit (lib.marleyos) enabled disabled;
-in {
-  options.marleyos.bundles.server.enable = lib.mkEnableOption "server";
-
-  config = lib.mkIf cfg.enable {
-    marleyos = {
-      isServer = true;
-
-      programs = {
-        cli = enabled;
-        tui = enabled;
-
-        neo = lib.mkForce disabled;
-        rbw = lib.mkForce disabled;
-        amfora = lib.mkForce disabled;
-        cava = lib.mkForce disabled;
-        ncmpcpp = lib.mkForce disabled;
-      };
-    };
-  };
-}

snowflake/modules/home/programs/gui/default.nix

@@ -1,27 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.marleyos.programs.gui;
-
-  inherit (lib.marleyos) enabled;
-in {
-  options.marleyos.programs.gui.enable = lib.mkEnableOption "gui";
-
-  config = lib.mkIf cfg.enable {
-    marleyos.programs = {
-      CEmu = enabled;
-      calibre = enabled;
-      discord = enabled;
-      floorp = enabled;
-      nemo = enabled;
-      pidgin = enabled;
-      thunderbird = enabled;
-      phpstorm = enabled;
-      vlc = enabled;
-      wezterm = enabled;
-      zathura = enabled;
-    };
-  };
-}

snowflake/modules/home/programs/gui/thunderbird/default.nix

@@ -1,23 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.marleyos.programs.thunderbird;
-in {
-  options.marleyos.programs.thunderbird.enable = lib.mkEnableOption "thunderbird";
-
-  config = lib.mkIf cfg.enable {
-    programs.thunderbird = {
-      enable = true;
-
-      settings = {
-        "privacy.donottrackheader.enabled" = true;
-      };
-
-      profiles."${config.marleyos.my.name}" = {
-        isDefault = true;
-      };
-    };
-  };
-}

snowflake/modules/home/programs/gui/wezterm/default.nix

@@ -1,46 +0,0 @@
-{
-  lib,
-  config,
-  system,
-  pkgs,
-  ...
-}: let
-  inherit (lib.snowfall.system) is-darwin;
-
-  cfg = config.marleyos.programs.wezterm;
-
-  isGenericLinux = config.targets.genericLinux.enable;
-  isNotNixOS = isGenericLinux || (is-darwin system);
-in {
-  options.marleyos.programs.wezterm.enable = lib.mkEnableOption "wezterm";
-
-  config = lib.mkIf cfg.enable {
-    programs.wezterm = {
-      enable = true;
-
-      # Generic linux: NixGL makes Wezterm shit the bed for some reason.
-      # macOS: Prefer brew cask so a proper Applications shortcut is made.
-      package =
-        if isNotNixOS
-        then pkgs.emptyDirectory
-        else pkgs.wezterm;
-
-      # TODO: create `local config` & return it seperately, so other modules can
-      # insert config in the middle
-      extraConfig =
-        # lua
-        ''
-          local config = wezterm.config_builder()
-
-          -- Fix color blocks instead of text issue.
-          config.front_end = "WebGpu"
-
-          config.freetype_load_flags = 'NO_HINTING'
-
-          config.enable_tab_bar = false
-
-          return config
-        '';
-    };
-  };
-}