From fd4ce0cdc4373b73085267adc0ab80a79dfaed7f Mon Sep 17 00:00:00 2001
From: Yuri Tatishchev <itatishch@gmail.com>
Date: Sun, 1 Jun 2025 18:39:00 -0700
Subject: [PATCH] WIP: refactor pt. 2

---
 flake.nix                        | 34 +++++++--------
 modules/opts/desktop/default.nix | 16 -------
 modules/opts/tools/default.nix   | 73 --------------------------------
 3 files changed, 15 insertions(+), 108 deletions(-)
 delete mode 100644 modules/opts/desktop/default.nix
 delete mode 100644 modules/opts/tools/default.nix

diff --git a/flake.nix b/flake.nix
index 32e7e56..f9badf4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,7 +24,19 @@
     };
   };
 
-  outputs = { self, nixpkgs, home-manager, plasma-manager, nixos-generators, secrix }: {
+  outputs = { self, nixpkgs, home-manager, plasma-manager, nixos-generators, secrix }:
+  let
+    hmModule = {
+      home-manager.useGlobalPkgs = true;
+      home-manager.useUserPackages = true;
+      home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ];
+
+      home-manager.users.cazzzer = import ./home;
+      # Optionally, use home-manager.extraSpecialArgs to pass
+      # arguments to home.nix
+    };
+  in
+  {
     apps.x86_64-linux.secrix = secrix.secrix self;
 
     nixosConfigurations = {
@@ -38,15 +50,7 @@
           ./users/cazzzer
           # https://nix-community.github.io/home-manager/index.xhtml#sec-flakes-nixos-module
           home-manager.nixosModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ];
-
-            home-manager.users.cazzzer = import ./home;
-            # Optionally, use home-manager.extraSpecialArgs to pass
-            # arguments to home.nix
-          }
+          hmModule
         ];
       };
       Yura-TPX13 = nixpkgs.lib.nixosSystem {
@@ -59,15 +63,7 @@
           ./users/cazzzer
           # https://nix-community.github.io/home-manager/index.xhtml#sec-flakes-nixos-module
           home-manager.nixosModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ];
-
-            home-manager.users.cazzzer = import ./home;
-            # Optionally, use home-manager.extraSpecialArgs to pass
-            # arguments to home.nix
-          }
+          hmModule
         ];
       };
       VM = nixpkgs.lib.nixosSystem {
diff --git a/modules/opts/desktop/default.nix b/modules/opts/desktop/default.nix
deleted file mode 100644
index c989248..0000000
--- a/modules/opts/desktop/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  cfg = config.opts.desktop;
-in
-{
-  options = {
-    opts.desktop = {
-      enable = lib.mkEnableOption "desktop environment";
-      pipewire.enable = lib.mkOption {
-        type = lib.types.bool;
-        default = true;
-        description = "Enable pipewire for audio and screen sharing support";
-      };
-    };
-  };
-}
diff --git a/modules/opts/tools/default.nix b/modules/opts/tools/default.nix
deleted file mode 100644
index 56a0ffd..0000000
--- a/modules/opts/tools/default.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  cfg = config.opts.tools;
-in
-{
-  options = {
-    opts.tools = {
-      enable = lib.mkEnableOption "common tools";
-      ide.enable = lib.mkOption {
-        type = lib.types.bool;
-        default = true;
-        description = "jetbrains and other visual IDEs";
-      };
-      dev.enable = lib.mkOption {
-        type = lib.types.bool;
-        default = true;
-        description = "programming languages and environments";
-      };
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    environment.systemPackages = with pkgs;[
-      dust
-      eza
-      fastfetch
-      fd
-      helix
-      micro
-      openssl
-      ripgrep
-      starship
-      tealdeer
-      transcrypt
-    ] ++
-    lib.optionals cfg.ide.enable [
-      # jetbrains.rust-rover
-      # jetbrains.goland
-      jetbrains.clion
-      jetbrains.idea-ultimate
-      jetbrains.pycharm-professional
-      jetbrains.webstorm
-      android-studio
-      zed-editor
-    ] ++
-    lib.optionals cfg.dev.enable [
-      # Rust
-      rustup
-
-      # Python
-      python3
-      poetry
-
-      # Haskell
-      haskellPackages.ghc
-      haskellPackages.stack
-
-      # Node
-      nodejs_22
-      pnpm
-      bun
-
-      # Nix
-      nil
-      nixd
-      nixfmt-rfc-style
-
-      # Gleam
-      gleam
-      beamMinimal26Packages.erlang
-    ];
-  };
-}