From 73b08cbd76d4471c9a6fddd05265d7d7fc4c45ff Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 7 Aug 2024 09:31:01 +0200
Subject: ...

---
 accounts/gkleen@sif/xmonad/xmonad.hs |  2 +-
 flake.lock                           | 17 +++++++++++++++++
 flake.nix                            |  6 ++++++
 hosts/sif/default.nix                |  6 +++---
 hosts/sif/hw.nix                     |  2 --
 user-profiles/mpv/default.nix        |  1 +
 user-profiles/yt-dlp.nix             |  5 ++++-
 7 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/accounts/gkleen@sif/xmonad/xmonad.hs b/accounts/gkleen@sif/xmonad/xmonad.hs
index d7a78a2d..a44d3bb7 100644
--- a/accounts/gkleen@sif/xmonad/xmonad.hs
+++ b/accounts/gkleen@sif/xmonad/xmonad.hs
@@ -931,7 +931,7 @@ myKeys' conf host = Map.fromList $
   where
     modm = XMonad.modMask conf
 
-    brCycle = [0, 1 % 100, 1 % 10, 1 % 4, 1 % 2, 3 % 4, 1]
+    brCycle = [0, 1 % 500, 1 % 250, 1 % 100, 1 % 10, 1 % 4, 1 % 2, 3 % 4, 1]
 
     powerActWords = ["poweroff", "reboot", "hibernate", "suspend"]
     powerActCompl = mkComplFunFromList' xPConfigMonospace powerActWords
diff --git a/flake.lock b/flake.lock
index e7ade8b5..5bfe9859 100644
--- a/flake.lock
+++ b/flake.lock
@@ -434,6 +434,22 @@
         "type": "github"
       }
     },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1722332872,
+        "narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "14c333162ba53c02853add87a0000cbd7aa230c2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1689261696,
@@ -779,6 +795,7 @@
         "home-manager": "home-manager",
         "home-manager-eostre": "home-manager-eostre",
         "nix-index-database": "nix-index-database",
+        "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2",
         "nixpkgs-eostre": "nixpkgs-eostre",
         "nixpkgs-pgbackrest": "nixpkgs-pgbackrest",
diff --git a/flake.nix b/flake.nix
index 400762fa..c317f5c1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -157,6 +157,12 @@
         poetry2nix.follows = "poetry2nix";
       };
     };
+    nixos-hardware = {
+      type = "github";
+      owner = "NixOS";
+      repo = "nixos-hardware";
+      ref = "master";
+    };
   };
 
   outputs = { self, nixpkgs, home-manager, sops-nix, deploy-rs, nvfetcher, ... }@inputs:
diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index 610d990d..3525015d 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -1,4 +1,4 @@
-{ flake, pkgs, customUtils, lib, config, path, ... }:
+{ flake, flakeInputs, pkgs, customUtils, lib, config, path, ... }:
 let
   mwnSubnetsPublic =
     [ "129.187.0.0/16" "141.40.0.0/16" "141.84.0.0/16"
@@ -15,6 +15,7 @@ in {
     ./mail
     tmpfs-root bcachefs initrd-all-crypto-modules default-locale openssh rebuild-machines
     networkmanager
+    flakeInputs.nixos-hardware.nixosModules.lenovo-thinkpad-p1
   ];
 
   config = {
@@ -59,7 +60,6 @@ in {
       plymouth.enable = true;
 
       kernelPackages = pkgs.linuxPackages_latest;
-      kernelParams = [ "i915.fastboot=1" "intel_pstate=no_hwp" "acpi_backlight=vendor" "thinkpad-acpi.brightness_enable=1" "quiet" ];
       extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
       kernelModules = ["v4l2loopback"];
       kernelPatches = [
@@ -536,7 +536,7 @@ in {
         prime = {
           nvidiaBusId = "PCI:1:0:0";
           intelBusId = "PCI:0:2:0";
-          sync.enable = true;
+          reverseSync.enable = true;
         };
       };
 
diff --git a/hosts/sif/hw.nix b/hosts/sif/hw.nix
index d01582e0..077d25a6 100644
--- a/hosts/sif/hw.nix
+++ b/hosts/sif/hw.nix
@@ -95,7 +95,5 @@
   # High-DPI console
   console.font = "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";
 
-  hardware.cpu.intel.updateMicrocode = true;
-
   hardware.enableRedistributableFirmware = true;
 }
diff --git a/user-profiles/mpv/default.nix b/user-profiles/mpv/default.nix
index 620be49d..bbb6d9ac 100644
--- a/user-profiles/mpv/default.nix
+++ b/user-profiles/mpv/default.nix
@@ -13,6 +13,7 @@
         osd-font = "Fira Sans";
         sub-font = "Fira Sans";
         # vo = "gpu";
+        vo = "gpu-next";
         hwdec = "auto";
         force-window = "yes";
         # af = "lavfi=[dynaudnorm=f=100:g=31:s=20.0]";
diff --git a/user-profiles/yt-dlp.nix b/user-profiles/yt-dlp.nix
index 7d2a1082..550d6a78 100644
--- a/user-profiles/yt-dlp.nix
+++ b/user-profiles/yt-dlp.nix
@@ -12,7 +12,10 @@
           "bestvideo*+bestaudio"
           "best"
         ];
-        sub-langs = "all,-live_chat,-rechat";
+        embed-subs = true;
+        # write-subs = true;
+        # write-auto-subs = true;
+        sub-langs = "en(-(gb|us|orig))?,de(-(de|orig))?,-live_chat,-rechat";
         prefer-free-formats = true;
         embed-metadata = true;
         # downloader = "${pkgs.axel}/bin/axel";
-- 
cgit v1.2.3