From dd0789409611fa572d8c63548de35c8320c5ca88 Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Fri, 5 Apr 2024 02:07:37 +0200
Subject: [PATCH] several laptop changes

---
 configs/thilo-laptop/home.nix      | 21 ---------------------
 configs/thilo-laptop/nixos.nix     |  9 +++++++++
 flake.lock                         | 12 ++++++------
 home-manager/modules/packages.nix  |  2 ++
 home-manager/programs/chromium.nix |  6 ++----
 nixos/common.nix                   |  8 ++++++++
 6 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/configs/thilo-laptop/home.nix b/configs/thilo-laptop/home.nix
index 684ca35..a5918fa 100644
--- a/configs/thilo-laptop/home.nix
+++ b/configs/thilo-laptop/home.nix
@@ -16,27 +16,6 @@
         isGraphical = true;
       };
 
-      home.pointerCursor = {
-        name = "Bibata-Modern-Classic";
-        package = pkgs.bibata-cursors;
-        size = 28;
-      };
-
-      programs.obs-studio = {
-        enable = true;
-        /* plugins = with pkgs.obs-studio-plugins; [
-             obs-vaapi
-             obs-teleport
-             droidcam-obs
-             obs-gstreamer
-             obs-shaderfilter
-             obs-command-source
-             obs-move-transition
-             advanced-scene-switcher
-           ];
-        */
-      };
-
       home.sessionVariables = { LD_LIBRARY_PATH = "${pkgs.libGL}/lib"; };
     };
   };
diff --git a/configs/thilo-laptop/nixos.nix b/configs/thilo-laptop/nixos.nix
index d1af438..154f7f0 100644
--- a/configs/thilo-laptop/nixos.nix
+++ b/configs/thilo-laptop/nixos.nix
@@ -12,6 +12,7 @@
     systemd-boot.enable = true;
     efi.canTouchEfiVariables = true;
   };
+  boot.plymouth.enable = true;
 
   # Setup keyfile
   boot.initrd.secrets = { "/crypto_keyfile.bin" = null; };
@@ -71,5 +72,13 @@
     "nix-2.16.2"
   ];
 
+
+  xdg.portal = {
+    enable = true;
+    extraPortals = [
+      pkgs.kdePackages.xdg-desktop-portal-kde
+    ];
+  };
+
   system.stateVersion = "23.05";
 }
diff --git a/flake.lock b/flake.lock
index 0f31a03..7d66a70 100644
--- a/flake.lock
+++ b/flake.lock
@@ -93,11 +93,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711625603,
-        "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=",
+        "lastModified": 1712016346,
+        "narHash": "sha256-O2nO7pD+krq+4HgkLB4VThRtAucIPfXDs/jJqCGlK1w=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2",
+        "rev": "4be0464472675212654dedf3e021bd5f1d58b92f",
         "type": "github"
       },
       "original": {
@@ -281,11 +281,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1711523803,
-        "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
+        "lastModified": 1711703276,
+        "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
+        "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
         "type": "github"
       },
       "original": {
diff --git a/home-manager/modules/packages.nix b/home-manager/modules/packages.nix
index 50132bd..355d792 100644
--- a/home-manager/modules/packages.nix
+++ b/home-manager/modules/packages.nix
@@ -118,6 +118,8 @@ in {
         yabridge
         inputs.suyu.packages.x86_64-linux.suyu
         inputs.nix-alien.packages.x86_64-linux.nix-alien
+        kdePackages.kdenlive
+        audacity
       ] else
         [ ]) ++ (if config.machine.isGnome then [
           gnomeExtensions.blur-my-shell
diff --git a/home-manager/programs/chromium.nix b/home-manager/programs/chromium.nix
index 8a6230b..00ef453 100644
--- a/home-manager/programs/chromium.nix
+++ b/home-manager/programs/chromium.nix
@@ -22,14 +22,12 @@ let
   isEnabled = if config.machine.isGraphical then true else false;
   dictionaries = with pkgs.hunspellDictsChromium; [ en_US de_DE ];
   commandLineArgs = [
+    "--enable-wayland-ime"
     "--ignore-gpu-blocklist"
     "--enable-gpu-rasterization"
     "--enable-zero-copy"
-    "--enable-features=VaapiVideoDecoder,VaapiVideoEncoder,WebRTCPipeWireCapturer"
     "--disable-features=UseChromeOSDirectVideoDecoder"
-    "--use-vulkan"
-    "--ozone-platform-hint=auto"
-    "--enable-hardware-overlays"
+    "--enable-features=WaylandWindowDecorations,VaapiVideoDecoder,VaapiVideoEncoder,VaapiVideoDecodeLinuxGL,WebRTCPipeWireCapturer"
   ];
   extensions = map (eid: { id = eid; }) chromium_extension;
 in {
diff --git a/nixos/common.nix b/nixos/common.nix
index f9afa40..444a4a9 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -73,6 +73,9 @@
     zsh.enable = true;
     adb.enable = true;
     noisetorch.enable = true;
+    dconf = {
+      enable = true;
+    };
   };
 
   environment.systemPackages = with pkgs; [ git zsh kitty steamtinkerlaunch ];
@@ -98,6 +101,11 @@
       enable = true;
       package = pkgs.mullvad-vpn;
     };
+    dbus = {
+      enable = true;
+      packages = [ pkgs.dconf ];
+    };
+    bamf.enable = true;
   };
 
   hardware = {