Reorganize modules
This commit is contained in:
Armel van Ravels
@@ -12,21 +12,21 @@
|
|||||||
imports = [
|
imports = [
|
||||||
# Include the results of the hardware scan.
|
# Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
../modules/home-manager.nix
|
../../modules/home-manager.nix
|
||||||
../modules/common.nix
|
../../modules/common.nix
|
||||||
../modules/users.nix
|
../../modules/users.nix
|
||||||
../modules/locales.nix
|
../../modules/locales.nix
|
||||||
../modules/services.nix
|
../../modules/services.nix
|
||||||
../modules/programs.nix
|
../../modules/programs.nix
|
||||||
../modules/docker.nix
|
../../modules/docker.nix
|
||||||
../modules/printing.nix
|
../../modules/printing.nix
|
||||||
../modules/bambu-studio-flatpak.nix
|
../../modules/bambu-studio-flatpak.nix
|
||||||
../modules/arduino-ide.nix
|
../../modules/arduino-ide.nix
|
||||||
../modules/devenv.nix
|
../../modules/devenv.nix
|
||||||
../modules/vlc.nix
|
../../modules/vlc.nix
|
||||||
../modules/btop.nix
|
../../modules/btop.nix
|
||||||
../modules/lazygit.nix
|
../../modules/lazygit.nix
|
||||||
# ../modules/bitwarden.nix
|
# ../../modules/bitwarden.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
@@ -8,11 +8,11 @@
|
|||||||
imports = [
|
imports = [
|
||||||
# Include the results of the hardware scan.
|
# Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
../modules/common.nix
|
../../modules/common.nix
|
||||||
../modules/users.nix
|
../../modules/users.nix
|
||||||
../modules/locales.nix
|
../../modules/locales.nix
|
||||||
../modules/services.nix
|
../../modules/services.nix
|
||||||
../modules/programs.nix
|
../../modules/programs.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# Bootloader.
|
# Bootloader.
|
||||||
@@ -3,34 +3,34 @@
|
|||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
../modules/home-manager.nix
|
../../modules/home-manager.nix
|
||||||
../modules/common.nix
|
../../modules/common.nix
|
||||||
../modules/users.nix
|
../../modules/users.nix
|
||||||
../modules/locales.nix
|
../../modules/locales.nix
|
||||||
../modules/services.nix
|
../../modules/services.nix
|
||||||
../modules/programs.nix
|
../../modules/programs.nix
|
||||||
../modules/gaming.nix
|
../../modules/gaming.nix
|
||||||
../modules/obs-studio.nix
|
../../modules/obs-studio.nix
|
||||||
../modules/garbage-collection.nix
|
../../modules/garbage-collection.nix
|
||||||
../modules/printing.nix
|
../../modules/printing.nix
|
||||||
../modules/docker.nix
|
../../modules/docker.nix
|
||||||
../modules/matrix.nix
|
../../modules/matrix.nix
|
||||||
../modules/kdenlive.nix
|
../../modules/kdenlive.nix
|
||||||
../modules/audacity.nix
|
../../modules/audacity.nix
|
||||||
../modules/ollama.nix
|
../../modules/ollama.nix
|
||||||
../modules/wireguard.nix
|
../../modules/wireguard.nix
|
||||||
../modules/qbittorrent.nix
|
../../modules/qbittorrent.nix
|
||||||
../modules/gimp.nix
|
../../modules/gimp.nix
|
||||||
../modules/openscad.nix
|
../../modules/openscad.nix
|
||||||
../modules/bambu-studio-flatpak.nix
|
../../modules/bambu-studio-flatpak.nix
|
||||||
../modules/arduino-ide.nix
|
../../modules/arduino-ide.nix
|
||||||
../modules/bitwarden.nix
|
../../modules/bitwarden.nix
|
||||||
../modules/vlc.nix
|
../../modules/vlc.nix
|
||||||
../modules/devenv.nix
|
../../modules/devenv.nix
|
||||||
../modules/btop.nix
|
../../modules/btop.nix
|
||||||
../modules/discord.nix
|
../../modules/discord.nix
|
||||||
../modules/lazygit.nix
|
../../modules/lazygit.nix
|
||||||
../modules/yazi.nix
|
../../modules/yazi.nix
|
||||||
./mtp-fix.nix
|
./mtp-fix.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -3,12 +3,12 @@
|
|||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
../modules/common.nix
|
../../modules/common.nix
|
||||||
../modules/users.nix
|
../../modules/users.nix
|
||||||
../modules/locales.nix
|
../../modules/locales.nix
|
||||||
../modules/services.nix
|
../../modules/services.nix
|
||||||
../modules/programs.nix
|
../../modules/programs.nix
|
||||||
../modules/gaming.nix
|
../../modules/gaming.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
@@ -3,30 +3,30 @@
|
|||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
../modules/home-manager.nix
|
../../modules/home-manager.nix
|
||||||
../modules/common.nix
|
../../modules/common.nix
|
||||||
../modules/users.nix
|
../../modules/users.nix
|
||||||
../modules/locales.nix
|
../../modules/locales.nix
|
||||||
../modules/services.nix
|
../../modules/services.nix
|
||||||
../modules/programs.nix
|
../../modules/programs.nix
|
||||||
../modules/garbage-collection.nix
|
../../modules/garbage-collection.nix
|
||||||
../modules/printing.nix
|
../../modules/printing.nix
|
||||||
../modules/docker.nix
|
../../modules/docker.nix
|
||||||
../modules/teams-for-linux.nix
|
../../modules/teams-for-linux.nix
|
||||||
../modules/azure-data-studio.nix
|
../../modules/azure-data-studio.nix
|
||||||
../modules/filezilla.nix
|
../../modules/filezilla.nix
|
||||||
../modules/wireguard.nix
|
../../modules/wireguard.nix
|
||||||
../modules/remmina.nix
|
../../modules/remmina.nix
|
||||||
../modules/postman.nix
|
../../modules/postman.nix
|
||||||
../modules/gimp.nix
|
../../modules/gimp.nix
|
||||||
../modules/jq.nix
|
../../modules/jq.nix
|
||||||
../modules/enova.nix
|
../../modules/enova.nix
|
||||||
../modules/devenv.nix
|
../../modules/devenv.nix
|
||||||
../modules/bitwarden.nix
|
../../modules/bitwarden.nix
|
||||||
../modules/btop.nix
|
../../modules/btop.nix
|
||||||
../modules/vlc.nix
|
../../modules/vlc.nix
|
||||||
../modules/lazygit.nix
|
../../modules/lazygit.nix
|
||||||
../modules/yazi.nix
|
../../modules/yazi.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
|
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 1.2 MiB |
|
Before Width: | Height: | Size: 6.9 MiB After Width: | Height: | Size: 6.9 MiB |
|
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 10 MiB After Width: | Height: | Size: 10 MiB |
90
outputs.nix
90
outputs.nix
@@ -6,75 +6,37 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
mkPkgsUnstable =
|
system = "x86_64-linux";
|
||||||
system:
|
|
||||||
import nixpkgs-unstable {
|
pkgsUnstable = import nixpkgs-unstable {
|
||||||
inherit system;
|
inherit system;
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
};
|
};
|
||||||
in
|
|
||||||
|
|
||||||
|
mkHost =
|
||||||
|
name:
|
||||||
|
nixpkgs.lib.nixosSystem {
|
||||||
|
inherit system;
|
||||||
|
|
||||||
|
specialArgs = {
|
||||||
|
inherit pkgsUnstable;
|
||||||
|
nixFlatpak = nix-flatpak;
|
||||||
|
};
|
||||||
|
|
||||||
|
modules = [
|
||||||
|
nix-flatpak.nixosModules.nix-flatpak
|
||||||
|
home-manager.nixosModules.home-manager
|
||||||
|
./hosts/${name}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
in
|
||||||
{
|
{
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
"gandalf" = nixpkgs.lib.nixosSystem {
|
gandalf = mkHost "gandalf";
|
||||||
system = "x86_64-linux";
|
frodo = mkHost "frodo";
|
||||||
specialArgs = {
|
legolas = mkHost "legolas";
|
||||||
pkgsUnstable = mkPkgsUnstable "x86_64-linux";
|
balrog = mkHost "balrog";
|
||||||
nixFlatpak = nix-flatpak;
|
work = mkHost "work";
|
||||||
};
|
|
||||||
modules = [
|
|
||||||
nix-flatpak.nixosModules.nix-flatpak
|
|
||||||
home-manager.nixosModules.home-manager
|
|
||||||
./systems/gandalf
|
|
||||||
];
|
|
||||||
};
|
|
||||||
"frodo" = nixpkgs.lib.nixosSystem {
|
|
||||||
system = "x86_64-linux";
|
|
||||||
specialArgs = {
|
|
||||||
pkgsUnstable = mkPkgsUnstable "x86_64-linux";
|
|
||||||
nixFlatpak = nix-flatpak;
|
|
||||||
};
|
|
||||||
modules = [
|
|
||||||
nix-flatpak.nixosModules.nix-flatpak
|
|
||||||
home-manager.nixosModules.home-manager
|
|
||||||
./systems/frodo
|
|
||||||
];
|
|
||||||
};
|
|
||||||
"legolas" = nixpkgs.lib.nixosSystem {
|
|
||||||
system = "x86_64-linux";
|
|
||||||
specialArgs = {
|
|
||||||
pkgsUnstable = mkPkgsUnstable "x86_64-linux";
|
|
||||||
nixFlatpak = nix-flatpak;
|
|
||||||
};
|
|
||||||
modules = [
|
|
||||||
nix-flatpak.nixosModules.nix-flatpak
|
|
||||||
home-manager.nixosModules.home-manager
|
|
||||||
./systems/legolas
|
|
||||||
];
|
|
||||||
};
|
|
||||||
"balrog" = nixpkgs.lib.nixosSystem {
|
|
||||||
system = "x86_64-linux";
|
|
||||||
specialArgs = {
|
|
||||||
pkgsUnstable = mkPkgsUnstable "x86_64-linux";
|
|
||||||
nixFlatpak = nix-flatpak;
|
|
||||||
};
|
|
||||||
modules = [
|
|
||||||
nix-flatpak.nixosModules.nix-flatpak
|
|
||||||
home-manager.nixosModules.home-manager
|
|
||||||
./systems/balrog
|
|
||||||
];
|
|
||||||
};
|
|
||||||
"work" = nixpkgs.lib.nixosSystem {
|
|
||||||
system = "x86_64-linux";
|
|
||||||
specialArgs = {
|
|
||||||
pkgsUnstable = mkPkgsUnstable "x86_64-linux";
|
|
||||||
nixFlatpak = nix-flatpak;
|
|
||||||
};
|
|
||||||
modules = [
|
|
||||||
nix-flatpak.nixosModules.nix-flatpak
|
|
||||||
home-manager.nixosModules.home-manager
|
|
||||||
./systems/work
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user