From 74a32efdd0b8d89a6ff5c3e4a52c4d41ef36fc5e Mon Sep 17 00:00:00 2001 From: Leonhard Kost Date: Sun, 8 Feb 2026 16:06:50 +0100 Subject: [PATCH] refactor(options): move options to global scope --- flake.nix | 4 +++- modules/home-manager/default.nix | 2 -- modules/nixos/default.nix | 2 -- modules/options.nix => options.nix | 0 4 files changed, 3 insertions(+), 5 deletions(-) rename modules/options.nix => options.nix (100%) diff --git a/flake.nix b/flake.nix index 75c1d0f..2d1c88b 100644 --- a/flake.nix +++ b/flake.nix @@ -23,9 +23,11 @@ system = "x86_64-linux"; pkgs = import nixpkgs { inherit system; }; + commonModules = [ ./options.nix ]; + mkNixosConfig = name: modules: { "${name}" = nixpkgs.lib.nixosSystem { - inherit modules; + modules = modules ++ commonModules; specialArgs = { inherit inputs outputs; }; }; }; diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index acd9e70..98bbcbe 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -1,7 +1,5 @@ { imports = [ - ../options.nix - ./git.nix ./fish.nix ./nixvim diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 0dfad01..fc9ade2 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -1,7 +1,5 @@ { imports = [ - ../options.nix - ./fish.nix ./firefox.nix ./hyprland.nix diff --git a/modules/options.nix b/options.nix similarity index 100% rename from modules/options.nix rename to options.nix