From 3d2e5368cbf57a6880e4a265657cf2e1ae8b3043 Mon Sep 17 00:00:00 2001 From: notohh Date: Fri, 29 Dec 2023 12:43:13 -0500 Subject: [PATCH] hosts: rename hardware-config & remove unnecessary tailscale call --- hosts/ame/default.nix | 2 +- hosts/ame/{hardware-configuration.nix => hardware.nix} | 0 hosts/ame/networking.nix | 2 -- hosts/arashi/default.nix | 2 +- hosts/arashi/{hardware-configuration.nix => hardware.nix} | 0 hosts/arashi/networking.nix | 2 -- hosts/haru/default.nix | 2 +- hosts/haru/{hardware-configuration.nix => hardware.nix} | 0 hosts/haru/networking.nix | 2 -- hosts/kariru/default.nix | 2 +- hosts/kariru/{hardware-configuration.nix => hardware.nix} | 0 hosts/kariru/networking.nix | 2 -- hosts/sakura/default.nix | 2 +- hosts/sakura/{hardware-configuration.nix => hardware.nix} | 0 hosts/sakura/networking.nix | 2 -- hosts/sora/default.nix | 2 +- hosts/sora/{hardware-configuration.nix => hardware.nix} | 0 hosts/tsuki/default.nix | 2 +- hosts/tsuki/{hardware-configuration.nix => hardware.nix} | 0 hosts/tsuki/home.nix | 4 ---- hosts/tsuki/networking.nix | 2 -- hosts/tsuru/default.nix | 2 +- hosts/tsuru/{hardware-configuration.nix => hardware.nix} | 0 hosts/tsuru/networking.nix | 2 -- hosts/yuki/default.nix | 2 +- hosts/yuki/{hardware-configuration.nix => hardware.nix} | 0 hosts/yuki/networking.nix | 2 -- 27 files changed, 9 insertions(+), 29 deletions(-) rename hosts/ame/{hardware-configuration.nix => hardware.nix} (100%) rename hosts/arashi/{hardware-configuration.nix => hardware.nix} (100%) rename hosts/haru/{hardware-configuration.nix => hardware.nix} (100%) rename hosts/kariru/{hardware-configuration.nix => hardware.nix} (100%) rename hosts/sakura/{hardware-configuration.nix => hardware.nix} (100%) rename hosts/sora/{hardware-configuration.nix => hardware.nix} (100%) rename hosts/tsuki/{hardware-configuration.nix => hardware.nix} (100%) rename hosts/tsuru/{hardware-configuration.nix => hardware.nix} (100%) rename hosts/yuki/{hardware-configuration.nix => hardware.nix} (100%) diff --git a/hosts/ame/default.nix b/hosts/ame/default.nix index 03edc7c..bfa97eb 100644 --- a/hosts/ame/default.nix +++ b/hosts/ame/default.nix @@ -1,6 +1,6 @@ {...}: { imports = [ - ./hardware-configuration.nix + ./hardware.nix ./services ./networking.nix ../../modules diff --git a/hosts/ame/hardware-configuration.nix b/hosts/ame/hardware.nix similarity index 100% rename from hosts/ame/hardware-configuration.nix rename to hosts/ame/hardware.nix diff --git a/hosts/ame/networking.nix b/hosts/ame/networking.nix index f704f0e..6de92d2 100644 --- a/hosts/ame/networking.nix +++ b/hosts/ame/networking.nix @@ -12,6 +12,4 @@ _: { nameserver 1.1.1.1 ''; }; - - services.tailscale.enable = true; } diff --git a/hosts/arashi/default.nix b/hosts/arashi/default.nix index cc9a87b..842ade8 100644 --- a/hosts/arashi/default.nix +++ b/hosts/arashi/default.nix @@ -1,6 +1,6 @@ {...}: { imports = [ - ./hardware-configuration.nix + ./hardware.nix ./services ./networking.nix ../../modules diff --git a/hosts/arashi/hardware-configuration.nix b/hosts/arashi/hardware.nix similarity index 100% rename from hosts/arashi/hardware-configuration.nix rename to hosts/arashi/hardware.nix diff --git a/hosts/arashi/networking.nix b/hosts/arashi/networking.nix index f704f0e..6de92d2 100644 --- a/hosts/arashi/networking.nix +++ b/hosts/arashi/networking.nix @@ -12,6 +12,4 @@ _: { nameserver 1.1.1.1 ''; }; - - services.tailscale.enable = true; } diff --git a/hosts/haru/default.nix b/hosts/haru/default.nix index 445de1b..efedcb2 100644 --- a/hosts/haru/default.nix +++ b/hosts/haru/default.nix @@ -1,6 +1,6 @@ {...}: { imports = [ - ./hardware-configuration.nix + ./hardware.nix ./services ./networking.nix ../../modules diff --git a/hosts/haru/hardware-configuration.nix b/hosts/haru/hardware.nix similarity index 100% rename from hosts/haru/hardware-configuration.nix rename to hosts/haru/hardware.nix diff --git a/hosts/haru/networking.nix b/hosts/haru/networking.nix index ccd8dbf..11382db 100644 --- a/hosts/haru/networking.nix +++ b/hosts/haru/networking.nix @@ -12,6 +12,4 @@ _: { nameserver 1.0.0.1 ''; }; - - services.tailscale.enable = true; } diff --git a/hosts/kariru/default.nix b/hosts/kariru/default.nix index ef856b4..7a4f99a 100644 --- a/hosts/kariru/default.nix +++ b/hosts/kariru/default.nix @@ -1,6 +1,6 @@ {...}: { imports = [ - ./hardware-configuration.nix + ./hardware.nix ./services ./networking.nix ../../modules diff --git a/hosts/kariru/hardware-configuration.nix b/hosts/kariru/hardware.nix similarity index 100% rename from hosts/kariru/hardware-configuration.nix rename to hosts/kariru/hardware.nix diff --git a/hosts/kariru/networking.nix b/hosts/kariru/networking.nix index f704f0e..6de92d2 100644 --- a/hosts/kariru/networking.nix +++ b/hosts/kariru/networking.nix @@ -12,6 +12,4 @@ _: { nameserver 1.1.1.1 ''; }; - - services.tailscale.enable = true; } diff --git a/hosts/sakura/default.nix b/hosts/sakura/default.nix index 9254504..2e1fc84 100644 --- a/hosts/sakura/default.nix +++ b/hosts/sakura/default.nix @@ -1,6 +1,6 @@ _: { imports = [ - ./hardware-configuration.nix + ./hardware.nix ./services ./networking.nix ../../modules diff --git a/hosts/sakura/hardware-configuration.nix b/hosts/sakura/hardware.nix similarity index 100% rename from hosts/sakura/hardware-configuration.nix rename to hosts/sakura/hardware.nix diff --git a/hosts/sakura/networking.nix b/hosts/sakura/networking.nix index f704f0e..6de92d2 100644 --- a/hosts/sakura/networking.nix +++ b/hosts/sakura/networking.nix @@ -12,6 +12,4 @@ _: { nameserver 1.1.1.1 ''; }; - - services.tailscale.enable = true; } diff --git a/hosts/sora/default.nix b/hosts/sora/default.nix index 06ffeef..7eb7bea 100644 --- a/hosts/sora/default.nix +++ b/hosts/sora/default.nix @@ -1,6 +1,6 @@ _: { imports = [ - ./hardware-configuration.nix + ./hardware.nix ./networking.nix ./services ../../modules diff --git a/hosts/sora/hardware-configuration.nix b/hosts/sora/hardware.nix similarity index 100% rename from hosts/sora/hardware-configuration.nix rename to hosts/sora/hardware.nix diff --git a/hosts/tsuki/default.nix b/hosts/tsuki/default.nix index b0cdac3..95e8d15 100755 --- a/hosts/tsuki/default.nix +++ b/hosts/tsuki/default.nix @@ -7,7 +7,7 @@ imports = [ inputs.nix-gaming.nixosModules.steamCompat inputs.nix-gaming.nixosModules.pipewireLowLatency - ./hardware-configuration.nix + ./hardware.nix ./services ./networking.nix ../../home/wayland/hyprland/wayland.nix diff --git a/hosts/tsuki/hardware-configuration.nix b/hosts/tsuki/hardware.nix similarity index 100% rename from hosts/tsuki/hardware-configuration.nix rename to hosts/tsuki/hardware.nix diff --git a/hosts/tsuki/home.nix b/hosts/tsuki/home.nix index 25885e9..b7c3ff6 100755 --- a/hosts/tsuki/home.nix +++ b/hosts/tsuki/home.nix @@ -100,10 +100,6 @@ HostName 100.83.81.116 User basegbot IdentityFile ~/.ssh/basegbot - Host pihole - HostName 192.168.1.221 - User notoh - IdentityFile ~/.ssh/pihole Host rpi4 HostName 100.92.145.147 User notoh diff --git a/hosts/tsuki/networking.nix b/hosts/tsuki/networking.nix index f704f0e..6de92d2 100644 --- a/hosts/tsuki/networking.nix +++ b/hosts/tsuki/networking.nix @@ -12,6 +12,4 @@ _: { nameserver 1.1.1.1 ''; }; - - services.tailscale.enable = true; } diff --git a/hosts/tsuru/default.nix b/hosts/tsuru/default.nix index 8c43376..3c782b6 100644 --- a/hosts/tsuru/default.nix +++ b/hosts/tsuru/default.nix @@ -1,6 +1,6 @@ {...}: { imports = [ - ./hardware-configuration.nix + ./hardware.nix ./services ./networking.nix ../../modules diff --git a/hosts/tsuru/hardware-configuration.nix b/hosts/tsuru/hardware.nix similarity index 100% rename from hosts/tsuru/hardware-configuration.nix rename to hosts/tsuru/hardware.nix diff --git a/hosts/tsuru/networking.nix b/hosts/tsuru/networking.nix index f704f0e..6de92d2 100644 --- a/hosts/tsuru/networking.nix +++ b/hosts/tsuru/networking.nix @@ -12,6 +12,4 @@ _: { nameserver 1.1.1.1 ''; }; - - services.tailscale.enable = true; } diff --git a/hosts/yuki/default.nix b/hosts/yuki/default.nix index 07a7f28..0ff26f2 100644 --- a/hosts/yuki/default.nix +++ b/hosts/yuki/default.nix @@ -1,6 +1,6 @@ {...}: { imports = [ - ./hardware-configuration.nix + ./hardware.nix ./services ./networking.nix ../../modules diff --git a/hosts/yuki/hardware-configuration.nix b/hosts/yuki/hardware.nix similarity index 100% rename from hosts/yuki/hardware-configuration.nix rename to hosts/yuki/hardware.nix diff --git a/hosts/yuki/networking.nix b/hosts/yuki/networking.nix index f704f0e..6de92d2 100644 --- a/hosts/yuki/networking.nix +++ b/hosts/yuki/networking.nix @@ -12,6 +12,4 @@ _: { nameserver 1.1.1.1 ''; }; - - services.tailscale.enable = true; }