felschr/nixos-config
1
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

refactor: move host configs to hosts/

Browse source
This commit is contained in:
Felix Schröter 2023-08-13 00:28:29 +02:00
parent 73ba13f6ab
commit cb0499cb09
Signed by: felschr
GPG key ID: 671E39E6744C807D
4 changed files with 52 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.nix
View file

@ -121,7 +121,7 @@
nixos-hardware.nixosModules.common-gpu-amd
(lib.createSystem "home-pc" {
hardwareConfig = ./hardware/home-pc.nix;
config = ./home-pc.nix;
config = ./hosts/home-pc.nix;
})
lib.createMediaGroup
(lib.createUser "felschr" {
@ -145,7 +145,7 @@
nixos-hardware.nixosModules.common-cpu-intel
(lib.createSystem "pilot1" {
hardwareConfig = ./hardware/pilot1.nix;
config = ./work-pc.nix;
config = ./hosts/work-pc.nix;
})
(lib.createUser "felschr" {
user.extraGroups = [ "wheel" "audio" "disk" ];
@ -164,7 +164,7 @@
nixos-hardware.nixosModules.common-cpu-intel-kaby-lake
(lib.createSystem "home-server" {
hardwareConfig = ./hardware/lattepanda.nix;
config = ./home-server.nix;
config = ./hosts/home-server.nix;
})
lib.createMediaGroup
(lib.createUser "felschr" {

34
home-pc.nix → hosts/home-pc.nix
View file

@ -1,23 +1,23 @@
{ config, pkgs, ... }:
{ ... }:
{
imports = [
./hardware/base.nix
./hardware/gpu-amd.nix
./hardware/bluetooth.nix
./hardware/xbox.nix
./hardware/steam.nix
./hardware/ledger.nix
./system/desktop.nix
./system/printing/home.nix
./system/gaming.nix
./desktop
./virtualisation/libvirt.nix
./virtualisation/podman.nix
./modules/systemdNotify.nix
./services/samba/home-pc.nix
./services/restic/home-pc.nix
./services/pcscd.nix
../hardware/base.nix
../hardware/gpu-amd.nix
../hardware/bluetooth.nix
../hardware/xbox.nix
../hardware/steam.nix
../hardware/ledger.nix
../system/desktop.nix
../system/printing/home.nix
../system/gaming.nix
../desktop
../virtualisation/libvirt.nix
../virtualisation/podman.nix
../modules/systemdNotify.nix
../services/samba/home-pc.nix
../services/restic/home-pc.nix
../services/pcscd.nix
];
nixpkgs.config.allowUnfree = true;

48
home-server.nix → hosts/home-server.nix
View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }:
{ config, pkgs, ... }:
let
# mkdir /etc/secrets/initrd -p
@ -10,31 +10,31 @@ let
}];
in with builtins; {
imports = [
./hardware/base.nix
./hardware/gpu-intel.nix
./desktop/x11.nix
./system/server.nix
./modules/systemdNotify.nix
./services/mail.nix
./services/restic/home-server.nix
./services/samba/home-server.nix
# ./services/kodi.nix
./services/jellyfin.nix
./services/etebase.nix
./services/website.nix
./services/wkd.nix
./services/home-assistant
./services/matrix
./services/immich.nix
./services/miniflux.nix
./services/paperless.nix
./services/nextcloud.nix
./services/calibre-web.nix
./services/focalboard.nix
../hardware/base.nix
../hardware/gpu-intel.nix
../desktop/x11.nix
../system/server.nix
../modules/systemdNotify.nix
../services/mail.nix
../services/restic/home-server.nix
../services/samba/home-server.nix
# ../services/kodi.nix
../services/jellyfin.nix
../services/etebase.nix
../services/website.nix
../services/wkd.nix
../services/home-assistant
../services/matrix
../services/immich.nix
../services/miniflux.nix
../services/paperless.nix
../services/nextcloud.nix
../services/calibre-web.nix
../services/focalboard.nix
];
age.secrets.cloudflare.file = ./secrets/cloudflare.age;
age.secrets.hostKey.file = ./secrets/home-server/hostKey.age;
age.secrets.cloudflare.file = ../secrets/cloudflare.age;
age.secrets.hostKey.file = ../secrets/home-server/hostKey.age;
nixpkgs.config.allowUnfree = true;

16
work-pc.nix → hosts/work-pc.nix
View file

@ -1,14 +1,14 @@
{ config, pkgs, ... }:
{ ... }:
{
imports = [
./hardware/base.nix
./hardware/gpu-intel.nix
./hardware/bluetooth.nix
./system/desktop.nix
./system/printing/home.nix
./desktop
./virtualisation/podman.nix
../hardware/base.nix
../hardware/gpu-intel.nix
../hardware/bluetooth.nix
../system/desktop.nix
../system/printing/home.nix
../desktop
../virtualisation/podman.nix
];
# replace with regenerated hardware-configuration.nix