dot

packages and services management
Log | Files | Refs | README

commit a7cceb58ce0b09d45583123ed3b6a5f8fcf8747f
parent 434eb387243742bfc39019e8fadf793ca8331d6d
Author: Josuah Demangeon <mail@josuah.net>
Date:   Thu, 21 Jun 2018 22:28:09 +0200

Merge branch 'master' of /home/git/conf

Diffstat:
Mconfigure | 3+++
Mdot/profile | 6+++++-
Apack/dmenu/build | 3+++
Mpack/dwm/config.h | 10++++++----
Mpack/git/build | 9++++++++-
Mpack/git/tar | 2+-
Mpack/gmake/tar | 2+-
Apack/ics2txt/build | 3+++
Apack/liblzma/build | 5+++++
Apack/libpng/build | 5+++++
Apack/libz/build | 5+++++
Mpack/spoon/config.h | 2+-
Mpack/st/config.mk | 8++------
As6/qemu-user/env/NAME | 0
Ms6/qemu-user/run | 10+++++-----
15 files changed, 53 insertions(+), 20 deletions(-)

diff --git a/configure b/configure @@ -22,4 +22,7 @@ ln -fs "$PWD/dot/msmtprc" "$HOME/.msmtprc" ln -fs "$PWD/dot/profile" "$HOME/.profile" ln -fs "$PWD/dot/xinitrc" "$HOME/.xinitrc" +ln -fs "$HOME/.profile" "$HOME/.bash_profile" +ln -fs "$HOME/.profile" "$HOME/.bashrc" + ! git clone git://josuah.net/bin "$HOME/bin" diff --git a/dot/profile b/dot/profile @@ -23,7 +23,7 @@ export LC_TIME=en_US.UTF-8 export PLAN9=/usr/local/9base export PATH=/usr/local/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/sbin -export PATH=$HOME/bin:$PATH:/usr/X11R6/bin:$PLAN9/bin +export PATH=/local/bin:$HOME/bin:$PATH:/usr/X11R6/bin:$PLAN9/bin export MANPATH=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man export MANPATH=$MANPATH:$PLAN9/share/man @@ -32,3 +32,7 @@ export MANPATH=$MANPATH:$PLAN9/share/man export BLIH=josuah.demangeon@epitech.eu export CVSROOT=anoncvs@anoncvs.fr.openbsd.org:/cvs export SSH_AUTH_SOCK=$HOME/.ssh/agent + +# Prompt + +export PS1=$(uname -n)$(test "$(whoami)" = root && echo '#' || echo '$')' ' diff --git a/pack/dmenu/build b/pack/dmenu/build @@ -0,0 +1,3 @@ +#!/bin/sh -ex + +make PREIFX=$PREFIX install diff --git a/pack/dwm/config.h b/pack/dwm/config.h @@ -72,16 +72,18 @@ static const Layout layouts[] = { static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_shade, "-nf", col_light, "-sb", col_light, "-sf", col_shade, NULL }; static const char *termcmd[] = { "st", "-f", termfont, NULL }; -static const char *menucmd[] = { "st", "-f", termfont, "-e", "io", NULL }; -static const char *opencmd[] = { "st", "-f", termfont, "-e", "plumb", NULL }; +static const char *opencmd[] = { "st", "-f", termfont, "-e", "io-xdg-open", NULL }; +static const char *sessioncmd[] = { "st", "-f", termfont, "-e", "io-session", NULL }; +static const char *plumbcmd[] = { "st", "-f", termfont, "-e", "plumb", NULL }; static const char *pstrcmd[] = { "st", "-f", termfont, "-e", "rc", "-c", "ptree | less -S", NULL }; static Key keys[] = { /* modifier key function argument */ { MODKEY, XK_space, spawn, {.v = dmenucmd } }, { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, - { MODKEY, XK_o, spawn, {.v = menucmd } }, - { MODKEY, XK_p, spawn, {.v = opencmd } }, + { MODKEY, XK_o, spawn, {.v = opencmd } }, + { MODKEY, XK_s, spawn, {.v = sessioncmd } }, + { MODKEY, XK_p, spawn, {.v = plumbcmd } }, { MODKEY, XK_x, spawn, {.v = pstrcmd } }, { MODKEY, XK_b, togglebar, {0} }, { MODKEY, XK_j, focusstack, {.i = +1 } }, diff --git a/pack/git/build b/pack/git/build @@ -1,4 +1,11 @@ #!/bin/sh -ex +export CFLAGS="-I'$DEST/include/'" +export LDFLAGS="-L'$DEST/lib/'" + ./configure --prefix="$PREFIX" \ - --without-tcltk + --without-tcltk \ + --without-iconv \ + --with-zlib="$DEST" + +gmake install diff --git a/pack/git/tar b/pack/git/tar @@ -1 +1 @@ -http://www.kernel.org/pub/software/scm/git/git-2.10.0.tar.gz +https://www.kernel.org/pub/software/scm/git/git-2.10.0.tar.gz diff --git a/pack/gmake/tar b/pack/gmake/tar @@ -1 +1 @@ -http://mirror.ibcp.fr/pub/gnu/make/make-4.2.tar.gz +https://mirror.ibcp.fr/pub/gnu/make/make-4.2.tar.gz diff --git a/pack/ics2txt/build b/pack/ics2txt/build @@ -0,0 +1,3 @@ +#!/bin/sh -ex + +make PREFIX="$PREFIX" install diff --git a/pack/liblzma/build b/pack/liblzma/build @@ -0,0 +1,5 @@ +#!/bin/sh -e + +./configure --prefix="$PREFIX" + +gmake install diff --git a/pack/libpng/build b/pack/libpng/build @@ -0,0 +1,5 @@ +#!/bin/sh -e + +./configure --prefix="$PREFIX" + +gmake install diff --git a/pack/libz/build b/pack/libz/build @@ -0,0 +1,5 @@ +#!/bin/sh -ex + +./configure --prefix="$PREFIX" + +make install diff --git a/pack/spoon/config.h b/pack/spoon/config.h @@ -3,7 +3,7 @@ int delay = 1; struct ent ents[] = { /* reorder/edit/remove these as you see fit */ - { .fmt = " [%s]", .read = countread, .arg = "/home/mail/INBOX/new" }, + { .fmt = " [%s]", .read = countread, .arg = "/home/josuah/mail/INBOX/new" }, { .fmt = " [%s]", .read = mixread, .arg = NULL }, { .fmt = " [%s]", .read = loadread, .arg = NULL }, { .fmt = " [%s]", .read = cpuread, .arg = "/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq" }, diff --git a/pack/st/config.mk b/pack/st/config.mk @@ -11,12 +11,8 @@ X11INC = /usr/X11R6/include X11LIB = /usr/X11R6/lib # includes and libs -INCS = -I. -I/usr/include -I${X11INC} \ - `pkg-config --cflags fontconfig` \ - `pkg-config --cflags freetype2` -LIBS = -L/usr/lib -lc -L${X11LIB} -lm -lX11 -lutil -lXft \ - `pkg-config --libs fontconfig` \ - `pkg-config --libs freetype2` +INCS = -I. -I/usr/include -I${X11INC} +LIBS = -L/usr/lib -lc -L${X11LIB} -lm -lX11 -lutil -lXft # flags CPPFLAGS = -DVERSION=\"${VERSION}\" -D_XOPEN_SOURCE=600 diff --git a/s6/qemu-user/env/NAME b/s6/qemu-user/env/NAME diff --git a/s6/qemu-user/run b/s6/qemu-user/run @@ -6,16 +6,16 @@ fdmove -c 2 1 -backtick name { getcwd PWD basename $PWD } -importas name name +s6-envdir env +importas NAME NAME qemu-system-x86_64 -m 333M - -name $name + -name $NAME -netdev user,id=nd0,hostfwd=tcp::10000-:22 -device e1000,netdev=nd0 -display none - /var/iso/$name.iso + /var/iso/$NAME.iso # -display curses -# -display vnc=0.0.0.0:$vnc +# -display vnc=0.0.0.0:0