Various N900 improvements, change default i3 terminal to "st"

This commit is contained in:
Oliver Smith 2018-11-22 05:45:46 +00:00
parent 7728b65460
commit 4468cf9b97
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
6 changed files with 83 additions and 12 deletions

View file

@ -1,6 +1,6 @@
pkgname=device-nokia-n900
pkgver=2
pkgrel=9
pkgver=3
pkgrel=0
pkgdesc="Nokia N900"
url="https://postmarketos.org"
arch="armhf"
@ -28,9 +28,11 @@ source="
pointercal
asound.state
weston.ini
i3wm/bq27200_status.sh
i3wm/conky.conf
i3wm/i3wm.conf
i3wm/i3status.conf
i3wm/bq27200_status.sh
i3wm/protip_shell.sh
xorg.conf
"
options="!check !archcheck"
@ -93,12 +95,17 @@ x11() {
i3wm() {
install_if="$pkgname postmarketos-ui-i3wm"
depends="unclutter-xfixes conky feh postmarketos-artwork-wallpapers"
install -D -m644 "$srcdir"/i3wm.conf \
"$subpkgdir"/etc/skel/.config/i3/config
install -D -m644 "$srcdir"/i3status.conf \
"$subpkgdir"/etc/skel/.config/i3/i3status.conf
install -D -m755 "$srcdir"/bq27200_status.sh \
"$subpkgdir"/etc/skel/.config/i3/bq27200_status.sh
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
}
nonfree_firmware() {
@ -120,7 +127,9 @@ dc585e11bf4e06e36c5c62bcc024eaacecc30437d9da5257df14be05e247a2f2bc208874be3058ed
143c21f0b18a016d37cb44178e9daea09f128a90769b48353c03c3f245cb9b1f7e773b9ccee084973fc78ddd7a18c2642e54888a85bda7c7daecddc9a8c62eff pointercal
e023df91295fe7e410e163747d17e5b92fe3c022ff076e286778b8334368f885603b8fda65671e4a7328766da7b2552ea4df1b1399df23e504a41a6655771142 asound.state
7f48d1a044f8c02f7b1d11487ec1f83978d9b0ea12529156e7418f82be556d9baee32b70c4d911174e388bb4941dc19519e93e7551d00ffcd825c848665ff096 weston.ini
387c76ef51d08b1f397364657ab32c5915fbd62b2786e9fd61b47e9eeed36d24571e22974ea36cb1b01c25eef5789c4e8e1de9a23de3a4a9192e727ed6a7ab67 i3wm.conf
3bed8554400d6bbebf7e61b14f347a0f3e24b29be296c56fc829ed655cf67fa547c09bb715589b716d6c3f04492e9f3a12473dce6c7151bc15562b9d102bac2f i3status.conf
4e7abd1ac6223494b2ce96f7fb2dfe6116ee8a526440df07307994ed577f1860222548f7512273b5a21febac8119794774658f60e5d6976747ddc60323d26a62 bq27200_status.sh
16c31bf28b9dcc256821b153de199bd27decc76e4bde63130c1d1556a63cf2cafb64c4d4df42e00690564fce801c5216e8e97e4262a546440fd4bc2e14eaae1c conky.conf
70968c0d7095d1ad935266305270c1c697bbbea451b817b22edd7e02d3218056a0163eaf9984c96df4d78b65377e0f24433cee12a76684a419806a90faf4ca4c i3wm.conf
3bed8554400d6bbebf7e61b14f347a0f3e24b29be296c56fc829ed655cf67fa547c09bb715589b716d6c3f04492e9f3a12473dce6c7151bc15562b9d102bac2f i3status.conf
0b80af9fd1f36e6bc06bdfdf48352897234ac7457210649016665da8570a5a64b8a0841b4fbeb64fd7054a5246a64718cf4412f8a53024ce39b28a80984972d8 protip_shell.sh
a91f98daa60efa2beb2ff6b405097f92edca5f1bbb9e7675499139be52ca2570712f8f06f9032ef29f636f99c8f8da8b992f746eab6424aac04260c16158bcc2 xorg.conf"

View file

@ -0,0 +1,31 @@
-- 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}
]]

View file

@ -15,8 +15,23 @@ mode "workspace" {
bindsym q mode "command"
}
# Control the music player daemon. Keybindings are roughly the same as in
# the ncmpcpp client.
mode "mpd" {
bindsym p exec mpc toggle
bindsym s exec mpc stop
bindsym Left exec mpc prev
bindsym Right exec mpc next
bindsym Up exec mpc vol +2
bindsym Down exec mpc vol -2
bindsym n exec i3-sensible-terminal -e ncmpcpp; mode "default"
bindsym q mode "command"
}
mode "command" {
bindsym t exec i3-sensible-terminal; mode "default"
bindsym t exec i3-sensible-terminal -e ~/.protip_shell.sh; mode "default"
bindsym d exec dmenu_run; mode "default"
bindsym q mode "default"
bindsym k kill; mode "default"
@ -37,6 +52,7 @@ mode "command" {
bindsym v split v
bindsym w mode "workspace"
bindsym m mode "mpd"
}
# Enter command mode
@ -60,4 +76,11 @@ bar {
}
}
exec_always --no-startup-id feh --bg-scale ~/.config/i3/wallpaper.jpg
# Wallpaper
exec_always --no-startup-id feh --bg-scale /usr/share/wallpapers/pmos-grass-800x480.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

View file

@ -0,0 +1,8 @@
#!/bin/sh
(
green="\033[32m"
reset="\033[0m"
echo -e "${green}PROTIP:${reset} ^i (ctrl+i) does autocompletion"
)
exec sh

View file

@ -3,12 +3,12 @@
pkgname="postmarketos-artwork-wallpapers"
pkgver=1
pkgrel=3
pkgrel=4
pkgdesc="Wallpapers for postmarketOS"
url="https://postmarketos.org/"
arch="noarch"
license="CC-BY-SA"
_hash="ffddddd3da2c8e32647e77ea1e47965a030e8501"
_hash="2b39e6081c7a676ae1be3fc036ccbfef3052072c"
source="postmarketos-artwork-$_hash.tar.gz::https://gitlab.com/postmarketOS/artwork/-/archive/${_hash}/artwork-${_hash}.tar.gz"
subpackages="$pkgname-extra"
options="!check"
@ -25,4 +25,4 @@ extra() {
"$subpkgdir"/usr/share/wallpapers/
}
sha512sums="8a938b3773ccd98f0904c9b57d15ae1ef139070a0eb44b9226d81d038cb8457b2e8671874ada85a6816e4fe8c307c9d3aa72ad5d804b38dcff0bedb8ab51b515 postmarketos-artwork-ffddddd3da2c8e32647e77ea1e47965a030e8501.tar.gz"
sha512sums="8050868afd6d95b7b0af9e321fffa0750806f7c3d4b8b9ead4e0a822d226e97699caf29cc9185def1521cc4d7ad595867ee16bea9c8986997eeb9605ac76a4be postmarketos-artwork-2b39e6081c7a676ae1be3fc036ccbfef3052072c.tar.gz"

View file

@ -1,11 +1,11 @@
pkgname=postmarketos-ui-i3wm
pkgver=0.2
pkgver=0.3
pkgrel=0
pkgdesc="(X11) Tiling WM (keyboard required)"
url="https://i3wm.org"
arch="noarch"
license="GPL-3.0"
depends="xorg-server mesa-egl i3wm i3status dmenu xset xfce4-terminal lightdm"
depends="xorg-server mesa-egl i3wm i3status dmenu xset st lightdm"
install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-deinstall"
source="lock.sh 60-lightdm-autologin.conf"
options="!check"