From 38f7ba4d91e12b743646cfb618612a8ae554b626 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 5 Dec 2025 17:56:47 -0600 Subject: [PATCH] chore: refactored input imports --- flake.nix | 23 ------------------- modules/nixos/core/homeManager/default.nix | 4 ++++ modules/nixos/core/nix/default.nix | 5 ----- modules/nixos/default.nix | 26 ++++++++++++++++------ modules/nixos/desktop/niri/default.nix | 3 +++ modules/nixos/desktop/nur/default.nix | 6 +++++ modules/nixos/lix/default.nix | 6 +++++ modules/nixos/microvm/default.nix | 1 - modules/nixos/sops/default.nix | 4 ++++ 9 files changed, 42 insertions(+), 36 deletions(-) create mode 100755 modules/nixos/desktop/nur/default.nix create mode 100755 modules/nixos/lix/default.nix diff --git a/flake.nix b/flake.nix index 95bc850..0ceb621 100755 --- a/flake.nix +++ b/flake.nix @@ -111,12 +111,6 @@ config.nixosModules.core config.nixosModules.mantle config.nixosModules.crust - inputs.niri.nixosModules.niri - inputs.home-manager.nixosModules.home-manager - # inputs.lix-module.nixosModules.default - inputs.nur.modules.nixos.default - inputs.microvm.nixosModules.host - inputs.sops-nix.nixosModules.sops ]; deimos = inputs.self.lib.mkLinuxSystem [ ./systems/deimos @@ -125,10 +119,6 @@ config.nixosModules.core config.nixosModules.mantle config.nixosModules.crust - inputs.home-manager.nixosModules.home-manager - # inputs.lix-module.nixosModules.default - inputs.nur.modules.nixos.default - inputs.sops-nix.nixosModules.sops ]; phobos = inputs.self.lib.mkLinuxSystem [ ./systems/phobos @@ -137,10 +127,6 @@ config.nixosModules.core config.nixosModules.mantle config.nixosModules.crust - inputs.home-manager.nixosModules.home-manager - # inputs.lix-module.nixosModules.default - inputs.nur.modules.nixos.default - inputs.sops-nix.nixosModules.sops ]; ceres = inputs.self.lib.mkLinuxSystem [ ./systems/ceres @@ -148,10 +134,6 @@ config.nixosModules.ceres config.nixosModules.core config.nixosModules.mantle - inputs.home-manager.nixosModules.home-manager - # inputs.lix-module.nixosModules.default - inputs.microvm.nixosModules.host - inputs.sops-nix.nixosModules.sops ]; eris = inputs.self.lib.mkLinuxSystem [ ./systems/eris @@ -159,16 +141,11 @@ config.nixosModules.eris config.nixosModules.core config.nixosModules.mantle - inputs.home-manager.nixosModules.home-manager - # inputs.lix-module.nixosModules.default - inputs.sops-nix.nixosModules.sops ]; iso = inputs.self.lib.mkLinuxSystem [ ./profiles/user0 config.nixosModules.iso config.nixosModules.core - inputs.home-manager.nixosModules.home-manager - inputs.lix-module.nixosModules.default ]; }; diff --git a/modules/nixos/core/homeManager/default.nix b/modules/nixos/core/homeManager/default.nix index 711f72e..8544a71 100755 --- a/modules/nixos/core/homeManager/default.nix +++ b/modules/nixos/core/homeManager/default.nix @@ -1,5 +1,9 @@ { flake, ... }: { + imports = [ + flake.inputs.home-manager.nixosModules.home-manager + ]; + nixpkgs.config.allowUnfree = true; nixpkgs.overlays = [ flake.inputs.nur.overlays.default diff --git a/modules/nixos/core/nix/default.nix b/modules/nixos/core/nix/default.nix index 412d4a4..e01a3eb 100755 --- a/modules/nixos/core/nix/default.nix +++ b/modules/nixos/core/nix/default.nix @@ -13,11 +13,6 @@ in allowUnfree = true; allowBroken = true; permittedInsecurePackages = [ - "electron-unwrapped-33.0.2" - "electron-31.7.7" - "electron-27.3.11" - "electron-33.4.11" - "olm-3.2.16" ]; }; }; diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 4723ac9..8a9155a 100755 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -9,12 +9,16 @@ in inherit (modules) flatpak hypr - wayland + impermanence + lix + microvm network + niri + nur plymouth tuios + wayland wireguard - microvm ; }; }; @@ -22,13 +26,16 @@ in deimos = { imports = builtins.attrValues { inherit (modules) - hypr - wayland - network flatpak - plymouth - wireguard + hypr + lix microvm + network + niri + nur + plymouth + wayland + wireguard ; }; }; @@ -37,6 +44,8 @@ in imports = builtins.attrValues { inherit (modules) microvm + lix + nur ; }; }; @@ -51,6 +60,7 @@ in forgejo impermanence jellyfin + lix mastodon microvm minecraft @@ -71,6 +81,7 @@ in imports = builtins.attrValues { inherit (modules) impermanence + lix microvm opencloud0 sambaEris @@ -82,6 +93,7 @@ in imports = builtins.attrValues { inherit (modules) iso + lix xserver ; }; diff --git a/modules/nixos/desktop/niri/default.nix b/modules/nixos/desktop/niri/default.nix index 28cfcf1..4c87206 100755 --- a/modules/nixos/desktop/niri/default.nix +++ b/modules/nixos/desktop/niri/default.nix @@ -3,5 +3,8 @@ let inherit (flake.config.aesthetics.themes.windowManager.enabled) niri; in { + imports = [ + flake.inputs.niri.nixosModules.niri + ]; programs.niri.enable = niri; } diff --git a/modules/nixos/desktop/nur/default.nix b/modules/nixos/desktop/nur/default.nix new file mode 100755 index 0000000..504903c --- /dev/null +++ b/modules/nixos/desktop/nur/default.nix @@ -0,0 +1,6 @@ +{ flake, ... }: +{ + imports = [ + flake.inputs.nur.modules.nixos.default + ]; +} diff --git a/modules/nixos/lix/default.nix b/modules/nixos/lix/default.nix new file mode 100755 index 0000000..e6e8653 --- /dev/null +++ b/modules/nixos/lix/default.nix @@ -0,0 +1,6 @@ +{ flake, ... }: +{ + imports = [ + flake.inputs.lix-module.nixosModules.default + ]; +} diff --git a/modules/nixos/microvm/default.nix b/modules/nixos/microvm/default.nix index f2b7ac8..80f2ea6 100755 --- a/modules/nixos/microvm/default.nix +++ b/modules/nixos/microvm/default.nix @@ -3,5 +3,4 @@ imports = [ flake.inputs.microvm.nixosModules.host ]; - } diff --git a/modules/nixos/sops/default.nix b/modules/nixos/sops/default.nix index 891fdd9..0200d56 100755 --- a/modules/nixos/sops/default.nix +++ b/modules/nixos/sops/default.nix @@ -3,6 +3,10 @@ let inherit (flake.config.people) user0; in { + + imports = [ + flake.inputs.sops-nix.nixosModules.sops + ]; sops = { defaultSopsFile = ../../../secrets/secrets.yaml; validateSopsFiles = false;