From f25dcd56d9b82b4696eae3d3ed7f85e0149e6581 Mon Sep 17 00:00:00 2001
From: ISnortPennies <ISnortPennies@protonmail.com>
Date: Sat, 28 Jan 2023 21:15:51 -0500
Subject: [PATCH] moved sxhkd configuration to seperate module

---
 flake.nix                           |  5 +++++
 home-manager/home.nix               |  1 -
 {home-manager => modules}/sxhkd.nix | 11 +++++++++--
 modules/xserver.nix                 |  5 -----
 4 files changed, 14 insertions(+), 8 deletions(-)
 rename {home-manager => modules}/sxhkd.nix (87%)

diff --git a/flake.nix b/flake.nix
index 31359ff..013fa5b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,6 +18,10 @@
       url = "github:ISnortPennies/nvim-config";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    sxhkd-flake = {
+      url = "github:ISnortPennies/sxhkd-flake";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
   outputs = {
     self,
@@ -58,6 +62,7 @@
         inherit system pkgs;
         specialArgs = {inherit inputs settings;};
         modules = [
+          (import ./modules/sxhkd.nix inputs)
           ./configuration.nix
           ./systems/desktop.nix
           {
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 6c2fedf..1fad2e5 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -7,7 +7,6 @@
   imports = let
     modules = [
       "librewolf"
-      "sxhkd"
       "theme"
       "picom"
       "spicetify"
diff --git a/home-manager/sxhkd.nix b/modules/sxhkd.nix
similarity index 87%
rename from home-manager/sxhkd.nix
rename to modules/sxhkd.nix
index bb64469..eb92c91 100644
--- a/home-manager/sxhkd.nix
+++ b/modules/sxhkd.nix
@@ -1,4 +1,11 @@
-{
+{sxhkd-flake, ...}: {
+  config,
+  lib,
+  options,
+  pkgs,
+  ...
+}: (sxhkd-flake.nixosModules.sxhkd {
+  inherit lib config options pkgs;
   services.sxhkd = {
     enable = true;
     keybindings = {
@@ -20,4 +27,4 @@
       "super + Print + shift" = "maim -s | xclip -selection clipboard -t image/png";
     };
   };
-}
+})
diff --git a/modules/xserver.nix b/modules/xserver.nix
index e4971d4..89fb60f 100644
--- a/modules/xserver.nix
+++ b/modules/xserver.nix
@@ -14,11 +14,6 @@
     windowManager.dwm.enable = true;
     displayManager = {
       defaultSession = "none+dwm";
-      sessionCommands = ''
-        if ! pidof sxhkd > /dev/null;then
-          sxhkd &
-        fi
-      '';
       lightdm = {
         enable = true;
         greeters.mini = {