From a6418a11fa62114d941b5731dc8a1150251d3d08 Mon Sep 17 00:00:00 2001 From: Cameron Katri Date: Fri, 13 Aug 2021 10:22:25 -0400 Subject: Various changes --- .config/nvim/init.vim | 3 +++ .crossenv.zsh | 35 +++++++++++++++++++++++++++++------ .cwmrc | 1 + .local/bin/freebsd-patch | 2 +- .login_conf | 2 +- .xinitrc | 3 +++ .zshrc | 4 ---- 7 files changed, 38 insertions(+), 12 deletions(-) diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index ec7c481..901c99d 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -57,3 +57,6 @@ endif let g:airline_symbols.linenr = '' let g:airline_symbols.branch = '⎇ ' let g:airline_symbols.dirty= '' + +au BufNewFile,BufRead *.x,*.xm,*.xmm,*.l.mm setf logos +au BufNewFile,BufRead *.tbd setf yaml diff --git a/.crossenv.zsh b/.crossenv.zsh index a547d11..4a0f182 100644 --- a/.crossenv.zsh +++ b/.crossenv.zsh @@ -1,12 +1,12 @@ iphoneos-arm64-proenv() { - MEMO_TARGET='iphoneos-arm64' PLATFORM='iphoneos' MEMO_ARCH='arm64' TARGET_SYSROOT='/usr/home/cameron/Documents/iOS/SDK/iPhoneOS14.3.sdk' MACOSX_SYSROOT='/usr/home/cameron/Documents/iOS/SDK/MacOSX11.1.sdk' GNU_HOST_TRIPLE='aarch64-apple-darwin' + MEMO_TARGET='iphoneos-arm64' PLATFORM='iphoneos' MEMO_ARCH='arm64' TARGET_SYSROOT='/usr/home/cameron/Documents/iOS/SDK/iPhoneOS12.0.sdk' MACOSX_SYSROOT='/usr/home/cameron/Documents/iOS/SDK/MacOSX12.0.sdk' GNU_HOST_TRIPLE='aarch64-apple-darwin' CC='aarch64-apple-darwin-clang' CXX='aarch64-apple-darwin-clang++' AR='aarch64-apple-darwin-ar' LD='aarch64-apple-darwin-ld ' CPP='aarch64-apple-darwin-clang -E' RANLIB='aarch64-apple-darwin-ranlib ' STRIP='aarch64-apple-darwin-strip' NM='aarch64-apple-darwin-nm' LIPO='aarch64-apple-darwin-lipo' OTOOL='aarch64-apple-darwin-otool' I_N_T='aarch64-apple-darwin-install_name_tool' EXTRA='' SED='sed ' LDID='ldid' GINSTALL='install ' LN='ln' CP='cp' - BUILD_ROOT='/usr/home/cameron/Documents/iOS/Procursus' BUILD_BASE='/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700' BUILD_INFO='/usr/home/cameron/Documents/iOS/Procursus/build_info' BUILD_WORK='/usr/home/cameron/Documents/iOS/Procursus/build_work/iphoneos-arm64/1700' BUILD_STAGE='/usr/home/cameron/Documents/iOS/Procursus/build_stage/iphoneos-arm64/1700' BUILD_DIST='/usr/home/cameron/Documents/iOS/Procursus/build_dist/iphoneos-arm64/1700' BUILD_STRAP='/usr/home/cameron/Documents/iOS/Procursus/build_strap/iphoneos-arm64/1700' BUILD_TOOLS='/usr/home/cameron/Documents/iOS/Procursus/build_tools' + BUILD_ROOT='/usr/home/cameron/Documents/iOS/Procursus' BUILD_BASE='/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1500' BUILD_INFO='/usr/home/cameron/Documents/iOS/Procursus/build_info' BUILD_WORK='/usr/home/cameron/Documents/iOS/Procursus/build_work/iphoneos-arm64/1500' BUILD_STAGE='/usr/home/cameron/Documents/iOS/Procursus/build_stage/iphoneos-arm64/1500' BUILD_DIST='/usr/home/cameron/Documents/iOS/Procursus/build_dist/iphoneos-arm64/1500' BUILD_STRAP='/usr/home/cameron/Documents/iOS/Procursus/build_strap/iphoneos-arm64/1500' BUILD_TOOLS='/usr/home/cameron/Documents/iOS/Procursus/build_tools' DEB_ARCH='iphoneos-arm' DEB_ORIGIN='' DEB_MAINTAINER='Cameron Katri ' - CFLAGS='-Os -g -arch arm64 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS14.3.sdk -miphoneos-version-min=14.0 -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/include -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/local/include -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/System/Library/Frameworks -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/Library/Frameworks' - CXXFLAGS='-Os -g -arch arm64 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS14.3.sdk -miphoneos-version-min=14.0 -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/include -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/local/include -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/System/Library/Frameworks -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/Library/Frameworks' - CPPFLAGS='-arch arm64 -miphoneos-version-min=14.0 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS14.3.sdk -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/include -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/local/include -Wno-error-implicit-function-declaration' - LDFLAGS='-Os -g -arch arm64 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS14.3.sdk -miphoneos-version-min=14.0 -L/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/lib -L/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/local/lib -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/System/Library/Frameworks -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/Library/Frameworks -liosexec' + CFLAGS='-Os -g -arch arm64 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS12.0.sdk -miphoneos-version-min=12.0 -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1500/usr/include -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1500/usr/local/include -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1500/System/Library/Frameworks -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1500/Library/Frameworks' + CXXFLAGS='-Os -g -arch arm64 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS12.0.sdk -miphoneos-version-min=12.0 -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1500/usr/include -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1500/usr/local/include -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1500/System/Library/Frameworks -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1500/Library/Frameworks' + CPPFLAGS='-arch arm64 -miphoneos-version-min=12.0 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS12.0.sdk -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1500/usr/include -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1500/usr/local/include -Wno-error-implicit-function-declaration' + LDFLAGS='-Os -g -arch arm64 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS12.0.sdk -miphoneos-version-min=12.0 -L/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1500/usr/lib -L/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1500/usr/local/lib -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1500/System/Library/Frameworks -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1500/Library/Frameworks -liosexec' export MEMO_TARGET PLATFORM MEMO_ARCH TARGET_SYSROOT MACOSX_SYSROOT GNU_HOST_TRIPLE export CC CXX AR LD CPP RANLIB STRIP NM LIPO OTOOL I_N_T EXTRA SED LDID GINSTALL LN CP export BUILD_ROOT BUILD_BASE BUILD_INFO BUILD_WORK BUILD_STAGE BUILD_DIST BUILD_STRAP BUILD_TOOLS @@ -25,6 +25,26 @@ apple_cmds-env() { export CFLAGS CXXFLAGS CPPFLAGS LDFLAGS } +darwin-arm64-env() { + CC='aarch64-apple-darwin-clang' CXX='aarch64-apple-darwin-clang++' AR='aarch64-apple-darwin-ar' LD='aarch64-apple-darwin-ld' CPP='aarch64-apple-darwin-clang -E' RANLIB='aarch64-apple-darwin-ranlib' STRIP='aarch64-apple-darwin-strip' NM='aarch64-apple-darwin-nm' LIPO='aarch64-apple-darwin-lipo' OTOOL='aarch64-apple-darwin-otool' I_N_T='aarch64-apple-darwin-install_name_tool' + CFLAGS="-arch arm64 -isysroot ${MACOSX_SYSROOT} -mmacosx-version-min=11.0" + CPPFLAGS="-arch arm64 -isysroot ${MACOSX_SYSROOT} -mmacosx-version-min=11.0" + CXXFLAGS="-arch arm64 -isysroot ${MACOSX_SYSROOT} -mmacosx-version-min=11.0" + LDFLAGS="-arch arm64 -isysroot ${MACOSX_SYSROOT} -mmacosx-version-min=11.0" + export CC CXX AR LD CPP RANLIB STRIP NM LIPO OTOOL I_N_T + export CFLAGS CPPFLAG CXXFLAGS LDFLAGS +} + +darwin-amd64-env() { + CC='x86_64-apple-darwin-clang' CXX='x86_64-apple-darwin-clang++' AR='x86_64-apple-darwin-ar' LD='x86_64-apple-darwin-ld' CPP='x86_64-apple-darwin-clang -E' RANLIB='x86_64-apple-darwin-ranlib' STRIP='x86_64-apple-darwin-strip' NM='x86_64-apple-darwin-nm' LIPO='x86_64-apple-darwin-lipo' OTOOL='x86_64-apple-darwin-otool' I_N_T='x86_64-apple-darwin-install_name_tool' + CFLAGS="-arch x86_64 -isysroot ${MACOSX_SYSROOT} -mmacosx-version-min=11.0" + CPPFLAGS="-arch x86_64 -isysroot ${MACOSX_SYSROOT} -mmacosx-version-min=11.0" + CXXFLAGS="-arch x86_64 -isysroot ${MACOSX_SYSROOT} -mmacosx-version-min=11.0" + LDFLAGS="-arch x86_64 -isysroot ${MACOSX_SYSROOT} -mmacosx-version-min=11.0" + export CC CXX AR LD CPP RANLIB STRIP NM LIPO OTOOL I_N_T + export CFLAGS CPPFLAG CXXFLAGS LDFLAGS +} + darwin-env() { CC='aarch64-apple-darwin-clang' CXX='aarch64-apple-darwin-clang++' AR='aarch64-apple-darwin-ar' LD='aarch64-apple-darwin-ld' CPP='aarch64-apple-darwin-clang -E' RANLIB='aarch64-apple-darwin-ranlib' STRIP='aarch64-apple-darwin-strip' NM='aarch64-apple-darwin-nm' LIPO='aarch64-apple-darwin-lipo' OTOOL='aarch64-apple-darwin-otool' I_N_T='aarch64-apple-darwin-install_name_tool' LDID='ldid' OPTIMIZATION_FLAGS="-Os -g -flto=thin" @@ -76,6 +96,9 @@ export MEMO_PGP_SIGN_KEY=7D3B36CEA40FCC2181FB6DCDBAFFD97826540F1C export MEMO_TARGET=iphoneos-arm64 export DPKG_TYPE=xz export GNUBINDIR=/usr/local/gnubin +export THEOS=~/Documents/iOS/theos +export THEOS_DEVICE_IP="localhost" +export THEOS_DEVICE_PORT="2222" function x86_64-linux-gnu-env() { export CC='clang --target=x86_64-linux-gnu' CFLAGS='--sysroot=/usr/compat/debian -isystem /usr/compat/debian/usr/lib/gcc/x86_64-linux-gnu/8/include/ -isystem /usr/compat/debian/usr/lib/gcc/x86_64-linux-gnu/8/include-fixed/ -g -W -Wall -Wmissing-prototypes -Wstrict-prototypes -Wwrite-strings -Wno-unused-parameter' CPPFLAGS='--sysroot=/usr/compat/debian -isystem /usr/compat/debian/usr/lib/gcc/x86_64-linux-gnu/8/include/ -isystem /usr/compat/debian/usr/lib/gcc/x86_64-linux-gnu/8/include-fixed/ -g -W -Wall -Wmissing-prototypes -Wstrict-prototypes -Wwrite-strings -Wno-unused-parameter' LDFLAGS='--sysroot=/usr/compat/debian -isystem /usr/compat/debian/usr/lib/gcc/x86_64-linux-gnu/8/include/ -isystem /usr/compat/debian/usr/lib/gcc/x86_64-linux-gnu/8/include-fixed/' LD='ld --target=x86_64-linux-gnu' AR='llvm-ar' NM='llvm-nm' diff --git a/.cwmrc b/.cwmrc index ded0c95..4bc4898 100644 --- a/.cwmrc +++ b/.cwmrc @@ -7,6 +7,7 @@ bind-key 4-w firefox bind-key 4-q window-close bind-key 4-t "st -e neomutt" bind-key 4-space menu-exec +bind-key 4C-s "xset dpms force off" command firefox firefox diff --git a/.local/bin/freebsd-patch b/.local/bin/freebsd-patch index 6c1121b..83503e5 100755 --- a/.local/bin/freebsd-patch +++ b/.local/bin/freebsd-patch @@ -1,4 +1,4 @@ #!/bin/sh for patch in $HOME/Documents/freebsd-patches/*.patch; do - patch -d /usr/src -p1 < $patch + git -C /usr/src am < $patch done diff --git a/.login_conf b/.login_conf index fdcf2ae..054c5d3 100644 --- a/.login_conf +++ b/.login_conf @@ -5,5 +5,5 @@ me:\ :lang=en_US.UTF-8:\ :charset=UTF-8:\ - :path=/usr/local/libexec/ccache /usr/local/llvm12/bin /sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin ~/.local/bin /opt/limd/bin /usr/local/libexec/apple/bin ~/Documents/go/bin:\ + :path=/usr/local/libexec/ccache /usr/local/llvm12/bin /sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin ~/.local/bin ~/Documents/iOS/theos/bin /opt/limd/bin /usr/local/libexec/apple/bin ~/Documents/go/bin:\ :umask=027: diff --git a/.xinitrc b/.xinitrc index b5b2628..c0221c2 100755 --- a/.xinitrc +++ b/.xinitrc @@ -15,6 +15,9 @@ fi export $(dbus-launch) +pkill xidle +xidle -delay 5 -nw -program "/usr/local/bin/xlock -dpmsstandby 5 -mode lightning" -timeout 1800 & + pkill -f lemonybar lemonybar & diff --git a/.zshrc b/.zshrc index faa5cd6..cbe0eaa 100755 --- a/.zshrc +++ b/.zshrc @@ -39,7 +39,6 @@ export COLORTERM=1 CLICOLOR=1 bindkey '^E' edit-command-line alias code='code-oss' alias sudo='sudo ' -alias icat="kitty +kitten icat" alias fuzz="fzf --preview 'bat --style=numbers,changes --color=always --line-range :500 {}' --preview-window=right:66%" alias sort='LC_ALL=C sort' # https://reviews.freebsd.org/D30545 @@ -67,9 +66,6 @@ setxkbmap -option compose:rctrl export GPG_TTY=$(tty) -# Completion for kitty -#kitty + complete setup zsh | source /dev/stdin - export LESS='-FiMRx2$z-4$Dd+c$Du+g' # https://reviews.freebsd.org/D30341 -- cgit v1.2.3-56-ge451