Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fe247039dd |
@@ -10,8 +10,8 @@
|
|||||||
# fi
|
# fi
|
||||||
|
|
||||||
if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then
|
if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then
|
||||||
exec sway
|
#exec sway
|
||||||
#exec sway -d 2> ~/sway.log
|
exec sway -d 2> ~/sway.log
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# if [[ -z $DISPLAY && $(tty) == /dev/tty1 && $XDG_SESSION_TYPE == tty ]]; then
|
# if [[ -z $DISPLAY && $(tty) == /dev/tty1 && $XDG_SESSION_TYPE == tty ]]; then
|
||||||
|
|||||||
20
.bashrc
20
.bashrc
@@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
# add from /etc/bash.bashrc default with fix for alacritty window title bars
|
# add from /etc/bash.bashrc default with fix for alacritty window title bars
|
||||||
case ${TERM} in
|
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/\~}"'
|
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 ll='ls -lah'
|
||||||
alias tree='tree -CL 2'
|
alias tree='tree -CL 2'
|
||||||
alias nv='nvim'
|
alias nv='nvim'
|
||||||
export EDITOR=nvim
|
export EDITOR=nano
|
||||||
export VISUAL=wm_spawn
|
export VISUAL=wm_spawn
|
||||||
alias feh='feh --scale-down'
|
alias feh='feh --scale-down'
|
||||||
|
|
||||||
@@ -70,14 +70,19 @@ fi
|
|||||||
|
|
||||||
#---begin fzf setup---
|
#---begin fzf setup---
|
||||||
#fast fuzzy file searching with fzf
|
#fast fuzzy file searching with fzf
|
||||||
#fzf kbd shortcuts: <alt-c>, <ctrl-r>, <ctrl-t>, <ctrl-p>
|
#fzf kbd shortcuts: <alt-c>, <ctrl-t>, <ctrl-p>
|
||||||
source /usr/share/fzf/key-bindings.bash
|
if [[ -e /usr/share/fzf/key-bindings.bash ]]; then
|
||||||
source /usr/share/fzf/completion.bash
|
source /usr/share/fzf/key-bindings.bash
|
||||||
|
source /usr/share/fzf/completion.bash
|
||||||
|
fi
|
||||||
|
|
||||||
#use ripgrep with fzf
|
#use ripgrep with fzf
|
||||||
export FZF_DEFAULT_COMMAND='rg -i --files --glob "!.git/*"'
|
#export FZF_DEFAULT_COMMAND='rg -i --files --glob "!.git/*"'
|
||||||
#export FZF_DEFAULT_COMMAND='rg --files --no-ignore --hidden --follow --glob "!.git/*"'
|
#export FZF_DEFAULT_COMMAND='rg --files --no-ignore --hidden --follow --glob "!.git/*"'
|
||||||
|
|
||||||
|
#bat instead of cat
|
||||||
|
#fzf --preview 'bat --color=always --style=numbers --line-range=:500 {}'
|
||||||
|
|
||||||
#or use fd with fzf
|
#or use fd with fzf
|
||||||
# export FZF_DEFAULT_COMMAND="fd --type file --color=always"
|
# export FZF_DEFAULT_COMMAND="fd --type file --color=always"
|
||||||
# export FZF_DEFAULT_COMMAND='fd --type file --hidden --color=always --follow --exclude .git'
|
# export FZF_DEFAULT_COMMAND='fd --type file --hidden --color=always --follow --exclude .git'
|
||||||
@@ -94,8 +99,7 @@ bind -x '"\C-p": fzfcmd;'
|
|||||||
|
|
||||||
|
|
||||||
#setup bash history
|
#setup bash history
|
||||||
#export HISTIGNORE="ls*:cd*:exit:ps*:history:pass*:gpg*:start*"
|
export HISTIGNORE="ls*:cd*:exit:ps*:history:pass*:gpg*:start*"
|
||||||
export HISTIGNORE="ls*:cd*:exit:ps*:history:gpg*:start*"
|
|
||||||
# export HISTSIZE=4096
|
# export HISTSIZE=4096
|
||||||
export HISTSIZE=-1 #make unlimited
|
export HISTSIZE=-1 #make unlimited
|
||||||
# export HISTSIZE=0 #disable history
|
# export HISTSIZE=0 #disable history
|
||||||
|
|||||||
@@ -30,9 +30,9 @@ order += "wireless _first_"
|
|||||||
order += "ethernet _first_"
|
order += "ethernet _first_"
|
||||||
#order += "run_watch DHCP"
|
#order += "run_watch DHCP"
|
||||||
#order += "path_exists ovpn"
|
#order += "path_exists ovpn"
|
||||||
order += "path_exists wgvpn"
|
#order += "path_exists wgvpn"
|
||||||
order += "path_exists wg0"
|
order += "path_exists wg0"
|
||||||
order += "battery all"
|
#order += "battery all"
|
||||||
order += "cpu_temperature 0"
|
order += "cpu_temperature 0"
|
||||||
order += "load"
|
order += "load"
|
||||||
order += "tztime local"
|
order += "tztime local"
|
||||||
@@ -84,6 +84,7 @@ run_watch DHCP {
|
|||||||
#update the following device path for temp1_input as needed
|
#update the following device path for temp1_input as needed
|
||||||
cpu_temperature 0 {
|
cpu_temperature 0 {
|
||||||
format = "%degrees °C"
|
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"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -17,8 +17,8 @@ set $alt Mod1
|
|||||||
|
|
||||||
# Your preferred terminal emulator
|
# Your preferred terminal emulator
|
||||||
# set $term urxvt
|
# set $term urxvt
|
||||||
set $term alacritty
|
#set $term alacritty
|
||||||
# set $term foot
|
set $term foot
|
||||||
|
|
||||||
# Your preferred application launcher
|
# Your preferred application launcher
|
||||||
# Note: it's recommended that you pass the final command to sway
|
# Note: it's recommended that you pass the final command to sway
|
||||||
@@ -54,14 +54,11 @@ font pango:monospace 8
|
|||||||
# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
|
# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
|
||||||
# output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
|
# output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
|
||||||
# output * bg #000000 solid_color
|
# output * bg #000000 solid_color
|
||||||
# output * bg #333333 solid_color
|
|
||||||
# output * bg #0000FF solid_color
|
|
||||||
output * bg #003151 solid_color
|
|
||||||
|
|
||||||
#Apple trackpad input device id:
|
#Apple trackpad input device id:
|
||||||
input "1452:657:bcm5974" {
|
#input "1452:657:bcm5974" {
|
||||||
tap enabled
|
# tap enabled
|
||||||
}
|
#}
|
||||||
|
|
||||||
#typematic delay and rate
|
#typematic delay and rate
|
||||||
input type:keyboard {
|
input type:keyboard {
|
||||||
@@ -318,7 +315,7 @@ focus_follows_mouse no
|
|||||||
#seat seat0 xcursor_theme Adwaita 12
|
#seat seat0 xcursor_theme Adwaita 12
|
||||||
|
|
||||||
#hide mouse cursor. Either after msec of inactivity or whenever typing
|
#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
|
# seat seat0 hide_cursor when-typing enable
|
||||||
|
|
||||||
#Can use the following with custom workspace save files to reload layouts
|
#Can use the following with custom workspace save files to reload layouts
|
||||||
@@ -327,5 +324,5 @@ seat seat0 hide_cursor 2000
|
|||||||
include /etc/sway/config.d/*
|
include /etc/sway/config.d/*
|
||||||
# exec xrdb -load ~/.Xresources
|
# exec xrdb -load ~/.Xresources
|
||||||
# exec mako
|
# exec mako
|
||||||
exec dunst
|
#exec dunst
|
||||||
#exec_always "systemctl --user import-environment; systemctl --user start sway-session.target"
|
#exec_always "systemctl --user import-environment; systemctl --user start sway-session.target"
|
||||||
|
|||||||
@@ -4,6 +4,3 @@ Description=check-battery
|
|||||||
[Service]
|
[Service]
|
||||||
ExecStart=%h/bin/check-battery.sh
|
ExecStart=%h/bin/check-battery.sh
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=check-battery.timer
|
|
||||||
; WantedBy=timers.target
|
|
||||||
|
|||||||
2
.nanorc
2
.nanorc
@@ -1,3 +1 @@
|
|||||||
include /usr/share/nano/*.nanorc
|
include /usr/share/nano/*.nanorc
|
||||||
set regexp
|
|
||||||
set nowrap
|
|
||||||
|
|||||||
4
.vimrc
4
.vimrc
@@ -396,7 +396,7 @@ endif
|
|||||||
|
|
||||||
" Set color manually
|
" Set color manually
|
||||||
" colorscheme base16-gruvbox-dark-hard
|
" colorscheme base16-gruvbox-dark-hard
|
||||||
colorscheme base16-gruvbox-dark-hard
|
colorscheme base16-atelier-dune-light
|
||||||
|
|
||||||
"gvim options
|
"gvim options
|
||||||
" if &t_Co > 2 || has("gui_running")
|
" if &t_Co > 2 || has("gui_running")
|
||||||
@@ -409,7 +409,7 @@ if has("gui_running")
|
|||||||
" default is go=aegimrLtT
|
" default is go=aegimrLtT
|
||||||
set go=aegLt
|
set go=aegLt
|
||||||
":set go+=m or go-=m to toggle menu
|
":set go+=m or go-=m to toggle menu
|
||||||
" colorscheme base16-gruvbox-dark-hard
|
" colorscheme base16-atelier-dune-light
|
||||||
" colorscheme base16-gruvbox-dark-hard
|
" colorscheme base16-gruvbox-dark-hard
|
||||||
autocmd VimEnter * Goyo
|
autocmd VimEnter * Goyo
|
||||||
autocmd VimEnter * Limelight0.8
|
autocmd VimEnter * Limelight0.8
|
||||||
|
|||||||
Reference in New Issue
Block a user