From f1be4c1fc59712ed7e26ee7af112763aa7f10a32 Mon Sep 17 00:00:00 2001
From: Julian Mutter <julian.mutter@comumail.de>
Date: Sat, 5 Oct 2024 16:17:39 +0200
Subject: [PATCH] Switch to hyprland

---
 homes/x86_64-linux/julian@aspi/default.nix |  6 +++---
 modules/home/hyprland/default.nix          | 13 ++++++++-----
 modules/nixos/hyprland/default.nix         |  2 +-
 systems/x86_64-linux/aspi/default.nix      |  5 ++---
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/homes/x86_64-linux/julian@aspi/default.nix b/homes/x86_64-linux/julian@aspi/default.nix
index 6810a0c..5b39106 100644
--- a/homes/x86_64-linux/julian@aspi/default.nix
+++ b/homes/x86_64-linux/julian@aspi/default.nix
@@ -37,9 +37,9 @@
     yazi.enable = true;
     emacs.enable = true;
 
-    i3.enable = true;
+    # i3.enable = true;
 
-    # hyprland.enable = true;
+    hyprland.enable = true;
     nix-helper.enable = true;
 
     desktop.enable = true;
@@ -94,7 +94,7 @@
       ## My scripts
       pkgs.frajul.deploy-to-pianopi
       pkgs.frajul.edit-config
-      # pkgs.frajul.open-messaging
+      pkgs.frajul.open-messaging
     ]
     ++ lib.lists.concatMap (packages-list-file: import packages-list-file { inherit pkgs; }) [
       ./fonts.nix
diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix
index 23778ff..45dc335 100644
--- a/modules/home/hyprland/default.nix
+++ b/modules/home/hyprland/default.nix
@@ -86,7 +86,7 @@ in
     wayland.windowManager.hyprland = {
       # Whether to enable Hyprland wayland compositor
       enable = true;
-      package = inputs.hyprland.packages."${pkgs.system}".hyprland;
+      # package = inputs.hyprland.packages."${pkgs.system}".hyprland; # does only work with nixos-unstable
 
       # The hyprland package to use (simplifies use of plugins)
       # package = inputs.hyprland.packages.${pkgs.system}.hyprland;
@@ -99,7 +99,10 @@ in
       # Make PATH available to systemd services
       systemd.variables = [ "--all" ];
 
-      plugins = [ inputs.hyprland-plugins.packages.${pkgs.system}.hyprbars ];
+      plugins = with pkgs; [
+        # inputs.hyprland-plugins.packages.${pkgs.system}.hyprbars # does only work with nixos-unstable
+        hyprlandPlugins.hyprbars
+      ];
 
       settings = {
         "$mod" = "SUPER";
@@ -136,7 +139,7 @@ in
 
         # Master layout
         master = {
-          new_is_master = false;
+          new_status = "slave";
           no_gaps_when_only = 2; # with border
           mfact = 0.5; # Do not make master bigger
         };
@@ -201,8 +204,8 @@ in
 
           # opening applications
           "$mod, D, exec, wofi --show drun,run"
-          "$mod, E, exec, thunar"
-          "$mod, Return, exec, alacritty"
+          "$mod, E, exec, pcmanfm"
+          "$mod, Return, exec, wezterm"
           "$mod, B, exec, firefox"
           "$mod, C, exec, qalculate-gtk"
 
diff --git a/modules/nixos/hyprland/default.nix b/modules/nixos/hyprland/default.nix
index 3d80eae..1997951 100644
--- a/modules/nixos/hyprland/default.nix
+++ b/modules/nixos/hyprland/default.nix
@@ -30,7 +30,7 @@ in
 
   config = lib.mkIf cfg.enable {
     programs.hyprland.enable = true;
-    programs.hyprland.package = inputs.hyprland.packages.${pkgs.system}.hyprland;
+    # programs.hyprland.package = inputs.hyprland.packages.${pkgs.system}.hyprland; # does only work with nixos-unstable
     programs.hyprland.xwayland.enable = true;
     security.pam.services.hyprlock = { };
   };
diff --git a/systems/x86_64-linux/aspi/default.nix b/systems/x86_64-linux/aspi/default.nix
index d93bb59..05cd9a5 100644
--- a/systems/x86_64-linux/aspi/default.nix
+++ b/systems/x86_64-linux/aspi/default.nix
@@ -73,8 +73,8 @@
     locales.enable = true;
     # thunar.enable = true;
     pcmanfm.enable = true;
-    # wayland.enable = true;
-    # hyprland.enable = true;
+    wayland.enable = true;
+    hyprland.enable = true;
     x11.enable = true;
   };
 
@@ -108,7 +108,6 @@
 
   security.pam.services.gdm.enableGnomeKeyring = true;
 
-  # services.displayManager.sddm.wayland.enable = true;
   services.blueman.enable = true;
   services.upower.enable = true;