Big refactor, test first

This commit is contained in:
Lillian Violet 2024-02-07 13:50:03 +01:00
parent fa6a06c51e
commit f7b36ba224
30 changed files with 76 additions and 30 deletions

View file

@ -0,0 +1,13 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
# You can import other home-manager modules here
imports = [
./lillian.nix
];
}

View file

@ -18,8 +18,8 @@
# You can also split up your configuration and import pieces of it here: # You can also split up your configuration and import pieces of it here:
# ./nvim.nix # ./nvim.nix
../../desktop/configuration.nix ../../desktop
./package-configs/plasma-desktop/configuration.nix ./package-configs/plasma-desktop
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [

View file

@ -0,0 +1,13 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
# You can import other home-manager modules here
imports = [
./lillian.nix
];
}

View file

@ -18,8 +18,8 @@
# You can also split up your configuration and import pieces of it here: # You can also split up your configuration and import pieces of it here:
# ./nvim.nix # ./nvim.nix
../../desktop/configuration.nix ../../desktop
./package-configs/plasma-desktop/configuration.nix ./package-configs/plasma-desktop
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [

View file

@ -9,11 +9,8 @@
... ...
}: { }: {
imports = [ imports = [
# Import locale settings
../shared/locale/configuration.nix
# Import shared packages # Import shared packages
../shared/packages/configuration.nix ../shared
]; ];
nixpkgs = { nixpkgs = {
# You can add overlays here # You can add overlays here

View file

@ -22,7 +22,7 @@
# You can also split up your configuration and import pieces of it here: # You can also split up your configuration and import pieces of it here:
# ./users.nix # ./users.nix
../../desktop/configuration.nix ../../desktop
# Import your generated (nixos-generate-config) hardware configuration # Import your generated (nixos-generate-config) hardware configuration
./hardware-configuration.nix ./hardware-configuration.nix
@ -32,7 +32,7 @@
extraSpecialArgs = {inherit inputs outputs;}; extraSpecialArgs = {inherit inputs outputs;};
users = { users = {
# Import your home-manager configuration # Import your home-manager configuration
lillian = import ../../../home-manager/hosts/EDI/EDI-Lillian.nix; lillian = import ../../../home-manager/hosts/EDI;
}; };
}; };

View file

@ -22,7 +22,7 @@
# You can also split up your configuration and import pieces of it here: # You can also split up your configuration and import pieces of it here:
# ./users.nix # ./users.nix
../../desktop/configuration.nix ../../desktop
# Import your generated (nixos-generate-config) hardware configuration # Import your generated (nixos-generate-config) hardware configuration
./hardware-configuration.nix ./hardware-configuration.nix

View file

@ -18,24 +18,11 @@
# ./nvim.nix # ./nvim.nix
./hardware-configuration.nix ./hardware-configuration.nix
# Import locale settings # Import shared settings
../../shared/locale/configuration.nix ../../shared
# Import shared packages
../../shared/packages/configuration.nix
#../../server/package-configs/akkoma/configuration.nix #../../server/package-configs/akkoma/configuration.nix
../../server/package-configs/forgejo/configuration.nix ../../server
../../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
]; ];
boot.tmp.cleanOnBoot = true; boot.tmp.cleanOnBoot = true;

View file

@ -16,7 +16,7 @@
# inputs.nix-colors.homeManagerModules.default # inputs.nix-colors.homeManagerModules.default
# Import the locale settings # Import the locale settings
../../shared/locale/configuration.nix ../../shared
# You can also split up your configuration and import pieces of it here: # You can also split up your configuration and import pieces of it here:
# ./nvim.nix # ./nvim.nix

View file

@ -16,10 +16,10 @@
./hardware-configuration.nix ./hardware-configuration.nix
# Import locale settings # Import locale settings
../../shared/locale/configuration.nix ../../shared/locale
# Import shared packages # Import shared packages
../../shared/packages/configuration.nix ../../shared/packages
]; ];
boot.loader.generic-extlinux-compatible.enable = true; boot.loader.generic-extlinux-compatible.enable = true;

View file

@ -0,0 +1,22 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
imports = [
./aria2
./conduit
./dex
./forgejo
./gotosocial
./jellyfin
./mail-server
./nextcloud
./ombi
./postgres
./roundcube
];
}

13
nixos/shared/default.nix Normal file
View file

@ -0,0 +1,13 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
imports = [
./locale
./packages
];
}

View file

@ -20,6 +20,7 @@
spacevim spacevim
wget wget
zsh zsh
tldr
# System libraries # System libraries
noto-fonts noto-fonts