fix localed, back to stateless networking

6 files changed, 16 insertions, 7 deletions

diff --git a/hosts/dishwasher/configuration.nix b/hosts/dishwasher/configuration.nix
index ffa9ff7..0556748 100644
--- a/hosts/dishwasher/configuration.nix
+++ b/hosts/dishwasher/configuration.nix
@@ -57,7 +57,10 @@
   };
 
 
-  i18n.defaultLocale = "en_US.UTF-8";
+  i18n = {
+    defaultLocale = "en_US.UTF-8";
+    supportedLocales = [ "en_US.UTF-8" "nl_NL.UTF-8" "ru_RU.UTF-8" ];
+  };
 
   # List services that you want to enable:
 
diff --git a/hosts/microwave/configuration.nix b/hosts/microwave/configuration.nix
index 305e6be..53abd1c 100644
--- a/hosts/microwave/configuration.nix
+++ b/hosts/microwave/configuration.nix
@@ -73,7 +73,6 @@
       "plugdev"
       "dialout"
       "bluetooth"
-      "networkmanager"
     ];
     group = "users";
     home = "/home/grue";
@@ -85,7 +84,13 @@
     enable = true;
     package = pkgs.wireshark;
   };
-  time.timeZone = "Europe/Berlin";
+  time.timeZone = "Europe/Amsterdam";
+
+  i18n = {
+    defaultLocale = "en_US.UTF-8";
+    supportedLocales = [ "all" ];
+    #supportedLocales = [ "en_US.UTF-8/UTF-8" "nl_NL.UTF-8/UTF-8" "ru_RU.UTF-8/UTF-8" ];
+  };
 
 
   programs.steam.enable = true;
diff --git a/hosts/microwave/default.nix b/hosts/microwave/default.nix
index 5b1f235..b442ac2 100644
--- a/hosts/microwave/default.nix
+++ b/hosts/microwave/default.nix
@@ -2,8 +2,7 @@
   imports = [
     ./configuration.nix
     ./hardware-configuration.nix
-
-    ./stateful-networking.nix
+    ./network.nix
     ./secrets.nix
   ];
 }
diff --git a/hosts/microwave/hardware-configuration.nix b/hosts/microwave/hardware-configuration.nix
index 7b2be8b..1652b60 100644
--- a/hosts/microwave/hardware-configuration.nix
+++ b/hosts/microwave/hardware-configuration.nix
@@ -54,7 +54,7 @@
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
   networking.interfaces.enp53s0.useDHCP = lib.mkDefault true;
-  networking.interfaces.wlp54s0.useDHCP = lib.mkDefault true;
+  networking.interfaces.wlan0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
diff --git a/hosts/microwave/network.nix b/hosts/microwave/network.nix
index b56e8fb..bb1d0ff 100644
--- a/hosts/microwave/network.nix
+++ b/hosts/microwave/network.nix
@@ -6,6 +6,7 @@
     hostName = "microwave"; # Define your hostname.
     hostId = "7da4f1e6";
     firewall.enable = true;
+    networkmanager.enable = false;
     useNetworkd = true;
     wireguard.enable = true;
     wireless.iwd = {
diff --git a/modules/basic-tools.nix b/modules/basic-tools.nix
index b0adbc8..dec82fc 100644
--- a/modules/basic-tools.nix
+++ b/modules/basic-tools.nix
@@ -12,6 +12,7 @@
     irssi
     killall
     neovim
+    nvimpager
     ripgrep
     tealdeer
     traceroute
@@ -53,7 +54,7 @@
   # set appropriate environ variables
   environment.variables = {
     EDITOR = "nvim";
-    PAGER = "less -F";
+    PAGER = "nvimpager";
   };
 
   environment.shellAliases = {