aboutsummaryrefslogtreecommitdiff
path: root/hosts/mercury
diff options
context:
space:
mode:
authorCollin Williams <96917990+bluedragon1221@users.noreply.github.com>2026-02-27 07:57:56 -0600
committerCollin Williams <96917990+bluedragon1221@users.noreply.github.com>2026-02-27 07:57:56 -0600
commitc303524a359d2be84d825acebbf8d7e2ddd8f24a (patch)
treeaf7a7537703b7989dff65478a26f5637c0d1abbd /hosts/mercury
parent1932c82d72fb74971b180f84e06bcd1724e6271b (diff)
refactor network config, add wireguard connection to vps
Diffstat (limited to 'hosts/mercury')
-rw-r--r--hosts/mercury/config.nix4
-rw-r--r--hosts/mercury/hjem.nix2
-rw-r--r--hosts/mercury/nixos.nix11
3 files changed, 13 insertions, 4 deletions
diff --git a/hosts/mercury/config.nix b/hosts/mercury/config.nix
index abf38fb..cdf24d9 100644
--- a/hosts/mercury/config.nix
+++ b/hosts/mercury/config.nix
@@ -36,9 +36,9 @@
};
network = {
- iwd.enable = true;
- networkd.enable = true;
+ wireless.dynamic = true;
};
+
audio.enable = true;
bluetooth.enable = true;
};
diff --git a/hosts/mercury/hjem.nix b/hosts/mercury/hjem.nix
index b50dd6f..9e0ca77 100644
--- a/hosts/mercury/hjem.nix
+++ b/hosts/mercury/hjem.nix
@@ -33,7 +33,7 @@ in {
inputs.glide-browser.packages."x86_64-linux".default
inputs.vermilion.packages."x86_64-linux".default
- (pkgs.callPackage ../../pkgs/yoshi.nix {inherit inputs;})
+ # (pkgs.callPackage ../../pkgs/yoshi.nix {inherit inputs;})
(pkgs.callPackage ../../pkgs/yo.nix {inherit inputs;})
];
diff --git a/hosts/mercury/nixos.nix b/hosts/mercury/nixos.nix
index f820b7f..fee1a5e 100644
--- a/hosts/mercury/nixos.nix
+++ b/hosts/mercury/nixos.nix
@@ -53,9 +53,18 @@
];
programs.ssh.extraConfig = ''
- Host ganymede
+ 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 20.251.8.247
+ Port 22
+ IdentityFile ~/Gliese_key_2.pem
'';
programs.firefox.policies.ExtensionSettings = {