From a72082bb3e8eaa21663dbbf69d158b531a5e257a Mon Sep 17 00:00:00 2001
From: albert <albert@sysctl.io>
Date: Tue, 14 Nov 2023 19:31:56 +0900
Subject: [PATCH] test

---
 .../common/hyprland/hyprland-conf.nix         | 21 +++++++++++++------
 .../hyprland/themes/gruvbox/waybar-conf.nix   | 16 +++++++-------
 home-manager/common/software/gui/firefox.nix  |  6 +++---
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/home-manager/common/desktops/hyprland/common/hyprland/hyprland-conf.nix b/home-manager/common/desktops/hyprland/common/hyprland/hyprland-conf.nix
index c15c75df..894a053f 100644
--- a/home-manager/common/desktops/hyprland/common/hyprland/hyprland-conf.nix
+++ b/home-manager/common/desktops/hyprland/common/hyprland/hyprland-conf.nix
@@ -102,15 +102,20 @@
       bind = $mainMod, C, killactive,
       bind = $mainMod, M, exit,
       bind = $mainMod, V, togglefloating,
-      bind = $mainMod, R, exec, wofi --show drun
+      # bind = $mainMod, R, exec, wofi --show drun
       bind = $mainMod, P, pseudo, # dwindle
       bind = $mainMod, J, togglesplit, # dwindle
 
       # Move focus with mainMod + arrow keys
-      # bind = $mainMod, left, movefocus, l
-      # bind = $mainMod, right, movefocus, r
-      # bind = $mainMod, up, movefocus, u
-      # bind = $mainMod, down, movefocus, d
+      bind = SUPER_ALT, left, movefocus, l
+      bind = SUPER_ALT, right, movefocus, r
+      bind = SUPER_ALT, up, movefocus, u
+      bind = SUPER_ALT, down, movefocus, d
+
+      bind = SUPER_ALT, H, movefocus, l
+      bind = SUPER_ALT, L, movefocus, r
+      bind = SUPER_ALT, K, movefocus, u
+      bind = SUPER_ALT, J, movefocus, d
 
       # Switch workspaces with mainMod + [0-9]
       bind = $mainMod, 1, workspace, 1
@@ -162,7 +167,11 @@
       bind = $mainMod, S, exec, steam
 
       # Lock the screen, send to swaylock and pause music
-      bind = $mainMod, L, exec, swaylock && playerctl pause
+      bind = $mainMod, L, exec, playerctl pause && sleep 0.5 && swaylock
+
+      # to switch between windows in a floating workspace
+      bind = $mainMod ,Tab, cyclenext,          # change focus to another window
+      bind = $mainMod ,Tab, bringactivetotop,   # bring it to the top
 
       # Resize
       bind = $mainMod, R, exec, notify-send "Entered resize mode.  Press ESC to quit."
diff --git a/home-manager/common/desktops/hyprland/themes/gruvbox/waybar-conf.nix b/home-manager/common/desktops/hyprland/themes/gruvbox/waybar-conf.nix
index f4f364a4..051c8cc9 100644
--- a/home-manager/common/desktops/hyprland/themes/gruvbox/waybar-conf.nix
+++ b/home-manager/common/desktops/hyprland/themes/gruvbox/waybar-conf.nix
@@ -39,18 +39,18 @@
             ],
 
             "custom/wlogout": {
-                "format": "",
+                "format": "  {}",
                 "on-click": "wlogout"
             },
 
             "custom/tailscale": {
-                "format": "{icon} {}",
+                "format": "{icon}",
                 "exec": "$HOME/.config/waybar/scripts/tailscale.sh",
                 "exec-if": "pgrep tailscaled",
                 "return-type": "json",
                 "interval": 5,
                 "format-icons": {
-                    "Running": "󰌆",
+                    "Running": "TESET 󰌆",
                     "Stopped": "󰌊",
                 }
             },
@@ -58,8 +58,8 @@
             "idle_inhibitor": {
                 "format": "{icon}",
                 "format-icons": {
-                    "activated": "",
-                    "deactivated": ""
+                    "activated": "  {}",
+                    "deactivated": "  {}"
                 }
             },
 
@@ -136,8 +136,8 @@
                     "warning": 35,
                     "critical": 20
                 },
-                "format": "{icon}  {capacity}%",
-                "format-charging": "󰂄  {capacity}%",
+                "format": "{icon} {capacity}%",
+                "format-charging": "󰂄 {capacity}%",
                 "format-plugged": "  {capacity}%",
                 "format-icons": ["", "", "", "", ""]
             },
@@ -163,7 +163,7 @@
 
         #workspaces button.visible,
         #workspaces button {
-            font-size: 1px;
+            font-size: 15px;
             border-radius: 50px;
             padding: 0px 5px;
             margin: 5px;
diff --git a/home-manager/common/software/gui/firefox.nix b/home-manager/common/software/gui/firefox.nix
index de728abf..e7191d7c 100644
--- a/home-manager/common/software/gui/firefox.nix
+++ b/home-manager/common/software/gui/firefox.nix
@@ -1,7 +1,7 @@
 { inputs, config, pkgs, theme, ... }: {
   #imports = [ ./themes/${theme}/firefox-theme.nix ];
 
-  home.file.".mozilla/firefox/nix-user-profile/chrome/firefox-gnome-theme".source = inputs.firefox-gnome-theme;
+  # home.file.".mozilla/firefox/nix-user-profile/chrome/firefox-gnome-theme".source = inputs.firefox-gnome-theme;
 
   programs.firefox = {
     enable = true;
@@ -9,8 +9,8 @@
     profiles.default = {
       isDefault = true;
       name = "default";
-      userChrome =  ''@import "firefox-gnome-theme/userChrome.css";'';
-      userContent = ''@import "firefox-gnome-theme/userContent.css";'';
+      # userChrome =  ''@import "firefox-gnome-theme/userChrome.css";'';
+      # userContent = ''@import "firefox-gnome-theme/userContent.css";'';
 
       # https://discourse.nixos.org/t/anyone-using-firefox-gnome-theme-successfully-with-nixos-home-manager/19248/3
       settings = {