From 972508e74de6e41fd2633b1405c032935f8d9a3c Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Thu, 12 Dec 2019 11:02:24 -0600 Subject: [PATCH 1/8] WIP pipeline --- apps/neovim/settings.vim | 2 +- bin/fsw | 18 +++++++++++-- bin/pipeline | 55 ++++++++++++++++++++++++++++++++++++++++ bin/upload | 2 ++ readme.md | 1 + setup | 1 + shell/bash/aliases | 3 ++- shell/bash/bashrc | 4 +-- 8 files changed, 80 insertions(+), 6 deletions(-) create mode 100755 bin/pipeline diff --git a/apps/neovim/settings.vim b/apps/neovim/settings.vim index 349d8a7..88eb70a 100644 --- a/apps/neovim/settings.vim +++ b/apps/neovim/settings.vim @@ -105,7 +105,7 @@ highlight GitGutterChangeDelete ctermbg=black guibg=black hi NonText ctermfg=black guifg=black set hidden " allows buffer switching without saving -set shortmess=Ia " hide vim intro, skip lots of file messages/prompts +set shortmess+=Ia " hide vim intro, skip lots of file messages/prompts set history=1000 " undo files diff --git a/bin/fsw b/bin/fsw index 57a35a5..08331cd 100755 --- a/bin/fsw +++ b/bin/fsw @@ -40,21 +40,32 @@ ${I}${I}${I}'.*' /etc/secrets \$HOME/.secrets USAGE } +dbg() { + if [[ ! -z ${FSW_DEBUG+x} ]]; then + echo -e "[debug] fsw: $@" + fi +} + if [[ $1 = '-h' ]] || [[ $1 = '--help' ]] || [[ -z $1 ]]; then help exit 0 fi FSW_EVENTS="${FSW_EVENTS:-close_write}" +dbg "Events: $FSW_EVENTS" SHELL_COMMAND="${1}"; shift +dbg "Command: $SHELL_COMMAND" FILTER="${1}"; shift +dbg "Filter: $FILTER" +dbg "Directory: ${1}" DIRS=("${1:-.}"); shift if [[ -e $FILTER ]]; then # TODO: this is a sad hack/workaround echo "It looks like your filter is an actual file. I'll just watch that for you." DIRS=("${FILTER}") fi -while [[ ! -z $1 ]]; do +while [[ ! -z $1 ]] && $(realpath $1) &> /dev/null; do + dbg "Directory: ${1}" DIRS+=("$1"); shift done inotifywait -m -e "${FSW_EVENTS}" -r "${DIRS[@]}" 2>&1 \ @@ -62,12 +73,15 @@ inotifywait -m -e "${FSW_EVENTS}" -r "${DIRS[@]}" 2>&1 \ | while read -r dir events filename; do if [[ "$dir $events" = "Watches established." ]]; then echo "Ready." + dbg "Directory: ${DIRS[@]}" else export FSW_FILENAME="$filename" export FSW_DIR="$dir" export FSW_PATH="$dir$filename" export FSW_FILE_EVENTS="$events" export FSW_EVENT="$events $dir$filename" - <<< "$FSW_PATH" grep -P "$FILTER" > /dev/null 2>&1 && eval "${SHELL_COMMAND}" + dbg "Event:\n $(date)\n $FSW_PATH\n $FILTER\n $FSW_EVENT\n $dir $events $filename\n ${SHELL_COMMAND}" + dbg "Filtered Event: $(<<< "$FSW_PATH" grep -P "$FILTER")" + <<< "$FSW_PATH" grep -P "$FILTER" > /dev/null 2>&1 && eval "${SHELL_COMMAND}" fi done diff --git a/bin/pipeline b/bin/pipeline new file mode 100755 index 0000000..b39ea47 --- /dev/null +++ b/bin/pipeline @@ -0,0 +1,55 @@ +#!/usr/bin/env bash + +SAVED_PIPELINE_DIR="$EDFP/pipelines" +mkdir -p "$SAVED_PIPELINE_DIR" + +if [[ ! -z "${1+x}" ]]; then + pdir="$SAVED_PIPELINE_DIR/$1"; shift + mkdir -p "$pdir" + if [[ -z ${1+x} ]]; then + td="$(mktemp -p "$pdir" -d "tmp_pipeline.XXXXXXXX")" + cleanup_trap="rm -rf \"$td\"" + else + td="$pdir/$1"; shift + mkdir -p "$td" + fi + transform="$pdir/transform" +else + td="$(mktemp --tmpdir -d pipeline.XXXXXXXX)" + transform="$td/transform" + cleanup_trap="rm -rf \"$td\"" +fi + +if [[ ! -e "$transform" ]]; then + echo -e "#!/usr/bin/env bash\n# for ${td}\n\nbase64" > "$transform" +fi + +in="$td/in" +out="$td/out" + +chmod +x "$transform" +echo "Hello World" > "$in" + +touch /tmp/ll.log +FSW_DEBUG=1 fswi \ + "bash -c '< \"$in\" \"$transform\" > \"$out\"'" \ + 'in$|transform$' \ + "$td" "$pdir" \ &> /tmp/ll.log & +watcher="$!" + +if [[ -z ${cleanup_trap+x} ]]; then + trap "kill \"$watcher\"" EXIT +else + trap "${cleanup_trap}; kill \"$watcher\"" EXIT +fi + +nvim \ + --cmd 'set shm+=atIWF' \ + --cmd 'set shm-=Oo' \ + -o "$in" "$transform" "$out" \ + --cmd 'set autoread' \ + --cmd 'set updatetime=250' \ + --cmd 'autocmd CursorHold,CursorHoldI silent write' + --cmd 'autocmd BufWrite * sleep 500m | checktime' + +# TODO: vim set autoread diff --git a/bin/upload b/bin/upload index 38936ac..18882c7 100755 --- a/bin/upload +++ b/bin/upload @@ -1,5 +1,7 @@ #!/usr/bin/env bash +# TODO: progress bar! + HOST="ld" f="${1}" diff --git a/readme.md b/readme.md index 479de71..67087df 100644 --- a/readme.md +++ b/readme.md @@ -78,6 +78,7 @@ Here are some bullet points on my workflow: * Makefile instead of setup script * [Vimux](https://github.com/benmills/vimux)? * Nerd Fonts with ligatures and icons for Kitty +* Setup network file sharing directory [upstream]: https://git.faceless.lytedev.io/lytedev/dotfiles diff --git a/setup b/setup index 1465e2a..8050fed 100755 --- a/setup +++ b/setup @@ -1,6 +1,7 @@ #!/usr/bin/env bash # TODO: ascii art header since I'm a leet haxx0r +# TODO: quiet mode? dfp=$(cd "$(dirname "${BASH_SOURCE[0]}" )/" && pwd) source "${dfp}/scripts/setup_helpers.bash" diff --git a/shell/bash/aliases b/shell/bash/aliases index e19c153..71eba07 100644 --- a/shell/bash/aliases +++ b/shell/bash/aliases @@ -108,7 +108,8 @@ alias sctlu="systemctl --user" alias logs="sudo journalctl" alias logsr="sudo journalctl -r" alias logsf="sudo journalctl -f" -alias btctl="sudo bluetoothctl" +alias bt="sudo bluetoothctl" +alias btctl="bt" alias pt="htop -t" # experimental htop tree-view-by-default alias resrc="source \$HOME/.bashrc" alias redshift="redshift -r -l 39.0997:-94.5786 -t 6500K:2500K" diff --git a/shell/bash/bashrc b/shell/bash/bashrc index 2543424..c1b595a 100644 --- a/shell/bash/bashrc +++ b/shell/bash/bashrc @@ -12,9 +12,9 @@ NICE_HOME="$HOME" # TODO: better logic for auto-detecting alternative home directories? # 1. check dirname(basename $HOME)) matches username # 2. check /home/$username -[[ $(basename "${HOME}") = "usr" ]] && NICE_HOME="$(realpath "$HOME/..")" [[ $(basename "${HOME}") = ".home" ]] && NICE_HOME="$(realpath "$HOME/..")" -# TODO: nice home explicitly definable on a per-device (env) basis +[[ -e "${HOME}/.nice_home" ]] && NICE_HOME="$(cat "${HOME}/.nice_home")" +[[ -e "${EDFP}/.nice_home" ]] && NICE_HOME="$(cat "${EDFP}/.nice_home")" export NICE_HOME export NOTES_DIR="$NICE_HOME/doc/notes" From 76594427ff4b991b4695847d2c3d0d110932c0c5 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Thu, 12 Dec 2019 13:00:03 -0600 Subject: [PATCH 2/8] Pipelines! --- bin/linewise | 10 ++++++++++ bin/pipeline | 23 ++++++++++++++++------- 2 files changed, 26 insertions(+), 7 deletions(-) create mode 100755 bin/linewise diff --git a/bin/linewise b/bin/linewise new file mode 100755 index 0000000..50711ad --- /dev/null +++ b/bin/linewise @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +if [[ ! -z "${1+x}" ]]; then + while read r; do + <<< "${r}" "$1" + done +else + echo "No reader program provided." + exit 1 +fi diff --git a/bin/pipeline b/bin/pipeline index b39ea47..0f589f5 100755 --- a/bin/pipeline +++ b/bin/pipeline @@ -25,16 +25,21 @@ if [[ ! -e "$transform" ]]; then fi in="$td/in" +if [[ ! -z "${1+x}" ]]; then + in="${1}"; shift +fi out="$td/out" +if [[ ! -z "${1+x}" ]]; then + out="${1}"; shift +fi chmod +x "$transform" echo "Hello World" > "$in" -touch /tmp/ll.log -FSW_DEBUG=1 fswi \ +fswi \ "bash -c '< \"$in\" \"$transform\" > \"$out\"'" \ 'in$|transform$' \ - "$td" "$pdir" \ &> /tmp/ll.log & + "$td" "$pdir" &> /dev/null & watcher="$!" if [[ -z ${cleanup_trap+x} ]]; then @@ -43,13 +48,17 @@ else trap "${cleanup_trap}; kill \"$watcher\"" EXIT fi +job="call jobstart(['inotifywait', '-m', '-e', 'close_write', '${out}'], {'on_stdout':{j,d,e->execute('checktime')}})" +echo "$job" + +# this will only autosave (and therefore autoreload) for the out buffer (since +# it was opened last) - autosaving (and therefore autorunning) is potentially +# very scary nvim \ --cmd 'set shm+=atIWF' \ --cmd 'set shm-=Oo' \ -o "$in" "$transform" "$out" \ --cmd 'set autoread' \ --cmd 'set updatetime=250' \ - --cmd 'autocmd CursorHold,CursorHoldI silent write' - --cmd 'autocmd BufWrite * sleep 500m | checktime' - -# TODO: vim set autoread + --cmd 'autocmd CursorHold,CursorHoldI silent write' \ + --cmd "$(<<< "$job" tr "'" '"')" From b81bdf6abd767e4f071e78b8478c52eab4a75479 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Thu, 12 Dec 2019 13:17:20 -0600 Subject: [PATCH 3/8] errors break things? --- bin/fsw | 2 +- bin/linewise | 2 +- bin/pipeline | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/fsw b/bin/fsw index 08331cd..fd40d37 100755 --- a/bin/fsw +++ b/bin/fsw @@ -82,6 +82,6 @@ inotifywait -m -e "${FSW_EVENTS}" -r "${DIRS[@]}" 2>&1 \ export FSW_EVENT="$events $dir$filename" dbg "Event:\n $(date)\n $FSW_PATH\n $FILTER\n $FSW_EVENT\n $dir $events $filename\n ${SHELL_COMMAND}" dbg "Filtered Event: $(<<< "$FSW_PATH" grep -P "$FILTER")" - <<< "$FSW_PATH" grep -P "$FILTER" > /dev/null 2>&1 && eval "${SHELL_COMMAND}" + <<< "$FSW_PATH" grep -P "$FILTER" > /dev/null 2>&1 && eval "${SHELL_COMMAND}" &> /dev/null fi done diff --git a/bin/linewise b/bin/linewise index 50711ad..2b337f7 100755 --- a/bin/linewise +++ b/bin/linewise @@ -2,7 +2,7 @@ if [[ ! -z "${1+x}" ]]; then while read r; do - <<< "${r}" "$1" + <<< "${r}" "$@" done else echo "No reader program provided." diff --git a/bin/pipeline b/bin/pipeline index 0f589f5..1d53fd7 100755 --- a/bin/pipeline +++ b/bin/pipeline @@ -49,7 +49,6 @@ else fi job="call jobstart(['inotifywait', '-m', '-e', 'close_write', '${out}'], {'on_stdout':{j,d,e->execute('checktime')}})" -echo "$job" # this will only autosave (and therefore autoreload) for the out buffer (since # it was opened last) - autosaving (and therefore autorunning) is potentially From 8d1e86feb4ebccec06233f8ea1f67b75d63cf222 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Thu, 12 Dec 2019 13:31:18 -0600 Subject: [PATCH 4/8] Logging for pipelines? --- bin/fsw | 2 +- bin/pipeline | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/bin/fsw b/bin/fsw index fd40d37..08331cd 100755 --- a/bin/fsw +++ b/bin/fsw @@ -82,6 +82,6 @@ inotifywait -m -e "${FSW_EVENTS}" -r "${DIRS[@]}" 2>&1 \ export FSW_EVENT="$events $dir$filename" dbg "Event:\n $(date)\n $FSW_PATH\n $FILTER\n $FSW_EVENT\n $dir $events $filename\n ${SHELL_COMMAND}" dbg "Filtered Event: $(<<< "$FSW_PATH" grep -P "$FILTER")" - <<< "$FSW_PATH" grep -P "$FILTER" > /dev/null 2>&1 && eval "${SHELL_COMMAND}" &> /dev/null + <<< "$FSW_PATH" grep -P "$FILTER" > /dev/null 2>&1 && eval "${SHELL_COMMAND}" fi done diff --git a/bin/pipeline b/bin/pipeline index 1d53fd7..fb42f12 100755 --- a/bin/pipeline +++ b/bin/pipeline @@ -33,13 +33,17 @@ if [[ ! -z "${1+x}" ]]; then out="${1}"; shift fi +# TODO: if no logging, log="/dev/null" +log="$td/log" + chmod +x "$transform" echo "Hello World" > "$in" +touch "$log" fswi \ - "bash -c '< \"$in\" \"$transform\" > \"$out\"'" \ + "bash -c 'cd \"$td\" && < \"$in\" \"$transform\" | tee \"$out\"'" \ 'in$|transform$' \ - "$td" "$pdir" &> /dev/null & + "$td" "$pdir" &> "$log" & watcher="$!" if [[ -z ${cleanup_trap+x} ]]; then From 0d0e131714c756be933e158919908c19e0c35b2b Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Tue, 31 Dec 2019 14:26:44 -0600 Subject: [PATCH 5/8] Stuff --- apps/htop/rc | 27 --------------------------- de/bspwm/wmstart | 5 +---- de/libinput/touchpad.conf | 1 + 3 files changed, 2 insertions(+), 31 deletions(-) diff --git a/apps/htop/rc b/apps/htop/rc index 73e2ece..e69de29 100644 --- a/apps/htop/rc +++ b/apps/htop/rc @@ -1,27 +0,0 @@ -# Beware! This file is rewritten by htop when settings are changed in the interface. -# The parser is also very primitive, and not human-friendly. -fields=0 48 17 18 38 39 40 2 46 47 49 1 -sort_key=46 -sort_direction=1 -hide_threads=0 -hide_kernel_threads=1 -hide_userland_threads=1 -shadow_other_users=0 -show_thread_names=0 -show_program_path=0 -highlight_base_name=1 -highlight_megabytes=1 -highlight_threads=1 -tree_view=1 -header_margin=1 -detailed_cpu_time=0 -cpu_count_from_zero=0 -update_process_names=0 -account_guest_in_cpu_meter=0 -color_scheme=0 -delay=15 -left_meters=LeftCPUs2 Memory Swap -left_meter_modes=1 1 1 -right_meters=RightCPUs2 Tasks LoadAverage Uptime -right_meter_modes=1 2 2 2 -vim_mode=1 diff --git a/de/bspwm/wmstart b/de/bspwm/wmstart index 5d244e9..5f68f09 100755 --- a/de/bspwm/wmstart +++ b/de/bspwm/wmstart @@ -1,6 +1,3 @@ #!/usr/bin/env bash -# allows bspwm to reload when killed -while true; do - bspwm || break -done +bspwm diff --git a/de/libinput/touchpad.conf b/de/libinput/touchpad.conf index cc9c592..6c7b894 100644 --- a/de/libinput/touchpad.conf +++ b/de/libinput/touchpad.conf @@ -5,4 +5,5 @@ Section "InputClass" MatchIsTouchpad "on" Option "Tapping" "on" Option "NaturalScrolling" "true" + Option "DisableWhileTyping" "false" EndSection From 66cc8734a82055d05b42ad63821ec35466b960ea Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Tue, 31 Dec 2019 21:48:49 -0600 Subject: [PATCH 6/8] Fix sudo setup and use fancy email for git --- apps/git/config | 2 +- bin/lib/sudo_setup | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/git/config b/apps/git/config index 42f3bf5..2021971 100644 --- a/apps/git/config +++ b/apps/git/config @@ -3,7 +3,7 @@ [user] name = Daniel Flanagan - email = daniel@lytedev.io + email = daniel@lyte.dev [filter "lfs"] clean = git-lfs clean -- %f diff --git a/bin/lib/sudo_setup b/bin/lib/sudo_setup index 8567b1f..74ea30a 100755 --- a/bin/lib/sudo_setup +++ b/bin/lib/sudo_setup @@ -8,8 +8,8 @@ if [[ $UID -ne 0 ]]; then exit fi -dfp=$(cd "$(dirname "${BASH_SOURCE[0]}" )/../" && pwd) -source "${dfp}/scripts/setup_helpers.bash" +dfp=$(cd "$(dirname "${BASH_SOURCE[0]}" )/../../" && pwd) +source "${dfp}/bin/lib/setup_helpers.bash" links=( # display manager files From 1acb330746b88b6e1a1660fd2dd3166829775b5a Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Tue, 7 Jan 2020 11:36:12 -0600 Subject: [PATCH 7/8] SWAAAAAY --- apps/de/sway/config | 133 ++++++++++++++++++++++++++++ apps/de/sway/{dm_entry => dm-entry} | 0 apps/de/sway/{sway-init => init} | 5 +- apps/htop/rc | 26 ++++++ apps/kitty/kitty.conf | 2 +- bin/lib/sudo_setup | 4 +- 6 files changed, 165 insertions(+), 5 deletions(-) create mode 100644 apps/de/sway/config rename apps/de/sway/{dm_entry => dm-entry} (100%) rename apps/de/sway/{sway-init => init} (83%) diff --git a/apps/de/sway/config b/apps/de/sway/config new file mode 100644 index 0000000..5650d7e --- /dev/null +++ b/apps/de/sway/config @@ -0,0 +1,133 @@ +set $mod Mod4 + +set $left h +set $down j +set $up k +set $right l + +set $term kitty +# TODO: launcher for wayland +# set $menu app-launcher +set $menu dmenu_path | dmenu | xargs swaymsg exec -- + +output * bg $HOME/.wallpaper fill + +# TODO: configured displays? +# output eDP-1 res 3200x1800 pos 0 0 scale 2 +# output DP-3 res 3440x1440 pos 1600 0 + +### Input configuration +# +# Example configuration: +# +# input "2:14:SynPS/2_Synaptics_TouchPad" { +# dwt enabled +# tap enabled +# natural_scroll enabled +# middle_emulation enabled +# } +# +# You can get the names of your inputs by running: swaymsg -t get_inputs +# Read `man 5 sway-input` for more information about this section. + +bindsym $mod+Return exec $term +bindsym $mod+t exec $term +bindsym $mod+c kill +bindsym $mod+Space exec $menu +bindsym $mod+Shift+r reload +bindsym $mod+Control+Escape exit +bindsym $mod+Shift+e exit + +bindsym $mod+$left focus left +bindsym $mod+$down focus down +bindsym $mod+$up focus up +bindsym $mod+$right focus right + +# TODO: this should nudge if floating? +bindsym $mod+Left focus left +bindsym $mod+Down focus down +bindsym $mod+Up focus up +bindsym $mod+Right focus right + +bindsym $mod+Shift+$left move left +bindsym $mod+Shift+$down move down +bindsym $mod+Shift+$up move up +bindsym $mod+Shift+$right move right + +bindsym $mod+Shift+Left move left +bindsym $mod+Shift+Down move down +bindsym $mod+Shift+Up move up +bindsym $mod+Shift+Right move right + +floating_modifier $mod normal + +bindsym $mod+1 workspace 1 +bindsym $mod+2 workspace 2 +bindsym $mod+3 workspace 3 +bindsym $mod+4 workspace 4 +bindsym $mod+5 workspace 5 +bindsym $mod+6 workspace 6 +bindsym $mod+7 workspace 7 +bindsym $mod+8 workspace 8 +bindsym $mod+9 workspace 9 +bindsym $mod+0 workspace 10 + +bindsym $mod+Shift+1 move container to workspace 1 +bindsym $mod+Shift+2 move container to workspace 2 +bindsym $mod+Shift+3 move container to workspace 3 +bindsym $mod+Shift+4 move container to workspace 4 +bindsym $mod+Shift+5 move container to workspace 5 +bindsym $mod+Shift+6 move container to workspace 6 +bindsym $mod+Shift+7 move container to workspace 7 +bindsym $mod+Shift+8 move container to workspace 8 +bindsym $mod+Shift+9 move container to workspace 9 +bindsym $mod+Shift+0 move container to workspace 10 + +bindsym $mod+b splith +bindsym $mod+v splitv + +bindsym $mod+e layout toggle split + +bindsym $mod+Shift+f fullscreen +bindsym $mod+f floating toggle +bindsym $mod+Alt+f focus mode_toggle +bindsym $mod+p focus parent + +bindsym $mod+Shift+minus move scratchpad +bindsym $mod+minus scratchpad show + +mode "resize" { + bindsym $left resize shrink width 10 px or 10 ppt + bindsym $down resize grow height 10 px or 10 ppt + bindsym $up resize shrink height 10 px or 10 ppt + bindsym $right resize grow width 10 px or 10 ppt + + bindsym Left resize shrink width 10 px or 10 ppt + bindsym Down resize grow height 10 px or 10 ppt + bindsym Up resize shrink height 10 px or 10 ppt + bindsym Right resize grow width 10 px or 10 ppt + + bindsym Return mode "default" + bindsym Escape mode "default" +} + +default_border none + +# bindsym $mod+r mode "resize" + +# man 5 sway-bar +bar { + position bottom + colors { + statusline #ffffff + background #111111 + inactive_workspace #11111100 #11111100 #5c5c5c + } +} + +input * { + repeat_delay 200 + repeat_rate 60 +} + +# include /etc/sway/config.d/* diff --git a/apps/de/sway/dm_entry b/apps/de/sway/dm-entry similarity index 100% rename from apps/de/sway/dm_entry rename to apps/de/sway/dm-entry diff --git a/apps/de/sway/sway-init b/apps/de/sway/init similarity index 83% rename from apps/de/sway/sway-init rename to apps/de/sway/init index e9eb301..6eee76c 100755 --- a/apps/de/sway/sway-init +++ b/apps/de/sway/init @@ -1,7 +1,7 @@ #!/usr/bin/env sh -killall -9 urxvtd -urxvtd & +# killall -9 urxvtd +# urxvtd & # key repeat export WLC_REPEAT_DELAY=200 @@ -14,5 +14,6 @@ export XKB_DEFAULT_OPTIONS=caps:escape export QT_QPA_PLATFORM=wayland-egl export CLUTTER_BACKEND=wayland export SDL_VIDEODRIVER=wayland +export MOZ_ENABLE_WAYLAND=1 sway diff --git a/apps/htop/rc b/apps/htop/rc index e69de29..b9f526d 100644 --- a/apps/htop/rc +++ b/apps/htop/rc @@ -0,0 +1,26 @@ +# Beware! This file is rewritten by htop when settings are changed in the interface. +# The parser is also very primitive, and not human-friendly. +fields=0 48 17 18 38 39 40 2 46 47 49 1 +sort_key=46 +sort_direction=1 +hide_threads=0 +hide_kernel_threads=1 +hide_userland_threads=0 +shadow_other_users=0 +show_thread_names=0 +show_program_path=1 +highlight_base_name=0 +highlight_megabytes=1 +highlight_threads=1 +tree_view=0 +header_margin=1 +detailed_cpu_time=0 +cpu_count_from_zero=0 +update_process_names=0 +account_guest_in_cpu_meter=0 +color_scheme=0 +delay=15 +left_meters=AllCPUs Memory Swap +left_meter_modes=1 1 1 +right_meters=Tasks LoadAverage Uptime +right_meter_modes=2 2 2 diff --git a/apps/kitty/kitty.conf b/apps/kitty/kitty.conf index c53bb36..75be590 100644 --- a/apps/kitty/kitty.conf +++ b/apps/kitty/kitty.conf @@ -5,7 +5,7 @@ bold_italic_font Iosevka Term Bold Italic font_size 11.0 adjust_line_height 0 -window_padding_width 18.0 +window_padding_width 5.0 window_margin_width 0.0 enable_audio_bell no diff --git a/bin/lib/sudo_setup b/bin/lib/sudo_setup index 74ea30a..aed4efc 100755 --- a/bin/lib/sudo_setup +++ b/bin/lib/sudo_setup @@ -13,8 +13,8 @@ source "${dfp}/bin/lib/setup_helpers.bash" links=( # display manager files - "$dfp/apps/de/sway/sway-init" "/usr/bin/sway-lytedev" - "$dfp/apps/de/sway/dm_entry" "/usr/share/wayland-sessions/sway-lytedev.desktop" + "$dfp/apps/de/sway/init" "/usr/bin/sway-lytedev" + "$dfp/apps/de/sway/dm-entry" "/usr/share/wayland-sessions/sway-lytedev.desktop" # touchpad "$dfp/apps/de/libinput/touchpad.conf" "/etc/X11/xorg.conf.d/41-libinput-lytedev-touchpad-options.conf" From 5195a855a6619cbe72af8c806bca5de8d30cecc5 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Tue, 7 Jan 2020 19:38:43 -0600 Subject: [PATCH 8/8] Bars --- apps/de/bspwm/bspwmrc | 2 +- apps/de/mako/config | 4 + .../de/{bar/polybar-config => polybar/config} | 2 +- apps/de/{bar => polybar}/mic.bash | 0 apps/de/{bar/bar.bash => polybar/run} | 4 +- apps/de/sway/config | 48 +++-- apps/de/sway/init | 5 + apps/de/waybar/config | 158 +++++++++++++++ apps/de/waybar/style.css | 188 ++++++++++++++++++ bin/app-launcher | 2 +- .../arch-linux/provisioning/2-essentials.bash | 1 + bin/startbar | 2 +- setup | 12 +- 13 files changed, 393 insertions(+), 35 deletions(-) create mode 100644 apps/de/mako/config rename apps/de/{bar/polybar-config => polybar/config} (99%) rename apps/de/{bar => polybar}/mic.bash (100%) rename apps/de/{bar/bar.bash => polybar/run} (97%) create mode 100644 apps/de/waybar/config create mode 100644 apps/de/waybar/style.css diff --git a/apps/de/bspwm/bspwmrc b/apps/de/bspwm/bspwmrc index 992badc..f764531 100755 --- a/apps/de/bspwm/bspwmrc +++ b/apps/de/bspwm/bspwmrc @@ -5,7 +5,7 @@ source "$HOME/.bashrc" # NO_COMPTON=1 BORDER_WIDTH=5 # change in bspwm_config, here for launcher START_BAR=1 -BAR_COMMAND="$DOTFILES_PATH/apps/de/bar/bar.bash" +BAR_COMMAND="$DOTFILES_PATH/apps/de/polybar/run" if [[ -z "$XDG_CONFIG_HOME" ]]; then export XDG_CONFIG_HOME="$HOME/.config" diff --git a/apps/de/mako/config b/apps/de/mako/config new file mode 100644 index 0000000..f65e8a5 --- /dev/null +++ b/apps/de/mako/config @@ -0,0 +1,4 @@ +max-visible=5 +default-timeout=30000 +background-color=#111111 +border-color=#666666 diff --git a/apps/de/bar/polybar-config b/apps/de/polybar/config similarity index 99% rename from apps/de/bar/polybar-config rename to apps/de/polybar/config index 56ec5ba..e3b039d 100644 --- a/apps/de/bar/polybar-config +++ b/apps/de/polybar/config @@ -387,7 +387,7 @@ margin-bottom = ${env:WINDOW_GAP:0} [module/microphone] type = custom/script -exec = $DOTFILES_PATH/apps/de/bar/mic.bash +exec = $DOTFILES_PATH/apps/de/polybar/mic.bash tail = true format =