diff options
Diffstat (limited to 'hosts/mercury')
| -rw-r--r-- | hosts/mercury/config.nix | 4 | ||||
| -rw-r--r-- | hosts/mercury/hjem.nix | 2 | ||||
| -rw-r--r-- | hosts/mercury/nixos.nix | 11 |
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 = { |