From 3b1d605c5daee8d47f5145ad00c8db8a88fb243d Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Thu, 29 Feb 2024 19:14:22 +0100
Subject: [PATCH] omit musescore, tweak inheritance of grouper, migrate desktop
 to plasma 6

---
 configs/thilo-pc/home.nix         |  4 ++--
 configs/thilo-pc/nixos.nix        |  4 ++--
 flake.lock                        | 18 +++++++++---------
 home-manager/modules/packages.nix |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/configs/thilo-pc/home.nix b/configs/thilo-pc/home.nix
index 7753098..727e456 100644
--- a/configs/thilo-pc/home.nix
+++ b/configs/thilo-pc/home.nix
@@ -16,11 +16,11 @@
         isGraphical = true;
       };
 
-      xsession.pointerCursor = {
+/*       xsession.pointerCursor = {
         name = "Bibata-Modern-Classic";
         package = pkgs.bibata-cursors;
         size = 128;
-      };
+      }; */
 
       services.kdeconnect.enable = true;
       services.kdeconnect.indicator = true;
diff --git a/configs/thilo-pc/nixos.nix b/configs/thilo-pc/nixos.nix
index e17828e..9b3c786 100644
--- a/configs/thilo-pc/nixos.nix
+++ b/configs/thilo-pc/nixos.nix
@@ -31,8 +31,8 @@
     xserver = {
       enable = true;
       displayManager.sddm.enable = true;
-      displayManager.defaultSession = "plasmawayland";
-      desktopManager.plasma5.enable = true;
+      displayManager.defaultSession = "plasma";
+      desktopManager.plasma6.enable = true;
       layout = "us";
       xkbVariant = "";
     };
diff --git a/flake.lock b/flake.lock
index 26979f8..3df8816 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1708440115,
-        "narHash": "sha256-j3n3LiEmsn2V5HqhzHf+nh7JrHGbFmzLMm9qnmzFPxw=",
+        "lastModified": 1709049058,
+        "narHash": "sha256-RLag2Uy3wezy+oW+bsEwloDRaxV9BV/QdzHmSz1Ciwo=",
         "owner": "dagger",
         "repo": "nix",
-        "rev": "b489ac4da2e88296611e5841f4580ebc185d7b83",
+        "rev": "c4d98a163455709a6d8bba53465854981e115c15",
         "type": "github"
       },
       "original": {
@@ -119,11 +119,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1708988456,
-        "narHash": "sha256-RCz7Xe64tN2zgWk+MVHkzg224znwqknJ1RnB7rVqUWw=",
+        "lastModified": 1709204054,
+        "narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1d085ea4444d26aa52297758b333b449b2aa6fca",
+        "rev": "2f3367769a93b226c467551315e9e270c3f78b15",
         "type": "github"
       },
       "original": {
@@ -381,11 +381,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1708807242,
-        "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=",
+        "lastModified": 1709150264,
+        "narHash": "sha256-HofykKuisObPUfj0E9CJVfaMhawXkYx3G8UIFR/XQ38=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a",
+        "rev": "9099616b93301d5cf84274b184a3a5ec69e94e08",
         "type": "github"
       },
       "original": {
diff --git a/home-manager/modules/packages.nix b/home-manager/modules/packages.nix
index 97f7a40..062cff4 100644
--- a/home-manager/modules/packages.nix
+++ b/home-manager/modules/packages.nix
@@ -50,7 +50,7 @@ in {
         (pkgs.writeShellScriptBin "nix-build-default" ''
           nix-build -E 'with import <nixpkgs> { }; callPackage ./default.nix { }'
         '')
-        (callPackage ./../pkgs/toggl-time-grouper/package.nix { inherit lib; })
+        (callPackage ./../pkgs/toggl-time-grouper/package.nix { inherit python3Packages; })
         nixpkgs-fmt
         toolbox
         distrobox
@@ -109,7 +109,7 @@ in {
         trayscale
         gnome.gnome-disk-utility
         inkscape
-        musescore
+        # musescore
         obsidian
         syncthingtray
         reaper