trying to unmodularize my setup

This commit is contained in:
Elias Gasparis 2025-01-05 11:49:14 +08:00
parent 195383e6d9
commit 2f5ed1481c
9 changed files with 56 additions and 20 deletions

View file

@ -13,7 +13,7 @@
greynix = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
./base.nix
./nixosModules/base.nix
./hosts/greynix/configuration.nix
home-manager.nixosModules.home-manager
@ -32,8 +32,9 @@
bluenix = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
./base.nix
./nixosModules/base.nix
./hosts/bluenix/configuration.nix
./nixosModules/docker.nix
home-manager.nixosModules.home-manager
{
@ -52,7 +53,7 @@
aspirenix = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
./base.nix
./nixosModules/base.nix
./hosts/aspirenix/configuration.nix
home-manager.nixosModules.home-manager

View file

@ -10,8 +10,13 @@
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
../../nixosModules/base.nix
../../nixosModules/modules.nix
];
# Enable/Disable Modules
dockerModule.enable = true;
boot.initrd.luks.devices."luks-880424d4-ac69-44cf-aa3b-99a224128551".device = "/dev/disk/by-uuid/880424d4-ac69-44cf-aa3b-99a224128551";
networking.hostName = "greynix"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.

View file

@ -1,17 +1,18 @@
{ config, lib, pkgs, ... }:
{ pkgs, config, lib ... }:
{
imports =
[ # I do imports in flakes
[
./gnome.nix
./systemd.nix
./fonts.nix
#module test
./nixosModules/docker.nix
./systemd.nix
./fonts.nix
];
# DELETE LATER
# Enable/Disable Modules
dockerModule.enable = true;
#dockerModule.enable = true;
# Bootloader.
boot.loader.systemd-boot.enable = true;

View file

@ -1,24 +1,12 @@
{ pkgs, lib, config, ... }:
# enable docker
# not all systems need this
{
options = {
dockerModule.enable =
lib.mkEnableOption "enables Docker Module";
};
config = lib.mkIf config.dockerModule.enable {
# Enable Docker
virtualisation.docker = {
enable = true;
autoPrune = {
enable = true;
};
};
};
}

View file

@ -0,0 +1,24 @@
{ pkgs, lib, config, ... }:
# enable docker
# not all systems need this
{
options = {
dockerModule.enable =
lib.mkEnableOption "enables Docker Module";
};
config = lib.mkIf config.dockerModule.enable {
# Enable Docker
virtualisation.docker = {
enable = true;
autoPrune = {
enable = true;
};
};
};
}

View file

@ -0,0 +1,17 @@
{ pkgs, lib, ... }:
# nix file for all modules
{
imports = [
./docker.nix
#./systemd.nix
#./gnome.nix
#./fonts.nix
];
# all modules default to true
dockerModule.enable = lib.mkDefault false;
}