From 9f21d3020b59f5427d838dc573c2e8a08980c2fc Mon Sep 17 00:00:00 2001
From: Gabe Venberg <gabevenberg@gmail.com>
Date: Wed, 15 May 2024 13:22:50 -0500
Subject: [PATCH] full, tested wsl config.

---
 hosts/archlaptop-vm/default.nix  |  4 ++++
 hosts/workstation-vm/default.nix |  4 ++++
 hosts/wsl-workstation.nix        | 19 ++++++++++---------
 modules/nixos/common.nix         |  3 ---
 roles/nixos/graphical-vm.nix     |  2 +-
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/hosts/archlaptop-vm/default.nix b/hosts/archlaptop-vm/default.nix
index 7672989..64c50df 100644
--- a/hosts/archlaptop-vm/default.nix
+++ b/hosts/archlaptop-vm/default.nix
@@ -83,6 +83,10 @@ inputs.nixpkgs.lib.nixosSystem {
       # Enable the OpenSSH daemon.
       services.openssh.enable = true;
 
+      # Bootloader.
+      boot.loader.systemd-boot.enable = true;
+      boot.loader.efi.canTouchEfiVariables = true;
+
       # Open ports in the firewall.
       # networking.firewall.allowedTCPPorts = [ ... ];
       # networking.firewall.allowedUDPPorts = [ ... ];
diff --git a/hosts/workstation-vm/default.nix b/hosts/workstation-vm/default.nix
index ae099e1..58bdad6 100644
--- a/hosts/workstation-vm/default.nix
+++ b/hosts/workstation-vm/default.nix
@@ -86,6 +86,10 @@ inputs.nixpkgs.lib.nixosSystem {
       # Enable the OpenSSH daemon.
       services.openssh.enable = true;
 
+      # Bootloader.
+      boot.loader.systemd-boot.enable = true;
+      boot.loader.efi.canTouchEfiVariables = true;
+
       # Open ports in the firewall.
       # networking.firewall.allowedTCPPorts = [ ... ];
       # networking.firewall.allowedUDPPorts = [ ... ];
diff --git a/hosts/wsl-workstation.nix b/hosts/wsl-workstation.nix
index 8d31bc1..93d97b5 100644
--- a/hosts/wsl-workstation.nix
+++ b/hosts/wsl-workstation.nix
@@ -9,22 +9,24 @@ inputs.nixpkgs.lib.nixosSystem {
   modules = [
     inputs.home-manager.nixosModules.home-manager
     inputs.nixos-wsl.nixosModules.default
-    ../../modules/hostopts.nix
-    ../../modules/nixos/common.nix
+    ../modules/hostopts.nix
+    ../modules/nixos/common.nix
     ({
       config,
       pkgs,
       ...
     }: {
-      wsl.enable=true;
+      wsl.enable = true;
+      wsl.wslConf.network.generateResolvConf = false;
+      networking.nameservers = ["1.1.1.1" "8.8.8.8"];
       host = {
-        user = "gabe";
+        user = "nixos";
       };
-      networking.hostName = "workstation-vm"; # Define your hostname.
+      networking.hostName = "gv-wsl"; # Define your hostname.
       # Set your time zone.
       time.timeZone = "America/Chicago";
 
-      programs.zsh.enable=true;
+      programs.zsh.enable = true;
       environment.shells = with pkgs; [zsh];
       # Define a user account. Don't forget to set a password with ‘passwd’.
       users.users.${config.host.user} = {
@@ -40,7 +42,6 @@ inputs.nixpkgs.lib.nixosSystem {
       }: {
         host = osConfig.host;
         home = {
-          enable-speech = true;
           nvim = {
             enable-lsp = true;
             enable-treesitter = true;
@@ -54,8 +55,8 @@ inputs.nixpkgs.lib.nixosSystem {
           };
         };
         imports = [
-          ../../roles/home-manager/terminal.nix
-          ../../modules/home-manager/common.nix
+          ../roles/home-manager/terminal.nix
+          ../modules/home-manager/common.nix
           inputs.nixvim.homeManagerModules.nixvim
         ];
       };
diff --git a/modules/nixos/common.nix b/modules/nixos/common.nix
index 80fd949..1820fb4 100644
--- a/modules/nixos/common.nix
+++ b/modules/nixos/common.nix
@@ -5,9 +5,6 @@
   outputs,
   ...
 }: {
-  # Bootloader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
   nix = {
     package = pkgs.nixFlakes;
     extraOptions = ''
diff --git a/roles/nixos/graphical-vm.nix b/roles/nixos/graphical-vm.nix
index 5950feb..8c3d5e9 100644
--- a/roles/nixos/graphical-vm.nix
+++ b/roles/nixos/graphical-vm.nix
@@ -6,7 +6,7 @@
 }: {
   #note: needs to have something that autostarts desktop files.
   services.spice-vdagentd.enable = true;
-  services.spice-autorandr.enable=true;
+  services.spice-autorandr.enable = true;
   imports = [
     ./vm.nix
   ];