From 83b98f5032d7e15fb4f2705c5797e1f2bce21fc6 Mon Sep 17 00:00:00 2001
From: Daniel Liu <mr.picklepinosaur@gmail.com>
Date: Wed, 13 Jan 2021 00:23:15 -0500
Subject: [PATCH] fetch
---
.bashrc | 8 +++-
.vimrc | 5 ++-
Scripts/ufetch-gentoo | 16 ++++----
Scripts/ufetch-manjaro | 86 ++++++++++++++++++++++++++++++++++++++++++
4 files changed, 104 insertions(+), 11 deletions(-)
create mode 100755 Scripts/ufetch-manjaro
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 <<EOF
- ${nc}${USER}${ic}@${nc}${hostname}${reset}
-${c0} .-----. ${lc}OS: ${ic}${os}${reset}
-${c0} .\` _ \`. ${lc}KERNEL: ${ic}${kernel}${reset}
-${c0} \`. (${c1}_) ${c0}\`. ${lc}HOST: ${ic}${host}${reset}
-${c0} \`${c1}. / ${lc}UPTIME: ${ic}${uptime}${reset}
-${c1} .\` .\` ${lc}PACKAGES: ${ic}${packages}${reset}
-${c1} / .\` ${lc}${uitype}: ${ic}${ui}${reset}
-${c1} \____.-\` ${lc}TERM: ${ic}${term}${reset}
+ ${nc}${USER}${ic}@${nc}${hostname}${reset}
+${c0} .-----. ${lc}OS: ${ic}${os}${reset}
+${c0} .\` _ \`. ${lc}KERNEL: ${ic}${kernel}${reset}
+${c0} \`. (${c1}_) ${c0}\`. ${lc}HOST: ${ic}${host}${reset}
+${c0} \`${c1}. / ${lc}UPTIME: ${ic}${uptime}${reset}
+${c1} .\` .\` ${lc}PACKAGES: ${ic}${packages}${reset}
+${c1} / .\` ${lc}${uitype}: ${ic}${ui}${reset}
+${c1} \____.-\` ${lc}TERM: ${ic}${term}${reset}
EOF
diff --git a/Scripts/ufetch-manjaro b/Scripts/ufetch-manjaro
new file mode 100755
index 0000000..002140a
--- /dev/null
+++ b/Scripts/ufetch-manjaro
@@ -0,0 +1,86 @@
+#!/bin/sh
+#
+# ufetch-arch - tiny system info for arch
+
+## INFO
+
+# user is already defined
+hostname="$(hostname)"
+os='Arch Linux'
+host="$(cat /sys/devices/virtual/dmi/id/product_name) $(cat /sys/devices/virtual/dmi/id/product_family)"
+kernel="$(uname -sr)"
+uptime="$(uptime -p | sed 's/up //')"
+packages="$(pacman -Q | wc -l)"
+shell="$(basename "${SHELL}")"
+term="$TERM"
+
+## UI DETECTION
+
+parse_rcs() {
+ for f in "${@}"; do
+ wm="$(tail -n 1 "${f}" 2> /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 <<EOF
+
+${c0} ${nc}${USER}${ic}@${nc}${hostname}${reset}
+${c0} ||||||||| |||| ${lc}OS: ${ic}${os}${reset}
+${c0} ||||||||| |||| ${lc}KERNEL: ${ic}${kernel}${reset}
+${c0} |||| |||| ${lc}HOST: ${ic}${host}${reset}
+${c0} |||| |||| |||| ${lc}UPTIME: ${ic}${uptime}${reset}
+${c0} |||| |||| |||| ${lc}PACKAGES: ${ic}${packages}${reset}
+${c0} |||| |||| |||| ${lc}${uitype}: ${ic}${ui}${reset}
+${c0} |||| |||| |||| ${lc}TERM: ${ic}${term}${reset}
+
+EOF
--
2.20.1