Merge desktop and laptop changes

modules/audio/pipewire/default.nix

@@ -5,6 +5,7 @@
 
   services.pipewire = {
     enable = true;
+    wireplumber.enable = true;
     alsa.enable = false;
     alsa.support32Bit = false;
     pulse.enable = true;

modules/graphics/nvidia/default.nix

@@ -1,7 +1,21 @@
 { config, pkgs, lib, ... }:
 
 {
-  services.xserver.videoDrivers = [ "nvidia" ];
-  hardware.opengl.enable = true;
-  hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable;
+  # Enable OpenGL
+  hardware.opengl = {
+    enable = true;
+    driSupport = true;
+    driSupport32Bit = true;
+  };
+
+  services.xserver.videoDrivers = ["nvidia"];
+
+  hardware.nvidia = {
+    modesetting.enable = true;
+    package = config.boot.kernelPackages.nvidiaPackages.stable;
+  };
+
+  environment.systemPackages = with pkgs; [
+    nvidia-vaapi-driver
+  ];
 }

modules/shell/xonsh/default.nix

@@ -0,0 +1,9 @@
+{ config, pkgs, lib, ... }:
+
+{
+  programs.xonsh.enable = true;
+
+  users.defaultUserShell = pkgs.xonsh;
+
+  environment.shells = with pkgs; [ xonsh ];
+}

modules/system/default.nix

@@ -2,7 +2,9 @@
 
 {
   # Use the systemd-boot EFI boot loader.
+  boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.loader.systemd-boot.enable = true;
+  boot.loader.timeout = 1;
   boot.loader.efi.canTouchEfiVariables = true;
 
   time.timeZone = "America/Los_Angeles";
@@ -18,12 +20,16 @@
   ];
 
   # XDG Compliance
+  xdg.portal.config.common.default = "*";
   environment.sessionVariables = rec {
     XDG_CONFIG_HOME = "\${HOME}/.config";
     XDG_CACHE_HOME  = "\${HOME}/.cache";
     XDG_STATE_HOME  = "\${HOME}/.local/state";
     XDG_DATA_HOME   = "\${HOME}/.local/share";
     XDG_BIN_HOME    = "\${HOME}/.local/bin";
+    PATH            = [
+      "\${HOME}/prog/scripts"
+    ];
   };
 
   users.groups = {