From f7b36ba22497c9a5b33a4835ebb9241c77b133d3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 7 Feb 2024 13:50:03 +0100 Subject: [PATCH] Big refactor, test first --- .../{configuration.nix => default.nix} | 0 home-manager/hosts/EDI/default.nix | 13 +++++++++++ .../EDI/{EDI-Lillian.nix => lillian.nix} | 4 ++-- .../{configuration.nix => default.nix} | 0 home-manager/hosts/GLaDOS/default.nix | 13 +++++++++++ .../{GLaDOS-Lillian.nix => lillian.nix} | 4 ++-- .../{configuration.nix => default.nix} | 0 .../{configuration.nix => default.nix} | 0 .../{configuration.nix => default.nix} | 5 +---- nixos/hosts/EDI/configuration.nix | 4 ++-- nixos/hosts/GLaDOS/configuration.nix | 2 +- nixos/hosts/queen/configuration.nix | 19 +++------------- nixos/hosts/shodan/configuration.nix | 2 +- nixos/hosts/wheatley/configuration.nix | 4 ++-- .../akkoma/{configuration.nix => default.nix} | 0 .../aria2/{configuration.nix => default.nix} | 0 .../{configuration.nix => default.nix} | 0 nixos/server/package-configs/default.nix | 22 +++++++++++++++++++ .../dex/{configuration.nix => default.nix} | 0 .../{configuration.nix => default.nix} | 0 .../{configuration.nix => default.nix} | 0 .../{configuration.nix => default.nix} | 0 .../{configuration.nix => default.nix} | 0 .../{configuration.nix => default.nix} | 0 .../ombi/{configuration.nix => default.nix} | 0 .../{configuration.nix => default.nix} | 0 .../{configuration.nix => default.nix} | 0 nixos/shared/default.nix | 13 +++++++++++ .../locale/{configuration.nix => default.nix} | 0 .../{configuration.nix => default.nix} | 1 + 30 files changed, 76 insertions(+), 30 deletions(-) rename home-manager/desktop/{configuration.nix => default.nix} (100%) create mode 100644 home-manager/hosts/EDI/default.nix rename home-manager/hosts/EDI/{EDI-Lillian.nix => lillian.nix} (88%) rename home-manager/hosts/EDI/package-configs/plasma-desktop/{configuration.nix => default.nix} (100%) create mode 100644 home-manager/hosts/GLaDOS/default.nix rename home-manager/hosts/GLaDOS/{GLaDOS-Lillian.nix => lillian.nix} (89%) rename home-manager/hosts/GLaDOS/package-configs/plasma-desktop/{configuration.nix => default.nix} (100%) rename nixos/board/package-configs/pi-hole/{configuration.nix => default.nix} (100%) rename nixos/desktop/{configuration.nix => default.nix} (97%) rename nixos/server/package-configs/akkoma/{configuration.nix => default.nix} (100%) rename nixos/server/package-configs/aria2/{configuration.nix => default.nix} (100%) rename nixos/server/package-configs/conduit/{configuration.nix => default.nix} (100%) create mode 100644 nixos/server/package-configs/default.nix rename nixos/server/package-configs/dex/{configuration.nix => default.nix} (100%) rename nixos/server/package-configs/forgejo/{configuration.nix => default.nix} (100%) rename nixos/server/package-configs/gotosocial/{configuration.nix => default.nix} (100%) rename nixos/server/package-configs/jellyfin/{configuration.nix => default.nix} (100%) rename nixos/server/package-configs/mail-server/{configuration.nix => default.nix} (100%) rename nixos/server/package-configs/nextcloud/{configuration.nix => default.nix} (100%) rename nixos/server/package-configs/ombi/{configuration.nix => default.nix} (100%) rename nixos/server/package-configs/postgres/{configuration.nix => default.nix} (100%) rename nixos/server/package-configs/roundcube/{configuration.nix => default.nix} (100%) create mode 100644 nixos/shared/default.nix rename nixos/shared/locale/{configuration.nix => default.nix} (100%) rename nixos/shared/packages/{configuration.nix => default.nix} (97%) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/default.nix similarity index 100% rename from home-manager/desktop/configuration.nix rename to home-manager/desktop/default.nix diff --git a/home-manager/hosts/EDI/default.nix b/home-manager/hosts/EDI/default.nix new file mode 100644 index 0000000..c17b81a --- /dev/null +++ b/home-manager/hosts/EDI/default.nix @@ -0,0 +1,13 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + # You can import other home-manager modules here + imports = [ + ./lillian.nix + ]; +} diff --git a/home-manager/hosts/EDI/EDI-Lillian.nix b/home-manager/hosts/EDI/lillian.nix similarity index 88% rename from home-manager/hosts/EDI/EDI-Lillian.nix rename to home-manager/hosts/EDI/lillian.nix index fa92fc5..56283bb 100644 --- a/home-manager/hosts/EDI/EDI-Lillian.nix +++ b/home-manager/hosts/EDI/lillian.nix @@ -18,8 +18,8 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix - ../../desktop/configuration.nix - ./package-configs/plasma-desktop/configuration.nix + ../../desktop + ./package-configs/plasma-desktop ]; home.packages = with pkgs; [ diff --git a/home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix b/home-manager/hosts/EDI/package-configs/plasma-desktop/default.nix similarity index 100% rename from home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix rename to home-manager/hosts/EDI/package-configs/plasma-desktop/default.nix diff --git a/home-manager/hosts/GLaDOS/default.nix b/home-manager/hosts/GLaDOS/default.nix new file mode 100644 index 0000000..c17b81a --- /dev/null +++ b/home-manager/hosts/GLaDOS/default.nix @@ -0,0 +1,13 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + # You can import other home-manager modules here + imports = [ + ./lillian.nix + ]; +} diff --git a/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix similarity index 89% rename from home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix rename to home-manager/hosts/GLaDOS/lillian.nix index 90e56bb..8558582 100644 --- a/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix +++ b/home-manager/hosts/GLaDOS/lillian.nix @@ -18,8 +18,8 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix - ../../desktop/configuration.nix - ./package-configs/plasma-desktop/configuration.nix + ../../desktop + ./package-configs/plasma-desktop ]; home.packages = with pkgs; [ diff --git a/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix b/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/default.nix similarity index 100% rename from home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix rename to home-manager/hosts/GLaDOS/package-configs/plasma-desktop/default.nix diff --git a/nixos/board/package-configs/pi-hole/configuration.nix b/nixos/board/package-configs/pi-hole/default.nix similarity index 100% rename from nixos/board/package-configs/pi-hole/configuration.nix rename to nixos/board/package-configs/pi-hole/default.nix diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/default.nix similarity index 97% rename from nixos/desktop/configuration.nix rename to nixos/desktop/default.nix index be24784..905cd38 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/default.nix @@ -9,11 +9,8 @@ ... }: { imports = [ - # Import locale settings - ../shared/locale/configuration.nix - # Import shared packages - ../shared/packages/configuration.nix + ../shared ]; nixpkgs = { # You can add overlays here diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index c7fd076..de5b0d9 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -22,7 +22,7 @@ # You can also split up your configuration and import pieces of it here: # ./users.nix - ../../desktop/configuration.nix + ../../desktop # Import your generated (nixos-generate-config) hardware configuration ./hardware-configuration.nix @@ -32,7 +32,7 @@ extraSpecialArgs = {inherit inputs outputs;}; users = { # Import your home-manager configuration - lillian = import ../../../home-manager/hosts/EDI/EDI-Lillian.nix; + lillian = import ../../../home-manager/hosts/EDI; }; }; diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index d42cb1c..7026ff6 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -22,7 +22,7 @@ # You can also split up your configuration and import pieces of it here: # ./users.nix - ../../desktop/configuration.nix + ../../desktop # Import your generated (nixos-generate-config) hardware configuration ./hardware-configuration.nix diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 2a20f4f..35610d2 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -18,24 +18,11 @@ # ./nvim.nix ./hardware-configuration.nix - # Import locale settings - ../../shared/locale/configuration.nix - - # Import shared packages - ../../shared/packages/configuration.nix + # Import shared settings + ../../shared #../../server/package-configs/akkoma/configuration.nix - ../../server/package-configs/forgejo/configuration.nix - ../../server/package-configs/gotosocial/configuration.nix - ../../server/package-configs/mail-server/configuration.nix - ../../server/package-configs/nextcloud/configuration.nix - ../../server/package-configs/postgres/configuration.nix - ../../server/package-configs/postgres/upgrade.nix - ../../server/package-configs/roundcube/configuration.nix - ../../server/package-configs/jellyfin/configuration.nix - ../../server/package-configs/ombi/configuration.nix - ../../server/package-configs/aria2/configuration.nix - ../../server/package-configs/conduit/configuration.nix + ../../server ]; boot.tmp.cleanOnBoot = true; diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 34382fb..50a7f73 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -16,7 +16,7 @@ # inputs.nix-colors.homeManagerModules.default # Import the locale settings - ../../shared/locale/configuration.nix + ../../shared # You can also split up your configuration and import pieces of it here: # ./nvim.nix diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 4e07297..fe691ae 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -16,10 +16,10 @@ ./hardware-configuration.nix # Import locale settings - ../../shared/locale/configuration.nix + ../../shared/locale # Import shared packages - ../../shared/packages/configuration.nix + ../../shared/packages ]; boot.loader.generic-extlinux-compatible.enable = true; diff --git a/nixos/server/package-configs/akkoma/configuration.nix b/nixos/server/package-configs/akkoma/default.nix similarity index 100% rename from nixos/server/package-configs/akkoma/configuration.nix rename to nixos/server/package-configs/akkoma/default.nix diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/default.nix similarity index 100% rename from nixos/server/package-configs/aria2/configuration.nix rename to nixos/server/package-configs/aria2/default.nix diff --git a/nixos/server/package-configs/conduit/configuration.nix b/nixos/server/package-configs/conduit/default.nix similarity index 100% rename from nixos/server/package-configs/conduit/configuration.nix rename to nixos/server/package-configs/conduit/default.nix diff --git a/nixos/server/package-configs/default.nix b/nixos/server/package-configs/default.nix new file mode 100644 index 0000000..6fef896 --- /dev/null +++ b/nixos/server/package-configs/default.nix @@ -0,0 +1,22 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + imports = [ + ./aria2 + ./conduit + ./dex + ./forgejo + ./gotosocial + ./jellyfin + ./mail-server + ./nextcloud + ./ombi + ./postgres + ./roundcube + ]; +} diff --git a/nixos/server/package-configs/dex/configuration.nix b/nixos/server/package-configs/dex/default.nix similarity index 100% rename from nixos/server/package-configs/dex/configuration.nix rename to nixos/server/package-configs/dex/default.nix diff --git a/nixos/server/package-configs/forgejo/configuration.nix b/nixos/server/package-configs/forgejo/default.nix similarity index 100% rename from nixos/server/package-configs/forgejo/configuration.nix rename to nixos/server/package-configs/forgejo/default.nix diff --git a/nixos/server/package-configs/gotosocial/configuration.nix b/nixos/server/package-configs/gotosocial/default.nix similarity index 100% rename from nixos/server/package-configs/gotosocial/configuration.nix rename to nixos/server/package-configs/gotosocial/default.nix diff --git a/nixos/server/package-configs/jellyfin/configuration.nix b/nixos/server/package-configs/jellyfin/default.nix similarity index 100% rename from nixos/server/package-configs/jellyfin/configuration.nix rename to nixos/server/package-configs/jellyfin/default.nix diff --git a/nixos/server/package-configs/mail-server/configuration.nix b/nixos/server/package-configs/mail-server/default.nix similarity index 100% rename from nixos/server/package-configs/mail-server/configuration.nix rename to nixos/server/package-configs/mail-server/default.nix diff --git a/nixos/server/package-configs/nextcloud/configuration.nix b/nixos/server/package-configs/nextcloud/default.nix similarity index 100% rename from nixos/server/package-configs/nextcloud/configuration.nix rename to nixos/server/package-configs/nextcloud/default.nix diff --git a/nixos/server/package-configs/ombi/configuration.nix b/nixos/server/package-configs/ombi/default.nix similarity index 100% rename from nixos/server/package-configs/ombi/configuration.nix rename to nixos/server/package-configs/ombi/default.nix diff --git a/nixos/server/package-configs/postgres/configuration.nix b/nixos/server/package-configs/postgres/default.nix similarity index 100% rename from nixos/server/package-configs/postgres/configuration.nix rename to nixos/server/package-configs/postgres/default.nix diff --git a/nixos/server/package-configs/roundcube/configuration.nix b/nixos/server/package-configs/roundcube/default.nix similarity index 100% rename from nixos/server/package-configs/roundcube/configuration.nix rename to nixos/server/package-configs/roundcube/default.nix diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix new file mode 100644 index 0000000..281b3e1 --- /dev/null +++ b/nixos/shared/default.nix @@ -0,0 +1,13 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + imports = [ + ./locale + ./packages + ]; +} diff --git a/nixos/shared/locale/configuration.nix b/nixos/shared/locale/default.nix similarity index 100% rename from nixos/shared/locale/configuration.nix rename to nixos/shared/locale/default.nix diff --git a/nixos/shared/packages/configuration.nix b/nixos/shared/packages/default.nix similarity index 97% rename from nixos/shared/packages/configuration.nix rename to nixos/shared/packages/default.nix index d16f35f..f262768 100644 --- a/nixos/shared/packages/configuration.nix +++ b/nixos/shared/packages/default.nix @@ -20,6 +20,7 @@ spacevim wget zsh + tldr # System libraries noto-fonts