[NixOS] Fixes

nixos/base.nix

@@ -3,6 +3,7 @@
   imports = [
     ./users.nix
     ./fonts.nix
+    ./essential-packages.nix
   ];
 
   nixpkgs.overlays = [
@@ -34,6 +35,24 @@
   '';
   networking.networkmanager = {
     enable = true;
+    enableStrongSwan = true;
+    packages = [ pkgs.networkmanager-l2tp ];
+    extraConfig = ''
+      [main]
+      rc-manager=resolvconf
+    '';
+  };
+
+  programs.zsh.enable = true;
+
+  services.avahi = {
+    enable = true;
+    nssmdns = true;
+    publish = {
+      enable = true;
+      domain = true;
+      userServices = true;
+    };
   };
 
   # Audio
@@ -44,17 +63,31 @@
   hardware.bluetooth.enable = true;
   services.blueman.enable = true;
 
-  # Keyboard
+  # Keyboard/Keymap
   console.keyMap = "us";
 
+  i18n = {
+    defaultLocale = "en_US.UTF-8";
+  };
+
   # Update timezone automatically
   services.tzupdate.enable = true;
 
-  programs.zsh.enable = true;
-
   # TODO: Add a comment explaining what this does.
   services.gnome.at-spi2-core.enable = true;
 
+  services.openssh.enable = true;
+
+  services.autorandr.enable = true;
+
+  services.locate.enable = true;
+
+  virtualisation.docker.enable = true;
+
+  programs.adb.enable = true;
+
+  hardware.keyboard.zsa.enable = true;
+
   services.xserver = {
     exportConfiguration = true;
     enable = true;

nixos/machines/biskcomp.nix

@@ -2,7 +2,7 @@
   imports = [
     ../raspberry-pi.nix
     # ../plex.nix
-    ./internet-computer.nix
+    ../internet-computer.nix
   ];
 
   networking.hostName = "biskcomp";

nixos/raspberry-pi.nix

@@ -4,9 +4,6 @@
   imports = [
     <nixos-hardware/raspberry-pi/4>
     ./base.nix
-    ./fonts.nix
-    ./internet-computer.nix
-    ./essential-packages.nix
   ];
 
   hardware.raspberry-pi."4".fkms-3d.enable = true;
@@ -53,30 +50,12 @@
     options = [ "noatime" ];
   };
 
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.imalison = {
-    isNormalUser = true;
-    extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
-  };
-
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
     raspberrypi-eeprom
   ];
 
-  services.openssh.enable = true;
-
-  services.avahi = {
-    enable = true;
-    nssmdns = true;
-    publish = {
-      enable = true;
-      domain = true;
-      userServices = true;
-    };
-  };
-
   nix = {
     autoOptimiseStore = true;
     gc = {
@@ -85,6 +64,4 @@
       options = "--delete-older-than 30d";
     };
   };
-
-  system.stateVersion = "21.05"; # Did you read the comment?
 }