forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

device-nokia-n900: drop conky (MR 4309)

Browse source 
Save a few CPU cycles by dropping conky. Additionally, the existing config has
not been working for a long time now, and no one missed it.

For completeness, it was no longer displaying on the desktop. Manually starting
it showed:

```
conky: X Error: type 0 Display b5e73620 XID 1302 serial 97 error_code 10 request_code 2 minor_code 0 other Display: b5e73620
```

There are instructions [1] to resolve/workaround it, but we clearly do not have
a pressing need for conky to begin with.

[1] https://github.com/brndnmtthws/conky/issues/1443#issuecomment-1557793718
[ci:skip-build]: already built successfully in CI
This commit is contained in:
Sicelo A. Mhlongo 2023-08-06 00:02:25 +02:00 committed by Oliver Smith
parent 7e488322cb
commit 7992f29cf9
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
3 changed files with 4 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
device/community/device-nokia-n900/APKBUILD
View file

@ -2,8 +2,8 @@
# Maintainer: Sicelo <absicsz@gmail.com>
# Co-Maintainer: Danct12 <danct12@disroot.org>
pkgname=device-nokia-n900
pkgver=9.1.1
pkgrel=1
pkgver=9.1.2
pkgrel=0
pkgdesc="Nokia N900"
url="https://postmarketos.org"
arch="armv7"
@ -29,7 +29,6 @@ source="
device-nokia-n900.start
deviceinfo
modules-initfs
i3wm/conky.conf
i3wm/i3blocks.conf
i3wm/i3wm.conf
i3wm/protip_shell.sh
@ -143,7 +142,7 @@ xkeyboard_config() {
i3wm() {
install_if="$pkgname postmarketos-ui-i3wm"
depends="unclutter-xfixes conky feh pm-utils i3blocks"
depends="unclutter-xfixes feh pm-utils i3blocks"
install -D -m644 "$srcdir"/i3wm.conf \
"$subpkgdir"/etc/skel/.config/i3/config
install -D -m644 "$srcdir"/i3blocks.conf \
@ -158,8 +157,6 @@ i3wm() {
"$subpkgdir"/etc/skel/.config/i3blocks/wifi
install -D -m755 "$srcdir"/protip_shell.sh \
"$subpkgdir"/etc/skel/.protip_shell.sh
install -D -m644 "$srcdir"/conky.conf \
"$subpkgdir"/etc/skel/.config/conky/conky.conf
install -D -m440 "$srcdir"/10-noroot-suspend \
"$subpkgdir"/etc/sudoers.d/10-noroot-suspend
}
@ -185,9 +182,8 @@ ac2f8a50280f7d5f8c5ce3ab50d00f1a4c8c1415890347542c684b6e24874a23d57a8f48c62451c4
e6bbac8de1a198ba716f44ade76606e1e0adcc574156b855ac41be5eb5308389d3277fd89cc34b119fbc33d9801ab9f79a6ff213392596bff40bc17e931c05ef device-nokia-n900.start
2463008d270ed09342f15b51f24ea455bd884021f95397991b85616b6840a6608d91cd1fc43186094f5c3d1bd25e88c16aa9ead07b018aea3d93cd2359bba0b1 deviceinfo
f90dcdd310595adf9e00f1eb1032461bd1666fff21eb18615f8e9ef48fff4f872abd3ca7c765fab50957b056a30330e49b5d1e399fc8690f4f9735ccc0eec145 modules-initfs
16c31bf28b9dcc256821b153de199bd27decc76e4bde63130c1d1556a63cf2cafb64c4d4df42e00690564fce801c5216e8e97e4262a546440fd4bc2e14eaae1c conky.conf
826a3790b49324c1e61c75b6c0ffc043a2a1d7c13a8c554fb5eae4977af47a1ca93d70ef8c783d712b953b70e18ae58fa4c6a49bf97263398a01a0c4f91ebc8f i3blocks.conf
7e8a92b828a3cb823b8df0c67ff3cb72d220f2fdc4557a613ad051baaf7e6e3d0865cdfb5eadff7f4b04302ac650bc485863e26f4d54485d5a1c2389ac0793e3 i3wm.conf
40a4df0249e8631c1b4dc4ae580e93885f51cb9a1abe44e35ef6719a84e284df2e0e4c320733d830a7aaa5c4166a30048690027f269ffdffdf052c88fd9cd7dc i3wm.conf
0b80af9fd1f36e6bc06bdfdf48352897234ac7457210649016665da8570a5a64b8a0841b4fbeb64fd7054a5246a64718cf4412f8a53024ce39b28a80984972d8 protip_shell.sh
2ae4771eda9b151de3b47dc4e3081eb86b92fc04c4be4b4fbb98c28016762d24008e935bbba8f95ea0732019f615ee43f5d93dacb21bdc3471e505a07a684e26 battery-bq27200
d9ef88c714e9fce8822f63b7a9d7fc3e1ed472c8c876b44ba524d44efea322839f13ddd2fa652420608427ecf7279bfaac302c9b67667f32796ca21da332164d calendar

31
device/community/device-nokia-n900/i3wm/conky.conf
View file

@ -1,31 +0,0 @@
-- vim: ts=4 sw=4 noet ai cindent syntax=lua
conky.config = {
alignment = 'middle_left',
background = false,
default_color = 'white',
default_outline_color = 'black',
draw_graph_borders = true,
draw_outline = true,
use_xft = true,
font = 'DejaVu Sans Mono:size=20',
default_bar_height = 6,
gap_x = 30,
gap_y = -50,
double_buffer = true,
out_to_console = false,
out_to_stderr = false,
extra_newline = false,
update_interval = 3.0,
}
conky.text = [[
${if_running mpd}${if_mpd_playing}${mpd_title}
${color gray}${mpd_artist}
${mpd_bar}
${else}postmarketOS
${color gray}Linux ${kernel}
${endif}${else}postmarketOS
${color gray}Linux ${kernel}
${endif}
]]

2
device/community/device-nokia-n900/i3wm/i3wm.conf
View file

@ -87,5 +87,3 @@ exec_always --no-startup-id feh --bg-fill /usr/share/wallpapers/postmarketos.jpg
# Hide mouse cursor
exec --no-startup-id unclutter-xfixes --fork
# Display various information on desktop (see conky config)
exec --no-startup-id conky --daemonize