1
0
This commit is contained in:
Deven Blake 2021-03-28 17:03:18 -04:00
parent 121c225f03
commit 9e70ae4b66
14 changed files with 127 additions and 225 deletions

View File

@ -1,38 +1,22 @@
xterm*loginshell: true
xterm*locale: UTF-8
xterm*titleModes: 16
xterm*utf8: 1
xterm*utf8Fonts: 1
xterm*utf8Title: true
xterm*metaSendsEscape: true
xterm*font: -*-*-*-*-*-*-*-*-*-*-*-*-*-*
! azuki font
!xterm*faceName: azuki_font:antialias=false
!xterm*faceSize: 10
! cordata font
!xterm*faceName: "Px437 Cordata PPC\-400"
!xterm*faceSize: 1
! unscii font ! unscii font
xterm*faceName: unscii:antialias=false *faceName: unscii:antialias=false
xterm*faceSize: 12 *faceSize: 12
! white - from alnj/dotfiles
!*background: #FFFCFD
!*foreground: #250E07
!*cursorColor: #250E07
*Background: #000000 *Background: #000000
! amber ! amber
*Foreground: #FFBF00 !*Foreground: #FFBF00
*cursorColor: #FFBF00 !*cursorColor: #FFBF00
! pink
*Foreground: #FFDBDB
*cursorColor: #FFDBDB
! black on white (first uncomment white's stuff) ! black on white (first uncomment white's stuff)
!*reverseVideo: true !*reverseVideo: true
! I used to use these but they make it really hard to see default Lynx.
! "quantified colors" but every nybble ! "quantified colors" but every nybble
! is decremented ====================== ! is decremented ======================
! black/dark-gray ! black/dark-gray
@ -87,3 +71,14 @@ xterm*faceSize: 12
!*.color7: #808080 !*.color7: #808080
!*.color15: #C0C0C0 !*.color15: #C0C0C0
! ===================================== ! =====================================
! xterm specific stuff
xterm*font: -*-*-*-*-*-*-*-*-*-*-*-*-*-*
xterm*loginshell: true
xterm*locale: UTF-8
xterm*titleModes: 16
xterm*metaSendsEscape: true
xterm*utf8: 1
xterm*utf8Fonts: 1
xterm*utf8Title: true

View File

@ -1,33 +1,14 @@
# convenient music play
# tons of repeated code, should be fixed
album() {
selection="$(find /mnt/audio -type d -mindepth 2 2>/dev/null | sort | dmenu -l 50)"
[ $selection = $(echo -e "\n") ] 2>/dev/null || i3-swallow audacious "$selection"
}
song() {
selection="$(find /mnt/audio -type f | sort | dmenu -l 50)"
[ $selection = $(echo -e "\n") ] 2>/dev/null || i3-swallow audacious "$selection"
}
# audio drive # audio drive
alias audio="sudo mount -L 'AUDIO' /mnt/audio" alias audio="sudo mount -L 'AUDIO' /mnt/audio"
# private bookmarks alias awk="nawk"
alias bmarks="firefox file://"$HOME"/bookmarks.html"
alias cat="9 cat" alias cat="9 cat"
alias cls="clear" alias cls="clear"
alias cp="cp -iv"
alias firefox="firefox-developer-edition" alias emacs="vi" # that'll freak people out
# useful aliases
alias iftoggle="sudo ip link set"
alias ifswitch="iftoggle $1 down && iftoggle $1 up"
alias imount="idevicepair pair && sudo ifuse -o allow_other /mnt/iphone/" alias imount="idevicepair pair && sudo ifuse -o allow_other /mnt/iphone/"
alias ipconfig="ifconfig" alias ipconfig="ifconfig"
alias ls="9 ls"
# other volumes # other volumes
mnt() { mnt() {
@ -35,10 +16,7 @@ mnt() {
sudo mount /dev/$1 /mnt/$1 && cd /mnt/$1 sudo mount /dev/$1 /mnt/$1 && cd /mnt/$1
} }
# music player alias mv="mv -iv"
alias mu="audacious"
# i always forget this one but it's useful
alias p="ping 1.1.1.1" alias p="ping 1.1.1.1"
# my media hard drive # my media hard drive
@ -51,13 +29,13 @@ path() {
pyenv() { pyenv() {
if [ $# -eq 0 ]; then if [ $# -eq 0 ]; then
source ./bin/activate . ./bin/activate
else else
source $1/bin/activate . $1/bin/activate
fi fi
} }
alias sudo="doas" alias sensors="watch sensors"
# Wacom Intuos 2 # Wacom Intuos 2
alias taboff="xsetwacom set 'Wacom Intuos2 6x8 Pen stylus' MapToOutput LVDS-1" alias taboff="xsetwacom set 'Wacom Intuos2 6x8 Pen stylus' MapToOutput LVDS-1"
@ -65,18 +43,13 @@ alias tabon="xsetwacom set 'Wacom Intuos2 6x8 Pen stylus' MapToOutput VGA-1"
alias tracert="tracepath" alias tracert="tracepath"
# dirtbag aliases to get myself to use vim more
alias emacs="vim"
alias ne="vim"
alias vi="vim"
alias weather="curl wttr.in/lewiston+maine?m"
webm() { webm() {
ffmpeg -i $1 -c:v libvpx -b:v 1M -c:a libvorbis $(printf "$1" | asplit - . 0).webm ffmpeg -i $1 -c:v libvpx -b:v 1M -c:a libvorbis $(printf "$1" | asplit . 0).webm
}
alias yta="youtube-dl -f bestaudio"
# project i'm working on
ytfeed() {
pyenv $HOME/src/ytfeed.py/
python $HOME/src/ytfeed.py/cli.py
}
ytfeedsh() {
pyenv $HOME/src/ytfeed.py/
python $HOME/src/ytfeed.py/shell.py
} }

View File

@ -1 +1 @@
source .profile source .env

View File

@ -4,105 +4,16 @@
set $mod Mod1 set $mod Mod1
# Font for window titles # Font for window titles
#font pango:monospace 8
#font pango:azuki_font 10
font pango:unscii 12 font pango:unscii 12
# This font is widely installed, provides lots of unicode glyphs, right-to-left # keybindings
# text rendering and scalability on retina/hidpi displays (thanks to pango). exec_always --no-startup-id sxhkd
#font pango:DejaVu Sans Mono 8
# The combination of xss-lock, nm-applet and pactl is a popular choice, so
# they are included here as an example. Modify as you see fit.
# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
# screen before suspend. Use loginctl lock-session to lock your screen.
#exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
# tint2 status bar
#exec --no-startup-id exec tint2
# Use pactl to adjust volume in PulseAudio.
## increase sound volume
bindsym XF86AudioRaiseVolume exec --no-startup-id pactl -- set-sink-volume @DEFAULT_SINK@ +5%
## decrease sound volume
bindsym XF86AudioLowerVolume exec --no-startup-id pactl -- set-sink-volume @DEFAULT_SINK@ -5%
## mute output
bindsym XF86AudioMute exec --no-startup-id pactl -- set-sink-mute @DEFAULT_SINK@ toggle
bindsym $mod+m exec --no-startup-id pactl -- set-sink-mute @DEFAULT_SINK@ toggle
## mute input
bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
bindsym $mod+Shift+m exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
# Use amixer to adjust volume in PulseAudio. (not as good as pactl)
#bindsym XF86AudioMute exec amixer sset 'Master' toggle
#bindsym XF86AudioLowerVolume exec amixer sset 'Master' 5%-
#bindsym XF86AudioRaiseVolume exec amixer sset 'Master' 5%+
# Screen brightness
# cred 4 https://github.com/patrickbolle/dotfiles/
bindsym $mod+equal exec light -A 5 && notify-send --expire-time=20 "LCD Backlight $(printf %.0f%% $(light -G))"
bindsym $mod+Shift+equal exec light -A 1 && notify-send --expire-time=20 "LCD Backlight $(printf %.0f%% $(light -G))"
bindsym $mod+minus exec light -U 5 && notify-send --expire-time=20 "LCD Backlight $(printf %.0f%% $(light -G))"
bindsym $mod+Shift+minus exec light -U 1 && notify-send --expire-time=20 "LCD Backlight $(printf %.0f%% $(light -G))"
# Use Mouse+$mod to drag floating windows to their wanted position # Use Mouse+$mod to drag floating windows to their wanted position
floating_modifier $mod floating_modifier $mod
# start a terminal # start pulseaudio
#bindsym $mod+Return exec i3-sensible-terminal exec --no-startup-id pulseaudio --start
bindsym $mod+Return exec uxterm
bindsym XF86Launch1 exec uxterm
# kill focused window
bindsym $mod+F4 kill
bindsym --release button2 kill
# start dmenu
bindsym $mod+d exec dmenu_run
# change focus
bindsym $mod+h focus left
bindsym $mod+j focus down
bindsym $mod+k focus up
bindsym $mod+l focus right
# move focused window
bindsym $mod+Shift+h move left
bindsym $mod+Shift+j move down
bindsym $mod+Shift+k move up
bindsym $mod+Shift+l move right
# split in horizontal orientation
bindsym $mod+g split h
# split in vertical orientation
bindsym $mod+v split v
# enter fullscreen mode for the focused container
bindsym $mod+f fullscreen toggle
bindsym $mod+F11 fullscreen toggle
# change container layout (stacked, tabbed, toggle split)
bindsym $mod+s layout stacking
bindsym $mod+w layout tabbed
bindsym $mod+e layout toggle split
# toggle tiling / floating
bindsym $mod+Shift+space floating toggle
# change focus between tiling / floating windows
bindsym $mod+space focus mode_toggle
# focus the parent container
bindsym $mod+a focus parent
# focus the child container
#bindsym $mod+d focus child
# Define names for default workspaces for which we configure key bindings later on. # Define names for default workspaces for which we configure key bindings later on.
# We use variables to avoid repeating the names in multiple places. # We use variables to avoid repeating the names in multiple places.
@ -117,18 +28,6 @@ set $ws8 "8"
set $ws9 "9" set $ws9 "9"
set $ws10 "10" set $ws10 "10"
# kanji
#set $ws1 "一"
#set $ws2 "二"
#set $ws3 "三"
#set $ws4 "四"
#set $ws5 "五"
#set $ws6 "六"
#set $ws7 "七"
#set $ws8 "八"
#set $ws9 "九"
#set $ws10 "十"
# switch to workspace # switch to workspace
bindsym $mod+1 workspace number $ws1 bindsym $mod+1 workspace number $ws1
bindsym $mod+2 workspace number $ws2 bindsym $mod+2 workspace number $ws2
@ -214,15 +113,6 @@ bar {
} }
} }
# Media player controls
bindsym XF86AudioPlay exec playerctl play
bindsym XF86AudioPause exec playerctl pause
bindsym XF86AudioNext exec playerctl next
bindsym XF86AudioPrev exec playerctl previous
# Screenshotting
bindsym Print exec scrot
# color customization # color customization
# class border bg text indicator child_border # class border bg text indicator child_border
client.focused #ff0000 #ffffff #ff0000 #2e9ef4 #ff0000 client.focused #ff0000 #ffffff #ff0000 #2e9ef4 #ff0000
@ -233,9 +123,6 @@ client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c
client.background #ffffff client.background #ffffff
# Task manager
bindsym Control+Shift+Escape exec xfce4-taskmanager
# Wallpaper # Wallpaper
exec --no-startup-id feh --bg-center /home/trinity/Pictures/Wallpapers/akirablast.jpg exec --no-startup-id feh --bg-center /home/trinity/Pictures/Wallpapers/akirablast.jpg

View File

@ -26,8 +26,8 @@ wireless _first_ {
} }
ethernet _first_ { ethernet _first_ {
format_up = "enp0s25: %ip (%speed)" format_up = "eth0: %ip (%speed)"
format_down = "enp0s25 DOWN" format_down = "eth0 DOWN"
} }
battery all { battery all {

View File

@ -1,5 +1,8 @@
auto_refresh_feeds: 1 auto_refresh_feeds: -1
cap: 200
consumption_file_name: /home/trinity/.ytfeed/consumption.txt consumption_file_name: /home/trinity/.ytfeed/consumption.txt
feed_directory: /home/trinity/.ytfeed/feeds/
xml_storage_directory: /home/trinity/.ytfeed/feeds/ xml_storage_directory: /home/trinity/.ytfeed/feeds/
video_downloader: youtube-dl --add-metadata -i -f "bestvideo[vcodec=vp9]+bestaudio[acodec=opus]" -o "\"/home/trinity/%(upload_date)s %(title)s.%(ext)s\"" video_downloader: youtube-dlp
viewer: mpv viewer: youtube-dl-mpv
web_browser: firefox-developer-edition

19
dotfiles-old/.env Normal file
View File

@ -0,0 +1,19 @@
DOOMWADDIR=/mnt/partone/misc/doomwads/; export DOOMWADDIR
EDITOR=vim; export EDITOR
PAGER="less"; export PAGER
PATH="$HOME/bin/:$HOME/bin/oneliners/:"$PATH
PATH=$PATH":$PLAN9/bin"
export PATH
PLAN9=/usr/local/plan9; export PLAN9
PS1="; "
PS2="; "
PS3="; "
if [ "$0" = "bash" ] || [ "$0" = "-bash" ]; then complete -c man which; fi
set -o vi
. $HOME/.aliases

View File

@ -1,19 +1 @@
#!/bin/sh ENV="$HOME"/.env; export ENV
EDITOR=vim
PS1="; "
PS2=">; "
PS3=">>; "
source $HOME/.aliases
complete -c man which
# for ruby working
eval "$(rbenv init -)"
PLAN9=/usr/local/plan9
export PLAN9
PATH=$PATH":$HOME/bin/:$HOME/bin/oneliners/:$PLAN9/bin"
export PATH

10
dotfiles-old/clone.sh Normal file
View File

@ -0,0 +1,10 @@
cp $HOME/.Xresources ./
cp $HOME/.aliases ./
cp $HOME/.bashrc ./
cp $HOME/.env ./
cp $HOME/.profile ./
mkdir -p ./.config/
cp $HOME/.config/ytfeed-config.txt ./.config/
mkdir -p ./.config/i3
cp $HOME/.config/i3/config ./.config/i3/config
mkdir -p ./.config/i3status

View File

@ -3,8 +3,11 @@
set -e set -e
source ./cdecho.sh source ./cdecho.sh
YAYURL="https://aur.archlinux.org/yay.git"
cde $HOME/src cde $HOME/src
git clone https://aur.archlinux.org/yay.git || git pull git clone $YAYURL || printf "yay already downloaded\n"
cde yay cde yay
git pull
makepkg -si makepkg -si
yay -V yay -V

3
dotfiles-old/scripts/dotfiles.sh Normal file → Executable file
View File

@ -15,6 +15,7 @@ fc-cache
# basic configs # basic configs
cp {.Xresources,.aliases,.bashrc,.profile} $HOME/ cp {.Xresources,.aliases,.bashrc,.profile} $HOME/
ln -s $HOME/.Xresources $HOME/.Xdefaults
# dmenu # dmenu
cde $HOME/src cde $HOME/src
@ -34,7 +35,7 @@ cp $HOME/src/dotfiles/.config/i3status/config i3status/
# winamp skin (checks to see if audacious is installed first) # winamp skin (checks to see if audacious is installed first)
sudo mkdir -p /usr/share/audacious/Skins/ sudo mkdir -p /usr/share/audacious/Skins/
which audacious && sudo curl https://archive.org/download/winampskin_Sailor_Moon_Gang/Sailor_Moon_Gang.wsz -o /usr/share/audacious/Skins/Sailor_Moon_Gang.wsz which audacious && sudo curl https://archive.org/download/winampskin_Sailor_Moon_Gang/Sailor_Moon_Gang.wsz -o /usr/share/audacious/Skins/Sailor_Moon_Gang.wsz || printf "[ERROR] Could not curl audacious skin.\n"
# wallpaper # wallpaper
cde $HOME cde $HOME

View File

@ -4,29 +4,46 @@
# these have use outside the terminal and thus are generated here # these have use outside the terminal and thus are generated here
# - because why make fifty files when i can make one file that does that for me? # - because why make fifty files when i can make one file that does that for me?
source ./cdecho.sh cde() {
cd $1
printf "Entered %s.\n" $(pwd)
}
mkdir -p $HOME/bin/oneliners || exit mkdir -p $HOME/bin/oneliners || exit
cde $HOME/bin/oneliners cde $HOME/bin/oneliners
DMENU_LINES="40"
SHABANG="#!/bin/sh\n" SHABANG="#!/bin/sh\n"
BASH_SHABANG="#!/bin/bash\n"
DMENU_LINES="40"
TEXTS_LIBRARY="/mnt/partone/texts/"
MUSIC_LIBRARY="/mnt/audio/"
# music stuff # music stuff
printf $SHABANG"selection=\"\$(find /mnt/audio -type d -mindepth 2 2>/dev/null | sort | dmenu -l $DMENU_LINES)\"\n[ \$selection = \$(printf \"\\n\") ] 2>/dev/null || audacious \"\$selection\"\n" >play_album printf $SHABANG"selection=\"\$(find $MUSIC_LIBRARY -type d -mindepth 2 2>/dev/null | sort | dmenu -l $DMENU_LINES)\"\n[ \$selection = \$(printf \"\\n\") ] 2>/dev/null || audacious \"\$selection\"\n" >play_album
printf $SHABANG"selection=\"\$(find /mnt/audio -type f | sort | dmenu -l $DMENU_LINES)\"\n[ \$selection = \$(printf \"\\n\") ] 2>/dev/null || audacious \"\$selection\"\n" >play_song printf $SHABANG"selection=\"\$(find $MUSIC_LIBRARY -type f | sort | dmenu -l $DMENU_LINES)\"\n[ \$selection = \$(printf \"\\n\") ] 2>/dev/null || audacious \"\$selection\"\n" >play_song
# reading # reading
printf $SHABANG"SELECTION=\"\$(find /mnt/partone/texts/ -type f | sort | dmenu -l $DMENU_LINES)\"\nEXTENSION=\"\$(echo \$SELECTION | asplit - . 1)\"\n[ \"\$EXTENSION\" = \"pdf\" ] && xpdf \"\$SELECTION\"\n" >read_book printf $SHABANG"SELECTION=\"\$(find $TEXTS_LIBRARY -type f | sort | dmenu -l $DMENU_LINES)\"
EXTENSION=\"\$(echo \$SELECTION | asplit . 1)\"
case \$EXTENSION in
(djvu) zathura \"\$SELECTION\" ;;
(epub) zathura \"\$SELECTION\" ;;
(html) firefox \"\$SELECTION\" ;;
(pdf) zathura \"\$SELECTION\" ;;
(*) xterm -e \"cat \"\"\$SELECTION\"\" | nl | less\" ;;
esac
" >read_book # broken, xterm things flash and exit 0.
# private bookmarks # private bookmarks
printf $SHABANG"firefox file://"$HOME"/bookmarks.html\n" >bmarks printf $SHABANG"firefox file://$HOME/bookmarks.html\n" >bmarks
# deemix # deemix
printf $SHABANG"python $HOME/src/deemix-pyweb/deemix-pyweb.py\n" >deemix printf $SHABANG"python $HOME/src/deemix-pyweb/deemix-pyweb.py\n" >deemix
# firefox (launches firefox-developer-edition) # firefox (launches firefox-developer-edition)
printf $SHABANG"firefox-developer-edition \"\$@\"\n" >firefox printf $BASH_SHABANG"firefox-developer-edition \"\$@\"\n" >firefox
# settings for specific monitors # settings for specific monitors
printf $SHABANG"xrandr --output HDMI-1 --auto --mode 720x480 --right-of LVDS-1\n" >1702 printf $SHABANG"xrandr --output HDMI-1 --auto --mode 720x480 --right-of LVDS-1\n" >1702
@ -36,13 +53,23 @@ printf $SHABANG"xrandr --output VGA-1 --auto --right-of LVDS-1\n" >mv720
printf $SHABANG"xrandr --output HDMI-1 --off\n" >hdmioff printf $SHABANG"xrandr --output HDMI-1 --off\n" >hdmioff
printf $SHABANG"xrandr --output VGA-1 --off\n" >vgaoff printf $SHABANG"xrandr --output VGA-1 --off\n" >vgaoff
# wireguard vpn stuff
printf $BASH_SHABANG"sudo wg-quick up \"\$@\"\n" >vpn-connect
printf $BASH_SHABANG"sudo wg-quick down \"\$@\"\n" >vpn-disconnect
printf $SHABANG"sudo ls /etc/wireguard/ | grep \"conf$\" | asplit .conf 0\n" >vpn-list
printf $SHABANG"xterm -e \"vpn-connect \$(vpn-list | dmenu); read -s -n 1\"\n" >vpn-quick # not to be confused with wg-quick
# i always forget to use multimc
printf $SHABANG"multimc\n" >minecraft
# project i'm working on # project i'm working on
printf $SHABANG"xterm -e \"source $HOME/src/ytfeed.py/bin/activate && python $HOME/src/ytfeed.py/cli.py\"\n" >ytfeed printf $SHABANG"xterm -e \". $HOME/src/ytfeed.py/bin/activate && python $HOME/src/ytfeed.py/cli.py\"\n" >ytfeed
printf $BASH_SHABANG"cd $HOME/src/ytfeed.sh/\n./renew.sh \"\$@\"\n" >ytfeed-renew
# youtube-dl stuff # youtube-dl stuff
printf $SHABANG"youtube-dl --add-metadata -i -o \"$HOME/%%(upload_date)s %%(title)s.%%(ext)s\" \"\$@\"\n" >youtube-dlo printf $BASH_SHABANG"youtube-dl --add-metadata -i -o \"$HOME/%%(upload_date)s %%(title)s.%%(ext)s\" \"\$@\"\n" >youtube-dlo
printf $SHABANG"youtube-dlo -f \"bestvideo[vcodec=vp9]+bestaudio[acodec=opus]\" \"\$@\"\n" >youtube-dlp printf $BASH_SHABANG"youtube-dlo -f \"bestvideo[vcodec=vp9]+bestaudio[acodec=opus]\" \"\$@\"\n" >youtube-dlp
printf $SHABANG"youtube-dlp -f \$(youtube-dl -F \$1 | 9 tail +4 | dmenu -p \"Choose a format.\" -l $DMENU_LINES | asplit - SP 0) \"\$@\"\n" >youtube-dl-interactive printf $BASH_SHABANG"youtube-dlp -f \$(youtube-dl -F \$1 | tail +4 | dmenu -p \"Choose a format.\" -l $DMENU_LINES | awk '{ print \$1 }') \"\$@\"\n" >youtube-dl-interactive
printf $SHABANG"youtube-dl-interactive \"\$@\" -o - | mpv -\n" >youtube-dl-mpv printf $BASH_SHABANG"youtube-dl-interactive \"\$@\" -o - | mpv -\n" >youtube-dl-mpv
ls && [ $(printf "Yes.\nNo." | dmenu -p "Any risky files?") = "No." ] && printf "Making executable.\n" && chmod +x * ls && [ $(printf "Yes.\nNo." | dmenu -p "Any risky files?") = "No." ] && printf "Making executable.\n" && chmod +x *

View File

@ -49,6 +49,7 @@ smartmontools
thunar thunar
thunderbird thunderbird
tlp tlp
twin
units units
unrar unrar
unzip unzip

View File

@ -2,6 +2,7 @@ aic94xx-firmware
bitwarden bitwarden
bitwarden-cli bitwarden-cli
bitwarden-dmenu bitwarden-dmenu
dashbinsh
discord_arch_electron discord_arch_electron
doas doas
freedownloadmanager freedownloadmanager