refactor: add default in device modules and put home state ver in common

This commit is contained in:
matt1432 2024-09-05 08:17:23 -04:00
parent 18d1178d85
commit e61ada3cd2
17 changed files with 72 additions and 64 deletions

View file

@ -11,7 +11,7 @@ in {
imports = [
./hardware-configuration.nix
./modules/desktop
./modules
self.nixosModules.kmscon
self.nixosModules.plymouth
@ -20,7 +20,6 @@ in {
# State Version: DO NOT CHANGE
system.stateVersion = "24.11";
home-manager.users.${mainUser}.home.stateVersion = "24.11";
# ------------------------------------------------
# User Settings

View file

@ -0,0 +1,5 @@
{...}: {
imports = [
./desktop
];
}

View file

@ -11,8 +11,7 @@ in {
imports = [
./hardware-configuration.nix
./modules/gpu-replay.nix
./modules/nix-gaming.nix
./modules
self.nixosModules.adb
self.nixosModules.desktop
@ -20,14 +19,10 @@ in {
self.nixosModules.server
];
home-manager.users.${mainUser} = {
imports = [
self.homeManagerModules.firefox
];
home-manager.users.${mainUser}.imports = [
self.homeManagerModules.firefox
];
# State Version: DO NOT CHANGE
home.stateVersion = "23.11";
};
# State Version: DO NOT CHANGE
system.stateVersion = "23.11";

View file

@ -0,0 +1,6 @@
{...}: {
imports = [
./gpu-replay.nix
./nix-gaming.nix
];
}

View file

@ -13,7 +13,7 @@ in {
imports = [
./hardware-configuration.nix
./modules/pcsd.nix
./modules
self.nixosModules.kmscon
self.nixosModules.server
@ -21,7 +21,6 @@ in {
# State Version: DO NOT CHANGE
system.stateVersion = "24.05";
home-manager.users.${mainUser}.home.stateVersion = "24.05";
# ------------------------------------------------
# User Settings

View file

@ -0,0 +1,10 @@
{...}: {
imports = [
./blocky.nix
./caddy.nix
./headscale
./nfs-client.nix
./pcsd.nix
./unbound.nix
];
}

View file

@ -5,15 +5,7 @@
}: let
inherit (config.sops) secrets;
in {
imports = [
pcsd.nixosModules.default
./blocky.nix
./caddy.nix
./headscale
./nfs-client.nix
./unbound.nix
];
imports = [pcsd.nixosModules.default];
services.pcsd = {
enable = true;

View file

@ -11,7 +11,7 @@ in {
imports = [
./hardware-configuration.nix
./modules/home-assistant.nix
./modules
self.nixosModules.kmscon
self.nixosModules.server
@ -19,7 +19,6 @@ in {
# State Version: DO NOT CHANGE
system.stateVersion = "24.11";
home-manager.users.${mainUser}.home.stateVersion = "24.11";
# ------------------------------------------------
# User Settings

View file

@ -0,0 +1,5 @@
{...}: {
imports = [
./home-assistant.nix
];
}

View file

@ -11,13 +11,7 @@ in {
imports = [
./hardware-configuration.nix
./modules/docker
./modules/jellyfin
./modules/llm.nix
./modules/mergerfs.nix
./modules/qbittorrent
./modules/snapraid.nix
./modules/subtitles
./modules
self.nixosModules.kmscon
self.nixosModules.server
@ -25,7 +19,6 @@ in {
# State Version: DO NOT CHANGE
system.stateVersion = "24.05";
home-manager.users.${mainUser}.home.stateVersion = "24.05";
# ------------------------------------------------
# User Settings

View file

@ -0,0 +1,11 @@
{...}: {
imports = [
./docker
./jellyfin
./qbittorrent
./subtitles
./llm.nix
./mergerfs.nix
./snapraid.nix
];
}

View file

@ -11,11 +11,7 @@ in {
imports = [
./hardware-configuration.nix
./modules/7-days-to-die.nix
./modules/binary-cache.nix
./modules/minecraft.nix
./modules/nfs.nix
./modules/pr-tracker.nix
./modules
self.nixosModules.docker
self.nixosModules.kmscon
@ -24,7 +20,6 @@ in {
# State Version: DO NOT CHANGE
system.stateVersion = "24.05";
home-manager.users.${mainUser}.home.stateVersion = "24.05";
# ------------------------------------------------
# User Settings

View file

@ -0,0 +1,9 @@
{...}: {
imports = [
./7-days-to-die.nix
./binary-cache.nix
./minecraft.nix
./nfs.nix
./pr-tracker.nix
];
}

View file

@ -12,7 +12,7 @@ in {
imports = [
./hardware-configuration.nix
./modules/security.nix
./modules
self.nixosModules.adb
self.nixosModules.desktop
@ -21,14 +21,10 @@ in {
self.nixosModules.server
];
home-manager.users.${mainUser} = {
imports = [
self.homeManagerModules.firefox
];
home-manager.users.${mainUser}.imports = [
self.homeManagerModules.firefox
];
# State Version: DO NOT CHANGE
home.stateVersion = "23.05";
};
# State Version: DO NOT CHANGE
system.stateVersion = "23.05";

View file

@ -0,0 +1,5 @@
{...}: {
imports = [
./security.nix
];
}