From 33a974f852fb119608a98999e7272c617155bde0 Mon Sep 17 00:00:00 2001
From: liv <shadows@with.al>
Date: Wed, 21 Aug 2024 19:10:35 +0200
Subject: [PATCH] switch yukari to plasma

---
 home/yukari.nix                | 2 +-
 nixos/common/bluetooth.nix     | 2 --
 nixos/desktop/hyprland.nix     | 1 +
 nixos/desktop/plasma.nix       | 2 --
 nixos/yukari/configuration.nix | 2 +-
 5 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/home/yukari.nix b/home/yukari.nix
index 0a92fb9..6b0eb36 100644
--- a/home/yukari.nix
+++ b/home/yukari.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ./global.nix
-    ./features/desktop/hyprland
+    ./features/desktop
     ./features/desktop/games
   ];
 
diff --git a/nixos/common/bluetooth.nix b/nixos/common/bluetooth.nix
index 6c1d179..2993af5 100644
--- a/nixos/common/bluetooth.nix
+++ b/nixos/common/bluetooth.nix
@@ -3,6 +3,4 @@
   hardware.bluetooth = {
     enable = true;
   };
-
-  services.blueman.enable = true;
 }
diff --git a/nixos/desktop/hyprland.nix b/nixos/desktop/hyprland.nix
index c43fc83..d65cf6d 100644
--- a/nixos/desktop/hyprland.nix
+++ b/nixos/desktop/hyprland.nix
@@ -1,4 +1,5 @@
 { ... }:
 {
   security.pam.services.swaylock = { };
+  services.blueman.enable = true;
 }
diff --git a/nixos/desktop/plasma.nix b/nixos/desktop/plasma.nix
index e10394c..95f69e0 100644
--- a/nixos/desktop/plasma.nix
+++ b/nixos/desktop/plasma.nix
@@ -3,6 +3,4 @@
   services.displayManager.sddm.enable = true;
   services.displayManager.sddm.wayland.enable = true;
   services.desktopManager.plasma6.enable = true;
-  i18n.inputMethod.enable = true;
-  i18n.inputMethod.type = "ibus";
 }
diff --git a/nixos/yukari/configuration.nix b/nixos/yukari/configuration.nix
index 9f37edd..3feb996 100644
--- a/nixos/yukari/configuration.nix
+++ b/nixos/yukari/configuration.nix
@@ -11,7 +11,7 @@
     ./hardware-configuration.nix
     ../services/postgres.nix
     ../desktop
-    ../desktop/hyprland.nix
+    ../desktop/plasma.nix
   ];
 
   nixpkgs = {