Rename folders coherently

flake.nix

@@ -12,11 +12,11 @@
   };
 
   outputs =
-    inputs@{
+    {
       nixpkgs,
       home-manager,
       ...
-    }:
+    }@inputs:
     let
       systems = [ "x86_64-linux" ];
       forAllSystems = nixpkgs.lib.genAttrs systems;
@@ -29,18 +29,34 @@
       home = import ./modules/home;
       nixos = import ./modules/nixos;
 
+      nix.settings.experimental-features = "nix-command flakes";
+
+      nixpkgs = {
+        overlays = [
+          inputs.self.overlays.additions
+          inputs.self.overlays.modifications
+          inputs.self.overlays.unstable-packages
+        ];
+      };
+
       nixosConfigurations = {
         nixos = nixpkgs.lib.nixosSystem {
           specialArgs = { inherit inputs; };
           modules = [
+            (
+              { ... }:
+              {
+                nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (nixpkgs.lib.getName pkg) [ "nvidia-x11" ];
+              }
+            )
             ./nixos/configuration.nix
           ]
           ++ [
+            {}
             home-manager.nixosModules.home-manager
             ./home/configuration.nix
           ];
         };
       };
-
     };
 }

home/configuration.nix

@@ -1,7 +1,7 @@
 { inputs, ... }:
 
 {
-  imports = [ ./parts/users.nix ];
+  imports = [ ./users ];
   home-manager.useUserPackages = true;
   home-manager.overwriteBackup = true;
   home-manager.backupFileExtension = "bak";

home/configurations/zed.nix

@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-
-    zed-editor
-
-    # Languages servers
-    nil
-    nixd
-
-  ];
-}

home/home.nix

@@ -4,24 +4,19 @@
 }:
 {
   imports = [
+
+    # App configurations
     ./configurations/gnome.nix
     ./configurations/firefox.nix
     ./configurations/ghostty.nix
-    ./configurations/zed.nix
+
+    # Modules
+    inputs.self.home
+
   ];
 
-  nixpkgs = {
+  within.home.zed.enable = true;
-    overlays = [
+  within.home.jetbrains.enable = true;
-      inputs.self.overlays.additions
-      inputs.self.overlays.modifications
-      inputs.self.overlays.unstable-packages
-    ];
-  };
-
-  home = {
-    username = "alistreaza";
-    homeDirectory = "/home/alistreaza";
-  };
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
   home.stateVersion = "25.11";

home/parts/users.nix

@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-  home-manager.users.alistreaza = import ../home.nix;
-}

home/users/alistreaza.nix

@@ -0,0 +1,9 @@
+{ ... }:
+
+{
+  imports = [ ../home.nix ];
+  home = {
+    username = "alistreaza";
+    homeDirectory = "/home/alistreaza";
+  };
+}

home/users/default.nix

@@ -0,0 +1,3 @@
+{
+  home-manager.users.alistreaza = import ./alistreaza.nix;
+}

modules/apps/default.nix

@@ -1,6 +1,6 @@
 {
   imports = [
-    ./services/shell.nix
+    ./subgroups/shell.nix
-    ./services/gnome.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
+  imports = [
-  # my-module = import ./my-module.nix;
+    ./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
+    ./subgroups/boot.nix
-    ./services/graphics.nix
+    ./subgroups/graphics.nix
-    ./services/networks.nix
+    ./subgroups/networks.nix
-    ./services/audio.nix
+    ./subgroups/audio.nix
-    ./services/keyboard.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" ];
 

nixos/configuration.nix

@@ -3,15 +3,14 @@
   ...
 }:
 {
-
   imports = [
 
     # Hardware
     ./hardware-configuration.nix
-    ./parts/kernel.nix
+    ./partials/kernel.nix
 
     # Configurations
-    ./parts/users.nix
+    ./partials/users.nix
 
     # Modules
     inputs.self.nixos
@@ -19,20 +18,6 @@
 
   ];
 
-  nixpkgs = {
-    overlays = [
-      inputs.self.overlays.additions
-      inputs.self.overlays.modifications
-      inputs.self.overlays.unstable-packages
-    ];
-  };
-
-  nix = {
-    settings = {
-      experimental-features = "nix-command flakes";
-    };
-  };
-
   networking.hostName = "nixos";
   networking.firewall.enable = true;
 
@@ -58,6 +43,9 @@
   within.gnome.shell.enable = true;
   within.gnome.apps.enable = true;
 
+  # Virtualisation Apps
+  within.shell.docker.enable = true;
+
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
   system.stateVersion = "25.11";
 }

overlays/default.nix

@@ -4,9 +4,7 @@
   modifications = final: prev: { };
 
   unstable-packages = final: _prev: {
-    unstable = import inputs.nixpkgs-unstable {
+    unstable = import inputs.nixpkgs-unstable { system = final.system; };
-      system = final.system;
-    };
   };
 
 }