diff --git a/.gitignore b/.gitignore index e065d56..cede950 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,8 @@ qutebrowser/quickmarks qutebrowser/qsettings qutebrowser/qutepocket.secrets vnc/tigervnc.history +buildfiles/st/st +buildfiles/x265/x265_git +buildfiles/x265/build +buildfiles/x265/build-10 +buildfiles/x265/build-12 diff --git a/buildfiles/README.md b/buildfiles/README.md new file mode 100644 index 0000000..c00e976 --- /dev/null +++ b/buildfiles/README.md @@ -0,0 +1,4 @@ +## Build Files + +- `st` builds [st](https://st.suckless.org/) with my custom config and installs to `/usr/local` +- `x265` builds a multi-bitrate [x265](https://bitbucket.org/multicoreware/x265_git) with numa support and installs to `/home/rudism/.local` diff --git a/buildfiles/st/build.sh b/buildfiles/st/build.sh new file mode 100755 index 0000000..6a58bce --- /dev/null +++ b/buildfiles/st/build.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +set -euo pipefail + +builddir="$(dirname "$0")" + +pushd "$builddir" + +if [ -d "./st" ]; then + git -C "./st" pull +else + git clone "https://git.suckless.org/st" +fi + +cp config.h ./st/ +cd st +make +sudo make install +popd diff --git a/st/config.h b/buildfiles/st/config.h similarity index 100% rename from st/config.h rename to buildfiles/st/config.h diff --git a/buildfiles/x265/build.sh b/buildfiles/x265/build.sh new file mode 100755 index 0000000..c346bba --- /dev/null +++ b/buildfiles/x265/build.sh @@ -0,0 +1,58 @@ +#!/usr/bin/env bash + +set -euo pipefail +builddir="$(dirname "$0")" + +pushd "$builddir" + +if [ -d "./x265_git" ]; then + git -C "./x265_git" pull +else + git clone "https://bitbucket.org/multicoreware/x265_git.git" +fi + +cmake -S x265_git/source -B build-12 \ + -DCMAKE_INSTALL_PREFIX='/home/rudism/.local' \ + -DCMAKE_ASM_NASM_FLAGS='-w-macro-params-legacy' \ + -DENABLE_ASSEMBLY='ON' \ + -DENABLE_LIBNUMA='ON' \ + -DHIGH_BIT_DEPTH='ON' \ + -DMAIN12='ON' \ + -DEXPORT_C_API='OFF' \ + -DENABLE_CLI='OFF' \ + -DENABLE_SHARED='OFF' \ + -Wno-dev +make -C build-12 + +cmake -S x265_git/source -B build-10 \ + -DCMAKE_INSTALL_PREFIX='/home/rudism/.local' \ + -DCMAKE_ASM_NASM_FLAGS='-w-macro-params-legacy' \ + -DENABLE_ASSEMBLY='ON' \ + -DENABLE_LIBNUMA='ON' \ + -DHIGH_BIT_DEPTH='ON' \ + -DEXPORT_C_API='OFF' \ + -DENABLE_CLI='OFF' \ + -DENABLE_SHARED='OFF' \ + -Wno-dev +make -C build-10 + +cmake -S x265_git/source -B build \ + -DCMAKE_INSTALL_PREFIX:PATH='/home/rudism/.local' \ + -DCMAKE_ASM_NASM_FLAGS='-w-macro-params-legacy' \ + -DENABLE_ASSEMBLY='ON' \ + -DENABLE_SHARED='ON' \ + -DENABLE_LIBNUMA='ON' \ + -DENABLE_HDR10_PLUS='ON' \ + -DEXTRA_LIB='x265_main10.a;x265_main12.a' \ + -DEXTRA_LINK_FLAGS='-L.' \ + -DLINKED_10BIT='ON' \ + -DLINKED_12BIT='ON' \ + -Wno-dev + +ln -s ../build-10/libx265.a build/libx265_main10.a +ln -s ../build-12/libx265.a build/libx265_main12.a +make -C build + +make -C build install + +popd diff --git a/herbstluftwm/autostart b/herbstluftwm/autostart index 48e89ef..d82479a 100755 --- a/herbstluftwm/autostart +++ b/herbstluftwm/autostart @@ -123,6 +123,8 @@ done # cycle through tags hc keybind $Mod-Control-Right use_index +1 --skip-visible hc keybind $Mod-Control-Left use_index -1 --skip-visible +hc keybind XF86Paste use_index +1 --skip_visible +hc keybind XF86Copy use_index -1 --skip_visible # layouting hc keybind $Mod-f fullscreen toggle diff --git a/shell/bashrc.d/01-common.sh b/shell/bashrc.d/01-common.sh index 399ac50..c394f4a 100644 --- a/shell/bashrc.d/01-common.sh +++ b/shell/bashrc.d/01-common.sh @@ -9,9 +9,10 @@ HISTTIMEFORMAT='%F %T ' export TERM_ITALICS=true -eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib) +eval "$(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)" -export PATH=$PATH:~/skynet/bin:~/node/node_modules/.bin:~/.local/bin:~/go/bin:~/.dotnet:~/.dotnet/tools:~/.cargo/bin:~/.luarocks/bin +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/.local/lib" +export PATH="$HOME/.local/bin:$PATH:$HOME/skynet/bin:$HOME/node/node_modules/.bin:$HOME/go/bin:$HOME/.dotnet:$HOME/.dotnet/tools:$HOME/.cargo/bin:$HOME/.luarocks/bin" export EDITOR=vim export PAGER=bat diff --git a/xorg/xinitrc b/xorg/xinitrc index 0fdb0f4..1f38d15 100644 --- a/xorg/xinitrc +++ b/xorg/xinitrc @@ -2,9 +2,11 @@ #. "$HOME/.profile" +export PATH="$HOME/.local/bin:$PATH" +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/.local/lib" + userresources=$HOME/.Xresources sysresources=/etc/X11/xinit/.Xresources -sysmodmap=/etc/X11/xinit/.Xmodmap if [ -f $sysresources ]; then xrdb -merge $sysresources