From 4ae96c2a658261bad3b98bf00317dfe3991a19e9 Mon Sep 17 00:00:00 2001
From: specCon18 <steven.carpenter@skdevstudios.com>
Date: Tue, 15 Aug 2023 22:40:24 -0400
Subject: [PATCH] fixed hyprland collision

---
 flake.lock                                    | 79 +------------------
 flake.nix                                     |  6 +-
 modules/home-manager/hyprland.nix             |  2 +-
 modules/system/desktop-environments/gnome.nix |  2 +-
 .../system/desktop-environments/hyprland.nix  | 13 ++-
 5 files changed, 11 insertions(+), 91 deletions(-)

diff --git a/flake.lock b/flake.lock
index d50ea6e..2ff8f64 100644
--- a/flake.lock
+++ b/flake.lock
@@ -163,31 +163,6 @@
         "type": "github"
       }
     },
-    "hyprland-protocols_2": {
-      "inputs": {
-        "nixpkgs": [
-          "xdph",
-          "nixpkgs"
-        ],
-        "systems": [
-          "xdph",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1691753796,
-        "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
-        "owner": "hyprwm",
-        "repo": "hyprland-protocols",
-        "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprland-protocols",
-        "type": "github"
-      }
-    },
     "lowdown-src": {
       "flake": false,
       "locked": {
@@ -356,22 +331,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
-      "locked": {
-        "lastModified": 1683014792,
-        "narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": [
@@ -408,8 +367,7 @@
         "hyprland": "hyprland",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_3",
-        "sops-nix": "sops-nix",
-        "xdph": "xdph_2"
+        "sops-nix": "sops-nix"
       }
     },
     "sops-nix": {
@@ -446,21 +404,6 @@
         "type": "github"
       }
     },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
     "wlroots": {
       "flake": false,
       "locked": {
@@ -508,26 +451,6 @@
         "repo": "xdg-desktop-portal-hyprland",
         "type": "github"
       }
-    },
-    "xdph_2": {
-      "inputs": {
-        "hyprland-protocols": "hyprland-protocols_2",
-        "nixpkgs": "nixpkgs_5",
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1691841170,
-        "narHash": "sha256-RCTm1/MVWYPnReMgyp7tr2ogGYo/pvw38jZaFwemgPU=",
-        "owner": "hyprwm",
-        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "57a3a41ba6b358109e4fc25c6a4706b5f7d93c6b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "xdg-desktop-portal-hyprland",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index f80dbd1..99a293a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,7 +7,7 @@
         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";
+        # 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, hyprland, xdph, ... }@inputs:
+    outputs = { self, home-manager, nixos-hardware, disko, nixpkgs, sops-nix, devenv, hyprland, ... }@inputs:
         let
             system = "x86_64-linux";
             pkgs = import nixpkgs {
@@ -63,7 +63,7 @@
                     ./machines/katana.nix #machine specific configuration
                     "speccon18"  #default user
                     [
-                        hyprland.nixosModules.default
+                        # hyprland.nixosModules.default
                         ./modules/system/desktop-environments/hyprland.nix
                         ./hosts/katana/default.nix
                         ./hosts/katana/networkd.nix
diff --git a/modules/home-manager/hyprland.nix b/modules/home-manager/hyprland.nix
index cf984e5..7eddf63 100644
--- a/modules/home-manager/hyprland.nix
+++ b/modules/home-manager/hyprland.nix
@@ -1,7 +1,7 @@
 { pkgs, config, lib, ...}:
 {
   wayland.windowManager.hyprland = {
-#    systemdIntegration = true;
+   # systemdIntegration = true;
     enable = true;
     extraConfig = ''
       bind = SUPER, Return, exec, alacritty
diff --git a/modules/system/desktop-environments/gnome.nix b/modules/system/desktop-environments/gnome.nix
index 9bccc32..657c300 100644
--- a/modules/system/desktop-environments/gnome.nix
+++ b/modules/system/desktop-environments/gnome.nix
@@ -47,7 +47,7 @@ in {
   };
   
   xdg = {
-    portal = { enable = lib.mkDefault true; };
+    # portal = { enable = lib.mkDefault true; };
     mime.defaultApplications = {
       "text/markdown" = "hx";
     };
diff --git a/modules/system/desktop-environments/hyprland.nix b/modules/system/desktop-environments/hyprland.nix
index ea5b0fd..e0431c5 100644
--- a/modules/system/desktop-environments/hyprland.nix
+++ b/modules/system/desktop-environments/hyprland.nix
@@ -1,9 +1,5 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: let
+{ config, pkgs, lib, ...}:
+let
   inherit (lib) mkEnableOption mkIf;
   cfg = config.speccon18.desktop.hyprland;
 in {
@@ -13,7 +9,7 @@ in {
   config = mkIf cfg.enable {
     programs.hyprland = {
       enable = true;
-      enableNvidiaPatches = true;
+      nvidiaPatches = true;
       xwayland.enable = true;
     };
     environment = {
@@ -28,6 +24,7 @@ in {
         rofi-wayland
         libnotify
         mako
+        hyprland
       ];
       sessionVariables = {
         WLR_NO_HARDWARE_CURSORS = "1";
@@ -37,8 +34,8 @@ in {
     xdg.portal = {
       enable = true;
       extraPortals = [
-        pkgs.xdg-desktop-portal-hyprland
         pkgs.xdg-desktop-portal-gtk
+        pkgs.xdg-desktop-portal-hyprland
       ];
     };
     hardware = {