From a722352175fd3ab0415fba406801b86af59cf802 Mon Sep 17 00:00:00 2001
From: Charlie Root <charlie@charlieroot.dev>
Date: Thu, 10 Oct 2024 20:31:02 +0200
Subject: [PATCH] quickshell stuff, enable nix-ld and fix hyprland binds

---
 hosts/temperance/configuration.nix        |  1 +
 modules/style/quickshell/module.nix       | 28 +++++++++++++----------
 modules/style/quickshell/shell/shell.qml  |  0
 modules/wms/wayland/hyprland/settings.nix |  2 +-
 4 files changed, 18 insertions(+), 13 deletions(-)
 create mode 100644 modules/style/quickshell/shell/shell.qml

diff --git a/hosts/temperance/configuration.nix b/hosts/temperance/configuration.nix
index 8da5c15..715957c 100644
--- a/hosts/temperance/configuration.nix
+++ b/hosts/temperance/configuration.nix
@@ -11,6 +11,7 @@
   console.keyMap = "de";
   security.polkit.enable = true;
   boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;
+  programs.nix-ld.enable = true;
   services = {
     fstrim.enable = lib.mkDefault true;
   };
diff --git a/modules/style/quickshell/module.nix b/modules/style/quickshell/module.nix
index 0a47bd3..ac3bd14 100644
--- a/modules/style/quickshell/module.nix
+++ b/modules/style/quickshell/module.nix
@@ -1,23 +1,27 @@
 {
+  config,
+  lib,
   inputs',
   pkgs,
-  lib,
   ...
 }: let
   inherit (inputs') quickshell;
   inherit (lib.generators) toKeyValue;
+  inherit (config.meta.mainUser) username;
 in {
-  home.packages = with pkgs; [
-    qt6.qtimageformats # amog
-    qt6.qt5compat # shader fx
-    quickshell.packages.default
-    pamtester # lockscreen
-    grim
-    imagemagick # screenshot
-  ];
+  home-manager.users.${username} = {
+    home.packages = with pkgs; [
+      qt6.qtimageformats # amog
+      qt6.qt5compat # shader fx
+      quickshell.packages.default
+      pamtester # lockscreen
+      grim
+      imagemagick # screenshot
+    ];
 
-  xdg.configFile."quickshell/manifest.conf".text = toKeyValue {} {
-    shell = "${./shell}";
-    lockscreen = "${./lockscreen}";
+    # xdg.configFile."quickshell/manifest.conf".text = toKeyValue {} {
+    #   shell = "${./shell}";
+    #   # lockscreen = "${./lockscreen}";
+    # };
   };
 }
diff --git a/modules/style/quickshell/shell/shell.qml b/modules/style/quickshell/shell/shell.qml
new file mode 100644
index 0000000..e69de29
diff --git a/modules/wms/wayland/hyprland/settings.nix b/modules/wms/wayland/hyprland/settings.nix
index f4721a7..0c8eab4 100644
--- a/modules/wms/wayland/hyprland/settings.nix
+++ b/modules/wms/wayland/hyprland/settings.nix
@@ -34,7 +34,7 @@ in {
       input = {
         kb_layout = "de,ru";
         kb_variant = ",phonetic_winkeys";
-        kb_options = "grp:rctrl_rshift_toggle ctrl:nocaps";
+        kb_options = "grp:rctrl_rshift_toggle";
 
         follow_mouse = true;