upRootNutrition/dotfiles
upRootNutrition/dotfiles
1
0
Fork 0
mirror of https://gitlab.com/upRootNutrition/dotfiles.git synced 2025-12-06 21:17:14 -06:00
Code Issues Projects 1 Releases Packages Wiki Activity Actions

chore: refactored input imports

Browse source
This commit is contained in:
Nick 2025-12-05 17:56:47 -06:00
parent 8ecdaefa43
commit 38f7ba4d91
9 changed files with 42 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

23
flake.nix
View file

@ -111,12 +111,6 @@
config.nixosModules.core config.nixosModules.core
config.nixosModules.mantle config.nixosModules.mantle
config.nixosModules.crust 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 [ deimos = inputs.self.lib.mkLinuxSystem [
./systems/deimos ./systems/deimos
@ -125,10 +119,6 @@
config.nixosModules.core config.nixosModules.core
config.nixosModules.mantle config.nixosModules.mantle
config.nixosModules.crust 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 [ phobos = inputs.self.lib.mkLinuxSystem [
./systems/phobos ./systems/phobos
@ -137,10 +127,6 @@
config.nixosModules.core config.nixosModules.core
config.nixosModules.mantle config.nixosModules.mantle
config.nixosModules.crust 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 [ ceres = inputs.self.lib.mkLinuxSystem [
./systems/ceres ./systems/ceres
@ -148,10 +134,6 @@
config.nixosModules.ceres config.nixosModules.ceres
config.nixosModules.core config.nixosModules.core
config.nixosModules.mantle 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 [ eris = inputs.self.lib.mkLinuxSystem [
./systems/eris ./systems/eris
@ -159,16 +141,11 @@
config.nixosModules.eris config.nixosModules.eris
config.nixosModules.core config.nixosModules.core
config.nixosModules.mantle config.nixosModules.mantle
inputs.home-manager.nixosModules.home-manager
# inputs.lix-module.nixosModules.default
inputs.sops-nix.nixosModules.sops
]; ];
iso = inputs.self.lib.mkLinuxSystem [ iso = inputs.self.lib.mkLinuxSystem [
./profiles/user0 ./profiles/user0
config.nixosModules.iso config.nixosModules.iso
config.nixosModules.core config.nixosModules.core
inputs.home-manager.nixosModules.home-manager
inputs.lix-module.nixosModules.default
]; ];
}; };

4
modules/nixos/core/homeManager/default.nix
View file

@ -1,5 +1,9 @@
{ flake, ... }: { flake, ... }:
{ {
imports = [
flake.inputs.home-manager.nixosModules.home-manager
];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nixpkgs.overlays = [ nixpkgs.overlays = [
flake.inputs.nur.overlays.default flake.inputs.nur.overlays.default

5
modules/nixos/core/nix/default.nix
View file

@ -13,11 +13,6 @@ in
allowUnfree = true; allowUnfree = true;
allowBroken = true; allowBroken = true;
permittedInsecurePackages = [ permittedInsecurePackages = [
"electron-unwrapped-33.0.2"
"electron-31.7.7"
"electron-27.3.11"
"electron-33.4.11"
"olm-3.2.16"
]; ];
}; };
}; };

26
modules/nixos/default.nix
View file

@ -9,12 +9,16 @@ in
inherit (modules) inherit (modules)
flatpak flatpak
hypr hypr
wayland impermanence
lix
microvm
network network
niri
nur
plymouth plymouth
tuios tuios
wayland
wireguard wireguard
microvm
; ;
}; };
}; };
@ -22,13 +26,16 @@ in
deimos = { deimos = {
imports = builtins.attrValues { imports = builtins.attrValues {
inherit (modules) inherit (modules)
hypr
wayland
network
flatpak flatpak
plymouth hypr
wireguard lix
microvm microvm
network
niri
nur
plymouth
wayland
wireguard
; ;
}; };
}; };
@ -37,6 +44,8 @@ in
imports = builtins.attrValues { imports = builtins.attrValues {
inherit (modules) inherit (modules)
microvm microvm
lix
nur
; ;
}; };
}; };
@ -51,6 +60,7 @@ in
forgejo forgejo
impermanence impermanence
jellyfin jellyfin
lix
mastodon mastodon
microvm microvm
minecraft minecraft
@ -71,6 +81,7 @@ in
imports = builtins.attrValues { imports = builtins.attrValues {
inherit (modules) inherit (modules)
impermanence impermanence
lix
microvm microvm
opencloud0 opencloud0
sambaEris sambaEris
@ -82,6 +93,7 @@ in
imports = builtins.attrValues { imports = builtins.attrValues {
inherit (modules) inherit (modules)
iso iso
lix
xserver xserver
; ;
}; };

3
modules/nixos/desktop/niri/default.nix
View file

@ -3,5 +3,8 @@ let
inherit (flake.config.aesthetics.themes.windowManager.enabled) niri; inherit (flake.config.aesthetics.themes.windowManager.enabled) niri;
in in
{ {
imports = [
flake.inputs.niri.nixosModules.niri
];
programs.niri.enable = niri; programs.niri.enable = niri;
} }

6
modules/nixos/desktop/nur/default.nix Executable file
View file

@ -0,0 +1,6 @@
{ flake, ... }:
{
imports = [
flake.inputs.nur.modules.nixos.default
];
}

6
modules/nixos/lix/default.nix Executable file
View file

@ -0,0 +1,6 @@
{ flake, ... }:
{
imports = [
flake.inputs.lix-module.nixosModules.default
];
}

1
modules/nixos/microvm/default.nix
View file

@ -3,5 +3,4 @@
imports = [ imports = [
flake.inputs.microvm.nixosModules.host flake.inputs.microvm.nixosModules.host
]; ];
} }

4
modules/nixos/sops/default.nix
View file

@ -3,6 +3,10 @@ let
inherit (flake.config.people) user0; inherit (flake.config.people) user0;
in in
{ {
imports = [
flake.inputs.sops-nix.nixosModules.sops
];
sops = { sops = {
defaultSopsFile = ../../../secrets/secrets.yaml; defaultSopsFile = ../../../secrets/secrets.yaml;
validateSopsFiles = false; validateSopsFiles = false;