idk, did some nvim stuff and xinitrc tweaks

This commit is contained in:
Bryson Steck 2022-05-02 23:02:43 -06:00
parent d5dfe1f125
commit a65108b731
7 changed files with 123 additions and 16 deletions

View file

@ -18,14 +18,71 @@ window:
padding: padding:
x: 10 x: 10
y: 10 y: 10
opacity: 0.9 # opacity: 0.95
#colors:
# primary:
# background: '#000000'
# foreground: '#ffffff'
#
# normal:
# black: '#000000'
# red: '#B00508'
# green: '#1B8F06'
# yellow: '#E9E700'
# blue: '#0858B5'
# magenta: '#830CB4'
# cyan: '#0CB488'
# white: '#9e9e9e'
#
# bright:
# black: '#373737'
# red: '#FF1313'
# green: '#44FF3A'
# yellow: '#FFAE11'
# blue: '#0095FF'
# magenta: '#D400D2'
# cyan: '#28FCB8'
# white: '#ffffff'
# Colors (Ayu Dark)
colors:
# Default colors
primary:
background: '0x0A0E14'
foreground: '0xB3B1AD'
# Normal colors
normal:
black: '0x01060E'
red: '0xEA6C73'
green: '0x91B362'
yellow: '0xF9AF4F'
blue: '0x53BDFA'
magenta: '0xFAE994'
cyan: '0x90E1C6'
white: '0xC7C7C7'
# Bright colors
bright:
black: '0x686868'
red: '0xF07178'
green: '0xC2D94C'
yellow: '0xFFB454'
blue: '0x59C2FF'
magenta: '0xFFEE99'
cyan: '0x95E6CB'
white: '0xFFFFFF'
# Gruvbox dark # Gruvbox dark
colors: colors:
primary: primary:
background: '#282828' # background: '#282828'
# background: '#3c3836'
background: '#32302f'
# background: '#000000'
foreground: '#fbf1c7' foreground: '#fbf1c7'
#
normal: normal:
black: '#282828' black: '#282828'
red: '#cc241d' red: '#cc241d'

View file

@ -23,12 +23,14 @@ alias copy='xclip -sel c <'
alias ..='cd ..' alias ..='cd ..'
alias ...='cd ../..' alias ...='cd ../..'
alias ....='cd ../../..' alias ....='cd ../../..'
alias back='cd -'
# binary renames # binary renames
alias java='/usr/java/jdk-17.0.1/bin/java' alias java='/usr/java/jdk-17.0.1/bin/java'
alias java8='/usr/java/jre1.8.0_291/bin/java' alias java8='/usr/java/jre1.8.0_291/bin/java'
alias java12='/usr/java/jdk-12.0.2/bin/java' alias java12='/usr/java/jdk-12.0.2/bin/java'
alias python='python3' alias python='python3'
#alias vim='nvim'
# quick important file edits # quick important file edits
alias todo='vim ~/TODO.md' alias todo='vim ~/TODO.md'
@ -40,3 +42,12 @@ alias iPhone='cd /home/bryson/Downloads/from-iPhone'
alias gs='gs -dNOSAFER' alias gs='gs -dNOSAFER'
alias django='python manage.py' alias django='python manage.py'
alias smci='sudo make clean install' alias smci='sudo make clean install'
alias smi='sudo make install'
# bash navigation
alias add-alias='vim ~/.bash/01-aliases.bash; . ~/.bash_profile'
# other garbage
alias wifi='nmcli d wifi'
#alias connect='nmcli d wifi connect'
#alias listwifi='nmcli d wifi list'

View file

@ -94,7 +94,12 @@ function _git_prompt() {
# [ bryson@hostname /current/path ] # [ bryson@hostname /current/path ]
# $ # $
#export _PS1="\[$lgray\][ \[\e[1m$color1\]\u\[$color2\]@\[$color3\]\h \[$color4\]\w \[\e[0m$lgray\]]" #export _PS1="\[$lgray\][ \[\e[1m$color1\]\u\[$color2\]@\[$color3\]\h \[$color4\]\w \[\e[0m$lgray\]]"
export _PS1="\[\e[$lgray\][ \[$LBLUE\]\u\[$lcyan\]@\[$GREEN\]\h \[$LYELLOW\]\w \[$lgray\]]" #export _PS1="\[\e[$lgray\][ \[$LBLUE\]\u\[$lcyan\]@\[$GREEN\]\h \[$LYELLOW\]\w \[$lgray\]]"
#export _PS2="\[$dgray\]"
# [ bryson@hostname path ]
# $
export _PS1="\[\e[$lgray\][ \[$LBLUE\]\u\[$lcyan\]@\[$GREEN\]\h \[$LYELLOW\]\W \[$lgray\]]"
export _PS2="\[$dgray\]" export _PS2="\[$dgray\]"
# define x titlebar # define x titlebar

View file

@ -9,11 +9,11 @@
if [[ $TERM == 'linux' && $(hostname) == 'dingo' ]]; then if [[ $TERM == 'linux' && $(hostname) == 'dingo' ]]; then
cat ~/bin/house.txt cat ~/bin/house.txt
printf "\n${CYAN}Welcome back Bryson :)\n\n" printf "\n${CYAN}Welcome back Bryson :)\n\n"
USAGE="${blue}\td:start-docked\n\tn:start-not-docked\n\tq:shutdown\n\tr:reboot\n\tb:bash\n\n${NC}" printf "${LGREEN}What should dingo do?\n${blue}"
printf "${LGREEN}What should dingo do?\n" echo -e '\td: start docked\n\tn: start not docked\n\tq: shutdown\n\tr: reboot\n\tl: logout\n\tb: bash\n\n'
printf "%b" $USAGE
while read -rs -N 1 key; do while read -rs -N 1 key; do
printf "${NC}"
case $key in case $key in
d) startx ;; d) startx ;;
n) nstartx.sh ;; n) nstartx.sh ;;
@ -21,11 +21,13 @@ if [[ $TERM == 'linux' && $(hostname) == 'dingo' ]]; then
read -rs -N 1 key2; case $key2 in y) shutdown now ;; esac; ;; read -rs -N 1 key2; case $key2 in y) shutdown now ;; esac; ;;
r) echo "Are you sure you want to reboot? (y/n)"; r) echo "Are you sure you want to reboot? (y/n)";
read -rs -N 1 key3; case $key3 in y) reboot ;; esac; ;; read -rs -N 1 key3; case $key3 in y) reboot ;; esac; ;;
l) logout ;;
b) break ;; b) break ;;
[h?]) echo "$USAGE";; [h?]) echo "$USAGE";;
esac esac
printf "${LGREEN}What should dingo do now?\n" clear
printf "%b" $USAGE printf "\n${red}Please try again...${NC}\n\n${LGREEN}What should dingo do now?\n${blue}"
echo -e '\td: start docked\n\tn: start not docked\n\tq: shutdown\n\tr: reboot\n\tl: logout\n\tb: bash\n\n'
done done
fi fi

View file

@ -1,18 +1,19 @@
set nocompatible set nocompatible
let g:gruvbox_guisp_fallback = "bg" let g:gruvbox_contrast_dark = 'soft'
let g:gruvbox_termcolors = '16'
colorscheme gruvbox colorscheme gruvbox
set ttymouse=sgr
set number
set bg:dark set bg:dark
set mouse=a set mouse=a
set tabstop=2 softtabstop=2 shiftwidth=2 expandtab set tabstop=2 softtabstop=2 shiftwidth=2 expandtab
set linebreak set linebreak
set ttymouse=sgr
set cursorline set cursorline
set backspace=indent,eol,start set backspace=indent,eol,start
set laststatus=2 set laststatus=2
set wildmenu set wildmenu
set scrolloff=5 set scrolloff=5
set incsearch set incsearch
set relativenumber
set ttimeout ttimeoutlen=25 set ttimeout ttimeoutlen=25
set clipboard=unnamedplus set clipboard=unnamedplus
@ -21,6 +22,27 @@ autocmd FileType markdown setlocal spell
execute pathogen#infect() execute pathogen#infect()
call plug#begin()
Plug 'neoclide/coc.nvim', {'branch': 'release'}
Plug 'jaxbot/semantic-highlight.vim'
call plug#end()
inoremap <silent><expr> <TAB>
\ pumvisible() ? "\<C-n>" :
\ <SID>check_back_space() ? "\<TAB>" :
\ coc#refresh()
inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
function! s:check_back_space() abort
let col = col('.') - 1
return !col || getline('.')[col - 1] =~# '\s'
endfunction
let s:semanticGUIColors = [ "#cc241d", "#98971a", "#d79921", "#458588", "#b16286", "#689d6a", "#928374", "#fb4934", "#b8bb26", "#fabd2f", "#83a598", "#d3869b", "#8ec07c", "#ebdbb2" ]
" stolen from https://shapeshed.com/vim-statuslines/ " stolen from https://shapeshed.com/vim-statuslines/
"function! GitBranch() "function! GitBranch()
" return system("git rev-parse --abbrev-ref HEAD 2>/dev/null | tr -d '\n'") " return system("git rev-parse --abbrev-ref HEAD 2>/dev/null | tr -d '\n'")
@ -78,5 +100,9 @@ let g:lightline = {
\ 'right': [ [ 'lineinfo' ], \ 'right': [ [ 'lineinfo' ],
\ [ 'fileformat', 'fileencoding', 'filetype' ] ] \ [ 'fileformat', 'fileencoding', 'filetype' ] ]
\ }, \ },
\ 'component_function': {
\ 'cocstatus': 'coc#status',
\ 'currentfunction': 'CocCurrentFunction'
\ },
\ } \ }
set noshowmode set noshowmode

View file

@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
# executed by startx # executed by startx
# for use when dingo is DOCKED # for use when dingo is DOCKED
export DOCKED=true
# load xinitrc.d stuff # load xinitrc.d stuff
@ -37,7 +38,9 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
fi fi
# open picom compositor # open picom compositor
picom -CG -I 0.1 -O 0.1 -o 0.0 --backend xrender --vsync --menu-opacity 1.0 & picom --config ~/.config/picom.conf &
exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
# set up monitors # set up monitors
#fixscreen #fixscreen
@ -70,5 +73,6 @@ nmcli radio wifi off &
# start dwm # start dwm
#xset r rate 300 50; exec dwm #xset r rate 300 50; exec dwm
xset r rate 300 50; exec /home/bryson/bin/startdwm.sh xset r rate 300 50 &
exec /home/bryson/bin/startdwm.sh

View file

@ -1,5 +1,6 @@
# executed by startx-not-docked # executed by startx-not-docked
# for use when dingo is NOT docked # for use when dingo is NOT docked
export DOCKED=false
# load xinitrc.d stuff # load xinitrc.d stuff
@ -36,8 +37,9 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
fi fi
# start picom compositor # start picom compositor
picom -CG -I 0.1 -O 0.1 -o 0.0 --backend xrender --menu-opacity 1.0 & picom --config ~/.config/picom.conf &
exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
# add network, battery, date and time to xsetroot # add network, battery, date and time to xsetroot
#sh ~/bin/xsetloop-not-docked.sh & #sh ~/bin/xsetloop-not-docked.sh &
@ -51,7 +53,7 @@ pacmd set-default-sink alsa_output.pci-0000_03_00.6.HiFi__hw_Generic_1__sink &
pacmd set-sink-volume alsa_output.pci-0000_03_00.6.HiFi__hw_Generic_1__sink 0 & pacmd set-sink-volume alsa_output.pci-0000_03_00.6.HiFi__hw_Generic_1__sink 0 &
# set up wallpaper # set up wallpaper
nitrogen --head=0 --set-zoom-fill ~/Pictures/Wallpapers/room.jpg & nitrogen --head=0 --set-zoom-fill ~/Pictures/Wallpapers/solid-gruvbox.png &
# start notifications daemon # start notifications daemon
notification-daemon & notification-daemon &