meta: Begin migrating packages to workflow-specific modules

Long-term this should make it easy to include all the GUI programs with
the desktop module and all the CLI programs with the shell module, as
well as the ability to easily disable sets of unneeded packages.

flake.nix

@@ -67,6 +67,11 @@
               networking = {
                 mullvad = true;
               };
+
+              desktop = {
+                japanese = true;
+                bloat = true;
+              };
             };
           }
         ];

home/git.nix

@@ -1,7 +1,9 @@
 { pkgs, ... }:
 
 {
-  home.packages = with pkgs; [ tig ];
+  home.packages = builtins.attrValues {
+    inherit (pkgs) tig mgitstatus;
+  };
 
   xdg.configFile."tig/config".text = ''
     color cursor black green bold

home/ironbar.nix

@@ -1,9 +1,11 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 let
   inherit (lib) singleton;
 in
 {
+  home.packages = with pkgs; [ ironbar ];
+
   xdg.configFile."ironbar/config.json".text = builtins.toJSON {
     name = "main";
     icon_theme = "Fluent-dark";

modules/desktop.nix

@@ -7,12 +7,14 @@ let
 in
 {
   options.modules.desktop = {
+    japanese = mkEnableOption "Japanese support (fcitx, anki, kanjidraw, etc.)";
+    bloat = mkEnableOption "GUI applications like Logseq";
   };
 
-  config = {
+  config = with cfg; {
     programs.hyprland.enable = true;
 
-    i18n.inputMethod = {
+    i18n.inputMethod = mkIf japanese {
       enabled = "fcitx5";
 
       fcitx5 = {
@@ -21,29 +23,46 @@ in
       };
     };
 
-    services.udisks2 = {
+    services = {
-      enable = true;
+      udisks2 = {
-      mountOnMedia = true;
-    };
-
-    services.xserver = {
-      enable = true;
-      excludePackages = [ pkgs.xterm ];
-    };
-
-    services.pipewire = {
-      enable = true;
-
-      alsa = {
         enable = true;
-        support32Bit = true;
+        mountOnMedia = true;
       };
 
-      pulse.enable = true;
+      xserver = {
+        enable = true;
+        excludePackages = [ pkgs.xterm ];
+      };
+
+      pipewire = {
+        enable = true;
+
+        alsa = {
+          enable = true;
+          support32Bit = true;
+        };
+
+        pulse.enable = true;
+      };
     };
 
     environment.systemPackages = with pkgs; [
       pulseaudio
+      anki
+      kanjidraw
+      logseq
+      mullvad-browser
+      spek
+      audacity
+      gimp
+      sqlitebrowser
+      qdirstat
+      libreoffice
+      krita
+      element-desktop
+      signal-desktop
+      ungoogled-chromium
+      qbittorrent
     ];
 
     services.greetd = {

modules/packages.nix

@@ -11,21 +11,7 @@
     zbar
     sakaya.packages.${system}.sakaya
 
-    logseq
-    mullvad-browser
-    spek
-    audacity
-    gimp
-    anki
-    sqlitebrowser
     sqlcipher
-    kanjidraw
-    libreoffice
-    krita
-    element-desktop
-    signal-desktop
-    ungoogled-chromium
-    qbittorrent
 
     gdu
     fdupes
@@ -94,7 +80,6 @@
     srb2
     crystalline
     thud
-    ironbar
     wallust
     activate-linux
     tango
@@ -115,10 +100,8 @@
     aaaaxy
     lutgen
     sudachi-rs
-    mgitstatus
     pnpm-shell-completion
     rclone
-    qdirstat
   ];
 
   nixpkgs.config.allowUnfree = true;