Merge branch 'upstream-custom' into dev

update: waybar ram icon
update: wifi icon in waybar
2024-04-15 13:18:02 -04:00 · 2024-04-15 13:17:46 -04:00 · 2024-04-09 14:16:04 -04:00 · 2024-04-05 16:20:49 -04:00 · 2024-04-05 16:20:36 -04:00 · 2024-04-05 16:13:32 -04:00
16 changed files with 46 additions and 5 deletions
@@ -0,0 +1,17 @@
+
+# ------------------------------------------------------
+# hidpi support
+# ------------------------------------------------------
+
+echo -e "${GREEN}"
+figlet "hidpi"
+echo -e "${NONE}"
+
+hidpiconfirm="Do you want 2x hidpi scale?"
+if gum confirm "$hidpiconfirm"; then
+    sed -i -E 's/size = [0-9]+(\.[0-9]+)?/size = 18/' alacritty/alacritty.toml
+    sed -i -E 's/[0-9]+(\.[0-9]+)?/16/' .settings/rofi-font.rasi
+    echo -e '\n# hidpi scale\nsource = ~/dotfiles/hypr/conf/hidpi.conf' >> hypr/conf/custom.conf
+    sed -i -E 's/1/2/' hypr/conf/monitors/default.conf
+    echo ":: finished hidpi patch."
+fi
@@ -0,0 +1,3 @@
+* {
+    border-radius:  15px;
+}
@@ -1,4 +1,3 @@
 * {
    border-width:   2px;
-    border-radius:  15px;
 }
@@ -1,5 +1,5 @@
 [font]
-size = 12.0
+size = 16.0

 [font.normal]
 family = "FiraCode Nerd Font"
@@ -0,0 +1,6 @@
+xwayland {
+  force_zero_scaling = true
+}
+
+env = GDK_SCALE,2
+env = QT_SCALE_FACTOR=2
@@ -0,0 +1,6 @@
+# ----------------------------------------------------- 
+# Monitor Setup
+# name: "Default"
+# ----------------------------------------------------- 
+
+monitor=,preferred,auto,2
@@ -61,6 +61,7 @@ if [[ $profile == *"Qtile"* ]]; then
    source .install/install-packages.sh
 fi
 source .install/wallpaper.sh
+source .install/hidpi.sh
 source .install/displaymanager.sh
 source .install/issue.sh
 source .install/restore.sh
@@ -38,6 +38,7 @@ configuration {

 /* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi"
+@import "~/dotfiles/.settings/rofi-border-radius.rasi"

 /* ---- Window ---- */
 window {
@@ -38,6 +38,7 @@ configuration {

 /* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi"
+@import "~/dotfiles/.settings/rofi-border-radius.rasi"

 /* ---- Window ---- */
 window {
@@ -38,6 +38,7 @@ configuration {

 /* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi"
+@import "~/dotfiles/.settings/rofi-border-radius.rasi"

 /* ---- Window ---- */
 window {
@@ -38,6 +38,7 @@ configuration {

 /* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi"
+@import "~/dotfiles/.settings/rofi-border-radius.rasi"

 /* ---- Window ---- */
 window {
@@ -38,6 +38,7 @@ configuration {

 /* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi"
+@import "~/dotfiles/.settings/rofi-border-radius.rasi"

 /* ---- Window ---- */
 window {
@@ -38,6 +38,7 @@ configuration {

 /* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi"
+@import "~/dotfiles/.settings/rofi-border-radius.rasi"

 /* ---- Window ---- */
 window {
@@ -33,6 +33,7 @@ configuration {

 /* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi"
+@import "~/dotfiles/.settings/rofi-border-radius.rasi"

 /* ---- Window ---- */
 window {
@@ -38,6 +38,7 @@ configuration {

 /* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi"
+@import "~/dotfiles/.settings/rofi-border-radius.rasi"

 /* ---- Window ---- */
 window {
@@ -247,7 +247,7 @@

    // Memory
    "memory": {
-        "format": "󰍛  {used:0.1f}G",
+        "format": " {used:0.1f}G",
        "on-click": "alacritty -e htop"
    },

@@ -305,7 +305,7 @@
    // Network
    "network": {
        "format": "{ifname}",
-        "format-wifi": "   {signalStrength}%",
+        "format-wifi": "{icon}   {signalStrength}%",
        "format-ethernet": "  {ifname}",
        "format-disconnected": "Disconnected",
        "tooltip-format": " {ifname} via {gwaddri}",
@@ -313,7 +313,8 @@
        "tooltip-format-ethernet": " {ifname}\nIP: {ipaddr}\n up: {bandwidthUpBits} down: {bandwidthDownBits}",
        "tooltip-format-disconnected": "Disconnected",
        "max-length": 50,
-        "on-click": "~/dotfiles/.settings/networkmanager.sh"
+        "on-click": "~/dotfiles/.settings/networkmanager.sh",
+        "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"]
    },

    // Battery
Author	SHA1	Message	Date
wyj	c7fbe7c7f5	Merge branch 'upstream-custom' into dev	2024-04-15 13:18:02 -04:00
wyj	d46e796571	update: waybar ram icon	2024-04-15 13:17:46 -04:00
wyj	14a56275eb	update: wifi icon in waybar	2024-04-09 14:16:04 -04:00
wyj	cc4a4fb1c0	Merge branch 'upstream-custom' into dev	2024-04-05 16:20:49 -04:00
wyj	26654d87e9	fix: rofi border radius	2024-04-05 16:20:36 -04:00
wyj	056ffe440f	Merge branch 'fcitx5' into dev	2024-04-05 16:13:32 -04:00
wyj	d7a50ce2fe	Merge branch 'fcitx5' into dev	2024-04-05 16:07:49 -04:00
wyj	2c3ff9e10d	Merge branch 'fcitx5' into dev	2024-04-05 15:50:17 -04:00
wyj	48eab0a6ab	Merge branch 'fcitx5' into dev	2024-04-05 15:31:39 -04:00
wyj	607178e5a2	Merge branch 'upstream-custom' into dev	2024-04-05 02:59:58 -04:00
wyj	71a63edafa	Merge branch 'upstream-custom' into dev	2024-04-05 01:34:01 -04:00
wyj	091bbbfb1a	Merge branch 'upstream-custom' into dev	2024-04-04 22:12:38 -04:00
wyj	f058ea58f7	Merge branch 'upstream-custom' into dev	2024-04-04 04:45:50 -04:00
wyj	6a9270c276	Merge branch 'upstream-custom' into dev	2024-04-04 03:17:46 -04:00
wyj	58966c14c8	Merge branch 'upstream-custom' into dev	2024-04-03 23:52:20 -04:00
wyj	d2b6c0adcc	Merge branch 'upstream-custom' into dev	2024-04-03 17:32:04 -04:00
wyj	75759b18c3	Merge branch 'upstream-custom' into dev	2024-04-03 14:34:51 -04:00
wyj	a1f6438b3c	Merge branch 'upstream-custom' into dev	2024-04-03 14:29:21 -04:00
wyj	87b7bed3fe	Merge branches 'upstream-hidpi' and 'upstream-custom' into dev	2024-04-03 14:23:18 -04:00
wyj	45214117ef	Merge remote-tracking branch 'upstream/main' into upstream-hidpi	2024-04-03 14:22:34 -04:00
wyj	07c38a02b5	Merge branch 'upstream-custom' into dev	2024-04-03 14:19:44 -04:00
wyj	fdbd7de334	Merge branch 'upstream-hidpi' into dev	2024-04-01 15:42:28 -04:00
wyj	0d4b85956e	fix: sed need -E	2024-04-01 15:42:06 -04:00
wyj	059396985d	Merge branch 'upstream-hidpi' into dev	2024-04-01 15:01:02 -04:00
wyj	8565146242	update: change the non-hidpi default font size in alacritty	2024-04-01 15:00:34 -04:00
wyj	d2a368d166	fix hidpi.sh: echo -e	2024-03-28 20:46:48 -04:00
wyj	c6678dcc96	update hidpi.sh: add finish output	2024-03-28 20:46:48 -04:00
wyj	b6156e3233	fix hidpi.sh	2024-03-28 20:46:48 -04:00
wyj	0da2e83f29	fix hidpi.sh: -i instead of -E	2024-03-28 20:46:48 -04:00
wyj	9f8b285ba3	update hidpi.sh: run always	2024-03-28 20:46:48 -04:00
wyj	671a47f09e	fix bug: missing fi	2024-03-28 20:46:48 -04:00
wyj	51a350c544	Merge branch 'upstream-custom' into dev	2024-03-28 19:30:46 -04:00
wyj	d28d59b6b8	Merge branch 'upstream-hidpi' into dev merge hidpi support	2024-03-28 13:05:00 -04:00
wyj	943cb53c93	add hidpi in install.sh	2024-03-28 01:45:39 -04:00
wyj	c3bfe46e79	add basic hidpi	2024-03-27 23:17:46 -04:00