diff --git a/clusters/linode-common.nix b/clusters/linode-common.nix index 6d8bff2..bf00bec 100644 --- a/clusters/linode-common.nix +++ b/clusters/linode-common.nix @@ -5,8 +5,8 @@ { imports = [ - ../roles/host_common.nix - ../roles/server_common.nix + ../profiles/host_common.nix + ../profiles/server_common.nix ]; # Ensure the right package architecture is used diff --git a/clusters/pi2B_rack.nix b/clusters/pi2B_rack.nix index a519d41..6de1d60 100644 --- a/clusters/pi2B_rack.nix +++ b/clusters/pi2B_rack.nix @@ -6,9 +6,9 @@ [ ../hardware/raspberry_pi_2_model_B.nix - ../roles/host_common.nix - ../roles/pi_common.nix - ../roles/server_common.nix + ../profiles/host_common.nix + ../profiles/pi_common.nix + ../profiles/server_common.nix ]; # Ensure the right package architecture is used diff --git a/clusters/pi3B_rack.nix b/clusters/pi3B_rack.nix index 964e2c6..a52f2fa 100644 --- a/clusters/pi3B_rack.nix +++ b/clusters/pi3B_rack.nix @@ -6,9 +6,9 @@ [ ../hardware/raspberry_pi_3_model_B.nix - ../roles/host_common.nix - ../roles/pi_common.nix - ../roles/server_common.nix + ../profiles/host_common.nix + ../profiles/pi_common.nix + ../profiles/server_common.nix ]; # Ensure the right package architecture is used diff --git a/hosts/airgead.nix b/hosts/airgead.nix index bac9340..32a8d78 100644 --- a/hosts/airgead.nix +++ b/hosts/airgead.nix @@ -7,8 +7,7 @@ imports = [ ../clusters/linode.nix - ../roles/cardano-node.nix - #../roles/monitoring.nix + ../profiles/cardano-node.nix ../secrets/airgead.nix ]; diff --git a/hosts/cuallaidh.nix b/hosts/cuallaidh.nix index a9ba220..9e15c75 100644 --- a/hosts/cuallaidh.nix +++ b/hosts/cuallaidh.nix @@ -7,19 +7,19 @@ imports = [ ../clusters/linode.nix - ../roles/coturn.nix - ../roles/cryptpad.nix - ../roles/cyclone-ibis.nix - ../roles/gitea.nix - #../roles/hydra.nix - ../roles/iohk.nix - ../roles/matrix.nix - ../roles/mcwhirter.io.nix - ../roles/nextcloud.nix - ../roles/nixpkgs-dev.nix - ../roles/taskserver.nix - #../roles/tmate-ssh-server.nix - ../roles/tt-rss.nix + ../profiles/coturn.nix + ../profiles/cryptpad.nix + #../profiles/cyclone-ibis.nix + ../profiles/gitea.nix + #../profiles/hydra.nix + ../profiles/iohk.nix + ../profiles/matrix.nix + #../profiles/mcwhirter.io.nix + ../profiles/nextcloud.nix + ../profiles/nixpkgs-dev.nix + ../profiles/taskserver.nix + #../profiles/tmate-ssh-server.nix + ../profiles/tt-rss.nix ../secrets/gitea.nix ../secrets/tt-rss.nix ]; diff --git a/hosts/dionach.nix b/hosts/dionach.nix index 0319f02..345e190 100644 --- a/hosts/dionach.nix +++ b/hosts/dionach.nix @@ -6,25 +6,25 @@ imports = [ ../hardware/purism_librem_15.nix # Include the results of the hardware scan. - ../roles/android.nix # Provide an Android dev environment - ../roles/cron-craige.nix # Provide Craige's cron jobs - ../roles/daedalus.nix # The open source cryptocurrency wallet for ADA - ../roles/desktop-feeds.nix # Tools for news feeds and podcasts - ../roles/haskell-dev.nix # Haskel dev environment - ../roles/host_common.nix # Common host configuration options - ../roles/iohk.nix # IOHK environment - ../roles/neomutt.nix # Neomutt email - ../roles/nix-community.nix # Nix community aarch64 tooling - ../roles/nix-mio-ops.nix # mio-ops Nix tooling - ../roles/nixpkgs-dev.nix # Nix pkgs dev tools - ../roles/openssh.nix # Enable and configure openssh - ../roles/qemu.nix # Qemu virtualisation - ../roles/weechat.nix # Weechat environment - ../roles/xmonad.nix # Xmonad desktop environment - ../roles/yubikey.nix # Yubikey tooling - ../secrets/craige.nix # Ssshhhhh! - ../secrets/root.nix # Ssshhhhh! - ../secrets/wireless.nix # Hey look! A squirrel! + ../profiles/android.nix # Provide an Android dev environment + ../profiles/cron-craige.nix # Provide Craige's cron jobs + ../profiles/daedalus.nix # The open source cryptocurrency wallet for ADA + ../profiles/desktop-feeds.nix # Tools for news feeds and podcasts + ../profiles/haskell-dev.nix # Haskel dev environment + ../profiles/host_common.nix # Common host configuration options + ../profiles/iohk.nix # IOHK environment + ../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/qemu.nix # Qemu virtualisation + ../profiles/weechat.nix # Weechat environment + ../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! ]; deployment.targetHost = "localhost"; @@ -141,7 +141,7 @@ zlib zlib.dev ( - import ../roles/vim.nix + import ../profiles/vim.nix ) ]; diff --git a/hosts/iolear-beag.nix b/hosts/iolear-beag.nix index 3ca2db9..13967c4 100644 --- a/hosts/iolear-beag.nix +++ b/hosts/iolear-beag.nix @@ -6,7 +6,7 @@ imports = [ ../hardware/lenovo_x201.nix - ../roles/desktop_common.nix + ../profiles/desktop_common.nix ]; # Use the GRUB 2 boot loader. diff --git a/hosts/paidh-dha.nix b/hosts/paidh-dha.nix index 1dea223..475b957 100644 --- a/hosts/paidh-dha.nix +++ b/hosts/paidh-dha.nix @@ -5,7 +5,7 @@ { imports = [ ../clusters/pi3B_rack.nix - ../roles/transmission.nix + ../profiles/transmission.nix ]; # Comment out deployment when building the SD Image. diff --git a/hosts/sithlainnir.nix b/hosts/sithlainnir.nix index 51b5744..06ee08b 100644 --- a/hosts/sithlainnir.nix +++ b/hosts/sithlainnir.nix @@ -6,7 +6,7 @@ imports = [ ../hardware/lenovo_x201.nix - ../roles/desktop_common.nix + ../profiles/desktop_common.nix ]; # Use the GRUB 2 boot loader. diff --git a/hosts/teintidh.nix b/hosts/teintidh.nix index b818e0b..4fb4060 100644 --- a/hosts/teintidh.nix +++ b/hosts/teintidh.nix @@ -6,9 +6,9 @@ imports = [ ../hardware/lenovo_x201.nix - ../roles/desktop_common.nix - ../roles/haskell-dev.nix - ../roles/kids-dev.nix + ../profiles/desktop_common.nix + ../profiles/haskell-dev.nix + ../profiles/kids-dev.nix ]; # Use the GRUB 2 boot loader. @@ -16,7 +16,7 @@ boot.loader.grub.version = 2; boot.loader.grub.device = "/dev/sda"; - deployment.targetHost = "10.42.0.117"; + deployment.targetHost = "10.42.0.127"; networking.hostName = "teintidh"; # Define your hostname. system.stateVersion = "18.09"; # The version of NixOS originally installed diff --git a/roles/android.nix b/profiles/android.nix similarity index 100% rename from roles/android.nix rename to profiles/android.nix diff --git a/roles/cardano-node.nix b/profiles/cardano-node.nix similarity index 100% rename from roles/cardano-node.nix rename to profiles/cardano-node.nix diff --git a/roles/chrony.nix b/profiles/chrony.nix similarity index 100% rename from roles/chrony.nix rename to profiles/chrony.nix diff --git a/roles/coturn.nix b/profiles/coturn.nix similarity index 100% rename from roles/coturn.nix rename to profiles/coturn.nix diff --git a/roles/craige4rocky.nix b/profiles/craige4rocky.nix similarity index 100% rename from roles/craige4rocky.nix rename to profiles/craige4rocky.nix diff --git a/roles/cron-craige.nix b/profiles/cron-craige.nix similarity index 100% rename from roles/cron-craige.nix rename to profiles/cron-craige.nix diff --git a/roles/cryptpad.nix b/profiles/cryptpad.nix similarity index 100% rename from roles/cryptpad.nix rename to profiles/cryptpad.nix diff --git a/roles/cyclone-ibis.nix b/profiles/cyclone-ibis.nix similarity index 100% rename from roles/cyclone-ibis.nix rename to profiles/cyclone-ibis.nix diff --git a/roles/daedalus.nix b/profiles/daedalus.nix similarity index 100% rename from roles/daedalus.nix rename to profiles/daedalus.nix diff --git a/roles/desktop-feeds.nix b/profiles/desktop-feeds.nix similarity index 100% rename from roles/desktop-feeds.nix rename to profiles/desktop-feeds.nix diff --git a/roles/desktop_common.nix b/profiles/desktop_common.nix similarity index 96% rename from roles/desktop_common.nix rename to profiles/desktop_common.nix index 0096317..75926a9 100644 --- a/roles/desktop_common.nix +++ b/profiles/desktop_common.nix @@ -5,10 +5,10 @@ { imports = [ - ../roles/games-kids.nix - ../roles/host_common.nix - ../roles/daedalus.nix - ../roles/openssh.nix + ../profiles/games-kids.nix + ../profiles/host_common.nix + ../profiles/daedalus.nix + ../profiles/openssh.nix ../secrets/user-craige.nix ../secrets/user-fiona.nix ../secrets/user-hamish.nix diff --git a/roles/emacs.nix b/profiles/emacs.nix similarity index 100% rename from roles/emacs.nix rename to profiles/emacs.nix diff --git a/roles/games-kids.nix b/profiles/games-kids.nix similarity index 100% rename from roles/games-kids.nix rename to profiles/games-kids.nix diff --git a/roles/gitea.nix b/profiles/gitea.nix similarity index 100% rename from roles/gitea.nix rename to profiles/gitea.nix diff --git a/roles/gitea_home.nix b/profiles/gitea_home.nix similarity index 100% rename from roles/gitea_home.nix rename to profiles/gitea_home.nix diff --git a/roles/grafana.nix b/profiles/grafana.nix similarity index 100% rename from roles/grafana.nix rename to profiles/grafana.nix diff --git a/roles/haskell-dev.nix b/profiles/haskell-dev.nix similarity index 100% rename from roles/haskell-dev.nix rename to profiles/haskell-dev.nix diff --git a/roles/host_common.nix b/profiles/host_common.nix similarity index 99% rename from roles/host_common.nix rename to profiles/host_common.nix index 2686420..66d1f0b 100644 --- a/roles/host_common.nix +++ b/profiles/host_common.nix @@ -91,7 +91,7 @@ #openssl # A cryptographic library that implements the SSL and TLS protocols ripgrep # Utility that provides usability of The Silver Searcher with the raw speed of grep ( - import ../roles/vim.nix + import ../profiles/vim.nix ) ]; variables = { diff --git a/roles/hydra-dev.nix b/profiles/hydra-dev.nix similarity index 100% rename from roles/hydra-dev.nix rename to profiles/hydra-dev.nix diff --git a/roles/hydra-fork.nix b/profiles/hydra-fork.nix similarity index 100% rename from roles/hydra-fork.nix rename to profiles/hydra-fork.nix diff --git a/roles/hydra.nix b/profiles/hydra.nix similarity index 100% rename from roles/hydra.nix rename to profiles/hydra.nix diff --git a/roles/iohk.nix b/profiles/iohk.nix similarity index 100% rename from roles/iohk.nix rename to profiles/iohk.nix diff --git a/roles/jormungandr-stake.nix b/profiles/jormungandr-stake.nix similarity index 100% rename from roles/jormungandr-stake.nix rename to profiles/jormungandr-stake.nix diff --git a/roles/jormungandr.nix b/profiles/jormungandr.nix similarity index 100% rename from roles/jormungandr.nix rename to profiles/jormungandr.nix diff --git a/roles/kids-dev.nix b/profiles/kids-dev.nix similarity index 100% rename from roles/kids-dev.nix rename to profiles/kids-dev.nix diff --git a/roles/matrix.nix b/profiles/matrix.nix similarity index 100% rename from roles/matrix.nix rename to profiles/matrix.nix diff --git a/roles/mcwhirter.io.nix b/profiles/mcwhirter.io.nix similarity index 100% rename from roles/mcwhirter.io.nix rename to profiles/mcwhirter.io.nix diff --git a/roles/monitoring.nix b/profiles/monitoring.nix similarity index 100% rename from roles/monitoring.nix rename to profiles/monitoring.nix diff --git a/roles/nCovid-19.nix b/profiles/nCovid-19.nix similarity index 100% rename from roles/nCovid-19.nix rename to profiles/nCovid-19.nix diff --git a/roles/neomutt.nix b/profiles/neomutt.nix similarity index 100% rename from roles/neomutt.nix rename to profiles/neomutt.nix diff --git a/roles/nextcloud.nix b/profiles/nextcloud.nix similarity index 100% rename from roles/nextcloud.nix rename to profiles/nextcloud.nix diff --git a/roles/nix-community.nix b/profiles/nix-community.nix similarity index 100% rename from roles/nix-community.nix rename to profiles/nix-community.nix diff --git a/roles/nix-mio-ops.nix b/profiles/nix-mio-ops.nix similarity index 100% rename from roles/nix-mio-ops.nix rename to profiles/nix-mio-ops.nix diff --git a/roles/nixpkgs-dev.nix b/profiles/nixpkgs-dev.nix similarity index 100% rename from roles/nixpkgs-dev.nix rename to profiles/nixpkgs-dev.nix diff --git a/roles/openssh.nix b/profiles/openssh.nix similarity index 100% rename from roles/openssh.nix rename to profiles/openssh.nix diff --git a/roles/pi_common.nix b/profiles/pi_common.nix similarity index 100% rename from roles/pi_common.nix rename to profiles/pi_common.nix diff --git a/roles/prometheus.nix b/profiles/prometheus.nix similarity index 100% rename from roles/prometheus.nix rename to profiles/prometheus.nix diff --git a/roles/qemu.nix b/profiles/qemu.nix similarity index 100% rename from roles/qemu.nix rename to profiles/qemu.nix diff --git a/roles/server_common.nix b/profiles/server_common.nix similarity index 88% rename from roles/server_common.nix rename to profiles/server_common.nix index 109f156..5a48bdc 100644 --- a/roles/server_common.nix +++ b/profiles/server_common.nix @@ -6,7 +6,7 @@ imports = [ - ../roles/openssh.nix + ../profiles/openssh.nix ../secrets/user-craige.nix ../secrets/user-root.nix ]; diff --git a/roles/taskserver.nix b/profiles/taskserver.nix similarity index 100% rename from roles/taskserver.nix rename to profiles/taskserver.nix diff --git a/roles/tmux.nix b/profiles/tmux.nix similarity index 100% rename from roles/tmux.nix rename to profiles/tmux.nix diff --git a/roles/transmission.nix b/profiles/transmission.nix similarity index 100% rename from roles/transmission.nix rename to profiles/transmission.nix diff --git a/roles/tt-rss.nix b/profiles/tt-rss.nix similarity index 100% rename from roles/tt-rss.nix rename to profiles/tt-rss.nix diff --git a/roles/vim.nix b/profiles/vim.nix similarity index 100% rename from roles/vim.nix rename to profiles/vim.nix diff --git a/roles/weechat.nix b/profiles/weechat.nix similarity index 100% rename from roles/weechat.nix rename to profiles/weechat.nix diff --git a/roles/xmonad.nix b/profiles/xmonad.nix similarity index 100% rename from roles/xmonad.nix rename to profiles/xmonad.nix diff --git a/roles/yubikey.nix b/profiles/yubikey.nix similarity index 100% rename from roles/yubikey.nix rename to profiles/yubikey.nix