nixos: rename hosts to machines + minor changes

This commit is contained in:
Guanran Wang 2023-09-27 07:52:00 +08:00
parent 24419b28e3
commit 16dd604ca9
Signed by: nyancat
SSH key fingerprint: SHA256:8oWGKciPALWut/6WA27oFKofX+6Wtc0gQnsefXLQx/8
18 changed files with 19 additions and 26 deletions

View file

@ -44,7 +44,7 @@
"iMac-macOS" = nix-darwin.lib.darwinSystem { "iMac-macOS" = nix-darwin.lib.darwinSystem {
system = "x86_64-darwin"; system = "x86_64-darwin";
modules = [ modules = [
./hosts/darwin/imac-2017.nix ./machines/darwin/imac-2017.nix
home-manager.darwinModules.home-manager home-manager.darwinModules.home-manager
{ {
@ -64,7 +64,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
./hosts/81fw-lenovo-legion-y7000.nix ./machines/nixos/81fw-lenovo-legion-y7000.nix
# Overlays # Overlays
{ {
@ -133,7 +133,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
./hosts/imac-2017.nix ./machines/nixos/imac-2017.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {

View file

@ -2,16 +2,16 @@
{ {
imports = [ imports = [
../nixos ../../nixos
../nixos/hardware/misc/audio.nix ./hardware/misc/audio.nix
../nixos/hardware/misc/bluetooth.nix ./hardware/misc/bluetooth.nix
../nixos/hardware/misc/opengl.nix ./hardware/misc/opengl.nix
../nixos/hardware/cpu/intel.nix ./hardware/cpu/intel.nix
../nixos/hardware/gpu/intel.nix ./hardware/gpu/intel.nix
../nixos/hardware/gpu/nvidia.nix ./hardware/gpu/nvidia.nix
../nixos/hardware/gpu/nvidia-prime.nix ./hardware/gpu/nvidia-prime.nix
../nixos/hardware/accessories/xbox.nix ./hardware/accessories/xbox.nix
(modulesPath + "/installer/scan/not-detected.nix") # what is this (modulesPath + "/installer/scan/not-detected.nix") # what is this
]; ];

View file

@ -2,13 +2,13 @@
{ {
imports = [ imports = [
../nixos ../../nixos
../nixos/hardware/misc/audio.nix ./hardware/misc/audio.nix
../nixos/hardware/misc/bluetooth.nix ./hardware/misc/bluetooth.nix
../nixos/hardware/misc/opengl.nix ./hardware/misc/opengl.nix
../nixos/hardware/cpu/intel.nix ./hardware/cpu/intel.nix
../nixos/hardware/gpu/amd.nix ./hardware/gpu/amd.nix
(modulesPath + "/hardware/network/broadcom-43xx.nix") (modulesPath + "/hardware/network/broadcom-43xx.nix")
(modulesPath + "/installer/scan/not-detected.nix") # what is this (modulesPath + "/installer/scan/not-detected.nix") # what is this
]; ];

View file

@ -3,7 +3,6 @@
{ {
imports = [ imports = [
./boot ./boot
./hardware
./i18n ./i18n
./networking ./networking
./nix ./nix

View file

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

View file

@ -3,6 +3,7 @@
{ {
imports = [ imports = [
./core.nix ./core.nix
./hardware.nix
./graphical ./graphical
./overlays ./overlays
./unfree ./unfree