Rename folders coherently

modules/apps/default.nix

@@ -1,6 +1,6 @@
 {
   imports = [
-    ./services/shell.nix
-    ./services/gnome.nix
+    ./subgroups/shell.nix
+    ./subgroups/gnome.nix
   ];
 }

modules/home/default.nix

@@ -1,6 +1,6 @@
-# Add your reusable home-manager modules to this directory, on their own file (https://nixos.wiki/wiki/Module).
-# These should be stuff you would like to share with others, not your personal configurations.
 {
-  # List your module files here
-  # my-module = import ./my-module.nix;
+  imports = [
+    ./submodules/zed.nix
+    ./submodules/jetbrains.nix
+  ];
 }

modules/home/submodules/jetbrains.nix

@@ -0,0 +1,22 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+with lib;
+let
+  cfg = config.within.home.jetbrains;
+in
+{
+  options.within.home.jetbrains = {
+    enable = mkEnableOption "System dns service";
+  };
+  config = mkIf cfg.enable {
+
+    home.packages = with pkgs.unstable; [
+      jetbrains.pycharm
+    ];
+
+  };
+}

modules/home/submodules/zed.nix

@@ -0,0 +1,26 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+with lib;
+let
+  cfg = config.within.home.zed;
+in
+{
+  options.within.home.zed = {
+    enable = mkEnableOption "System dns service";
+  };
+  config = mkIf cfg.enable {
+
+    home.packages = with pkgs; [
+
+      zed-editor
+      nil
+      nixd
+
+    ];
+
+  };
+}

modules/nixos/default.nix

@@ -1,9 +1,9 @@
 {
   imports = [
-    ./services/boot.nix
-    ./services/graphics.nix
-    ./services/networks.nix
-    ./services/audio.nix
-    ./services/keyboard.nix
+    ./subgroups/boot.nix
+    ./subgroups/graphics.nix
+    ./subgroups/networks.nix
+    ./subgroups/audio.nix
+    ./subgroups/keyboard.nix
   ];
 }

modules/nixos/submodules/nvidia-prime.nix

@@ -1,25 +0,0 @@
-{ lib, config, ... }:
-with lib;
-let
-  cfg = config.within.graphics.nvidia.prime;
-in
-{
-  options.within.graphics.nvidia.prime = {
-    enable = mkEnableOption "System nvidia prime service";
-  };
-  config = mkIf cfg.enable {
-
-    services.xserver.videoDrivers = [
-      "modesetting"
-      "nvidia"
-    ];
-
-    hardware.nvidia.powerManagement.finegrained = true;
-    hardware.nvidia.prime = {
-      offload.enable = true;
-      intelBusId = "PCI:0@0:2:0";
-      nvidiaBusId = "PCI:1@0:0:0";
-    };
-
-  };
-}

modules/nixos/submodules/nvidia.nix

@@ -9,12 +9,6 @@ in
   };
   config = mkIf cfg.enable {
 
-    nixpkgs.config.allowUnfreePredicate =
-      pkg:
-      builtins.elem (lib.getName pkg) [
-        "nvidia-x11"
-      ];
-
     services.xserver.enable = true;
     services.xserver.videoDrivers = [ "nvidia" ];