From: Daniel Liu Date: Wed, 13 Jan 2021 05:23:15 +0000 (-0500) Subject: fetch X-Git-Url: https://git.danieliu.xyz/?a=commitdiff_plain;h=83b98f5032d7e15fb4f2705c5797e1f2bce21fc6;p=dotfiles.git fetch --- diff --git a/.bashrc b/.bashrc index 4852bc2..4e9ad64 100644 --- a/.bashrc +++ b/.bashrc @@ -14,7 +14,6 @@ PS1=' λ_ \W > ' #set vi mode set -o vi -ufetch-arch # ibus export GTK_IM_MODULE=ibus @@ -40,10 +39,17 @@ alias musicdl="youtube-dl -f bestaudio" alias mpv="mpv --no-input-default-bindings" alias slock='slock -m "$(figlet locked xd | cowsay -f cheese -n)"' alias darkmpv='mpv --vf=sub,lavfi="negate"' +alias nmaplocal='nmap -sn 192.168.1.0/24' source fzfutil export NINEIT_USERNAME=pinosaur + + +# startup stuff + +ufetch-arch + export LF_ICONS="\ di=:\ fi=:\ diff --git a/.vimrc b/.vimrc index 13df5e9..b105301 100644 --- a/.vimrc +++ b/.vimrc @@ -8,7 +8,8 @@ syntax on set number set relativenumber -set hlsearch +" set hlsearch +set incsearch set encoding=utf-8 set tabstop=4 set shiftwidth=4 @@ -45,7 +46,7 @@ Plug 'lervag/vimtex' Plug 'jiangmiao/auto-pairs' Plug 'PietroPate/vim-tex-conceal' Plug 'vim-airline/vim-airline' -Plug 'ctrlpvim/ctrlp.vim' +" Plug 'ctrlpvim/ctrlp.vim' " Plug 'neoclide/coc.nvim', {'branch': 'release'} " Plug 'habamax/vim-godot' Plug 'tpope/vim-commentary' diff --git a/Scripts/ufetch-gentoo b/Scripts/ufetch-gentoo index 0825eb4..5a36307 100755 --- a/Scripts/ufetch-gentoo +++ b/Scripts/ufetch-gentoo @@ -75,13 +75,13 @@ c1="${reset}${magenta}" # second color cat < /dev/null | cut -d ' ' -f 2)" + [ -n "${wm}" ] && echo "${wm}" && return + done +} + +rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")" + +ui='unknown' +uitype='UI' +if [ -n "${DE}" ]; then + ui="${DE}" + uitype='DE' +elif [ -n "${WM}" ]; then + ui="${WM}" + uitype='WM' +elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then + ui="${XDG_CURRENT_DESKTOP}" + uitype='DE' +elif [ -n "${DESKTOP_SESSION}" ]; then + ui="${DESKTOP_SESSION}" + uitype='DE' +elif [ -n "${rcwm}" ]; then + ui="${rcwm}" + uitype='WM' +elif [ -n "${XDG_SESSION_TYPE}" ]; then + ui="${XDG_SESSION_TYPE}" +fi + +ui="$(basename "${ui}")" + +## DEFINE COLORS + +# probably don't change these +if [ -x "$(command -v tput)" ]; then + bold="$(tput bold)" + black="$(tput setaf 0)" + red="$(tput setaf 1)" + green="$(tput setaf 2)" + yellow="$(tput setaf 3)" + blue="$(tput setaf 4)" + magenta="$(tput setaf 5)" + cyan="$(tput setaf 6)" + white="$(tput setaf 7)" + reset="$(tput sgr0)" +fi + +# you can change these +lc="${reset}${bold}${green}" # labels +nc="${reset}${bold}${white}" # user and hostname +ic="${reset}" # info +c0="${reset}${green}" # first color + +## OUTPUT + +cat <