From b3275019b72086d114ac9e18732d2c35a3680ff3 Mon Sep 17 00:00:00 2001
From: Felix Suchert <dev@felixsuchert.de>
Date: Fri, 22 Mar 2024 10:40:02 +0100
Subject: [PATCH] Update to Plasma 6, remove plymouth

---
 entropy/nixos/configuration.nix | 14 ++++++++------
 entropy/nixos/modules/kde.nix   | 32 +++++++++++++++++---------------
 entropy/nixos/modules/sway.nix  |  6 ++++--
 3 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/entropy/nixos/configuration.nix b/entropy/nixos/configuration.nix
index 3b12a74..0110e1f 100644
--- a/entropy/nixos/configuration.nix
+++ b/entropy/nixos/configuration.nix
@@ -44,8 +44,8 @@
 
   # OVERRIDES ##########################################################
   nixpkgs.config.permittedInsecurePackages = [
-    "electron-25.9.0"
-    "freeimage-unstable-2021-11-01"
+    #"electron-25.9.0"
+    #"freeimage-unstable-2021-11-01"
   ];
 
 
@@ -56,10 +56,11 @@
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  boot.plymouth = {
-    enable = true;
-    theme = "breeze";
-  };
+  # NOTE(feliix42): Didn't work as I wanted it to so...
+  # boot.plymouth = {
+  #   enable = true;
+  #   theme = "breeze";
+  # };
 
   # ------------ kernel -------------------------------------------------------
   boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_7;
@@ -291,6 +292,7 @@
     ## git and friends
     gitAndTools.delta
     gitAndTools.gitui
+    difftastic
     ## terminal, browsers, text editing, note taking
     alacritty
     # TODO(feliix42): Fix at some point!
diff --git a/entropy/nixos/modules/kde.nix b/entropy/nixos/modules/kde.nix
index 4c07da6..6b5c766 100644
--- a/entropy/nixos/modules/kde.nix
+++ b/entropy/nixos/modules/kde.nix
@@ -1,25 +1,27 @@
 { pkgs, ... }:
 
 {
-  services.xserver = {
-    enable = false;
-    autorun = false;
+  services.desktopManager.plasma6.enable = true;
 
-    desktopManager.plasma5 = {
-      enable = true;
-    };
+  # services.xserver = {
+  #   enable = false;
+  #   autorun = false;
 
-    # use startx to run plasma
-    displayManager.startx.enable = true;
+  #   desktopManager.plasma5 = {
+  #     enable = true;
+  #   };
 
-    # I'd like a log please
-    logFile = "/var/log/Xorg.0.log";
-  };
+  #   # use startx to run plasma
+  #   displayManager.startx.enable = true;
 
-  environment.etc."X11/xinit/xinitrc".text = ''
-    export DESKTOP_SESSION=plasma
-    exec ${pkgs.libsForQt5.plasma-workspace}/bin/startplasma-x11
-  '';
+  #   # I'd like a log please
+  #   logFile = "/var/log/Xorg.0.log";
+  # };
+
+  # environment.etc."X11/xinit/xinitrc".text = ''
+  #   export DESKTOP_SESSION=plasma
+  #   exec ${pkgs.libsForQt5.plasma-workspace}/bin/startplasma-x11
+  # '';
 
   #environment.variables = {
     #GDK_SCALE = "2";
diff --git a/entropy/nixos/modules/sway.nix b/entropy/nixos/modules/sway.nix
index 0c740fa..ad875a6 100644
--- a/entropy/nixos/modules/sway.nix
+++ b/entropy/nixos/modules/sway.nix
@@ -111,9 +111,11 @@ in
 
   environment.etc."greetd/environments".text = ''
     ${pkgs.sway}/bin/sway
-    ${pkgs.xorg.xinit}/bin/startx
-    ${pkgs.libsForQt5.plasma-workspace}/bin/startplasma-wayland
+    sway
+    startplasma-wayland
     ${pkgs.fish}/bin/fish
   '';
+    # ${pkgs.xorg.xinit}/bin/startx
+    # ${pkgs.libsForQt5.plasma-workspace}/bin/startplasma-wayland
 
 }