From f0b640eeedbbf3df2390495c41287d3146ad830b Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Thu, 3 Oct 2024 19:30:56 +0200 Subject: [PATCH 1/5] fix bar layout --- .../eww/configDir/bottomBar/bottomBar.yuck | 28 ++++++----- .../panels/eww/configDir/topBar/topBar.yuck | 49 ++++++++++--------- 2 files changed, 42 insertions(+), 35 deletions(-) diff --git a/modules/desktop-environment/home/panels/eww/configDir/bottomBar/bottomBar.yuck b/modules/desktop-environment/home/panels/eww/configDir/bottomBar/bottomBar.yuck index 635de40..cad75ea 100644 --- a/modules/desktop-environment/home/panels/eww/configDir/bottomBar/bottomBar.yuck +++ b/modules/desktop-environment/home/panels/eww/configDir/bottomBar/bottomBar.yuck @@ -15,18 +15,22 @@ (defwidget bottomBar [] (overlay :class "bottomBar" - (centerbox - (box - :halign "start" - (workspaceWidget) - ) - (box - :halign "center" - (traveldings) - ) - (box - :halign "end" - (label :text "${iceData.speed}km/h") + (transform + :translate-y "1.5px" + (centerbox + (box + :halign "start" + (workspaceWidget) + ) + (box + :halign "center" + (traveldings) + ) + (box + :halign "end" + ; (label :text "${iceData.speed}km/h") + (iceTacho) + ) ) ) (box diff --git a/modules/desktop-environment/home/panels/eww/configDir/topBar/topBar.yuck b/modules/desktop-environment/home/panels/eww/configDir/topBar/topBar.yuck index be4b25f..bf20581 100644 --- a/modules/desktop-environment/home/panels/eww/configDir/topBar/topBar.yuck +++ b/modules/desktop-environment/home/panels/eww/configDir/topBar/topBar.yuck @@ -16,30 +16,33 @@ (defwidget topBar [] (overlay :class "topBar" - (centerbox - (box - :halign "start" - :spacing 12 - :space-evenly false - (label :text " ") - (cpu) - (sep) - (mem) - (sep) - (label :markup bat0) - (sep) - (label :markup bat1) - ) - (box - :halign "center" - (systray - :icon-size 18 - :spacing 3 + (transform + :translate-y "-1.5px" + (centerbox + (box + :halign "start" + :spacing 12 + :space-evenly false + (label :text " ") + (cpu) + (sep) + (mem) + (sep) + (label :markup bat0) + (sep) + (label :markup bat1) + ) + (box + :halign "center" + (systray + :icon-size 18 + :spacing 3 + ) + ) + (box + :halign "end" + (time) ) - ) - (box - :halign "end" - (time) ) ) (box From effe29cd74c07a279341c108e845a5e226d0ec45 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Thu, 3 Oct 2024 19:31:13 +0200 Subject: [PATCH 2/5] continue work on ICE tacho --- .../eww/configDir/bottomBar/bottomBar.yuck | 19 +++++-- .../panels/eww/configDir/scripts/iceTacho.nu | 49 ++++++++++++++----- 2 files changed, 51 insertions(+), 17 deletions(-) mode change 100644 => 100755 modules/desktop-environment/home/panels/eww/configDir/scripts/iceTacho.nu diff --git a/modules/desktop-environment/home/panels/eww/configDir/bottomBar/bottomBar.yuck b/modules/desktop-environment/home/panels/eww/configDir/bottomBar/bottomBar.yuck index cad75ea..611590e 100644 --- a/modules/desktop-environment/home/panels/eww/configDir/bottomBar/bottomBar.yuck +++ b/modules/desktop-environment/home/panels/eww/configDir/bottomBar/bottomBar.yuck @@ -47,8 +47,19 @@ ) ) -(defpoll iceData - :interval "2s" - :initial "" - `(iw dev wlp4s0 link | grep "WIFIonICE" > /dev/null) && curl https://iceportal.de/api1/rs/status` +(defwidget iceTacho [] + (box + :class "iceTacho" + :tooltip "Tz${iceTachoData.tzn} (BR ${iceTachoData.br})" + (circular-progress + :value { iceTachoData.frac * 60 + 20 } + :thickness 3 + ) + (label :text "${iceTachoData.speed} km/h") + ) +) + +(deflisten iceTachoData + :initial "null" + { "~/.config/eww/scripts/iceTacho.nu" } ) diff --git a/modules/desktop-environment/home/panels/eww/configDir/scripts/iceTacho.nu b/modules/desktop-environment/home/panels/eww/configDir/scripts/iceTacho.nu old mode 100644 new mode 100755 index 0be47c8..fa82321 --- a/modules/desktop-environment/home/panels/eww/configDir/scripts/iceTacho.nu +++ b/modules/desktop-environment/home/panels/eww/configDir/scripts/iceTacho.nu @@ -1,15 +1,38 @@ #!/usr/bin/env nu -const TABLE = [ - [ br vmax ]; - [ 401 280 ] - [ 402 280 ] - [ 403 330 ] - [ 406 330 ] - [ 407 320 ] - [ 408 320 ] - [ 411 230 ] - [ 415 230 ] - [ 412 265 ] - [ 605 200 ] -]; +const TABLE = { + 401: 280 + 402: 280 + 403: 330 + 406: 330 + 407: 320 + 408: 320 + 411: 230 + 415: 230 + 412: 265 + 605: 200 +}; + +def main [ ] { + loop { + if ((iw dev wlp4s0 link | lines | filter {|it| $it =~ "WIFIonICE" } | length) == 1) { + let iceData = http get https://iceportal.de/api1/rs/status; + let tzn = $iceData.tzn; + let br = $iceData.series; + let speed = $iceData.speed; + let speedfrac = $speed / ($TABLE | get $br); + + print ({ + tzn: $tzn, + br: $br, + speed: $speed, + frac: $speedfrac + } | to json -r); + + sleep 2sec; + } else { + print "null"; + sleep 5sec; + } + } +} From cdb1b93296b68976013f4150b2708db1d0fc35e7 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Thu, 3 Oct 2024 19:31:26 +0200 Subject: [PATCH 3/5] make evolution setup cooler(tm) --- modules/desktop/social.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/desktop/social.nix b/modules/desktop/social.nix index b8569bc..10c05d0 100644 --- a/modules/desktop/social.nix +++ b/modules/desktop/social.nix @@ -1,6 +1,7 @@ { config, lib, + pkgs, ... }: let cfg = config.jade.desktop.social; @@ -16,11 +17,17 @@ in ... }: { home.packages = with pkgs; [ - pkgs-stable.evolutionWithPlugins signal-desktop mumble element-desktop + pkgs.evolution-data-server-gtk4 ]; }; + programs.evolution = { + enable = true; + plugins = [pkgs.evolution-ews]; + }; + services.gnome.evolution-data-server.enable = true; + services.gnome.evolution-data-server.plugins = []; }; } From f9b59e8ed24149ffc762e18758ab92d117ecdad1 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Thu, 3 Oct 2024 19:31:47 +0200 Subject: [PATCH 4/5] setup teams window assignment --- modules/desktop-environment/home/sway/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/desktop-environment/home/sway/default.nix b/modules/desktop-environment/home/sway/default.nix index 951afa5..2a2bee3 100644 --- a/modules/desktop-environment/home/sway/default.nix +++ b/modules/desktop-environment/home/sway/default.nix @@ -79,6 +79,7 @@ {class = "^Signal$";} {class = "^Element$";} {class = "^Evolution$";} + {class = "^teams-for-linux$";} ]; "2" = [ {app_id = "^firefox$";} From b7fe5a0014e26c8654ef0074aea1cbb188111d01 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Thu, 3 Oct 2024 19:31:56 +0200 Subject: [PATCH 5/5] enable touchpad tapping --- hosts/catbook-j/modules/input.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/catbook-j/modules/input.nix b/hosts/catbook-j/modules/input.nix index f6d8fee..fdb5785 100644 --- a/hosts/catbook-j/modules/input.nix +++ b/hosts/catbook-j/modules/input.nix @@ -23,5 +23,5 @@ sensitivity = 256; }; - services.libinput.touchpad.tapping = false; + services.libinput.touchpad.tapping = true; }