8 files changed, 67 insertions, 42 deletions
diff --git a/system/autorandr/docked-close/config b/system/autorandr/docked-close/config
index 1f4ebdb1..1da7d06c 100644
--- a/system/autorandr/docked-close/config
+++ b/system/autorandr/docked-close/config
@@ -1,20 +1,20 @@
-output DP-1
+output DP1
 off
-output HDMI-1
+output HDMI1
 off
-output DP-2
+output DP2
 off
-output HDMI-2
+output HDMI2
 off
-output DP-2-3
+output DP2-3
 off
-output eDP-1
+output eDP1
 off
-output DP-2-1
+output DP2-1
 mode 2560x1440
 pos 1920x0
 rate 59.95
-output DP-2-2
+output DP2-2
 mode 2560x1440
 pos 4480x0
 rate 59.95
diff --git a/system/autorandr/docked-open/config b/system/autorandr/docked-open/config
index 84771820..42437216 100644
--- a/system/autorandr/docked-open/config
+++ b/system/autorandr/docked-open/config
@@ -1,23 +1,23 @@
-output DP-1
+output DP1
 off
-output HDMI-1
+output HDMI1
 off
-output DP-2
+output DP2
 off
-output HDMI-2
+output HDMI2
 off
-output DP-2-3
+output DP2-3
 off
-output eDP-1
+output eDP1
 mode 1920x1080
 pos 0x0
 primary
 rate 60.03
-output DP-2-1
+output DP2-1
 mode 2560x1440
 pos 1920x0
 rate 59.95
-output DP-2-2
+output DP2-2
 mode 2560x1440
 pos 4480x0
 rate 59.95
diff --git a/system/autorandr/laptop/config b/system/autorandr/laptop/config
index 0048c8b9..94f4e43d 100644
--- a/system/autorandr/laptop/config
+++ b/system/autorandr/laptop/config
@@ -1,18 +1,18 @@
-output DP-1
+output DP1
 off
-output HDMI-1
+output HDMI1
 off
-output DP-2
+output DP2
 off
-output HDMI-2
+output HDMI2
 off
-output DP-2-1
+output DP2-1
 off
-output DP-2-2
+output DP2-2
 off
-output DP-2-3
+output DP2-3
 off
-output eDP-1
+output eDP1
 mode 1920x1080
 pos 0x0
 primary
diff --git a/system/autorandr/work-1/config b/system/autorandr/work-1/config
index 3573f22d..34fda0db 100644
--- a/system/autorandr/work-1/config
+++ b/system/autorandr/work-1/config
@@ -1,21 +1,21 @@
-output DP-1
+output DP1
 off
-output HDMI-1
+output HDMI1
 off
-output DP-2
+output DP2
 off
-output HDMI-2
+output HDMI2
 mode 1920x1200
 pos 0x0
 primary
 rate 59.95
-output DP-2-1
+output DP2-1
 off
-output DP-2-2
+output DP2-2
 off
-output DP-2-3
+output DP2-3
 off
-output eDP-1
+output eDP1
 mode 1920x1080
 pos 1920x0
 rate 60.03
diff --git a/system/settings/hardware/intel-gpu.nix b/system/settings/hardware/intel-gpu.nix
index 95d27cc0..3503c315 100644
--- a/system/settings/hardware/intel-gpu.nix
+++ b/system/settings/hardware/intel-gpu.nix
@@ -1,6 +1,14 @@
 { config, pkgs, ... }:
 
 {
+  # https://wiki.gentoo.org/wiki/Intel#Feature_support
+  services.xserver = {
+    useGlamor = true;
+    deviceSection = ''
+      Option      "DRI"            "3"
+    '';
+    videoDrivers = [ "intel" ];
+  };
 
   boot.kernelParams = [
     "i915.enable_guc=2"
diff --git a/system/settings/hardware/network-manager.nix b/system/settings/hardware/network-manager.nix
index f28548a1..4fc762d5 100644
--- a/system/settings/hardware/network-manager.nix
+++ b/system/settings/hardware/network-manager.nix
@@ -1,10 +1,32 @@
 { config, pkgs, ... }:
 
-{ networking.networkmanager = {
-    enable = true;
-    dns = "unbound";
+{
+  networking = {
+    networkmanager = {
+      enable = true;
+      dns = "none";
+    };
   };
 
+  services.unbound = {
+    enable = true;
+    forwardAddresses = [ "127.0.0.1@5353" ];
+  };
+  services.stubby = {
+    enable = true;
+    roundRobinUpstreams = false;
+    listenAddresses = [ "127.0.0.1@5353" "0::1@5353" ];
+    upstreamServers = ''
+      - address_data: 45.90.28.0
+        tls_auth_name: "abd6e5.dns1.nextdns.io"
+      - address_data: 2a07:a8c0::0
+        tls_auth_name: "abd6e5.dns1.nextdns.io"
+      - address_data: 45.90.30.0
+        tls_auth_name: "abd6e5.dns2.nextdns.io"
+      - address_data: 2a07:a8c1::0
+        tls_auth_name: "abd6e5.dns2.nextdns.io"
+    '';
+  };
   environment.systemPackages = with pkgs; [
     networkmanagerapplet
     networkmanager_dmenu
diff --git a/user/settings/zsh.nix b/user/settings/zsh.nix
index a2c14586..5966928d 100644
--- a/user/settings/zsh.nix
+++ b/user/settings/zsh.nix
@@ -268,6 +268,8 @@ in
 
       source ${pkgs.fzf}/share/fzf/key-bindings.zsh
 
+      source ${pkgs.google-cloud-sdk}/google-cloud-sdk/completion.zsh.inc
+
     '' + builtins.readFile ../zsh/.config/zsh/.zshrc;
   };
 }
diff --git a/user/zsh/.config/zsh/.zshrc b/user/zsh/.config/zsh/.zshrc
index fdc6b108..f20c3825 100644
--- a/user/zsh/.config/zsh/.zshrc
+++ b/user/zsh/.config/zsh/.zshrc
@@ -68,13 +68,6 @@ zstyle ':completion:*' completer _expand _complete _match
 
 # Plugins
 
-if [[ -n $commands[gcloud] ]]
-then
-   autoload bashcompinit
-   bashcompinit
-   source ${$(readlink =gcloud):h}/../etc/bash_completion.d/gcloud.inc
-fi
-
 if [[ -n $commands[helm] ]]
 then
   autoload _helm