From 57f0011d41751e5f11c3277c91a90231a596aee0 Mon Sep 17 00:00:00 2001
From: Heiko Blobner <heiko.blobner@posteo.de>
Date: Thu, 13 Jul 2023 10:37:12 +0200
Subject: [PATCH] hmgr: hprland

---
 .../modules/desktop/hprland/default.nix       | 57 +++++--------------
 1 file changed, 13 insertions(+), 44 deletions(-)

diff --git a/home-manager/modules/desktop/hprland/default.nix b/home-manager/modules/desktop/hprland/default.nix
index 1c34cee..f1a0e2f 100644
--- a/home-manager/modules/desktop/hprland/default.nix
+++ b/home-manager/modules/desktop/hprland/default.nix
@@ -1,51 +1,20 @@
-{ inputs, lib, config, pkgs, ... }: {
-  imports = [
-    ../common
-    ../common/wayland-wm
-    inputs.hyprland.homeManagerModules.default
-  ];
-
-  programs = {
-    fish.loginShellInit = ''
-      if test (tty) = "/dev/tty1"
-        exec Hyprland &> /dev/null
-      end
-    '';
-    zsh.loginExtra = ''
-      if [ "$(tty)" = "/dev/tty1" ]; then
-        exec Hyprland &> /dev/null
-      fi
-    '';
-    zsh.profileExtra = ''
-      if [ "$(tty)" = "/dev/tty1" ]; then
-        exec Hyprland &> /dev/null
-      fi
-    '';
-  };
+{pkgs, ...}: let
+  flake-compat = builtins.fetchTarball "https://github.com/edolstra/flake-compat/archive/master.tar.gz";
 
-  home.packages = with pkgs; [
-    inputs.hyprwm-contrib.packages.${system}.grimblast
-    swaybg
-    swayidle
-    # TODO
-    # inputs.hyprland.packages.${system}.xdg-desktop-portal-hyprland
+  hyprland = (import flake-compat {
+    src = builtins.fetchTarball "https://github.com/hyprwm/Hyprland/archive/master.tar.gz";
+  }).defaultNix;
+in {
+  imports = [
+    hyprland.homeManagerModules.default
   ];
 
-  programs.waybar.package = pkgs.waybar.overrideAttrs (oa: {
-    mesonFlags = (oa.mesonFlags or  [ ]) ++ [ "-Dexperimental=true" ];
-  });
-
   wayland.windowManager.hyprland = {
     enable = true;
-    package = inputs.hyprland.packages.${pkgs.system}.default;
-    extraConfig =
-      (import ./monitors.nix {
-        inherit lib;
-        inherit (config) monitors;
-      }) +
-      (import ./config.nix {
-        inherit (config) home colorscheme wallpaper;
-      });
+
+    extraConfig = ''
+      bind = SUPER, Return, exec, kitty
+      # ...
+    '';
   };
 }
-