From 5db71961b2b169649c253618cd6be6181a752411 Mon Sep 17 00:00:00 2001 From: Joonas Onatsu Date: Wed, 16 Oct 2024 08:41:00 +0300 Subject: [PATCH] small fixes --- .../desktop/graphics/sway/waybar/default.nix | 15 ++++---- .../desktop/graphics/sway/waybar/style.css | 4 +- modules/packages/squeekboard/default.nix | 37 +++++++++++++------ modules/packages/squeekboard/fi_wide.yaml | 0 modules/packages/squeekboard/squeekboard.nix | 37 +++++++++++-------- 5 files changed, 56 insertions(+), 37 deletions(-) create mode 100644 modules/packages/squeekboard/fi_wide.yaml diff --git a/modules/desktop/graphics/sway/waybar/default.nix b/modules/desktop/graphics/sway/waybar/default.nix index 51f18eb..c00d0db 100644 --- a/modules/desktop/graphics/sway/waybar/default.nix +++ b/modules/desktop/graphics/sway/waybar/default.nix @@ -64,7 +64,8 @@ with lib; let modules-right = [ "sway/language" - "group/network" + "network" + "group/battery" "group/hardware" "tray" "clock" @@ -72,7 +73,7 @@ with lib; let ]; "custom/menu" = { - format = ""; + format = ""; on-click = "swaymsg exec \\$menu"; tooltip = false; }; @@ -84,7 +85,7 @@ with lib; let }; "idle_inhibitor" = { - format = "{icon}"; + format = "{icon}"; format-icons = { activated = ""; deactivated = ""; @@ -93,7 +94,7 @@ with lib; let "custom/clipboard" = { tooltip = false; - format = ""; + format = ""; interval = "once"; #return-type = "json"; on-click = "swaymsg -q exec '$clipboard'; waybar-signal clipboard"; @@ -119,7 +120,7 @@ with lib; let }; "sway/language" = { - format = " {short}"; + format = " {short}"; tooltip-format = "{long}"; on-click = "swaymsg input type:keyboard xkb_switch_layout next"; on-scroll-up = "swaymsg input type:keyboard xkb_switch_layout next"; @@ -176,7 +177,6 @@ with lib; let interval = 15; format = "{icon} {capacity}%"; format-charging = "󰢟 {capacity}%"; - format-plugged = " {capacity}%"; format-alt = "{icon} {time}"; format-icons = [ "" @@ -185,7 +185,6 @@ with lib; let "" "" ]; - tooltip-format = "{timeTo} {power}W"; }; "battery#bat2" = { bat = "BAT1"; @@ -239,7 +238,7 @@ with lib; let }; "custom/power" = { - format = "⏻"; + format = "⏻"; tooltip = false; on-click = "swaymsg exec \\$powermenu"; }; diff --git a/modules/desktop/graphics/sway/waybar/style.css b/modules/desktop/graphics/sway/waybar/style.css index 31ade0d..dac557f 100644 --- a/modules/desktop/graphics/sway/waybar/style.css +++ b/modules/desktop/graphics/sway/waybar/style.css @@ -79,8 +79,8 @@ window#waybar { background-color: @background_color; color: @text_color; - transition-property: background-color; - transition-duration: .5s; + /*transition-property: background-color; + transition-duration: .5s;*/ } window#waybar.hidden { diff --git a/modules/packages/squeekboard/default.nix b/modules/packages/squeekboard/default.nix index e49b514..7727f57 100644 --- a/modules/packages/squeekboard/default.nix +++ b/modules/packages/squeekboard/default.nix @@ -1,18 +1,31 @@ # Copyright 2022-2024 TII (SSRC) and the Ghaf contributors # SPDX-License-Identifier: Apache-2.0 -(final: _prev: { - squeekboard = _prev.squeekboard.overrideAttrs (oldAttrs: { - postPatch = oldAttrs.postPatch or "" + '' - ${_prev.coreutils}/bin/cp -rf ${./us_wide.yaml} data/keyboards/terminal/us_wide.yaml - ''; +(final: prev: let + pkgSrc = prev.fetchFromGitLab { + domain = "gitlab.gnome.org"; + group = "World"; + owner = "Phosh"; + repo = "${prev.squeekboard.pname}"; + rev = "v${prev.squeekboard.version}"; + hash = "sha256-ZVSnLH2wLPcOHkU2pO0BgIdGmULMNiacIYMRmhN+bZ8="; + }; +in { + squeekboard = prev.squeekboard.overrideAttrs (oldAttrs: { + postPatch = + oldAttrs.postPatch + or "" + + '' + ${prev.coreutils}/bin/cp -rf ${./us_wide.yaml} data/keyboards/terminal/us_wide.yaml + ${prev.coreutils}/bin/cp -rf ${./fi_wide.yaml} data/keyboards/terminal/fi_wide.yaml + ''; postInstall = '' - mkdir -p $out/share/dbus-1/services - cat < $out/share/dbus-1/services/sm.puri.OSK0.service - [D-BUS Service] - Name=sm.puri.OSK0 - Exec=$out/bin/squeekboard - END + mkdir -p $out/share/dbus-1/services + cat < $out/share/dbus-1/services/sm.puri.OSK0.service + [D-BUS Service] + Name=sm.puri.OSK0 + Exec=$out/bin/squeekboard + END ''; }); - squeekboard-control = final.callPackage ./squeekboard.nix {pkgs=final;}; + squeekboard-control = final.callPackage ./squeekboard.nix {pkgs = final;}; }) diff --git a/modules/packages/squeekboard/fi_wide.yaml b/modules/packages/squeekboard/fi_wide.yaml new file mode 100644 index 0000000..e69de29 diff --git a/modules/packages/squeekboard/squeekboard.nix b/modules/packages/squeekboard/squeekboard.nix index cdddeff..b0f3807 100644 --- a/modules/packages/squeekboard/squeekboard.nix +++ b/modules/packages/squeekboard/squeekboard.nix @@ -1,18 +1,25 @@ # Copyright 2022-2024 TII (SSRC) and the Ghaf contributors # SPDX-License-Identifier: Apache-2.0 +{pkgs}: +pkgs.writeShellApplication { + name = "squeekboard-control"; + runtimeInputs = [ + pkgs.systemd + ]; + text = '' + function visible { + case "$(busctl --user get-property sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 Visible)" in + *true*) return 0;; + *) return 1;; + esac + } -{ - pkgs, -}: -pkgs.writeScriptBin "squeekboard-control" '' - #${pkgs.bash}/bin/bash - i=$(busctl --user get-property sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 Visible) - echo $i - if [ "$i" == "b true" ] - then - pkill squeekboard - else - busctl --user call sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b true - fi - echo "Toggling on-screen keyboard..." - '' + printf "Toggling on-screen keyboard..." + + if visible; then + busctl --user call sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b false + else + busctl --user call sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b true + fi + ''; +}