Merge default.nix files into configuration.nix

This commit is contained in:
Oliver Davies 2025-01-08 08:54:14 +00:00
parent 6cd711920b
commit 30f336f05b
10 changed files with 92 additions and 121 deletions

View file

@ -72,7 +72,7 @@
modules = [
agenix.nixosModules.default
./nix/hosts/lemp11
./nix/hosts/lemp11/configuration.nix
];
};
@ -86,7 +86,7 @@
modules = [
agenix.nixosModules.default
./nix/hosts/nixedo
./nix/hosts/nixedo/configuration.nix
];
};
@ -101,7 +101,7 @@
nixos-hardware.nixosModules.common-gpu-intel
nixos-hardware.nixosModules.lenovo-thinkpad-t490
./nix/hosts/t490
./nix/hosts/t490/configuration.nix
];
};
@ -119,7 +119,7 @@
disko.nixosModules.disko
nixos-wsl.nixosModules.default
./nix/hosts/PW05CH3L
./nix/hosts/PW05CH3L/configuration.nix
];
};

View file

@ -1,6 +1,26 @@
{ inputs, ... }:
{ inputs, username, ... }:
{
imports = [
../common
../../users/opdavies
./configuration.nix
];
features = {
cli = {
docker.enable = true;
};
};
wsl = {
enable = true;
defaultUser = username;
};
services.syncthing.enable = true;
nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
nix = {

View file

@ -1,23 +0,0 @@
{ username, ... }:
{
imports = [
../common
../../users/opdavies
./configuration.nix
];
features = {
cli = {
docker.enable = true;
};
};
wsl = {
enable = true;
defaultUser = username;
};
services.syncthing.enable = true;
}

View file

@ -15,10 +15,33 @@
./hardware-configuration.nix
../common
../../users/opdavies
../../users/eric
../../users/luke
];
features = {
cli = {
docker.enable = true;
};
desktop = {
autorandr.enable = true;
gaming.enable = true;
peek.enable = true;
};
homelab = {
gitea.enable = true;
immich.enable = true;
jellyfin.enable = true;
paperless.enable = true;
pihole.enable = true;
tubearchivist-container.enable = true;
};
};
nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
# Bootloader.

View file

@ -1,31 +0,0 @@
{ ... }:
{
features = {
cli = {
docker.enable = true;
};
desktop = {
autorandr.enable = true;
gaming.enable = true;
peek.enable = true;
};
homelab = {
gitea.enable = true;
immich.enable = true;
jellyfin.enable = true;
paperless.enable = true;
pihole.enable = true;
tubearchivist-container.enable = true;
};
};
imports = [
../common
../../users/opdavies
./configuration.nix
];
}

View file

@ -7,10 +7,36 @@
{
imports = [
./hardware-configuration.nix
./secrets.nix
./modules/acme.nix
../common
../../users/opdavies
];
features = {
cli = {
docker.enable = true;
};
homelab = {
audiobookshelf.enable = true;
beaverhabits.enable = true;
freshrss.enable = true;
gitea.enable = true;
immich.enable = true;
jellyfin.enable = true;
paperless.enable = true;
pihole.enable = true;
tubearchivist-container.enable = true;
vaultwarden.enable = true;
};
};
programs.dconf.enable = true;
services.logind.lidSwitchExternalPower = "ignore";
nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
boot.loader = {

View file

@ -1,29 +0,0 @@
{
features = {
cli = {
docker.enable = true;
};
homelab = {
audiobookshelf.enable = true;
beaverhabits.enable = true;
freshrss.enable = true;
gitea.enable = true;
immich.enable = true;
jellyfin.enable = true;
paperless.enable = true;
pihole.enable = true;
tubearchivist-container.enable = true;
vaultwarden.enable = true;
};
};
imports = [
../common
../../users/opdavies
./configuration.nix
./secrets.nix
./extra.nix
];
}

View file

@ -1,5 +0,0 @@
{
programs.dconf.enable = true;
services.logind.lidSwitchExternalPower = "ignore";
}

View file

@ -1,15 +1,26 @@
{
inputs,
pkgs,
username,
...
}:
{ inputs, pkgs, ... }:
{
imports = [
./hardware-configuration.nix
./hardware.nix
./programs.nix
./services
./users.nix
../common
../../users/opdavies
];
features = {
desktop = {
autorandr.enable = true;
gaming.enable = true;
i3.enable = true;
peek.enable = true;
};
};
nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
boot = {

View file

@ -1,21 +0,0 @@
{
imports = [
../common
../../users/opdavies
./configuration.nix
./hardware.nix
./programs.nix
./services
./users.nix
];
features = {
desktop = {
autorandr.enable = true;
gaming.enable = true;
i3.enable = true;
peek.enable = true;
};
};
}