machines/eir: Update config

It's been a while since I last used this machine. At some point I need
to go through it with a fine-toothed comb, but for now these changes
will be enough.

1 files changed, 21 insertions, 49 deletions

diff --git a/machines/devhell/eir.nix b/machines/devhell/eir.nix
index eae67a4f..cbe391a7 100644
--- a/machines/devhell/eir.nix
+++ b/machines/devhell/eir.nix
@@ -28,9 +28,19 @@
 
   hardware = {
     cpu.intel.updateMicrocode = true;
+    enableRedistributableFirmware = true;
+    trackpoint = {
+      enable = true;
+      emulateWheel = true;
+    };
     opengl = {
       enable = true;
-      extraPackages = [ pkgs.libvdpau-va-gl pkgs.vaapiVdpau pkgs.vaapiIntel ];
+      driSupport = true;
+      extraPackages = with pkgs; [
+        libvdpau-va-gl
+        vaapiVdpau
+        vaapiIntel
+      ];
     };
   };
 
@@ -55,10 +65,20 @@
   # FIXME Check if this is still necessary in the future
   systemd.services.systemd-networkd-wait-online.enable = false;
 
+  # XXX Make networkd ignore virtual network interfaces
+  systemd.network.networks."99-libvirt" = {
+    matchConfig.Name = "virbr* vnet*";
+    linkConfig.Unmanaged = true;
+  };
   networking = {
     hostName = "eir";
     wireless.iwd.enable = true;
     useNetworkd = true;
+    interfaces = {
+      enp0s25.useDHCP = true;
+      wwp0s29u1u4.useDHCP = true;
+      wlan0.useDHCP = true;
+    };
   };
 
   nix = {
@@ -152,54 +172,6 @@
         Xcursor.theme:               Vanilla-DMZ-AA
         Xcursor.size:                22
         *.charClass:33:48,35:48,37:48,43:48,45-47:48,61:48,63:48,64:48,95:48,126:48,35:48,58:48
-
-        ! Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
-        ! Copyright (c) 2016-present Sven Greb <code@svengreb.de>
-
-        ! Project:    Nord XResources
-        ! Version:    0.1.0
-        ! Repository: https://github.com/arcticicestudio/nord-xresources
-        ! License:    MIT
-
-        #define nord0 #2E3440
-        #define nord1 #3B4252
-        #define nord2 #434C5E
-        #define nord3 #4C566A
-        #define nord4 #D8DEE9
-        #define nord5 #E5E9F0
-        #define nord6 #ECEFF4
-        #define nord7 #8FBCBB
-        #define nord8 #88C0D0
-        #define nord9 #81A1C1
-        #define nord10 #5E81AC
-        #define nord11 #BF616A
-        #define nord12 #D08770
-        #define nord13 #EBCB8B
-        #define nord14 #A3BE8C
-        #define nord15 #B48EAD
-
-        *.foreground:   nord4
-        *.background:   nord0
-        *.cursorColor:  nord4
-        *fading: 35
-        *fadeColor: nord3
-
-        *.color0: nord1
-        *.color1: nord11
-        *.color2: nord14
-        *.color3: nord13
-        *.color4: nord9
-        *.color5: nord15
-        *.color6: nord8
-        *.color7: nord5
-        *.color8: nord3
-        *.color9: nord11
-        *.color10: nord14
-        *.color11: nord13
-        *.color12: nord9
-        *.color13: nord15
-        *.color14: nord7
-        *.color15: nord6
       ''}"
     '';
   };