config sync

7 files changed, 33 insertions, 9 deletions

diff --git a/config/nvim b/config/nvim
-Subproject 98c4b45bbf604061256e3800f964ba8a5f6e80e
+Subproject 6c6d185182928212edb0e4fdb12f4a6dc001332
diff --git a/config/qutebrowser/config.py b/config/qutebrowser/config.py
index 98d350e..f469c83 100644
--- a/config/qutebrowser/config.py
+++ b/config/qutebrowser/config.py
@@ -212,6 +212,7 @@ nmap(leader + 'wp', 'tab-pin')
 # Tab movement
 nmap('<Ctrl-k>', 'tab-prev')
 nmap('<Ctrl-j>', 'tab-next')
+nmap(localleader + '<Tab>', 'tab-focus last')
 nmap('<Ctrl-Shift-k>', 'tab-move -')
 nmap('<Ctrl-Shift-j>', 'tab-move +')
 nmap(localleader + 'b', 'cmd-set-text -s :tab-select') # List buffers by index
diff --git a/configuration.nix b/configuration.nix
index c6691ea..f3e26e9 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -24,8 +24,6 @@ in
     allowBroken = false;
   };
 
-  services.tlp.enable = true;
-
   services.udisks2.enable = true;
 
   programs.dconf.enable = true;
@@ -55,6 +53,7 @@ in
     alsa.enable = true;
     pulse.enable = true;
     jack.enable = true;
+    wireplumber.enable = true;
   };
 
   # Network
@@ -103,6 +102,13 @@ in
   };
   programs.darling.enable = true; # macos emu
 
+  # programs.tmux = {
+  #   enable = true;
+  #   secureSocket = true;
+  #   terminal = "tmux-direct"; # st-256color
+  #   shortcut = "0";
+  # };
+
   # I18n and keyboard layout
   time.timeZone = "Asia/Kolkata";
   i18n.defaultLocale = "en_US.UTF-8";
@@ -119,7 +125,6 @@ in
     enable = true;
     autorun = false;
     displayManager.startx.enable = true;
-    # videoDrivers = [ "intel" "modesetting" ];
     libinput = {
       enable = true;
       touchpad = {
diff --git a/extras/notes b/extras/notes
-Subproject a9536ae1c8fbbd2a8ddb41b124f2955ddcfabf8
+Subproject 8f6fb614f59908052610f571112e5f7317b4b63
diff --git a/hardware/thinkpad-e14/default.nix b/hardware/thinkpad-e14/default.nix
index 2b24965..3ce72db 100644
--- a/hardware/thinkpad-e14/default.nix
+++ b/hardware/thinkpad-e14/default.nix
@@ -16,7 +16,7 @@
       "thunderbolt"
       "sd_mod"
     ];
-    kernelModules = [ ];
+    kernelModules = [ "i915" ];
   };
   boot.kernelModules = [
     "kvm-intel"
@@ -30,6 +30,7 @@
   ];
   boot.extraModulePackages = with config.boot.kernelPackages; [
     acpi_call
+    v4l2loopback
   ];
   boot.kernelParams = [
     "i8042.nopnp=1"
@@ -37,6 +38,7 @@
     "acpi_osi=linux"
     "acpi_backlight=native"
     "i915.enable_dpcd_backlight=0"
+    "i915.enable_guc=2"
     # "acpi_backlight=vendor"
     # "acpi_backlight=intel_backlight"
     # "i915.force_probe=46a8"
@@ -72,16 +74,20 @@
     driSupport32Bit = true;
     extraPackages = with pkgs; [
       intel-media-driver
+      # intel-vaapi-driver
       vaapiIntel
       vaapiVdpau
       libvdpau-va-gl
-      # intel-ocl
-      intel-media-driver
       intel-gmmlib
       vulkan-tools
       mesa.drivers
     ];
   };
+  environment.variables = {
+    VDPAU_DRIVER = "va_gl";
+    LIBVA_DRIVER_NAME = "iHD";
+  };
+  # services.xserver.videoDrivers = [ "intel" ];
 
   # Bootloader
   boot.loader = {
@@ -110,7 +116,9 @@
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   networking.useDHCP = lib.mkDefault true;
   powerManagement = {
-    enable = true;
-    cpuFreqGovernor = lib.mkDefault "powersave";
+    enable = false;
+    cpuFreqGovernor = "powersave";
   };
+
+  services.tlp.enable = lib.mkDefault false;
 }
diff --git a/home.nix b/home.nix
index 91fa3be..91e87e6 100644
--- a/home.nix
+++ b/home.nix
@@ -39,6 +39,13 @@ in
   #   image/jpeg=sxiv.desktop
   # '';
 
+  programs.obs-studio = {
+    enable = true;
+    plugins = [
+      pkgs.obs-studio-plugins.obs-pipewire-audio-capture
+    ];
+  };
+
   services.easyeffects = {
     enable = true;
     # preset = "default";
diff --git a/packages.nix b/packages.nix
index 21a9303..04a7737 100644
--- a/packages.nix
+++ b/packages.nix
@@ -65,7 +65,7 @@ let
     imagemagick
     ffmpeg-full
     feh
-    obs-studio
+    # obs-studio
     inkscape
     # krita
     zathura
@@ -138,6 +138,9 @@ let
     xorg.xgamma
 
     v4l-utils
+
+    libva
+    libdrm
   ];
 in
 {