From 3975dce4182dee253231bf03a632ffc55b7b430f Mon Sep 17 00:00:00 2001 From: Laurent Gueret Date: Tue, 27 Jan 2026 15:57:56 +0100 Subject: [PATCH] Rename folders coherently --- flake.nix | 22 +++++++++++++--- home/configuration.nix | 2 +- home/configurations/zed.nix | 12 --------- home/home.nix | 21 ++++++--------- home/parts/users.nix | 5 ---- home/users/alistreaza.nix | 9 +++++++ home/users/default.nix | 3 +++ modules/apps/default.nix | 4 +-- .../apps/{services => subgroups}/gnome.nix | 0 .../apps/{services => subgroups}/shell.nix | 0 modules/home/default.nix | 8 +++--- modules/home/submodules/jetbrains.nix | 22 ++++++++++++++++ modules/home/submodules/zed.nix | 26 +++++++++++++++++++ modules/nixos/default.nix | 10 +++---- .../nixos/{services => subgroups}/audio.nix | 0 .../nixos/{services => subgroups}/boot.nix | 0 .../{services => subgroups}/graphics.nix | 0 .../{services => subgroups}/keyboard.nix | 0 .../{services => subgroups}/networks.nix | 0 modules/nixos/submodules/nvidia-prime.nix | 25 ------------------ modules/nixos/submodules/nvidia.nix | 6 ----- nixos/configuration.nix | 22 ++++------------ nixos/{parts => partials}/kernel.nix | 0 nixos/{parts => partials}/users.nix | 0 overlays/default.nix | 4 +-- 25 files changed, 105 insertions(+), 96 deletions(-) delete mode 100644 home/configurations/zed.nix delete mode 100644 home/parts/users.nix create mode 100644 home/users/alistreaza.nix create mode 100644 home/users/default.nix rename modules/apps/{services => subgroups}/gnome.nix (100%) rename modules/apps/{services => subgroups}/shell.nix (100%) create mode 100644 modules/home/submodules/jetbrains.nix create mode 100644 modules/home/submodules/zed.nix rename modules/nixos/{services => subgroups}/audio.nix (100%) rename modules/nixos/{services => subgroups}/boot.nix (100%) rename modules/nixos/{services => subgroups}/graphics.nix (100%) rename modules/nixos/{services => subgroups}/keyboard.nix (100%) rename modules/nixos/{services => subgroups}/networks.nix (100%) delete mode 100644 modules/nixos/submodules/nvidia-prime.nix rename nixos/{parts => partials}/kernel.nix (100%) rename nixos/{parts => partials}/users.nix (100%) diff --git a/flake.nix b/flake.nix index 7ef31f3..be40dd5 100755 --- a/flake.nix +++ b/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 ]; }; }; - }; } diff --git a/home/configuration.nix b/home/configuration.nix index a89e7dc..e57f493 100644 --- a/home/configuration.nix +++ b/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"; diff --git a/home/configurations/zed.nix b/home/configurations/zed.nix deleted file mode 100644 index 15598ad..0000000 --- a/home/configurations/zed.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = with pkgs; [ - - zed-editor - - # Languages servers - nil - nixd - - ]; -} diff --git a/home/home.nix b/home/home.nix index 7db4057..71016e2 100755 --- a/home/home.nix +++ b/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 = { - overlays = [ - inputs.self.overlays.additions - inputs.self.overlays.modifications - inputs.self.overlays.unstable-packages - ]; - }; - - home = { - username = "alistreaza"; - homeDirectory = "/home/alistreaza"; - }; + within.home.zed.enable = true; + within.home.jetbrains.enable = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion home.stateVersion = "25.11"; diff --git a/home/parts/users.nix b/home/parts/users.nix deleted file mode 100644 index 7721995..0000000 --- a/home/parts/users.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ ... }: - -{ - home-manager.users.alistreaza = import ../home.nix; -} diff --git a/home/users/alistreaza.nix b/home/users/alistreaza.nix new file mode 100644 index 0000000..c62a364 --- /dev/null +++ b/home/users/alistreaza.nix @@ -0,0 +1,9 @@ +{ ... }: + +{ + imports = [ ../home.nix ]; + home = { + username = "alistreaza"; + homeDirectory = "/home/alistreaza"; + }; +} diff --git a/home/users/default.nix b/home/users/default.nix new file mode 100644 index 0000000..defa159 --- /dev/null +++ b/home/users/default.nix @@ -0,0 +1,3 @@ +{ + home-manager.users.alistreaza = import ./alistreaza.nix; +} diff --git a/modules/apps/default.nix b/modules/apps/default.nix index 7d09b73..af5ac6c 100755 --- a/modules/apps/default.nix +++ b/modules/apps/default.nix @@ -1,6 +1,6 @@ { imports = [ - ./services/shell.nix - ./services/gnome.nix + ./subgroups/shell.nix + ./subgroups/gnome.nix ]; } diff --git a/modules/apps/services/gnome.nix b/modules/apps/subgroups/gnome.nix similarity index 100% rename from modules/apps/services/gnome.nix rename to modules/apps/subgroups/gnome.nix diff --git a/modules/apps/services/shell.nix b/modules/apps/subgroups/shell.nix similarity index 100% rename from modules/apps/services/shell.nix rename to modules/apps/subgroups/shell.nix diff --git a/modules/home/default.nix b/modules/home/default.nix index 45aae31..eefa0f8 100755 --- a/modules/home/default.nix +++ b/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 + ]; } diff --git a/modules/home/submodules/jetbrains.nix b/modules/home/submodules/jetbrains.nix new file mode 100644 index 0000000..b2cda93 --- /dev/null +++ b/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 + ]; + + }; +} diff --git a/modules/home/submodules/zed.nix b/modules/home/submodules/zed.nix new file mode 100644 index 0000000..c73c347 --- /dev/null +++ b/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 + + ]; + + }; +} diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 862b1ad..5545637 100644 --- a/modules/nixos/default.nix +++ b/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 ]; } diff --git a/modules/nixos/services/audio.nix b/modules/nixos/subgroups/audio.nix similarity index 100% rename from modules/nixos/services/audio.nix rename to modules/nixos/subgroups/audio.nix diff --git a/modules/nixos/services/boot.nix b/modules/nixos/subgroups/boot.nix similarity index 100% rename from modules/nixos/services/boot.nix rename to modules/nixos/subgroups/boot.nix diff --git a/modules/nixos/services/graphics.nix b/modules/nixos/subgroups/graphics.nix similarity index 100% rename from modules/nixos/services/graphics.nix rename to modules/nixos/subgroups/graphics.nix diff --git a/modules/nixos/services/keyboard.nix b/modules/nixos/subgroups/keyboard.nix similarity index 100% rename from modules/nixos/services/keyboard.nix rename to modules/nixos/subgroups/keyboard.nix diff --git a/modules/nixos/services/networks.nix b/modules/nixos/subgroups/networks.nix similarity index 100% rename from modules/nixos/services/networks.nix rename to modules/nixos/subgroups/networks.nix diff --git a/modules/nixos/submodules/nvidia-prime.nix b/modules/nixos/submodules/nvidia-prime.nix deleted file mode 100644 index 027e92a..0000000 --- a/modules/nixos/submodules/nvidia-prime.nix +++ /dev/null @@ -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"; - }; - - }; -} diff --git a/modules/nixos/submodules/nvidia.nix b/modules/nixos/submodules/nvidia.nix index 8602c77..c3bd6c8 100644 --- a/modules/nixos/submodules/nvidia.nix +++ b/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" ]; diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 7b5432a..9095513 100755 --- a/nixos/configuration.nix +++ b/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"; } diff --git a/nixos/parts/kernel.nix b/nixos/partials/kernel.nix similarity index 100% rename from nixos/parts/kernel.nix rename to nixos/partials/kernel.nix diff --git a/nixos/parts/users.nix b/nixos/partials/users.nix similarity index 100% rename from nixos/parts/users.nix rename to nixos/partials/users.nix diff --git a/overlays/default.nix b/overlays/default.nix index 4e62a83..cca0799 100755 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -4,9 +4,7 @@ modifications = final: prev: { }; unstable-packages = final: _prev: { - unstable = import inputs.nixpkgs-unstable { - system = final.system; - }; + unstable = import inputs.nixpkgs-unstable { system = final.system; }; }; }