From 7df26f30a2e4b6c468400ae03d482c63bd06ff43 Mon Sep 17 00:00:00 2001
From: RGBCube <RGBCube@users.noreply.github.com>
Date: Fri, 3 Nov 2023 14:37:34 +0300
Subject: [PATCH] Move copy and paste tools to Hyprland  and fix variable
 assignment in Hyprland config

---
 machines/enka/helix/default.nix    |  6 +-----
 machines/enka/hyprland/default.nix | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/machines/enka/helix/default.nix b/machines/enka/helix/default.nix
index dd347ad..1ee61cc 100644
--- a/machines/enka/helix/default.nix
+++ b/machines/enka/helix/default.nix
@@ -1,8 +1,4 @@
-{ lib, pkgs, systemPackages, homeConfiguration, homePackages, enabled, ... }: lib.recursiveUpdate3
-
-(with pkgs; systemPackages [
-  xclip
-])
+{ lib, pkgs, homeConfiguration, homePackages, enabled, ... }: lib.recursiveUpdate
 
 (homeConfiguration "nixos" {
   programs.helix = enabled {
diff --git a/machines/enka/hyprland/default.nix b/machines/enka/hyprland/default.nix
index 1570d9c..5f593a2 100644
--- a/machines/enka/hyprland/default.nix
+++ b/machines/enka/hyprland/default.nix
@@ -1,6 +1,6 @@
-{ homeConfiguration, enabled, ... }:
+{ lib, pkgs, homeConfiguration, homePackages, enabled, ... }: lib.recursiveUpdate
 
-homeConfiguration "nixos" {
+(homeConfiguration "nixos" {
   wayland.windowManager.hyprland = enabled {
     extraConfig = ''
       monitor = , preferred, auto, 1
@@ -61,13 +61,13 @@ homeConfiguration "nixos" {
       bind =      , Print, exec, grim -g "$(slurp)" - | wl-copy
       bind = SHIFT, Print, exec, kazam
 
+      $active_color   = 0xD79921
+      $inactive_color = 0x928374
+
       general {
         gaps_in  = 5
         gaps_out = 5
 
-        $active_color   = 0xD79921
-        $inactive_color = 0x928374
-
         col.active_border         = $active_color
         col.nogroup_border_active = $active_color
 
@@ -113,5 +113,12 @@ homeConfiguration "nixos" {
       }
     '';
   };
-}
+})
 
+(with pkgs; homePackages [
+  grim
+  slurp
+
+  wl-copy
+  wl-paste
+])