restructure

desktop/software/default.nix

@@ -0,0 +1,65 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.hd.desktop.software;
+  inherit (lib) mkEnableOption mkIf;
+in
+{
+  imports = [ ./development.nix ];
+
+  options.hd.desktop.software.enable = mkEnableOption "Software";
+
+  config = mkIf cfg.enable {
+    hd.desktop.software.development.enable = true;
+
+    environment.systemPackages = with pkgs; [
+      # vesktop
+      bitwarden
+      calibre
+      element-desktop
+      gh
+      kitty
+      nil
+      obsidian
+      rclone
+      signal-desktop
+      spotify
+      starship
+      stow
+      tor-browser
+      vlc
+      wireguard-tools
+      wl-clipboard
+      zotero
+      zulip
+    ];
+
+    virtualisation = {
+      docker.enable = true;
+    };
+
+    programs = {
+      firefox.enable = true;
+      git.enable = true;
+      kdeconnect.enable = true;
+    };
+
+    home = {
+      programs.thunderbird = {
+        enable = true;
+        package = pkgs.thunderbird-latest;
+        profiles.default = {
+          isDefault = true;
+          withExternalGnupg = true;
+        };
+      };
+    };
+
+    # Some excludes
+    services.xserver.excludePackages = [ pkgs.xterm ];
+  };
+}

desktop/software/development.nix

@@ -0,0 +1,35 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+let
+  cfg = config.hd.desktop.software.development;
+  inherit (lib) mkEnableOption mkIf;
+in
+{
+  options.hd.desktop.software.development.enable = mkEnableOption "Dev Software";
+
+  config = mkIf cfg.enable {
+    documentation.dev.enable = true;
+
+    environment.systemPackages = with pkgs; [
+      vscode
+      binutils
+      clang
+      gcc
+      gdb
+      gnumake
+      man-pages
+      man-pages-posix
+      nixfmt-rfc-style
+      python313
+      python313Packages.mypy
+      rustup
+      emacs
+      jetbrains.gateway
+      jetbrains.rust-rover
+    ];
+  };
+}