diff options
| author | Franck Cuny <franck@fcuny.net> | 2024-12-09 08:28:01 -0800 |
|---|---|---|
| committer | Franck Cuny <franck@fcuny.net> | 2024-12-09 08:28:01 -0800 |
| commit | 0998d8294e21cd8bdc6ac94525df0aae51bb4b0d (patch) | |
| tree | 06c34041e7fb2f474e046dbb5deec3f23f82f0af /nix | |
| parent | set hostname and correct ssh key (diff) | |
| download | world-0998d8294e21cd8bdc6ac94525df0aae51bb4b0d.tar.gz | |
move each machine into a directory
it will be easier to break down some configs.
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/lib/mkSystem.nix | 2 | ||||
| -rw-r--r-- | nix/machines/hq-c02fk3q7md6t/default.nix (renamed from nix/machines/macbook-pro-intel.nix) | 2 | ||||
| -rw-r--r-- | nix/machines/mba-m2/default.nix (renamed from nix/machines/macbook-air-m2.nix) | 4 | ||||
| -rw-r--r-- | nix/machines/vm-aarch64.nix | 4 | ||||
| -rw-r--r-- | nix/machines/vm-aarch64/default.nix | 5 | ||||
| -rw-r--r-- | nix/machines/vm-aarch64/hardware.nix (renamed from nix/machines/hardware/vm-aarch64-utm.nix) | 0 | ||||
| -rw-r--r-- | nix/machines/vm-hetzner/default.nix (renamed from nix/machines/vm-hetzner.nix) | 0 | ||||
| -rw-r--r-- | nix/machines/vm-hetzner/hardware.nix (renamed from nix/machines/hardware/vm-hetzner.nix) | 0 | ||||
| -rw-r--r-- | nix/machines/vm-synology.nix | 4 | ||||
| -rw-r--r-- | nix/machines/vm-synology/default.nix | 5 | ||||
| -rw-r--r-- | nix/machines/vm-synology/hardware.nix (renamed from nix/machines/hardware/vm-synology.nix) | 0 |
11 files changed, 14 insertions, 12 deletions
diff --git a/nix/lib/mkSystem.nix b/nix/lib/mkSystem.nix index dbacac6..87af732 100644 --- a/nix/lib/mkSystem.nix +++ b/nix/lib/mkSystem.nix @@ -7,7 +7,7 @@ name: let # The config files for this system. - machineConfig = ../machines/${name}.nix; + machineConfig = ../machines/${name}; userOSConfig = ../users/${user}/${if darwin then "darwin" else "nixos"}.nix; userHMConfig = ../users/${user}/home-manager.nix; diff --git a/nix/machines/macbook-pro-intel.nix b/nix/machines/hq-c02fk3q7md6t/default.nix index 07b464e..001f3d5 100644 --- a/nix/machines/macbook-pro-intel.nix +++ b/nix/machines/hq-c02fk3q7md6t/default.nix @@ -1,5 +1,5 @@ { pkgs, ... }: { - imports = [ ./darwin-shared.nix ]; + imports = [ ../darwin-shared.nix ]; system.stateVersion = 5; diff --git a/nix/machines/macbook-air-m2.nix b/nix/machines/mba-m2/default.nix index 9b0265a..72a4e8b 100644 --- a/nix/machines/macbook-air-m2.nix +++ b/nix/machines/mba-m2/default.nix @@ -1,9 +1,9 @@ { pkgs, ... }: { - imports = [ ./darwin-shared.nix ]; + imports = [ ../darwin-shared.nix ]; system.stateVersion = 5; - networking.hostName = "mba-fcuny"; + networking.hostName = "mba-m2"; programs.fish.enable = true; environment.shells = [ pkgs.fish ]; diff --git a/nix/machines/vm-aarch64.nix b/nix/machines/vm-aarch64.nix deleted file mode 100644 index ac9c74e..0000000 --- a/nix/machines/vm-aarch64.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ ... }: { - imports = [ ./hardware/vm-aarch64-utm.nix ./vm-shared.nix ]; - networking.hostName = "vm-aarch64"; -} diff --git a/nix/machines/vm-aarch64/default.nix b/nix/machines/vm-aarch64/default.nix new file mode 100644 index 0000000..302a80c --- /dev/null +++ b/nix/machines/vm-aarch64/default.nix @@ -0,0 +1,5 @@ +{ ... }: { + imports = [ ./hardware.nix ../vm-shared.nix ]; + + networking.hostName = "vm-aarch64"; +} diff --git a/nix/machines/hardware/vm-aarch64-utm.nix b/nix/machines/vm-aarch64/hardware.nix index 084cc74..084cc74 100644 --- a/nix/machines/hardware/vm-aarch64-utm.nix +++ b/nix/machines/vm-aarch64/hardware.nix diff --git a/nix/machines/vm-hetzner.nix b/nix/machines/vm-hetzner/default.nix index a268779..a268779 100644 --- a/nix/machines/vm-hetzner.nix +++ b/nix/machines/vm-hetzner/default.nix diff --git a/nix/machines/hardware/vm-hetzner.nix b/nix/machines/vm-hetzner/hardware.nix index 89a92a9..89a92a9 100644 --- a/nix/machines/hardware/vm-hetzner.nix +++ b/nix/machines/vm-hetzner/hardware.nix diff --git a/nix/machines/vm-synology.nix b/nix/machines/vm-synology.nix deleted file mode 100644 index 643c821..0000000 --- a/nix/machines/vm-synology.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ ... }: { - imports = [ ./hardware/vm-synology.nix ./vm-shared.nix ]; - networking.hostName = "vm-synology"; -} diff --git a/nix/machines/vm-synology/default.nix b/nix/machines/vm-synology/default.nix new file mode 100644 index 0000000..928ab86 --- /dev/null +++ b/nix/machines/vm-synology/default.nix @@ -0,0 +1,5 @@ +{ ... }: { + imports = [ ./hardware.nix ../vm-shared.nix ]; + + networking.hostName = "vm-synology"; +} diff --git a/nix/machines/hardware/vm-synology.nix b/nix/machines/vm-synology/hardware.nix index 5511e98..5511e98 100644 --- a/nix/machines/hardware/vm-synology.nix +++ b/nix/machines/vm-synology/hardware.nix |