From bcc246acf935c075ecc32490605af5c1955d0ca3 Mon Sep 17 00:00:00 2001
From: specCon18 <steven.carpenter@skdevstudios.com>
Date: Tue, 15 Aug 2023 21:45:34 -0400
Subject: [PATCH] re-re-enabled hyperland

---
 flake.nix                                        | 14 +++++++-------
 modules/home-manager/hyprland.nix                |  3 ++-
 modules/system/desktop-environments/hyprland.nix |  1 -
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/flake.nix b/flake.nix
index 52f8021..55ac59d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,8 +6,8 @@
         nixos-hardware.url = "github:NixOS/nixos-hardware/master";
         sops-nix.url = github:Mic92/sops-nix;
         devenv.url = "github:cachix/devenv/latest";
-        # hyprland.url = "github:hyprwm/Hyprland";
-        # xdph.url = "github:hyprwm/xdg-desktop-portal-hyprland";
+        hyprland.url = "github:hyprwm/Hyprland";
+        xdph.url = "github:hyprwm/xdg-desktop-portal-hyprland";
         home-manager = {
             url = "github:nix-community/home-manager/release-23.05";
             inputs.nixpkgs.follows = "nixpkgs";
@@ -18,7 +18,7 @@
         };
     };
 
-    outputs = { self, home-manager, nixos-hardware, disko, nixpkgs, sops-nix, devenv, ... }@inputs:
+    outputs = { self, home-manager, nixos-hardware, disko, nixpkgs, sops-nix, devenv, hyprland, xdph ... }@inputs:
         let
             system = "x86_64-linux";
             pkgs = import nixpkgs {
@@ -63,8 +63,8 @@
                     ./machines/katana.nix #machine specific configuration
                     "speccon18"  #default user
                     [
-                       # hyprland.nixosModules.default
-                        # ./modules/system/desktop-environments/hyprland.nix
+                        hyprland.nixosModules.default
+                        ./modules/system/desktop-environments/hyprland.nix
                         ./hosts/katana/default.nix
                         ./hosts/katana/networkd.nix
                         ./hosts/katana/system-pkgs.nix
@@ -76,8 +76,8 @@
                         
                     ] #extra modules to be loaded
                     [
-                        # hyprland.homeManagerModules.default
-                        # ./modules/home-manager/hyprland.nix
+                        hyprland.homeManagerModules.default
+                        ./modules/home-manager/hyprland.nix
                         ./modules/home-manager/helix.nix
                         ./modules/home-manager/alacritty.nix
                         ./modules/home-manager/vscode.nix
diff --git a/modules/home-manager/hyprland.nix b/modules/home-manager/hyprland.nix
index af1d38f..d49047e 100644
--- a/modules/home-manager/hyprland.nix
+++ b/modules/home-manager/hyprland.nix
@@ -1,11 +1,12 @@
 { pkgs, config, lib, ...}:
 {
   wayland.windowManager.hyprland = {
+    systemdIntegration = true;
     enable = true;
     extraConfig = ''
       bind = SUPER, Return, exec, alacritty
       bind = CONTROL_SHIFT, W, exec, firefox
-      bind = SUPER, colon, exec, rofi -show drun
+      bind = SUPER, R, exec, rofi -show drun
       exec-once=waybar
       exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
       exec-once=mako
diff --git a/modules/system/desktop-environments/hyprland.nix b/modules/system/desktop-environments/hyprland.nix
index 7f6cbdc..e442c6a 100644
--- a/modules/system/desktop-environments/hyprland.nix
+++ b/modules/system/desktop-environments/hyprland.nix
@@ -28,7 +28,6 @@ in {
         rofi-wayland
         libnotify
         mako
-        xdg-desktop-portal-hyprland
       ];
       sessionVariables = {
         WLR_NO_HARDWARE_CURSORS = "1";