Nix/HM: update instructions for current-state module

pages/Nix/Hyprland on Home Manager.md

@@ -2,9 +2,11 @@ For a list of available options, check the
 [Home Manager options](https://nix-community.github.io/home-manager/options.html#opt-wayland.windowManager.hyprland.enable).
 
 {{< hint title=Note >}}
-- *(Required) NixOS Module*: enables critical components needed to run Hyprland properly
+
-- *(Optional) Home-manager module*: lets you declaratively configure Hyprland
+- _(Required) NixOS Module_: enables critical components needed to run Hyprland
-{{< /hint >}}
+  properly
+- _(Optional) Home-manager module_: lets you declaratively configure Hyprland
+  {{< /hint >}}
 
 ## Installation
 
@@ -12,7 +14,8 @@ For a list of available options, check the
 
 {{< tab "Home Manager" >}}
 
-Home Manager has options for Hyprland without needing to import the Flake module.
+Home Manager has options for Hyprland without needing to import the Flake
+module.
 
 ```nix
 {
@@ -21,8 +24,17 @@ Home Manager has options for Hyprland without needing to import the Flake module
 ```
 
 {{< /tab >}}
+
 {{< tab "Flakes" >}}
 
+{{< hint >}}
+
+The flake module is merely an extension to the Home Manager downstream module.
+It is mainly used as a staging area for new options, so unless you're a tester
+you should use the downstream Home Manager module.
+
+{{< /hint >}}
+
 The following snippet of code tries to show how to bring the Hyprland flake from
 the flake input and import it into the module system. Feel free to make any
 adjustment for your setup.
@@ -57,15 +69,23 @@ Don't forget to replace `user@hostname` with your username and hostname!
   };
 }
 ```
+
 {{< /tab >}}
 
 {{< tab "No flakes (with flake-compat)" >}}
 
+{{< hint >}}
+
+The flake module is merely an extension to the Home Manager downstream module.
+It is mainly used as a staging area for new options, so unless you're a tester
+you should use the downstream Home Manager module.
+
+{{< /hint >}}
+
 The following snippet of code tries to show how to bring the Hyprland flake from
 the flake input and import it into the module system. Feel free to make any
 adjustment for your setup.
 
-
 ```nix
 # home config
 
@@ -76,35 +96,27 @@ adjustment for your setup.
     src = builtins.fetchTarball "https://github.com/hyprwm/Hyprland/archive/master.tar.gz";
   }).defaultNix;
 in {
-  imports = [
+  imports = [hyprland.homeManagerModules.default];
-    hyprland.homeManagerModules.default
-  ];
 
-  wayland.windowManager.hyprland = {
+  wayland.windowManager.hyprland.enable = true;
-    enable = true;
-
-    extraConfig = ''
-      bind = SUPER, Return, exec, kitty
-      # ...
-    '';
-  };
 }
 ```
+
 {{< /tab >}}
 
 {{< /tabs >}}
 
+};
 
 ## Usage
 
 Once the module is enabled, you can use it to declaratively configure Hyprland.
 Here is an example config, made to work with either the upstream Home Manager
-module, or the Flake-based Home Manager module.
+module, or the flake-based Home Manager module.
 
 ```nix
 # home.nix
-{config, pkgs, ...}: {
+{
-  # hyprland module from HM
   wayland.windowManager.hyprland.settings = {
     "$mod" = "SUPER";
     bind =
@@ -129,37 +141,12 @@ module, or the Flake-based Home Manager module.
           10)
       );
   };
-
-  # hyprland module from the flake
-  wayland.windowManager.hyprland.extraConfig = ''
-    $mod = SUPER
-
-    bind = $mod, F, exec, firefox
-    bind = , Print, exec, grimblast copy area
-
-    # workspaces
-    # binds $mod + [shift +] {1..10} to [move to] workspace {1..10}
-    ${builtins.concatStringsSep "\n" (builtins.genList (
-        x: let
-          ws = let
-            c = (x + 1) / 10;
-          in
-            builtins.toString (x + 1 - (c * 10));
-        in ''
-          bind = $mod, ${ws}, workspace, ${toString (x + 1)}
-          bind = $mod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}
-        ''
-      )
-      10)}
-
-    # ...
-  '';
 }
 ```
 
 ## Plugins
 
-Hyprland plugins can be added through an option:
+Hyprland plugins can be added through the `plugins` option:
 
 ```nix
 wayland.windowManager.hyprland.plugins = [
@@ -168,45 +155,41 @@ wayland.windowManager.hyprland.plugins = [
 ];
 ```
 
-For examples on how to build hyprland plugins using nix see the
+For examples on how to build Hyprland plugins using nix see the
 [official plugins](https://github.com/hyprwm/hyprland-plugins).
 
 ## Fixing problems with themes
 
-If your themes for mouse cursor, icons or windows don't load correctly, try setting them with `home.pointerCursor` and `gtk.theme`, which enable a bunch of compatibility options that should make the themes load in all situations.
+If your themes for mouse cursor, icons or windows don't load correctly, try
+setting them with `home.pointerCursor` and `gtk.theme`, which enable a bunch of
+compatibility options that should make the themes load in all situations.
 
 Example configuration:
-```
+
-  home-manager = {
+```nix
-    useGlobalPkgs = true;
+home.pointerCursor = {
-    useUserPackages = true;
+  gtk.enable = true;
-    users.username = {
+  # x11.enable = true;
-      home = {
+  package = pkgs.bibata-cursors;
-        stateVersion = "23.05";
+  name = "Bibata-Modern-Classic";
-        pointerCursor = {
+  size = 16;
-          gtk.enable = true;
+};
-          # x11.enable = true;
+
-          package = pkgs.bibata-cursors;
+gtk = {
-          name = "Bibata-Modern-Amber";
+  enable = true;
-          size = 32;
+  theme = {
-        };
+    package = pkgs.flat-remix-gtk;
-      };
+    name = "Flat-Remix-GTK-Grey-Darkest";
-      gtk = {
-        enable = true;
-        theme = {
-          package = pkgs.flat-remix-gtk;
-          name = "Flat-Remix-GTK-Grey-Darkest";
-        };
-        iconTheme = {
-          package = pkgs.libsForQt5.breeze-icons;
-          name = "breeze-dark";
-        };
-        font = {
-          name = "Sans";
-          size = 11;
-        };
-      };
-    };
   };
 
+  iconTheme = {
+    package = pkgs.gnome.adwaita-icon-theme;
+    name = "Adwaita";
+  };
+
+  font = {
+    name = "Sans";
+    size = 11;
+  };
+};
 ```