From 50ae1f3d3f53eca68066934ed3ba32d46afc895e Mon Sep 17 00:00:00 2001
From: liv <shadows@with.al>
Date: Sun, 18 Aug 2024 22:41:55 +0200
Subject: [PATCH] set up kde for enoko

---
 home/common/desktop/default.nix          | 24 -------------------
 home/common/desktop/wlr/default.nix      | 30 ++++++++++++++++++++++++
 home/common/desktop/{ => wlr}/mako.nix   |  0
 home/common/desktop/{ => wlr}/waybar.nix |  0
 home/common/desktop/{ => wlr}/wofi.nix   |  0
 home/desktop/hyprland/default.nix        |  1 +
 home/enoko.nix                           | 11 +++++----
 home/global.nix                          |  1 +
 nixos/desktop/plasma.nix                 |  5 ++++
 nixos/enoko/configuration.nix            | 13 ++++++----
 10 files changed, 52 insertions(+), 33 deletions(-)
 create mode 100644 home/common/desktop/wlr/default.nix
 rename home/common/desktop/{ => wlr}/mako.nix (100%)
 rename home/common/desktop/{ => wlr}/waybar.nix (100%)
 rename home/common/desktop/{ => wlr}/wofi.nix (100%)
 create mode 100644 nixos/desktop/plasma.nix

diff --git a/home/common/desktop/default.nix b/home/common/desktop/default.nix
index 2d828ec..107fc4c 100644
--- a/home/common/desktop/default.nix
+++ b/home/common/desktop/default.nix
@@ -4,38 +4,14 @@
     ./firefox.nix
     ./alacritty.nix
     ./gtk.nix
-    ./mako.nix
-    ./wofi.nix
-    ./waybar.nix
     ./vscode.nix
   ];
 
-  home.packages = with pkgs; [
-    wf-recorder
-    wl-clipboard
-    vesktop
-    xdg-utils
-    nautilus
-    adwaita-icon-theme
-  ];
   home.sessionVariables = {
     MOZ_ENABLE_WAYLAND = 1;
     QT_QPA_PLATFORM = "wayland";
     LIBSEAT_BACKEND = "logind";
   };
 
-  programs.imv.enable = true;
-
   xdg.mimeApps.enable = true;
-  xdg.portal = {
-    enable = true;
-    extraPortals = [ pkgs.xdg-desktop-portal-wlr ];
-    config = {
-      common = {
-        default = [
-          "wlr"
-        ];
-      };
-    };
-  };
 }
diff --git a/home/common/desktop/wlr/default.nix b/home/common/desktop/wlr/default.nix
new file mode 100644
index 0000000..f1ee23f
--- /dev/null
+++ b/home/common/desktop/wlr/default.nix
@@ -0,0 +1,30 @@
+{ pkgs, ... }: {
+  imports = [
+    ./mako.nix
+    ./wofi.nix
+    ./waybar.nix
+  ];
+
+  home.packages = with pkgs; [
+    wf-recorder
+    wl-clipboard
+    vesktop
+    xdg-utils
+    nautilus
+    adwaita-icon-theme
+  ];
+
+  programs.imv.enable = true;
+
+  xdg.portal = {
+    enable = true;
+    extraPortals = [ pkgs.xdg-desktop-portal-wlr ];
+    config = {
+      common = {
+        default = [
+          "wlr"
+        ];
+      };
+    };
+  };
+}
diff --git a/home/common/desktop/mako.nix b/home/common/desktop/wlr/mako.nix
similarity index 100%
rename from home/common/desktop/mako.nix
rename to home/common/desktop/wlr/mako.nix
diff --git a/home/common/desktop/waybar.nix b/home/common/desktop/wlr/waybar.nix
similarity index 100%
rename from home/common/desktop/waybar.nix
rename to home/common/desktop/wlr/waybar.nix
diff --git a/home/common/desktop/wofi.nix b/home/common/desktop/wlr/wofi.nix
similarity index 100%
rename from home/common/desktop/wofi.nix
rename to home/common/desktop/wlr/wofi.nix
diff --git a/home/desktop/hyprland/default.nix b/home/desktop/hyprland/default.nix
index cb60854..783b36a 100644
--- a/home/desktop/hyprland/default.nix
+++ b/home/desktop/hyprland/default.nix
@@ -2,6 +2,7 @@
 {
   imports = [
     ../../common/desktop
+    ../../common/desktop/wlr
     ./swaylock.nix
     ./swayidle.nix
   ];
diff --git a/home/enoko.nix b/home/enoko.nix
index 4fb9916..061cfaa 100644
--- a/home/enoko.nix
+++ b/home/enoko.nix
@@ -2,7 +2,7 @@
 { inputs, lib, pkgs, ... }: {
   imports = [
     ./global.nix
-    ./desktop/hyprland
+    ./common/desktop
   ];
 
   config.monitors = [
@@ -16,9 +16,10 @@
       scale = "1.175000";
     }
   ];
+
   # Fix HiDPI scaling
-  config.wayland.windowManager.hyprland = {
-    settings.xwayland.force_zero_scaling = true;
-    settings.env = "GDK_SCALE,2";
-  };
+  # config.wayland.windowManager.hyprland = {
+  #   settings.xwayland.force_zero_scaling = true;
+  #   settings.env = "GDK_SCALE,2";
+  # };
 }
diff --git a/home/global.nix b/home/global.nix
index b2f924d..d0cbc62 100644
--- a/home/global.nix
+++ b/home/global.nix
@@ -58,6 +58,7 @@
       };
     };
     targets.wofi.enable = false;
+    targets.kde.enable = false;
   };
 
   xdg.mime.enable = true;
diff --git a/nixos/desktop/plasma.nix b/nixos/desktop/plasma.nix
new file mode 100644
index 0000000..9f01200
--- /dev/null
+++ b/nixos/desktop/plasma.nix
@@ -0,0 +1,5 @@
+{ ... }: {
+  services.displayManager.sddm.enable = true;
+  services.displayManager.sddm.wayland.enable = true;
+  services.desktopManager.plasma6.enable = true;
+}
diff --git a/nixos/enoko/configuration.nix b/nixos/enoko/configuration.nix
index 86f7da2..dc2807a 100644
--- a/nixos/enoko/configuration.nix
+++ b/nixos/enoko/configuration.nix
@@ -9,7 +9,7 @@
     ../common
     ./hardware-configuration.nix
     ../services/postgres.nix
-    ../desktop/hyprland.nix
+    ../desktop/plasma.nix
   ];
 
   nixpkgs = {
@@ -84,9 +84,14 @@
   };
 
   # hyprland stuff
-  programs.hyprland = {
-    enable = true;
-  };
+  # programs.hyprland = {
+  #   enable = true;
+  # };
+
+  # enable ppd specifically for the framework
+  services.power-profiles-daemon.enable = true;
+
+  boot.kernelParams = lib.optionals (lib.versionOlder config.boot.kernelPackages.kernel.version "6.8") ["rtc_cmos.use_acpi_alarm=1"] ;
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
   system.stateVersion = "24.05";