hosts: remove kaze
hosts: remove kaze hosts: update networking nushell: update aliases profiles: remove kaze grafana: remove kaze
This commit is contained in:
parent
475d7def0c
commit
c65ae2f7a6
GPG key ID:
BD47506D475EE86D
21 changed files with 10 additions and 226 deletions
|
|
@ -63,10 +63,6 @@
|
|||
Hostname 100.73.192.45
|
||||
User notoh
|
||||
IdentityFile ~/.ssh/haru
|
||||
Host kaze
|
||||
Hostname 100.69.79.81
|
||||
User notoh
|
||||
IdentityFile ~/.ssh/kaze
|
||||
Host basegbot
|
||||
HostName 100.83.81.116
|
||||
User basegbot
|
||||
|
|
|
|||
|
|
@ -47,7 +47,6 @@
|
|||
wine
|
||||
bottles
|
||||
lutris
|
||||
r2modman
|
||||
moonlight-qt
|
||||
tokei
|
||||
jellyfin-media-player
|
||||
|
|
@ -58,6 +57,7 @@
|
|||
uxplay
|
||||
drawio
|
||||
postman
|
||||
gale
|
||||
inputs.zen.packages.${pkgs.system}.default
|
||||
inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin
|
||||
inputs.flocon.packages.${pkgs.system}.bolt-launcher
|
||||
|
|
@ -105,10 +105,6 @@
|
|||
Hostname 100.73.192.45
|
||||
User notoh
|
||||
IdentityFile ~/.ssh/haru
|
||||
Host kaze
|
||||
Hostname 100.69.79.81
|
||||
User notoh
|
||||
IdentityFile ~/.ssh/kaze
|
||||
Host basegbot
|
||||
HostName 100.83.81.116
|
||||
User basegbot
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ alias grep = rg
|
|||
alias build = nh os boot .
|
||||
alias switch = nh os switch .
|
||||
alias clean = sudo nh clean all
|
||||
alias deploy = nix run github:serokell/deploy-rs
|
||||
alias deploy = nix run github:serokell/deploy-rs -- --targets
|
||||
alias sakura = nix run github:serokell/deploy-rs ".#sakura"
|
||||
alias kariru = nix run github:serokell/deploy-rs ".#kariru"
|
||||
alias yuki = nix run github:serokell/deploy-rs ".#yuki"
|
||||
|
|
@ -26,7 +26,6 @@ alias arashi = nix run github:serokell/deploy-rs ".#arashi"
|
|||
alias sora = nix run github:serokell/deploy-rs ".#sora"
|
||||
alias tsuru = nix run github:serokell/deploy-rs ".#tsuru"
|
||||
alias haru = nix run github:serokell/deploy-rs ".#haru"
|
||||
alias kaze = nix run github:serokell/deploy-rs ".#kaze"
|
||||
alias dl = yt-dlp -P ~/Videos/downloaded
|
||||
alias dlad = yt-dlp -x --audio-format mp3 --embed-thumbnail
|
||||
alias dlcd = yt-dlp
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ _: {
|
|||
environment.etc = {
|
||||
"resolv.conf".text = ''
|
||||
nameserver 192.168.1.103
|
||||
nameserver 9.9.9.9
|
||||
nameserver 1.1.1.1
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -151,21 +151,5 @@
|
|||
}
|
||||
];
|
||||
};
|
||||
kaze = nixosSystem {
|
||||
inherit specialArgs;
|
||||
modules = [
|
||||
./kaze
|
||||
{
|
||||
home-manager = {
|
||||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
extraSpecialArgs = specialArgs;
|
||||
users.notoh = {
|
||||
imports = homeImports."default";
|
||||
};
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -71,16 +71,6 @@
|
|||
sshOpts = ["-t" "-i" "~/.ssh/forgejo"];
|
||||
magicRollback = true;
|
||||
};
|
||||
kaze = {
|
||||
hostname = "100.69.79.81";
|
||||
profiles.system = {
|
||||
user = "root";
|
||||
path = activate.nixos inputs.self.nixosConfigurations.kaze;
|
||||
};
|
||||
sshUser = "root";
|
||||
sshOpts = ["-t" "-i" "~/.ssh/forgejo"];
|
||||
magicRollback = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ _: {
|
|||
environment.etc = {
|
||||
"resolv.conf".text = ''
|
||||
nameserver 192.168.1.103
|
||||
nameserver 9.9.9.9
|
||||
nameserver 1.1.1.1
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ _: {
|
|||
environment.etc = {
|
||||
"resolv.conf".text = ''
|
||||
nameserver 192.168.1.103
|
||||
nameserver 9.9.9.9
|
||||
nameserver 1.1.1.1
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
{...}: {
|
||||
imports = [
|
||||
./hardware.nix
|
||||
./services
|
||||
./networking.nix
|
||||
./topology.nix
|
||||
../common
|
||||
];
|
||||
|
||||
users = {
|
||||
users.notoh.openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE4qfqJNxwNg9ryeT/XbjfQyuDKbBAwRn2Lzq3Iq5kA7 kaze"
|
||||
];
|
||||
users.root.openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMd8j1+fC/ng7l17rsxugVtlhurUe1ICizwA9lQkSuNY forgejo"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/profiles/qemu-guest.nix")
|
||||
];
|
||||
|
||||
boot = {
|
||||
kernelModules = ["kvm-amd"];
|
||||
extraModulePackages = [];
|
||||
loader.grub = {
|
||||
enable = true;
|
||||
configurationLimit = 5;
|
||||
device = "/dev/vda";
|
||||
useOSProber = true;
|
||||
};
|
||||
initrd = {
|
||||
availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" "virtio_blk"];
|
||||
kernelModules = [];
|
||||
};
|
||||
};
|
||||
|
||||
fileSystems = {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-uuid/9cb414ab-0bb4-4db7-b77e-7d2a8cafd657";
|
||||
fsType = "ext4";
|
||||
};
|
||||
"/var/lib/slab" = {
|
||||
device = "/dev/disk/by-uuid/733a3f7b-b232-4b34-8742-460a67d8f1d0";
|
||||
fsType = "ext4";
|
||||
};
|
||||
};
|
||||
|
||||
swapDevices = [
|
||||
{device = "/dev/disk/by-uuid/100a4262-ce57-47a7-b99a-f124a8e369de";}
|
||||
];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.ens3.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
}
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
_: {
|
||||
networking = {
|
||||
networkmanager.enable = true;
|
||||
hostName = "kaze";
|
||||
firewall = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
environment.etc = {
|
||||
"resolv.conf".text = ''
|
||||
nameserver 9.9.9.9
|
||||
nameserver 149.112.112.112
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
_: {
|
||||
imports = [
|
||||
./tailscale.nix
|
||||
./minio.nix
|
||||
];
|
||||
}
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
environment.systemPackages = [pkgs.minio-client];
|
||||
|
||||
systemd.services.minio.environment = {MINIO_BROWSER_REDIRECT = "false";};
|
||||
|
||||
sops.secrets.minio = {
|
||||
owner = "minio";
|
||||
group = "minio";
|
||||
mode = "0600";
|
||||
restartUnits = ["minio.service"];
|
||||
};
|
||||
services.minio = let
|
||||
dataDir = "/var/lib/slab/minio";
|
||||
in {
|
||||
enable = true;
|
||||
region = "us-east-1";
|
||||
consoleAddress = "0.0.0.0:9006";
|
||||
listenAddress = "0.0.0.0:9005";
|
||||
rootCredentialsFile = config.sops.secrets.minio.path;
|
||||
dataDir = ["${dataDir}/data"];
|
||||
configDir = "${dataDir}/config";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
sops.secrets.tsauth-kaze = {sopsFile = ../../../secrets/tailscale/secrets.yaml;};
|
||||
environment.systemPackages = [pkgs.jq pkgs.tailscale];
|
||||
services.tailscale = {
|
||||
useRoutingFeatures = lib.mkDefault "client";
|
||||
};
|
||||
networking.firewall.allowedUDPPorts = [config.services.tailscale.port];
|
||||
networking.firewall.trustedInterfaces = [config.services.tailscale.interfaceName];
|
||||
|
||||
systemd.services.tailscale-autoconnect = {
|
||||
description = "Automatic connection to Tailscale";
|
||||
|
||||
# make sure tailscale is running before trying to connect to tailscale
|
||||
after = ["network-pre.target" "tailscale.service"];
|
||||
wants = ["network-pre.target" "tailscale.service"];
|
||||
wantedBy = ["multi-user.target"];
|
||||
|
||||
# set this service as a oneshot job
|
||||
serviceConfig.Type = "oneshot";
|
||||
|
||||
# have the job run this shell script
|
||||
script = with pkgs; ''
|
||||
# wait for tailscaled to settle
|
||||
sleep 2
|
||||
|
||||
# check if we are already authenticated to tailscale
|
||||
status="$(${tailscale}/bin/tailscale status -json | ${jq}/bin/jq -r .BackendState)"
|
||||
if [ $status = "Running" ]; then # if so, then do nothing
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# otherwise authenticate with tailscale
|
||||
${tailscale}/bin/tailscale up -authkey file:${config.sops.secrets.tsauth-kaze.path} --exit-node=100.104.42.96 --exit-node-allow-lan-access=true --accept-dns=false
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
_: {
|
||||
topology = {
|
||||
self = {
|
||||
name = "kaze";
|
||||
hardware.info = "BuyVM VPS";
|
||||
interfaces = {
|
||||
tailscale0 = {
|
||||
addresses = ["100.69.79.81/32"];
|
||||
network = "tailscale0";
|
||||
type = "wireguard";
|
||||
};
|
||||
eth0 = {
|
||||
network = "hetzner";
|
||||
addresses = ["198.98.48.71 "];
|
||||
type = "ethernet";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -9,7 +9,7 @@ _: {
|
|||
environment.etc = {
|
||||
"resolv.conf".text = ''
|
||||
nameserver 192.168.1.103
|
||||
nameserver 9.9.9.9
|
||||
nameserver 1.1.1.1
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -68,12 +68,6 @@ in {
|
|||
url = "http://100.82.146.40:${prometheusPort}";
|
||||
orgId = 1;
|
||||
}
|
||||
{
|
||||
name = "Prometheus-kaze";
|
||||
type = "prometheus";
|
||||
url = "http://100.69.79.81:${prometheusPort}";
|
||||
orgId = 1;
|
||||
}
|
||||
{
|
||||
name = "Prometheus-haru";
|
||||
type = "prometheus";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
networking = {
|
||||
hostName = "sora";
|
||||
nameservers = [
|
||||
"9.9.9.9"
|
||||
"1.1.1.1"
|
||||
"149.112.112.112"
|
||||
];
|
||||
defaultGateway = "172.31.1.1";
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ _: {
|
|||
environment.etc = {
|
||||
"resolv.conf".text = ''
|
||||
nameserver 192.168.1.103
|
||||
nameserver 9.9.9.9
|
||||
nameserver 1.1.1.1
|
||||
options edns0
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ _: {
|
|||
environment.etc = {
|
||||
"resolv.conf".text = ''
|
||||
nameserver 192.168.1.103
|
||||
nameserver 9.9.9.9
|
||||
nameserver 1.1.1.1
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ _: {
|
|||
environment.etc = {
|
||||
"resolv.conf".text = ''
|
||||
nameserver 192.168.1.103
|
||||
nameserver 9.9.9.9
|
||||
nameserver 1.1.1.1
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue