From 1105278ca26eef880d1d6173618bb95709cd2090 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Thu, 2 Jul 2020 21:36:42 +0200 Subject: [PATCH] Rename hosts folder --- common/secret/default.nix | Bin 16253 -> 16260 bytes home-manager/games.nix | 2 +- home-manager/machines.nix | 4 +- home-manager/mpd.nix | 20 ++++++++- .../machines}/apollo/configuration.nix | 26 +++++++----- .../apollo/hardware-configuration.nix | 1 + .../machines}/apollo/secret/.gitattributes | 0 .../machines}/apollo/secret/default.nix | Bin .../machines}/apollo/secret/jaliconfig.py | Bin {hosts => nixos/machines}/apollo/secret/pw-me | Bin .../apollo/secret/syncthing/cert.pem | Bin .../machines}/apollo/secret/syncthing/key.pem | Bin .../apollo/secret/tinc/ed25519_key.priv | Bin .../machines}/apollo/secret/wireguard-private | Bin {hosts => nixos/machines}/hera/boot.nix | 0 {hosts => nixos/machines}/hera/cloud.nix | 2 +- .../machines}/hera/configuration.nix | 38 +++++++++--------- .../machines}/hera/hardware-configuration.nix | 0 {hosts => nixos/machines}/hera/mail.nix | 2 +- {hosts => nixos/machines}/hera/network.nix | 2 +- .../machines}/hera/secret/.gitattributes | 0 .../machines}/hera/secret/boot_rsa | Bin .../machines}/hera/secret/default.nix | Bin .../machines}/hera/secret/kassandra.nix | Bin .../machines}/hera/secret/maralorn.sieve | Bin .../machines}/hera/secret/pw-choreutes | Bin {hosts => nixos/machines}/hera/secret/pw-me | Bin .../machines}/hera/secret/secrets.nix | Bin .../machines}/hera/secret/syncthing/cert.pem | Bin .../machines}/hera/secret/syncthing/key.pem | Bin .../machines}/hera/secret/weechat.nix | Bin .../machines}/hera/secret/wireguard-private | Bin {hosts => nixos/machines}/hera/web.nix | 0 .../machines}/hera/weechat/default-keys.conf | 0 .../machines}/hera/weechat/default.nix | 0 .../plugins/perl/autoload/mass_hl_blocker.pl | 0 .../weechat/plugins/perl/mass_hl_blocker.pl | 0 .../plugins/python/autojoin_on_invite.py | 0 .../python/autoload/autojoin_on_invite.py | 0 .../plugins/python/autoload/buffer_autoset.py | 0 .../weechat/plugins/python/autoload/go.py | 0 .../weechat/plugins/python/autoload/grep.py | 0 .../plugins/python/autoload/sortlatest.py | 0 .../plugins/python/autoload/topicdiff.py | 0 .../weechat/plugins/python/buffer_autoset.py | 0 .../hera/weechat/plugins/python/go.py | 0 .../hera/weechat/plugins/python/grep.py | 0 .../hera/weechat/plugins/python/sortlatest.py | 0 .../hera/weechat/plugins/python/topicdiff.py | 0 {system => nixos/roles}/blog.nix | 0 {system => nixos/roles}/boot-key.nix | 0 {system => nixos/roles}/coturn.nix | 0 {system => nixos/roles}/default.nix | 4 +- {system => nixos/roles}/email2matrix.nix | 0 {system => nixos/roles}/fonts.nix | 0 {system => nixos/roles}/git.nix | 0 {system => nixos/roles}/go-neb.nix | 0 {system => nixos/roles}/local-nix-cache.nix | 2 +- {system => nixos/roles}/mathechor.de.nix | 0 {system => nixos/roles}/matrix-synapse.nix | 0 {system => nixos/roles}/modules/go-neb.nix | 0 {system => nixos/roles}/modules/laptop.nix | 0 .../roles}/modules/loginctl-linger.nix | 0 .../roles}/monitoring/alertmanager.nix | 0 .../roles}/monitoring/blackbox_rules.yml | 0 .../roles}/monitoring/default.nix | 0 .../grafana-dashboards/health-status.json | 0 .../grafana-dashboards/node-exporter.json | 0 .../roles}/monitoring/grafana.nix | 0 .../roles}/monitoring/nixpkgs.nix | 0 {system => nixos/roles}/monitoring/probes.nix | 0 .../roles}/monitoring/prometheus.nix | 0 {system => nixos/roles}/monitoring/rules.yml | 0 {system => nixos/roles}/riot.nix | 0 {system => nixos/roles}/serve-store.nix | 0 {system => nixos/roles}/server/default.nix | 0 {system => nixos/roles}/server/init_ssh.nix | 0 {system => nixos/roles}/standalone/admin.nix | 0 .../roles}/standalone/default.nix | 2 +- {system => nixos/roles}/test-timer.nix | 2 +- {system => nixos/roles}/use-cache.nix | 0 overlays/grafana-devel/package.nix | 2 +- overlays/pkgSets.nix | 2 +- overlays/testing.nix | 2 +- 84 files changed, 69 insertions(+), 44 deletions(-) rename {hosts => nixos/machines}/apollo/configuration.nix (78%) rename {hosts => nixos/machines}/apollo/hardware-configuration.nix (95%) rename {hosts => nixos/machines}/apollo/secret/.gitattributes (100%) rename {hosts => nixos/machines}/apollo/secret/default.nix (100%) rename {hosts => nixos/machines}/apollo/secret/jaliconfig.py (100%) rename {hosts => nixos/machines}/apollo/secret/pw-me (100%) rename {hosts => nixos/machines}/apollo/secret/syncthing/cert.pem (100%) rename {hosts => nixos/machines}/apollo/secret/syncthing/key.pem (100%) rename {hosts => nixos/machines}/apollo/secret/tinc/ed25519_key.priv (100%) rename {hosts => nixos/machines}/apollo/secret/wireguard-private (100%) rename {hosts => nixos/machines}/hera/boot.nix (100%) rename {hosts => nixos/machines}/hera/cloud.nix (99%) rename {hosts => nixos/machines}/hera/configuration.nix (80%) rename {hosts => nixos/machines}/hera/hardware-configuration.nix (100%) rename {hosts => nixos/machines}/hera/mail.nix (97%) rename {hosts => nixos/machines}/hera/network.nix (96%) rename {hosts => nixos/machines}/hera/secret/.gitattributes (100%) rename {hosts => nixos/machines}/hera/secret/boot_rsa (100%) rename {hosts => nixos/machines}/hera/secret/default.nix (100%) rename {hosts => nixos/machines}/hera/secret/kassandra.nix (100%) rename {hosts => nixos/machines}/hera/secret/maralorn.sieve (100%) rename {hosts => nixos/machines}/hera/secret/pw-choreutes (100%) rename {hosts => nixos/machines}/hera/secret/pw-me (100%) rename {hosts => nixos/machines}/hera/secret/secrets.nix (100%) rename {hosts => nixos/machines}/hera/secret/syncthing/cert.pem (100%) rename {hosts => nixos/machines}/hera/secret/syncthing/key.pem (100%) rename {hosts => nixos/machines}/hera/secret/weechat.nix (100%) rename {hosts => nixos/machines}/hera/secret/wireguard-private (100%) rename {hosts => nixos/machines}/hera/web.nix (100%) rename {hosts => nixos/machines}/hera/weechat/default-keys.conf (100%) rename {hosts => nixos/machines}/hera/weechat/default.nix (100%) rename {hosts => nixos/machines}/hera/weechat/plugins/perl/autoload/mass_hl_blocker.pl (100%) rename {hosts => nixos/machines}/hera/weechat/plugins/perl/mass_hl_blocker.pl (100%) rename {hosts => nixos/machines}/hera/weechat/plugins/python/autojoin_on_invite.py (100%) rename {hosts => nixos/machines}/hera/weechat/plugins/python/autoload/autojoin_on_invite.py (100%) rename {hosts => nixos/machines}/hera/weechat/plugins/python/autoload/buffer_autoset.py (100%) rename {hosts => nixos/machines}/hera/weechat/plugins/python/autoload/go.py (100%) rename {hosts => nixos/machines}/hera/weechat/plugins/python/autoload/grep.py (100%) rename {hosts => nixos/machines}/hera/weechat/plugins/python/autoload/sortlatest.py (100%) rename {hosts => nixos/machines}/hera/weechat/plugins/python/autoload/topicdiff.py (100%) rename {hosts => nixos/machines}/hera/weechat/plugins/python/buffer_autoset.py (100%) rename {hosts => nixos/machines}/hera/weechat/plugins/python/go.py (100%) rename {hosts => nixos/machines}/hera/weechat/plugins/python/grep.py (100%) rename {hosts => nixos/machines}/hera/weechat/plugins/python/sortlatest.py (100%) rename {hosts => nixos/machines}/hera/weechat/plugins/python/topicdiff.py (100%) rename {system => nixos/roles}/blog.nix (100%) rename {system => nixos/roles}/boot-key.nix (100%) rename {system => nixos/roles}/coturn.nix (100%) rename {system => nixos/roles}/default.nix (96%) rename {system => nixos/roles}/email2matrix.nix (100%) rename {system => nixos/roles}/fonts.nix (100%) rename {system => nixos/roles}/git.nix (100%) rename {system => nixos/roles}/go-neb.nix (100%) rename {system => nixos/roles}/local-nix-cache.nix (93%) rename {system => nixos/roles}/mathechor.de.nix (100%) rename {system => nixos/roles}/matrix-synapse.nix (100%) rename {system => nixos/roles}/modules/go-neb.nix (100%) rename {system => nixos/roles}/modules/laptop.nix (100%) rename {system => nixos/roles}/modules/loginctl-linger.nix (100%) rename {system => nixos/roles}/monitoring/alertmanager.nix (100%) rename {system => nixos/roles}/monitoring/blackbox_rules.yml (100%) rename {system => nixos/roles}/monitoring/default.nix (100%) rename {system => nixos/roles}/monitoring/grafana-dashboards/health-status.json (100%) rename {system => nixos/roles}/monitoring/grafana-dashboards/node-exporter.json (100%) rename {system => nixos/roles}/monitoring/grafana.nix (100%) rename {system => nixos/roles}/monitoring/nixpkgs.nix (100%) rename {system => nixos/roles}/monitoring/probes.nix (100%) rename {system => nixos/roles}/monitoring/prometheus.nix (100%) rename {system => nixos/roles}/monitoring/rules.yml (100%) rename {system => nixos/roles}/riot.nix (100%) rename {system => nixos/roles}/serve-store.nix (100%) rename {system => nixos/roles}/server/default.nix (100%) rename {system => nixos/roles}/server/init_ssh.nix (100%) rename {system => nixos/roles}/standalone/admin.nix (100%) rename {system => nixos/roles}/standalone/default.nix (95%) rename {system => nixos/roles}/test-timer.nix (97%) rename {system => nixos/roles}/use-cache.nix (100%) diff --git a/common/secret/default.nix b/common/secret/default.nix index ccad819dabd74c74c8d13835f3c26ceee413ae9b..b6e0ff59a6cf179f7c70b3e74ec65da83b7d3e2a 100644 GIT binary patch literal 16260 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 literal 16253 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/secret/boot_rsa +# dropbearkey -t rsa -f /etc/nixosnixos/machines/secret/boot_rsa let inherit (config.m-0.private) me; - inherit (import ../../common/common.nix { inherit pkgs; }) syncthing; + inherit (import ../../../common/common.nix { inherit pkgs; }) syncthing; in { imports = [ ./hardware-configuration.nix - ../../system - ../../system/test-timer.nix - ../../system/standalone - ../../system/server - ../../system/git.nix - ../../system/riot.nix - ../../system/mathechor.de.nix - ../../system/monitoring - ../../system/blog.nix - ../../system/email2matrix.nix - ../../system/matrix-synapse.nix - ../../system/coturn.nix - ../../system/serve-store.nix - ../../system/go-neb.nix + ../../roles + ../../roles/test-timer.nix + ../../roles/standalone + ../../roles/server + ../../roles/git.nix + ../../roles/riot.nix + ../../roles/mathechor.de.nix + ../../roles/monitoring + ../../roles/blog.nix + ../../roles/email2matrix.nix + ../../roles/matrix-synapse.nix + ../../roles/coturn.nix + ../../roles/serve-store.nix + ../../roles/go-neb.nix ./web.nix ./mail.nix ./boot.nix @@ -103,8 +103,8 @@ in { user = "maralorn"; openDefaultPorts = true; declarative = syncthing.declarativeWith [ "apollo" ] "/media" // { - cert = "/etc/nixos/hosts/hera/secret/syncthing/cert.pem"; - key = "/etc/nixos/hosts/hera/secret/syncthing/key.pem"; + cert = "/etc/nixosnixos/machineshera/secret/syncthing/cert.pem"; + key = "/etc/nixosnixos/machineshera/secret/syncthing/key.pem"; }; }; }; @@ -117,7 +117,7 @@ in { isNormalUser = true; uid = 1001; extraGroups = [ "wheel" "systemd-journal" ]; - passwordFile = "/etc/nixos/hosts/hera/secret/pw-choreutes"; + passwordFile = "/etc/nixosnixos/machineshera/secret/pw-choreutes"; }; # This value determines the NixOS release with which your system is to be diff --git a/hosts/hera/hardware-configuration.nix b/nixos/machines/hera/hardware-configuration.nix similarity index 100% rename from hosts/hera/hardware-configuration.nix rename to nixos/machines/hera/hardware-configuration.nix diff --git a/hosts/hera/mail.nix b/nixos/machines/hera/mail.nix similarity index 97% rename from hosts/hera/mail.nix rename to nixos/machines/hera/mail.nix index 2da103a3..1726e2d9 100644 --- a/hosts/hera/mail.nix +++ b/nixos/machines/hera/mail.nix @@ -25,7 +25,7 @@ in { autoStart = true; config = { pkgs, lib, ... }: { imports = - [ ../../system "${(import ../../nix/sources.nix).nixos-mailserver}" ]; + [ ../../roles "${(import ../../../nix/sources.nix).nixos-mailserver}" ]; services.prometheus.exporters = { node.port = 9101; postfix = { diff --git a/hosts/hera/network.nix b/nixos/machines/hera/network.nix similarity index 96% rename from hosts/hera/network.nix rename to nixos/machines/hera/network.nix index 20e8c5ad..35ae6836 100644 --- a/hosts/hera/network.nix +++ b/nixos/machines/hera/network.nix @@ -54,7 +54,7 @@ in { wireguard.interfaces = { m0wire = { ips = [ "${hosts.hera-wg}/112" ]; - privateKeyFile = "/etc/nixos/hosts/hera/secret/wireguard-private"; + privateKeyFile = "/etc/nixosnixos/machineshera/secret/wireguard-private"; listenPort = wireguard.port; peers = [{ publicKey = wireguard.pub.apollo; diff --git a/hosts/hera/secret/.gitattributes b/nixos/machines/hera/secret/.gitattributes similarity index 100% rename from hosts/hera/secret/.gitattributes rename to nixos/machines/hera/secret/.gitattributes diff --git a/hosts/hera/secret/boot_rsa b/nixos/machines/hera/secret/boot_rsa similarity index 100% rename from hosts/hera/secret/boot_rsa rename to nixos/machines/hera/secret/boot_rsa diff --git a/hosts/hera/secret/default.nix b/nixos/machines/hera/secret/default.nix similarity index 100% rename from hosts/hera/secret/default.nix rename to nixos/machines/hera/secret/default.nix diff --git a/hosts/hera/secret/kassandra.nix b/nixos/machines/hera/secret/kassandra.nix similarity index 100% rename from hosts/hera/secret/kassandra.nix rename to nixos/machines/hera/secret/kassandra.nix diff --git a/hosts/hera/secret/maralorn.sieve b/nixos/machines/hera/secret/maralorn.sieve similarity index 100% rename from hosts/hera/secret/maralorn.sieve rename to nixos/machines/hera/secret/maralorn.sieve diff --git a/hosts/hera/secret/pw-choreutes b/nixos/machines/hera/secret/pw-choreutes similarity index 100% rename from hosts/hera/secret/pw-choreutes rename to nixos/machines/hera/secret/pw-choreutes diff --git a/hosts/hera/secret/pw-me b/nixos/machines/hera/secret/pw-me similarity index 100% rename from hosts/hera/secret/pw-me rename to nixos/machines/hera/secret/pw-me diff --git a/hosts/hera/secret/secrets.nix b/nixos/machines/hera/secret/secrets.nix similarity index 100% rename from hosts/hera/secret/secrets.nix rename to nixos/machines/hera/secret/secrets.nix diff --git a/hosts/hera/secret/syncthing/cert.pem b/nixos/machines/hera/secret/syncthing/cert.pem similarity index 100% rename from hosts/hera/secret/syncthing/cert.pem rename to nixos/machines/hera/secret/syncthing/cert.pem diff --git a/hosts/hera/secret/syncthing/key.pem b/nixos/machines/hera/secret/syncthing/key.pem similarity index 100% rename from hosts/hera/secret/syncthing/key.pem rename to nixos/machines/hera/secret/syncthing/key.pem diff --git a/hosts/hera/secret/weechat.nix b/nixos/machines/hera/secret/weechat.nix similarity index 100% rename from hosts/hera/secret/weechat.nix rename to nixos/machines/hera/secret/weechat.nix diff --git a/hosts/hera/secret/wireguard-private b/nixos/machines/hera/secret/wireguard-private similarity index 100% rename from hosts/hera/secret/wireguard-private rename to nixos/machines/hera/secret/wireguard-private diff --git a/hosts/hera/web.nix b/nixos/machines/hera/web.nix similarity index 100% rename from hosts/hera/web.nix rename to nixos/machines/hera/web.nix diff --git a/hosts/hera/weechat/default-keys.conf b/nixos/machines/hera/weechat/default-keys.conf similarity index 100% rename from hosts/hera/weechat/default-keys.conf rename to nixos/machines/hera/weechat/default-keys.conf diff --git a/hosts/hera/weechat/default.nix b/nixos/machines/hera/weechat/default.nix similarity index 100% rename from hosts/hera/weechat/default.nix rename to nixos/machines/hera/weechat/default.nix diff --git a/hosts/hera/weechat/plugins/perl/autoload/mass_hl_blocker.pl b/nixos/machines/hera/weechat/plugins/perl/autoload/mass_hl_blocker.pl similarity index 100% rename from hosts/hera/weechat/plugins/perl/autoload/mass_hl_blocker.pl rename to nixos/machines/hera/weechat/plugins/perl/autoload/mass_hl_blocker.pl diff --git a/hosts/hera/weechat/plugins/perl/mass_hl_blocker.pl b/nixos/machines/hera/weechat/plugins/perl/mass_hl_blocker.pl similarity index 100% rename from hosts/hera/weechat/plugins/perl/mass_hl_blocker.pl rename to nixos/machines/hera/weechat/plugins/perl/mass_hl_blocker.pl diff --git a/hosts/hera/weechat/plugins/python/autojoin_on_invite.py b/nixos/machines/hera/weechat/plugins/python/autojoin_on_invite.py similarity index 100% rename from hosts/hera/weechat/plugins/python/autojoin_on_invite.py rename to nixos/machines/hera/weechat/plugins/python/autojoin_on_invite.py diff --git a/hosts/hera/weechat/plugins/python/autoload/autojoin_on_invite.py b/nixos/machines/hera/weechat/plugins/python/autoload/autojoin_on_invite.py similarity index 100% rename from hosts/hera/weechat/plugins/python/autoload/autojoin_on_invite.py rename to nixos/machines/hera/weechat/plugins/python/autoload/autojoin_on_invite.py diff --git a/hosts/hera/weechat/plugins/python/autoload/buffer_autoset.py b/nixos/machines/hera/weechat/plugins/python/autoload/buffer_autoset.py similarity index 100% rename from hosts/hera/weechat/plugins/python/autoload/buffer_autoset.py rename to nixos/machines/hera/weechat/plugins/python/autoload/buffer_autoset.py diff --git a/hosts/hera/weechat/plugins/python/autoload/go.py b/nixos/machines/hera/weechat/plugins/python/autoload/go.py similarity index 100% rename from hosts/hera/weechat/plugins/python/autoload/go.py rename to nixos/machines/hera/weechat/plugins/python/autoload/go.py diff --git a/hosts/hera/weechat/plugins/python/autoload/grep.py b/nixos/machines/hera/weechat/plugins/python/autoload/grep.py similarity index 100% rename from hosts/hera/weechat/plugins/python/autoload/grep.py rename to nixos/machines/hera/weechat/plugins/python/autoload/grep.py diff --git a/hosts/hera/weechat/plugins/python/autoload/sortlatest.py b/nixos/machines/hera/weechat/plugins/python/autoload/sortlatest.py similarity index 100% rename from hosts/hera/weechat/plugins/python/autoload/sortlatest.py rename to nixos/machines/hera/weechat/plugins/python/autoload/sortlatest.py diff --git a/hosts/hera/weechat/plugins/python/autoload/topicdiff.py b/nixos/machines/hera/weechat/plugins/python/autoload/topicdiff.py similarity index 100% rename from hosts/hera/weechat/plugins/python/autoload/topicdiff.py rename to nixos/machines/hera/weechat/plugins/python/autoload/topicdiff.py diff --git a/hosts/hera/weechat/plugins/python/buffer_autoset.py b/nixos/machines/hera/weechat/plugins/python/buffer_autoset.py similarity index 100% rename from hosts/hera/weechat/plugins/python/buffer_autoset.py rename to nixos/machines/hera/weechat/plugins/python/buffer_autoset.py diff --git a/hosts/hera/weechat/plugins/python/go.py b/nixos/machines/hera/weechat/plugins/python/go.py similarity index 100% rename from hosts/hera/weechat/plugins/python/go.py rename to nixos/machines/hera/weechat/plugins/python/go.py diff --git a/hosts/hera/weechat/plugins/python/grep.py b/nixos/machines/hera/weechat/plugins/python/grep.py similarity index 100% rename from hosts/hera/weechat/plugins/python/grep.py rename to nixos/machines/hera/weechat/plugins/python/grep.py diff --git a/hosts/hera/weechat/plugins/python/sortlatest.py b/nixos/machines/hera/weechat/plugins/python/sortlatest.py similarity index 100% rename from hosts/hera/weechat/plugins/python/sortlatest.py rename to nixos/machines/hera/weechat/plugins/python/sortlatest.py diff --git a/hosts/hera/weechat/plugins/python/topicdiff.py b/nixos/machines/hera/weechat/plugins/python/topicdiff.py similarity index 100% rename from hosts/hera/weechat/plugins/python/topicdiff.py rename to nixos/machines/hera/weechat/plugins/python/topicdiff.py diff --git a/system/blog.nix b/nixos/roles/blog.nix similarity index 100% rename from system/blog.nix rename to nixos/roles/blog.nix diff --git a/system/boot-key.nix b/nixos/roles/boot-key.nix similarity index 100% rename from system/boot-key.nix rename to nixos/roles/boot-key.nix diff --git a/system/coturn.nix b/nixos/roles/coturn.nix similarity index 100% rename from system/coturn.nix rename to nixos/roles/coturn.nix diff --git a/system/default.nix b/nixos/roles/default.nix similarity index 96% rename from system/default.nix rename to nixos/roles/default.nix index b151e5de..5abe2204 100644 --- a/system/default.nix +++ b/nixos/roles/default.nix @@ -2,7 +2,7 @@ let me = config.m-0.private.me; in { imports = [ - ../common + ../../common ./modules/laptop.nix ./modules/loginctl-linger.nix ]; @@ -10,7 +10,7 @@ in { i18n = { defaultLocale = "en_US.UTF-8"; }; # For nixos-rebuild - nixpkgs.overlays = import ../overlays { inherit lib; }; + nixpkgs.overlays = import ../../overlays { inherit lib; }; time.timeZone = "Europe/Berlin"; diff --git a/system/email2matrix.nix b/nixos/roles/email2matrix.nix similarity index 100% rename from system/email2matrix.nix rename to nixos/roles/email2matrix.nix diff --git a/system/fonts.nix b/nixos/roles/fonts.nix similarity index 100% rename from system/fonts.nix rename to nixos/roles/fonts.nix diff --git a/system/git.nix b/nixos/roles/git.nix similarity index 100% rename from system/git.nix rename to nixos/roles/git.nix diff --git a/system/go-neb.nix b/nixos/roles/go-neb.nix similarity index 100% rename from system/go-neb.nix rename to nixos/roles/go-neb.nix diff --git a/system/local-nix-cache.nix b/nixos/roles/local-nix-cache.nix similarity index 93% rename from system/local-nix-cache.nix rename to nixos/roles/local-nix-cache.nix index ab90380c..e0e3c748 100644 --- a/system/local-nix-cache.nix +++ b/nixos/roles/local-nix-cache.nix @@ -1,5 +1,5 @@ { config, pkgs, lib, ... }: -let inherit (import ../lib) sources; +let inherit (import ../../lib) sources; local-nix-cache = import sources.local-nix-cache { }; in { imports = [ (local-nix-cache.path + "/module.nix") ]; diff --git a/system/mathechor.de.nix b/nixos/roles/mathechor.de.nix similarity index 100% rename from system/mathechor.de.nix rename to nixos/roles/mathechor.de.nix diff --git a/system/matrix-synapse.nix b/nixos/roles/matrix-synapse.nix similarity index 100% rename from system/matrix-synapse.nix rename to nixos/roles/matrix-synapse.nix diff --git a/system/modules/go-neb.nix b/nixos/roles/modules/go-neb.nix similarity index 100% rename from system/modules/go-neb.nix rename to nixos/roles/modules/go-neb.nix diff --git a/system/modules/laptop.nix b/nixos/roles/modules/laptop.nix similarity index 100% rename from system/modules/laptop.nix rename to nixos/roles/modules/laptop.nix diff --git a/system/modules/loginctl-linger.nix b/nixos/roles/modules/loginctl-linger.nix similarity index 100% rename from system/modules/loginctl-linger.nix rename to nixos/roles/modules/loginctl-linger.nix diff --git a/system/monitoring/alertmanager.nix b/nixos/roles/monitoring/alertmanager.nix similarity index 100% rename from system/monitoring/alertmanager.nix rename to nixos/roles/monitoring/alertmanager.nix diff --git a/system/monitoring/blackbox_rules.yml b/nixos/roles/monitoring/blackbox_rules.yml similarity index 100% rename from system/monitoring/blackbox_rules.yml rename to nixos/roles/monitoring/blackbox_rules.yml diff --git a/system/monitoring/default.nix b/nixos/roles/monitoring/default.nix similarity index 100% rename from system/monitoring/default.nix rename to nixos/roles/monitoring/default.nix diff --git a/system/monitoring/grafana-dashboards/health-status.json b/nixos/roles/monitoring/grafana-dashboards/health-status.json similarity index 100% rename from system/monitoring/grafana-dashboards/health-status.json rename to nixos/roles/monitoring/grafana-dashboards/health-status.json diff --git a/system/monitoring/grafana-dashboards/node-exporter.json b/nixos/roles/monitoring/grafana-dashboards/node-exporter.json similarity index 100% rename from system/monitoring/grafana-dashboards/node-exporter.json rename to nixos/roles/monitoring/grafana-dashboards/node-exporter.json diff --git a/system/monitoring/grafana.nix b/nixos/roles/monitoring/grafana.nix similarity index 100% rename from system/monitoring/grafana.nix rename to nixos/roles/monitoring/grafana.nix diff --git a/system/monitoring/nixpkgs.nix b/nixos/roles/monitoring/nixpkgs.nix similarity index 100% rename from system/monitoring/nixpkgs.nix rename to nixos/roles/monitoring/nixpkgs.nix diff --git a/system/monitoring/probes.nix b/nixos/roles/monitoring/probes.nix similarity index 100% rename from system/monitoring/probes.nix rename to nixos/roles/monitoring/probes.nix diff --git a/system/monitoring/prometheus.nix b/nixos/roles/monitoring/prometheus.nix similarity index 100% rename from system/monitoring/prometheus.nix rename to nixos/roles/monitoring/prometheus.nix diff --git a/system/monitoring/rules.yml b/nixos/roles/monitoring/rules.yml similarity index 100% rename from system/monitoring/rules.yml rename to nixos/roles/monitoring/rules.yml diff --git a/system/riot.nix b/nixos/roles/riot.nix similarity index 100% rename from system/riot.nix rename to nixos/roles/riot.nix diff --git a/system/serve-store.nix b/nixos/roles/serve-store.nix similarity index 100% rename from system/serve-store.nix rename to nixos/roles/serve-store.nix diff --git a/system/server/default.nix b/nixos/roles/server/default.nix similarity index 100% rename from system/server/default.nix rename to nixos/roles/server/default.nix diff --git a/system/server/init_ssh.nix b/nixos/roles/server/init_ssh.nix similarity index 100% rename from system/server/init_ssh.nix rename to nixos/roles/server/init_ssh.nix diff --git a/system/standalone/admin.nix b/nixos/roles/standalone/admin.nix similarity index 100% rename from system/standalone/admin.nix rename to nixos/roles/standalone/admin.nix diff --git a/system/standalone/default.nix b/nixos/roles/standalone/default.nix similarity index 95% rename from system/standalone/default.nix rename to nixos/roles/standalone/default.nix index 3d2b7c99..da692769 100644 --- a/system/standalone/default.nix +++ b/nixos/roles/standalone/default.nix @@ -29,7 +29,7 @@ environment = { # Put these into an extra file so the essential packages can also be included on non selfadminstrated systems from home-manager systemPackages = builtins.attrValues ({ - inherit (import ../../lib/update-system.nix { + inherit (import ../../../lib/update-system.nix { inherit pkgs; nixos-rebuild = config.system.build.nixos-rebuild; }) diff --git a/system/test-timer.nix b/nixos/roles/test-timer.nix similarity index 97% rename from system/test-timer.nix rename to nixos/roles/test-timer.nix index 46973ef0..0d473c3a 100644 --- a/system/test-timer.nix +++ b/nixos/roles/test-timer.nix @@ -1,7 +1,7 @@ { pkgs, config, lib, ... }: let user = "maralorn"; - inherit (import ../lib/update-system.nix { + inherit (import ../../lib/update-system.nix { nixos-rebuild = config.system.build.nixos-rebuild; inherit pkgs; }) diff --git a/system/use-cache.nix b/nixos/roles/use-cache.nix similarity index 100% rename from system/use-cache.nix rename to nixos/roles/use-cache.nix diff --git a/overlays/grafana-devel/package.nix b/overlays/grafana-devel/package.nix index 7458171a..b1500bd3 100644 --- a/overlays/grafana-devel/package.nix +++ b/overlays/grafana-devel/package.nix @@ -12,7 +12,7 @@ let providers = [{ name = "Static dashboards"; folder = ""; - options.path = ../../system/monitoring/grafana-dashboards; + options.path = ../../nixos/roles/monitoring/grafana-dashboards; orgId = 1; type = "file"; updateIntervalSeconds = 60; diff --git a/overlays/pkgSets.nix b/overlays/pkgSets.nix index fb831577..10513c19 100644 --- a/overlays/pkgSets.nix +++ b/overlays/pkgSets.nix @@ -11,7 +11,7 @@ self: super: { inherit (self) git-crypt htop tree pwgen borgbackup inotifyTools direnv socat nmap ncdu tcpdump tmux tig exa fzf ag fd bat ripgrep ranger pass sshuttle vnstat - entr libargon2 mblaze niv; + entr libargon2 mblaze niv compsize; }; my-home-pkgs = { diff --git a/overlays/testing.nix b/overlays/testing.nix index 6ea36904..b60980f3 100644 --- a/overlays/testing.nix +++ b/overlays/testing.nix @@ -26,7 +26,7 @@ in { name = "test-system-config"; inherit bins; inherit imports; - } (haskellBody "system" ''nix_build $ ["", "-A", "system"] ++ paths ++ ["-I", [i|nixos-config=#{configDir}/hosts/#{hostname}/configuration.nix|], "-o", [i|result-system-#{hostname}|]] ++ fmap toString args''); + } (haskellBody "system" ''nix_build $ ["", "-A", "system"] ++ paths ++ ["-I", [i|nixos-config=#{configDir}nixos/machines#{hostname}/configuration.nix|], "-o", [i|result-system-#{hostname}|]] ++ fmap toString args''); test-home-config = self.writeHaskellScript { name = "test-home-config";