chore: bump to last hyprland-rs

.direnv/bin/nix-direnv-reload

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+set -e
+if [[ ! -d "/home/cyril/personal/hyprland-autoname-workspaces" ]]; then
+  echo "Cannot find source directory; Did you move it?"
+  echo "(Looking for "/home/cyril/personal/hyprland-autoname-workspaces")"
+  echo 'Cannot force reload with this script - use "direnv reload" manually and then try again'
+  exit 1
+fi
+
+# rebuild the cache forcefully
+_nix_direnv_force_reload=1 direnv exec "/home/cyril/personal/hyprland-autoname-workspaces" true
+
+# Update the mtime for .envrc.
+# This will cause direnv to reload again - but without re-building.
+touch "/home/cyril/personal/hyprland-autoname-workspaces/.envrc"
+
+# Also update the timestamp of whatever profile_rc we have.
+# This makes sure that we know we are up to date.
+touch -r "/home/cyril/personal/hyprland-autoname-workspaces/.envrc" "/home/cyril/personal/hyprland-autoname-workspaces/.direnv"/*.rc

.envrc

@@ -0,0 +1,2 @@
+export NIX_CONFIG="extra-experimental-features = nix-command flakes"
+use flake

.gitignore

@@ -1,2 +1,3 @@
 /target
 *.html
+.direnv/

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "hyprland-autoname-workspaces"
 authors = ["Cyril Levis", "Maxim Baz"]
-version = "1.1.14"
+version = "1.1.15"
 edition = "2021"
 categories = ["gui"]
 keywords = ["linux", "desktop-application", "hyprland", "waybar", "wayland"]

config.toml.example

@@ -1,4 +1,4 @@
-version = "1.1.14"
+version = "1.1.15"
 
 [format]
 dedup = true

flake.nix

@@ -0,0 +1,29 @@
+{
+  inputs = {
+    naersk.url = "github:nix-community/naersk/master";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils, naersk }:
+    let systems = [ "x86_64-linux" "aarch64-linux" ];
+    in flake-utils.lib.eachSystem systems (system:
+      let
+        pkgs = import nixpkgs { inherit system; };
+        naersk-lib = pkgs.callPackage naersk { };
+        libs = with pkgs; [ libxkbcommon libinput libpulseaudio systemd ];
+      in
+      {
+        defaultPackage = naersk-lib.buildPackage {
+          src = ./.;
+          meta.mainProgram = "hyprland-autoname-workspaces";
+          nativeBuildInputs = [ pkgs.pkg-config ];
+          buildInputs = libs;
+        };
+        devShell = with pkgs; mkShell {
+          buildInputs = [ cargo rustc rustfmt pre-commit rustPackages.clippy pkg-config ] ++ libs;
+          RUST_SRC_PATH = rustPlatform.rustLibSrc;
+        };
+      }
+    );
+}

src/renamer/formatter.rs

@@ -1,6 +1,7 @@
 use crate::renamer::ConfigFile;
 use crate::renamer::IconStatus::*;
 use crate::{AppClient, Renamer};
+use hyprland::data::FullscreenMode;
 use std::collections::HashMap;
 use strfmt::strfmt;
 
@@ -103,8 +104,8 @@ impl Renamer {
             println!("client: {client:#?}\nformatter vars => {vars:#?}");
         }
 
-        let is_grouped =
-            client.is_fullscreen && (client.is_active || !is_dedup_inactive_fullscreen);
+        let is_grouped = client.is_fullscreen != FullscreenMode::None
+            && (client.is_active || !is_dedup_inactive_fullscreen);
 
         match (is_grouped, is_dedup) {
             (true, true) => formatter(fmt_client_dup_fullscreen, &vars),
@@ -141,7 +142,11 @@ pub fn generate_counted_clients(
 ) -> Vec<(AppClient, i32)> {
     if need_dedup {
         let mut sorted_clients = clients;
-        sorted_clients.sort_by(|a, b| b.is_fullscreen.cmp(&a.is_fullscreen));
+        sorted_clients.sort_by(|a, b| {
+            let bf = b.is_fullscreen != FullscreenMode::None;
+            let af = a.is_fullscreen != FullscreenMode::None;
+            bf.cmp(&af)
+        });
         sorted_clients.sort_by(|a, b| b.is_active.cmp(&a.is_active));
 
         sorted_clients
@@ -194,7 +199,7 @@ mod tests {
             title: String::from("Title"),
             initial_title: String::from("Title"),
             is_active: false,
-            is_fullscreen: false,
+            is_fullscreen: FullscreenMode::None,
             matched_rule: Inactive(Default(String::from("DefaultIcon"))),
             is_dedup_inactive_fullscreen: false,
         };
@@ -206,7 +211,10 @@ mod tests {
         assert_eq!(workspace.clients[0].class, "Class");
         assert_eq!(workspace.clients[0].title, "Title");
         assert_eq!(workspace.clients[0].is_active, false);
-        assert_eq!(workspace.clients[0].is_fullscreen, false);
+        assert_eq!(
+            workspace.clients[0].is_fullscreen,
+            FullscreenMode::Fullscreen
+        );
         match &workspace.clients[0].matched_rule {
             Inactive(Default(icon)) => assert_eq!(icon, "DefaultIcon"),
             _ => panic!("Unexpected IconConfig value"),

src/renamer/mod.rs

@@ -324,7 +324,7 @@ mod tests {
             title: "xplr".to_string(),
             initial_title: "zsh".to_string(),
             is_active: false,
-            is_fullscreen: FullscreenMode::None,
+            is_fullscreen: FullscreenMode::Fullscreen,
             matched_rule: Inactive(Class("(kitty|alacritty)".to_string(), "term".to_string())),
             is_dedup_inactive_fullscreen: false,
         };
@@ -1644,7 +1644,7 @@ mod tests {
                         title: "kitty".to_string(),
                         initial_title: "kitty".to_string(),
                         is_active: true,
-                        is_fullscreen: FullscreenMode::Fullsreen,
+                        is_fullscreen: FullscreenMode::Fullscreen,
                         matched_rule: renamer.parse_icon(
                             "kitty".to_string(),
                             "kitty".to_string(),