meta: Miscellaneous updates

I wanted to commit some more stuff for 2020. Better late than never,
right? The most significant change is probably in fish_prompt.fish.
I fixed an edge case where the directory in question could be the
same as the user's username.
This commit is contained in:
Donovan Glover 2020-12-31 23:53:51 -05:00
parent d8ed02a78f
commit e2ca722963
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
8 changed files with 28 additions and 8 deletions

View File

@ -1,5 +1,5 @@
pkgname=tari-core
pkgver=0.7.1
pkgver=0.8.0
pkgrel=1
pkgdesc="My Arch Linux setup"
arch=('any')
@ -33,8 +33,12 @@ depends=(
task
cmatrix
imagemagick
siege
ponysay
lolcat
figlet
calcurse
whois
vim
neovim
httpie
@ -80,6 +84,7 @@ depends=(
xorg-xwininfo
xorg-xrandr
xorg-xinit
xorg-xev
xdo
xcape
xdg-user-dirs
@ -125,7 +130,7 @@ depends=(
evince
file-roller
nautilus
gnome-mpv
celluloid
l3afpad
gthumb
lollypop

View File

@ -1,4 +1,4 @@
Copyright (C) 2017-2019 Donovan Glover
Copyright (C) 2017-2020 Donovan Glover
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the

View File

@ -64,3 +64,4 @@ bspc rule -a kwrite state=floating
bspc rule -a ark state=floating
bspc rule -a kmag state=floating
bspc rule -a kcharselect state=floating
bspc rule -a Onboard state=floating sticky=on

View File

@ -13,3 +13,7 @@ trim_trailing_whitespace = true
[Makefile]
indent_style = tab
indent_size = 4
[*.html]
indent_style = tab
indent_size = 4

View File

@ -31,7 +31,7 @@ fish_default_key_bindings
# Use exa as a drop-in replacement for ls and tree (faster, more colors, etc.)
alias ls="exa --group-directories-first"
alias tree="exa --group-directories-first --long --tree -I 'node_modules|lib|.git'"
alias tree="exa --group-directories-first --long --tree -I 'node_modules|.git|public'"
# Abbreviations are aliases that expand
if not set -q set_abbr
@ -51,15 +51,22 @@ if not set -q set_abbr
abbr gm "git merge"
abbr gp "git push" # Push your commits to a remote server
abbr gr "git reset HEAD~" # Undo the last commit but keep changed files
abbr gra "git remote add"
abbr gre "git remote --verbose" # List all remotes
abbr grh "git reset HEAD"
abbr grr "git reset --hard HEAD~" # Remove the last commit and all changes with it
abbr gs "git status"
abbr gst "git stash"
abbr gstp "git stash pop"
abbr gt "git tag"
abbr gts "git tag -s"
abbr y "yarn"
abbr ya "yarn add"
abbr yar "yarn remove"
abbr yi "yarn init"
abbr yin "yarn install"
abbr yu "yarn upgrade-interactive"
abbr t "task"
abbr ta "task add"
@ -72,6 +79,7 @@ if not set -q set_abbr
abbr copy "xclip -sel clip <" # Easily copy the contents of any file
abbr dog "pygmentize -g" # "dog" is a colorful version of cat
abbr cf "tput reset" # Clear the terminal completely
abbr nf "tput reset; and neofetch --size 56%; and xdotool key --delay 100 Ctrl+Shift+Page_Up"
abbr b "feh --bg-fill" # Change the background
abbr c "clear" # Because 5 letters is too much

View File

@ -14,7 +14,7 @@ function fish_prompt
set pwd (basename $PWD)
set branch (git branch ^/dev/null | sed -n '/\* /s///p')
if [ $pwd = $USER ]
if [ $PWD = "/home/$USER" ]
set pwd "~"
end

View File

@ -1,5 +1,5 @@
# New Start: A modern Arch workflow built with an emphasis on functionality.
# Copyright (C) 2017 Donovan Glover
# Copyright (C) 2017-2018 Donovan Glover
# Change the directory from ~/.ncmpcpp to ~/.config/ncmpcpp
ncmpcpp_directory = "~/.config/ncmpcpp"
@ -19,3 +19,5 @@ allow_for_physical_item_deletion = "no"
# Disable mouse support
mouse_support = "no"
execute_on_song_change = "~/.config/mpd/mpdnotify"

View File

@ -115,8 +115,8 @@ highlight Search ctermbg=240 ctermfg=255
highlight IncSearch ctermbg=255 ctermfg=240
" Easily show lines that go past the character count
highlight OverLength ctermbg=240 ctermfg=230
call matchadd('OverLength', '\%80v')
" highlight OverLength ctermbg=240 ctermfg=230
" call matchadd('OverLength', '\%80v')
autocmd BufNewFile,BufRead *.ecr setlocal syntax=html
autocmd BufNewFile,BufRead *.slang setlocal filetype=slim