diff --git a/.bash_profile b/.bash_profile index 4390a2a..06c6716 100644 --- a/.bash_profile +++ b/.bash_profile @@ -10,8 +10,8 @@ # fi if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then - exec sway - #exec sway -d 2> ~/sway.log + #exec sway + exec sway -d 2> ~/sway.log fi # if [[ -z $DISPLAY && $(tty) == /dev/tty1 && $XDG_SESSION_TYPE == tty ]]; then diff --git a/.bashrc b/.bashrc index 57cf7ec..bb03fce 100644 --- a/.bashrc +++ b/.bashrc @@ -7,7 +7,7 @@ # add from /etc/bash.bashrc default with fix for alacritty window title bars case ${TERM} in - xterm*|rxvt*|Eterm|alacritty|aterm|kterm|gnome*) + xterm*|rxvt*|Eterm|alacritty|aterm|foot|kterm|gnome*) PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"' ;; @@ -45,7 +45,7 @@ alias la='ls -A' alias ll='ls -lah' alias tree='tree -CL 2' alias nv='nvim' -export EDITOR=nvim +export EDITOR=nano export VISUAL=wm_spawn alias feh='feh --scale-down' @@ -71,8 +71,10 @@ fi #---begin fzf setup--- #fast fuzzy file searching with fzf #fzf kbd shortcuts: , , -source /usr/share/fzf/key-bindings.bash -source /usr/share/fzf/completion.bash +if [[ -e /usr/share/fzf/key-bindings.bash ]]; then + source /usr/share/fzf/key-bindings.bash + source /usr/share/fzf/completion.bash +fi #use ripgrep with fzf #export FZF_DEFAULT_COMMAND='rg -i --files --glob "!.git/*"' diff --git a/.config/i3status/config b/.config/i3status/config index 7a14192..00a1e91 100644 --- a/.config/i3status/config +++ b/.config/i3status/config @@ -30,9 +30,9 @@ order += "wireless _first_" order += "ethernet _first_" #order += "run_watch DHCP" #order += "path_exists ovpn" -order += "path_exists wgvpn" +#order += "path_exists wgvpn" order += "path_exists wg0" -order += "battery all" +#order += "battery all" order += "cpu_temperature 0" order += "load" order += "tztime local" @@ -84,6 +84,7 @@ run_watch DHCP { #update the following device path for temp1_input as needed cpu_temperature 0 { format = "%degrees °C" - path = "/sys/devices/platform/coretemp.0/hwmon/hwmon*/temp2_input" + #path = "/sys/devices/platform/coretemp.0/hwmon/hwmon*/temp2_input" + path = "/sys/class/thermal/thermal_zone0/temp" } diff --git a/.config/sway/config b/.config/sway/config index 0126123..ad2d7a9 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -17,8 +17,8 @@ set $alt Mod1 # Your preferred terminal emulator # set $term urxvt -set $term alacritty -# set $term foot +#set $term alacritty +set $term foot # Your preferred application launcher # Note: it's recommended that you pass the final command to sway @@ -56,9 +56,9 @@ font pango:monospace 8 # output * bg #000000 solid_color #Apple trackpad input device id: -input "1452:657:bcm5974" { - tap enabled -} +#input "1452:657:bcm5974" { +# tap enabled +#} #typematic delay and rate input type:keyboard { @@ -315,7 +315,7 @@ focus_follows_mouse no #seat seat0 xcursor_theme Adwaita 12 #hide mouse cursor. Either after msec of inactivity or whenever typing -seat seat0 hide_cursor 2000 +#seat seat0 hide_cursor 2000 # seat seat0 hide_cursor when-typing enable #Can use the following with custom workspace save files to reload layouts @@ -324,5 +324,5 @@ seat seat0 hide_cursor 2000 include /etc/sway/config.d/* # exec xrdb -load ~/.Xresources # exec mako -exec dunst +#exec dunst #exec_always "systemctl --user import-environment; systemctl --user start sway-session.target" diff --git a/.nanorc b/.nanorc new file mode 100644 index 0000000..7fa0d6c --- /dev/null +++ b/.nanorc @@ -0,0 +1 @@ +include /usr/share/nano/*.nanorc