diff options
Diffstat (limited to 'hosts')
| -rw-r--r-- | hosts/ganymede/config.nix | 33 | ||||
| -rw-r--r-- | hosts/ganymede/nixos.nix | 37 | ||||
| -rw-r--r-- | hosts/gliese-key.age | 18 | ||||
| -rw-r--r-- | hosts/mercury/config.nix | 7 | ||||
| -rw-r--r-- | hosts/mercury/nixos.nix | 33 |
5 files changed, 17 insertions, 111 deletions
diff --git a/hosts/ganymede/config.nix b/hosts/ganymede/config.nix index 6fe1e3e..c4d9109 100644 --- a/hosts/ganymede/config.nix +++ b/hosts/ganymede/config.nix @@ -8,11 +8,6 @@ owner = "wpa_supplicant"; }; - "gliese-key" = { - file = ../gliese-key.age; - owner = "collin"; - }; - "caddy-env".file = ./secrets/caddy-env.age; "collin-copyparty-password" = { @@ -55,18 +50,9 @@ services = { sshd = { enable = true; - portConfig = [ - { - port = 2222; - listenAddr = "0.0.0.0"; - rootLogin = true; - } - { - port = 22; - listenAddr = "0.0.0.0"; - rootLogin = true; - } - ]; + port = 22; + listenAddr = "0.0.0.0"; + rootLogin = true; }; goaccess = { @@ -83,21 +69,16 @@ privateUrl = "git.ganymede"; }; - agate = { - enable = true; - publicUrl = "williamsfam.us.com"; - }; + # agate = { + # enable = true; + # publicUrl = "williamsfam.us.com"; + # }; minecraft = { enable = true; listenAddr = "0.0.0.0"; }; - polaris = { - enable = true; - privateUrl = "music.ganymede"; - }; - qbittorrent = { enable = true; privateUrl = "bittorrent.ganymede"; diff --git a/hosts/ganymede/nixos.nix b/hosts/ganymede/nixos.nix index a2314ee..a706b5f 100644 --- a/hosts/ganymede/nixos.nix +++ b/hosts/ganymede/nixos.nix @@ -16,8 +16,6 @@ facter.reportPath = ./facter.json; - virtualisation.oci-containers.backend = "docker"; # fix weird issue with minecraft server (only thing running in docker right now) - # backup usb teather configuration systemd.network.networks."80-usb-teather" = { name = "enp0s20f0u2"; @@ -31,43 +29,8 @@ wantedBy = ["default.target"]; }; - # VPN to server - systemd.network = { - netdevs."10-wg0" = { - netdevConfig = { - Kind = "wireguard"; - Name = "wg0"; - }; - wireguardConfig = { - PrivateKeyFile = config.collinux.secrets."wireguard-pk".path; - ListenPort = 51820; - }; - wireguardPeers = [ - { - PublicKey = "seOq75FUGb+KThvOXCEAGdabWbb+jTRUntITpuAPgWA="; - AllowedIPs = "0.0.0.0/0"; - Endpoint = "20.251.8.247:51820"; - PersistentKeepalive = 25; - } - ]; - }; - networks."wg0" = { - matchConfig.Name = "wg0"; - address = ["10.100.0.2/24"]; - DHCP = "no"; - networkConfig.IPv6AcceptRA = false; - }; - }; - services.fail2ban.enable = true; - programs.ssh.extraConfig = '' - Host gliese - HostName 10.100.0.1 - User green - IdentityFile ${config.collinux.secrets."gliese-key".path} - ''; - # merge logs from subdomains services.caddy.virtualHosts."up.williamsfam.us.com".logFormat = lib.mkForce '' output file /var/log/caddy/access-williamsfam.us.com.log diff --git a/hosts/gliese-key.age b/hosts/gliese-key.age deleted file mode 100644 index 6fc5ce5..0000000 --- a/hosts/gliese-key.age +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGF6QmlsZyA0RCtu -NWFrbW0zTU53Rk05NzRUUG1oRG4rK05EM1pnYTYwaEpCYWZBbFFrCmM3TmtRandq -TnBVVk9ZRm1oMzlIajR1b1RJdHl4MERtbkw1MmQ3em55cncKLT4gc3NoLWVkMjU1 -MTkgSmc0eVdRIGJPcG56L3c0QUovSVJsVDlrTkJhNTBaSXlzQkkweU1mcTB5dEtK -SDhKekUKaWEzdTUvbU5seVkvZUJDQW9XTVQ1bEJzWU5XVU5VREhIMnFxd0FRWHhS -dwotPiAyQC1ncmVhc2UgLE85NyBOZ2ssbmIKMEN1MWNWL2dWZwotLS0gazN5U0xM -ZjhXV1B2MmlhUm5rQXJGcWJKcVRUdXZ5Z3cxWEN2a3FVdEJWMAqoHBpRSjJB1CKI -fWVLuRxB5c/gBXoiE8VfQ7O5v1JN6ZJ7C9m+d6PcgSKaCjEgPdnRxxe7JCDc3dUS -cnebY/h7q+vAkLTqvtuiBMw67c5p79/EW7FpN6Wzzmc9wIHvbPf0zsn4EOqfc24I -cuB55uviE0//E3Xh6iRvvx5XEgSBUGLeycZa5P0fmUJUOhG9CtJya4D2tB6huyNK -2+dJgQdFkXghinzPQimnDXYhoD7PTM6yGaJQdrB0GT6lXMCBlRB9p2uEArrVYhJu -/vAXFsGxENjI7XvH1RabM1gLN7Eytq/ptz+9/S/sMQ4D4FPp3L2gHklEqepOv3Df -z1b7PA5aOQj3+jlpcAUkfKtgA32vT7KddlRXQWHzC7VyuEpGjT+qydNet+tBW5Z6 -DDNc/LJ/sNvOsBQE2wqvi4/bLpAG2By6CKrZYZrE+l1zJMWkbT6QnOR9/aby15am -iSq4agnTdxsx3JrJ+V5thUyDNrAIY/DQg0rLfoGy37g877vENco+3USdoOeRJjHD -1yRjq39y8h4EQCyeaAx0h3MQEJMiReHxbQ== ------END AGE ENCRYPTED FILE----- diff --git a/hosts/mercury/config.nix b/hosts/mercury/config.nix index 12518f4..d2164c4 100644 --- a/hosts/mercury/config.nix +++ b/hosts/mercury/config.nix @@ -2,12 +2,7 @@ collinux = { theme = "catppuccin"; - secrets = { - "gliese-key" = { - file = ../gliese-key.age; - owner = "collin"; - }; - }; + secrets = {}; user.useRun0 = true; diff --git a/hosts/mercury/nixos.nix b/hosts/mercury/nixos.nix index 3f5c0b0..8fcb504 100644 --- a/hosts/mercury/nixos.nix +++ b/hosts/mercury/nixos.nix @@ -1,19 +1,20 @@ { lib, inputs, - config, ... }: { imports = [ ./disks.nix ./battery.nix - # ./ai.nix inputs.nixos-facter-modules.nixosModules.facter inputs.lanzaboote.nixosModules.lanzaboote ]; facter.reportPath = ./facter.json; + services.dbus.implementation = "broker"; + + environment.defaultPackages = lib.mkForce []; # im not a noob services.syncthing = { enable = true; @@ -26,14 +27,14 @@ name = "ganymede"; user = "collin"; monitoringPort = 20000; - extraArguments = "-N -D 9090 -L 4141:localhost:4141 collin@williamsfam.us.com"; + extraArguments = "-N -D 9090 collin@williamsfam.us.com"; } ]; - - services.dbus.implementation = "broker"; - - environment.defaultPackages = lib.mkForce []; # im not a noob - + programs.ssh.extraConfig = '' + Host ganymede + HostName williamsfam.us.com + Port 22 + ''; security.pki.certificates = [ '' -----BEGIN CERTIFICATE----- @@ -50,22 +51,6 @@ '' ]; - programs.ssh.extraConfig = '' - Match host ganymede exec "nc -z -w1 192.168.50.2 2222" - HostName 192.168.50.2 - Port 2222 - - Host ganymede - HostName williamsfam.us.com - Port 22 - - Host gliese - HostName 10.100.0.1 - User green - IdentityFile ${config.collinux.secrets."gliese-key".path} - ProxyJump collin@ganymede - ''; - programs.firefox.policies.ExtensionSettings = { "foxyproxy@eric.h.jung" = { installation_mode = "force_installed"; |