From 5d45159363451af706b21eb5418912a5830f926d Mon Sep 17 00:00:00 2001
From: Florian Schmitt <mrflos@gmail.com>
Date: Sun, 29 Sep 2024 21:39:49 +0300
Subject: [PATCH] no more kde plasma home, kde plasma 6 and transparent kitty
 term

---
 .gitignore                |  2 +-
 dotfiles/kitty/kitty.conf |  6 +++---
 modules/desktop.nix       | 14 +++++---------
 modules/home-config.nix   | 20 ++++++++++----------
 4 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index b8dfe78..f0a20ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 .DS_Store
-./configuration.nix
+/configuration.nix
 darwin-configuration.nix
 deploy/result
 
diff --git a/dotfiles/kitty/kitty.conf b/dotfiles/kitty/kitty.conf
index 3337c69..2564302 100644
--- a/dotfiles/kitty/kitty.conf
+++ b/dotfiles/kitty/kitty.conf
@@ -84,10 +84,10 @@ confirm_os_window_close 0
 enable_audio_bell no
 window_padding_width 10
 font_size 14.0
-background_opacity 1 
-#background_opacity 0.98
+#background_opacity 1 
+background_opacity 0.98
 #background_image ~/Nextcloud/Images/Wallpapers/kitty-bg.png
 #background_image_layout cscaled
 #background_tint 0.99
 #modify_font cell_height 130%
-startup_session ~/.config/kitty/session.conf
+#startup_session ~/.config/kitty/session.conf
diff --git a/modules/desktop.nix b/modules/desktop.nix
index d5cedfc..c8bf627 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -26,16 +26,12 @@
       openFirewall = true;
     };
 
-    xserver.desktopManager.plasma5.enable = true;
-    displayManager.defaultSession = "plasmawayland";
+    desktopManager.plasma6.enable = true;
+    displayManager.defaultSession = "plasma";
     displayManager.sddm.wayland.enable = true;
     displayManager.sddm.enable = true;
     displayManager.sddm.enableHidpi = true;
     displayManager.sddm.theme = "rose-pine";
-    #xserver = {
-    #  enable = true;
-    #  desktopManager.plasma5.enable = true;
-    #};
     dbus.enable = true;
   };
 
@@ -63,7 +59,7 @@
     droidcam.enable = true;
     firefox.enable = true;
     firefox.languagePacks = [ "fr" ];
-    #hyprland.enable = true;
+    hyprland.enable = true;
 
     ssh.askPassword = pkgs.lib.mkForce "${pkgs.ksshaskpass.out}/bin/ksshaskpass"; # conflict between kde and gnome cf. https://github.com/NixOS/nixpkgs/issues/75867
     ssh.startAgent = true;
@@ -82,7 +78,7 @@
   nixpkgs.config.allowUnfree = true;
 
   # no kde bloat
-  environment.plasma5.excludePackages = with pkgs.libsForQt5; [
+  environment.plasma6.excludePackages = with pkgs.kdePackages; [
     baloo
     elisa
     khelpcenter
@@ -137,7 +133,7 @@
     kitty
     latte-dock
     libreoffice-qt
-    libsForQt5.ark
+    kdePackages.ark
     mixxx
     mumble
     nextcloud-client
diff --git a/modules/home-config.nix b/modules/home-config.nix
index eb12935..b6a1c00 100644
--- a/modules/home-config.nix
+++ b/modules/home-config.nix
@@ -6,12 +6,12 @@
   ...
 }:
 let
-  plasma-manager = pkgs.fetchFromGitHub {
-    owner = "pjones";
-    repo = "plasma-manager";
-    rev = "4e56cfeb95081a43cb49487d0996dc936d6201e5";
-    sha256 = "sha256-LJ/lFEupLSi7xtUps234hhMk7ZdVLRoYeU7KiCFaoGw=";
-  };
+  # plasma-manager = pkgs.fetchFromGitHub {
+  #   owner = "pjones";
+  #   repo = "plasma-manager";
+  #   rev = "4e56cfeb95081a43cb49487d0996dc936d6201e5";
+  #   sha256 = "sha256-LJ/lFEupLSi7xtUps234hhMk7ZdVLRoYeU7KiCFaoGw=";
+  # };
   startupScript = pkgs.pkgs.writeShellScriptBin "hyprland-start" ''
     ${pkgs.waybar}/bin/waybar &
     ${pkgs.swww}/bin/swww init &
@@ -67,10 +67,10 @@ in
         yarn
       ];
 
-      imports = [
-        (plasma-manager + "/modules")
-        ./home-plasma.nix
-      ];
+      # imports = [
+      #   (plasma-manager + "/modules")
+      #   ./home-plasma.nix
+      # ];
       home.file = {
         "./.config/kitty/" = {
           source = ../dotfiles/kitty;