From 7dc43bab54acfb0b3697c3e438b121a25ad1e9d5 Mon Sep 17 00:00:00 2001 From: Mid Favila Date: Thu, 17 Feb 2022 12:39:23 -0400 Subject: [PATCH] Update rcrc and move esrc out of homedir. --- {user/homedir => jnk}/esrc | 0 user/homedir/rcrc | 74 ++++++++++++++++++++++++++++++++++++++ user/homedir/xsession | 48 ++++++++++++++----------- 3 files changed, 102 insertions(+), 20 deletions(-) rename {user/homedir => jnk}/esrc (100%) create mode 100644 user/homedir/rcrc diff --git a/user/homedir/esrc b/jnk/esrc similarity index 100% rename from user/homedir/esrc rename to jnk/esrc diff --git a/user/homedir/rcrc b/user/homedir/rcrc new file mode 100644 index 0000000..6194bd7 --- /dev/null +++ b/user/homedir/rcrc @@ -0,0 +1,74 @@ +##################################################################### +## Environment ## +##################################################################### + +# Set the time zone +TZ=AEST+4 + +# Clear the terminal +clear + +# Set our default directory to the Workspace +cd $HOME/Desktop/Workspace + +# Set up preferred tools +EDITOR='emacsclient -cuq -nw' +PAGER='less' +XPG='xless' +W3B='Links' +VPLAY='fpv' +MPLAY='fpm' +IVIEW='iview' + +# Configure for kiss compat +KISS_PATH=`{du -hd3 /var/db/kiss/repos/kiss-mfavila/ |cut -f2|sed -ne 's/.*git.*//gh' -ne 's/.*NR.*//gh' -e p|tr '\n' :} +KISS_DL='axel' +KISS_SU='sup' + +# Configure our toolchain +CFLAGS='-pipe -w -D_GLIBCXX_ASSERTIONS -D_FORTIFY_SOURCE=2 -O2 -march=haswell -fno-asynchronous-unwind-tables -momit-leaf-frame-pointer -ftree-loop-vectorize -fstack-protector-strong --param ssp-buffer-size=4 -fstack-clash-protection -fPIE -fPIC -Wl,--hash-style=gnu -fno-plt -fomit-frame-pointer -fmodulo-sched -fno-expensive-optimizations -fira-loop-pressure -fno-sched-spec-load -fconserve-stack -fisolate-erroneous-paths-attribute -fdelete-null-pointer-checks -fisolate-erroneous-paths-dereference' +CXXFLAGS=$CFLAGS +FFLAGS=$CFLAGS +LDFLAGS='-Wl,-O2,-sort-common,-as-needed,-z,relro,-z,now' + +# Set makejobs to number of threads minus two +MAKEFLAGS=`{echo -j`{expr `{grep cores /proc/cpuinfo|wc -l} - 2}} + +# Build in memory and keep crap out of home +XDG_CACHE_HOME='/tmp' +LESSHISTFILE='/dev/urandom' +XDG_CONFIG_HOME='/home/midfavila/.config/' +CONFIG_DIR='.config' + +##################################################################### +## Prompt Settings ## +##################################################################### + +# Determine what directory we're in +fn cdir {if(~ `{pwd} `{echo $HOME}) + {printf %s '~'} else + {printf %s `{basename `{pwd}}}} + +fn prompt {prompt=`{printf '%s' `whoami^:^`cdir^'>'^' '}} + +##################################################################### +## Aliases ## +##################################################################### + +# Editor +fn edit {emacsclient -cuq -nw $*} + +# Git +fn gcl {git clone $*} + +# KISS +fn k {kiss $*} + +# Stream Furry.FM +fn stream_furryfm {fpm https://s4.radio.co/sa18a4da89/low} + +# Stream AnonRadio +fn stream_anonradio {fpm http://anonradio.net:8000/anonradio} + +# Stream chiptune +fn stream_chiptune {fpm http://lwtve.xyz/modmusic.ogg} diff --git a/user/homedir/xsession b/user/homedir/xsession index c59bf41..58f9f73 100755 --- a/user/homedir/xsession +++ b/user/homedir/xsession @@ -1,39 +1,43 @@ -#!/bin/es -. ~/.esrc +#!/bin/rc +. $HOME/.rcrc -fn load_configs{ - for (x=`{ls ~/.config/xresources/*}) +fn load_configs { + for(x in `{ls $HOME/.config/xresources/*}) {xrdb -merge $x} - } -fn setup_daemons{ - if {~ $HOSTNAME speculatores} + } +fn setup_daemons { + if (~ $HOSTNAME speculatores) { } { - # Start the compositor. + # Start the compositor picom -cCzfGD3 --shadow-exclude bounding_shaped --vsync --no-use-damage --backend $backend& } - # Manage clicks on the root window. -# xclickroot -1 ~/.config/fxde/fxde-core/config/menu & + # Manage clicks on the root window +# xclickroot -1 $HOME/.config/fxde/fxde-core/config/menu & - # Manage hotkeys. + # Manage hotkeys sxhkd -c $FXDE_DIR/fxde-core/config/sxhkdrc & - # Start the screen locker on a timer. + # Start the screen locker on a timer xssstart slock & - } + } + fn start_ui{ # Welcome chime. aplay $FXDE_DIR/fxde-assets/audio/Login.wav & # Set cursor. xsetroot -xcf $FXDE_DIR/fxde-assets/cursors/$CURSOR/cursors/left_ptr 12 & + # Set wallpaper. xwallpaper --no-randr --tile $FXDE_DIR/fxde-assets/wallpaper/$PAPE + # Start the status bar. Doesn't work in some WMs. EWMH maybe..? #$FXDE_DIR/fxde-core/scripts/bar.es|lemonbar -b -F '#FFFFFF' -g265x16+0+0 -B '#00000000' -f 'xft:family=Iosevka:style=Mono:size=11:' |sh - & + # Start the system clock. respawn xclock & @@ -45,16 +49,20 @@ fn start_ui{ } fn cleanup{ - for(i=respawn xclock xload stalonetray){pkill $i} + for(prog in respawn xclock xload stalonetray){pkill $prog} } ################################################################################ ## The actual config is below this. ## ################################################################################ -# Where to look for assets. -FXDE_DIR=~/.config/fxde/ -FVWM_DIR=~/.config/fxde/ +# Make sure our terminal knows to use 256 colors +TERM=xterm-256color + + +# Where to look for assets +FXDE_DIR=$HOME/.config/fxde/ +FVWM_DIR=$HOME/.config/fxde/ # Paper to use. PAPE=solardarktile_0.png @@ -63,10 +71,10 @@ PAPE=solardarktile_0.png CURSOR=Lambda # What WM? -wm=emwm +WM=emwm -for (phase=load_configs setup_daemons start_ui){$phase} -$wm +for(phase in load_configs setup_daemons start_ui){$phase} +$WM cleanup exit