From 093d20022d1bd36a2ff7d5d7c4c3cec590692fe2 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Fri, 23 Aug 2024 18:00:07 +1000 Subject: [PATCH] chore(nix): updated import paths --- hosts/airgead/default.nix | 6 ++--- hosts/brighde/default.nix | 6 ++--- hosts/ceilidh/default.nix | 2 +- hosts/ceitidh/default.nix | 4 ++-- hosts/cuallaidh/default.nix | 30 ++++++++++++------------- hosts/dhu/default.nix | 6 ++--- hosts/dionach/default.nix | 6 ++--- hosts/doilidh/default.nix | 2 +- hosts/eamhair/default.nix | 2 +- hosts/iolear-beag/default.nix | 6 ++--- hosts/paidh-uachdar/default.nix | 15 ++++++------- hosts/sercanto/default.nix | 39 ++++++++++++++++----------------- hosts/sithlainnir/default.nix | 6 ++--- hosts/teintidh/default.nix | 8 +++---- 14 files changed, 67 insertions(+), 71 deletions(-) diff --git a/hosts/airgead/default.nix b/hosts/airgead/default.nix index 9f6ebd3..5ed7eee 100644 --- a/hosts/airgead/default.nix +++ b/hosts/airgead/default.nix @@ -6,9 +6,9 @@ ... }: { imports = [ - ../networks/linode.nix - ../profiles/cardano-node.nix - ../secrets/airgead.nix + ../../networks/linode.nix + ../../profiles/cardano-node.nix + ../../secrets/airgead.nix ]; deployment.targetHost = "172.105.187.96"; diff --git a/hosts/brighde/default.nix b/hosts/brighde/default.nix index 0c04172..a9b990a 100644 --- a/hosts/brighde/default.nix +++ b/hosts/brighde/default.nix @@ -5,9 +5,9 @@ ... }: { imports = [ - ../hardware/lenovo_yoga7i.nix - ../profiles/desktopFiona.nix - ../profiles/desktop_common.nix + ../../hardware/lenovo_yoga7i.nix + ../../profiles/desktopFiona.nix + ../../profiles/desktop_common.nix ]; # Use the UEFI boot loader. diff --git a/hosts/ceilidh/default.nix b/hosts/ceilidh/default.nix index 327c188..d3cc741 100644 --- a/hosts/ceilidh/default.nix +++ b/hosts/ceilidh/default.nix @@ -5,7 +5,7 @@ lib, ... }: { - imports = [../hardware/raspberry_pi_4_model_B.nix]; + imports = [../../hardware/raspberry_pi_4_model_B.nix]; # Comment out deployment when building the SD Image. deployment.targetHost = "10.42.0.108"; diff --git a/hosts/ceitidh/default.nix b/hosts/ceitidh/default.nix index 2562d76..de2fd9d 100644 --- a/hosts/ceitidh/default.nix +++ b/hosts/ceitidh/default.nix @@ -6,8 +6,8 @@ ... }: { imports = [ - ../networks/pi3B_rack.nix - ../profiles/cyclone-ibis.nix + ../../networks/pi3B_rack.nix + ../../profiles/cyclone-ibis.nix ]; # Comment out deployment when building the SD Image. diff --git a/hosts/cuallaidh/default.nix b/hosts/cuallaidh/default.nix index 541d7f5..42d6b27 100644 --- a/hosts/cuallaidh/default.nix +++ b/hosts/cuallaidh/default.nix @@ -6,22 +6,20 @@ ... }: { imports = [ - ../modules/tmate-ssh-server.nix - ../networks/linode.nix - ../profiles/coturn.nix - #../profiles/cryptpad.nix - #../profiles/hydra.nix - ../profiles/iog.nix - ../profiles/ipv6.nix - ../profiles/mastodon.nix - ../profiles/matrix.nix - ../profiles/mcwhirter.io.nix - ../profiles/minecraftServer.nix - ../profiles/nextcloud.nix - ../profiles/nixpkgs-dev.nix - ../profiles/taskserver.nix - ../profiles/tt-rss.nix - ../secrets/tt-rss.nix + ../../modules/tmate-ssh-server.nix + ../../networks/linode.nix + ../../profiles/coturn.nix + ../../profiles/iog.nix + ../../profiles/ipv6.nix + ../../profiles/mastodon.nix + ../../profiles/matrix.nix + ../../profiles/mcwhirter.io.nix + ../../profiles/minecraftServer.nix + ../../profiles/nextcloud.nix + ../../profiles/nixpkgs-dev.nix + ../../profiles/taskserver.nix + ../../profiles/tt-rss.nix + ../../secrets/tt-rss.nix ]; deployment.targetHost = "172.105.171.16"; diff --git a/hosts/dhu/default.nix b/hosts/dhu/default.nix index 5109590..389e50e 100644 --- a/hosts/dhu/default.nix +++ b/hosts/dhu/default.nix @@ -5,9 +5,9 @@ ... }: { imports = [ - ../hardware/eeepc701.nix # Include common configuration options - ../secrets/wireless.nix - ../profiles/sway.nix + ../../hardware/eeepc701.nix # Include common configuration options + ../../secrets/wireless.nix + ../../profiles/sway.nix ]; deployment.targetHost = "10.42.0.119"; diff --git a/hosts/dionach/default.nix b/hosts/dionach/default.nix index fd6522e..570c0ff 100644 --- a/hosts/dionach/default.nix +++ b/hosts/dionach/default.nix @@ -5,9 +5,9 @@ ... }: { imports = [ - ../hardware/purism_librem_15.nix # Include results of the hardware scan. - ../profiles/desktop_common.nix - ../profiles/steam.nix + ../../hardware/purism_librem_15.nix # Include results of the hardware scan. + ../../profiles/desktop_common.nix + ../../profiles/steam.nix ]; deployment.targetHost = "10.42.0.190"; diff --git a/hosts/doilidh/default.nix b/hosts/doilidh/default.nix index af7e87b..afb6ed0 100644 --- a/hosts/doilidh/default.nix +++ b/hosts/doilidh/default.nix @@ -5,7 +5,7 @@ lib, ... }: { - imports = [../networks/pi3B_rack.nix]; + imports = [../../networks/pi3B_rack.nix]; # Comment out deployment when building the SD Image. deployment.targetHost = "10.42.0.204"; diff --git a/hosts/eamhair/default.nix b/hosts/eamhair/default.nix index 7344210..7d86e98 100644 --- a/hosts/eamhair/default.nix +++ b/hosts/eamhair/default.nix @@ -5,7 +5,7 @@ lib, ... }: { - imports = [../networks/pi3B_rack.nix]; + imports = [../../networks/pi3B_rack.nix]; # Comment out deployment when building the SD Image. deployment.targetHost = "10.42.0.205"; diff --git a/hosts/iolear-beag/default.nix b/hosts/iolear-beag/default.nix index ebdafb6..9a40049 100644 --- a/hosts/iolear-beag/default.nix +++ b/hosts/iolear-beag/default.nix @@ -5,9 +5,9 @@ ... }: { imports = [ - ../hardware/lenovo_x201.nix - ../profiles/desktop_common.nix - ../profiles/wine.nix + ../../hardware/lenovo_x201.nix + ../../profiles/desktop_common.nix + ../../profiles/wine.nix ]; # Use the GRUB 2 boot loader. diff --git a/hosts/paidh-uachdar/default.nix b/hosts/paidh-uachdar/default.nix index b23fb7c..eeb6dc9 100644 --- a/hosts/paidh-uachdar/default.nix +++ b/hosts/paidh-uachdar/default.nix @@ -6,14 +6,13 @@ ... }: { imports = [ - ../hardware/raspberry_pi_3_model_B.nix - ../profiles/host_common.nix - ../profiles/openssh.nix - ../profiles/pi_common.nix - #../profiles/xmonad.nix - ../secrets/craige.nix # Ssshhhhh! - ../secrets/root.nix # Ssshhhhh! - ../secrets/wireless.nix # Hey look! A squirrel! + ../../hardware/raspberry_pi_3_model_B.nix + ../../profiles/host_common.nix + ../../profiles/openssh.nix + ../../profiles/pi_common.nix + ../../secrets/craige.nix # Ssshhhhh! + ../../secrets/root.nix # Ssshhhhh! + ../../secrets/wireless.nix # Hey look! A squirrel! ]; # Comment out deployment when building the SD Image. diff --git a/hosts/sercanto/default.nix b/hosts/sercanto/default.nix index 5c3fa11..ae670e5 100644 --- a/hosts/sercanto/default.nix +++ b/hosts/sercanto/default.nix @@ -5,26 +5,25 @@ ... }: { imports = [ - ../hardware/system76_lemurPro.nix # Include results of the hardware scan. - ../profiles/cron-craige.nix # Provide Craige's cron jobs - ../profiles/desktopCraige.nix # Craige's desktop tools and apps - ../profiles/haskell-dev.nix # Haskell dev environment - ../profiles/host_common.nix # Common host configuration options - ../profiles/iog.nix # IOHK environment - ../profiles/keyboard.nix - ../profiles/neomutt.nix # Neomutt email - ../profiles/nix-community.nix # Nix community aarch64 tooling - ../profiles/nix-mio-ops.nix # mio-ops Nix tooling - ../profiles/nixpkgs-dev.nix # Nix pkgs dev tools - ../profiles/openssh.nix # Enable and configure openssh - ../profiles/pantheon.nix # Enable and configure the pantheon desktop - ../profiles/pipewire.nix # Enable and pipewire audio system - ../profiles/powerManagement.nix # Power management for laptops - ../profiles/xmonad.nix # Xmonad desktop environment - ../profiles/yubikey.nix # Yubikey tooling - ../secrets/craige.nix # Ssshhhhh! - ../secrets/root.nix # Ssshhhhh! - #../secrets/wireless.nix # Hey look! A squirrel! + ../../hardware/system76_lemurPro.nix # Include results of the hardware scan. + ../../profiles/cron-craige.nix # Provide Craige's cron jobs + ../../profiles/desktopCraige.nix # Craige's desktop tools and apps + ../../profiles/haskell-dev.nix # Haskell dev environment + ../../profiles/host_common.nix # Common host configuration options + ../../profiles/iog.nix # IOHK environment + ../../profiles/keyboard.nix + ../../profiles/neomutt.nix # Neomutt email + ../../profiles/nix-community.nix # Nix community aarch64 tooling + ../../profiles/nix-mio-ops.nix # mio-ops Nix tooling + ../../profiles/nixpkgs-dev.nix # Nix pkgs dev tools + ../../profiles/openssh.nix # Enable and configure openssh + ../../profiles/pantheon.nix # Enable and configure the pantheon desktop + ../../profiles/pipewire.nix # Enable and pipewire audio system + ../../profiles/powerManagement.nix # Power management for laptops + ../../profiles/xmonad.nix # Xmonad desktop environment + ../../profiles/yubikey.nix # Yubikey tooling + ../../secrets/craige.nix # Ssshhhhh! + ../../secrets/root.nix # Ssshhhhh! ]; deployment.targetHost = "10.42.0.180"; diff --git a/hosts/sithlainnir/default.nix b/hosts/sithlainnir/default.nix index a7b88bd..db2c09c 100644 --- a/hosts/sithlainnir/default.nix +++ b/hosts/sithlainnir/default.nix @@ -5,9 +5,9 @@ ... }: { imports = [ - ../hardware/lenovo_x201.nix - ../profiles/desktopFiona.nix - ../profiles/desktop_common.nix + ../../hardware/lenovo_x201.nix + ../../profiles/desktopFiona.nix + ../../profiles/desktop_common.nix ]; # Use the GRUB 2 boot loader. diff --git a/hosts/teintidh/default.nix b/hosts/teintidh/default.nix index 1486fbb..7ee6e12 100644 --- a/hosts/teintidh/default.nix +++ b/hosts/teintidh/default.nix @@ -5,10 +5,10 @@ ... }: { imports = [ - ../hardware/lenovo_x201.nix - ../profiles/desktop_common.nix - ../profiles/haskell-dev.nix - ../profiles/kids-dev.nix + ../../hardware/lenovo_x201.nix + ../../profiles/desktop_common.nix + ../../profiles/haskell-dev.nix + ../../profiles/kids-dev.nix ]; # Use the GRUB 2 boot loader.