diff --git a/home-manager/users/sstent/default.nix b/home-manager/users/sstent/default.nix index 4779638..5c1b212 100644 --- a/home-manager/users/sstent/default.nix +++ b/home-manager/users/sstent/default.nix @@ -101,6 +101,11 @@ # ssh-add -l export PATH=$PATH:/bin #Fix for wslpath + # Fix ssh completion + # bash: warning: setlocale: LC_CTYPE: cannot change locale (en_US.UTF-8) + export LANG=C + + for command in $({ just --summary; just -l | grep "# alias for " | awk "{print \$1}"; } | tr " " "\\n" | sed "/^default\$/d" | xargs); do alias $command="just $command" @@ -138,6 +143,32 @@ UserKnownHostsFile = "/dev/null"; }; }; + ##pr2100 + "192.168.1.109" = { + user = "sshd"; + extraOptions = { + StrictHostKeyChecking = "no"; + UpdateHostKeys = "yes"; + PubkeyAcceptedKeyTypes = "+ssh-rsa"; ##needed to allow the USG to login with ssh key + }; + }; + ##USG + "192.168.1.1" = { + user = "fbleagh"; + extraOptions = { + StrictHostKeyChecking = "no"; + UpdateHostKeys = "yes"; + PubkeyAcceptedKeyTypes = "+ssh-rsa"; ##needed to allow the USG to login with ssh key + }; + }; + "router" = { + user = "fbleagh"; + extraOptions = { + StrictHostKeyChecking = "no"; + UpdateHostKeys = "yes"; + PubkeyAcceptedKeyTypes = "+ssh-rsa"; ##needed to allow the USG to login with ssh key + }; + }; "odroid*" = { user = "root"; extraOptions = { diff --git a/hosts/common.nix b/hosts/common.nix index 0d5a911..69598d6 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -65,6 +65,22 @@ nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"]; # nix.nixPath = [ "nixpkgs=pkgs.outPath" ]; networking.search = ["node.dc1.consul" "service.dc1.consul"]; + networking.nameservers = ["192.168.1.1" "1.1.1.1"]; + # Enable networking + networking.networkmanager.enable = true; + +# Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "en_US.UTF-8"; + LC_IDENTIFICATION = "en_US.UTF-8"; + LC_MEASUREMENT = "en_US.UTF-8"; + LC_MONETARY = "en_US.UTF-8"; + LC_NAME = "en_US.UTF-8"; + LC_PAPER = "en_US.UTF-8"; + LC_TELEPHONE = "en_US.UTF-8"; + }; #services.envfs.enable = true; environment.systemPackages = [ diff --git a/modules/nixos/wsl2/default.nix b/modules/nixos/wsl2/default.nix index 814bc32..6aead3e 100644 --- a/modules/nixos/wsl2/default.nix +++ b/modules/nixos/wsl2/default.nix @@ -46,6 +46,7 @@ in { wslConf.automount.root = "/mnt"; defaultUser = "sstent"; startMenuLaunchers = true; + wslConf.network.generateResolvConf = false; # wslConf.interop.appendWindowsPath = false; #No longer needed in 23.05 #interop.preserveArgvZero = true;