diff --git a/.gitignore b/.gitignore index 0c52811d..e956d0e1 100644 --- a/.gitignore +++ b/.gitignore @@ -23,5 +23,4 @@ install.run LICENSE - node_modules/ diff --git a/.prettierignore b/.prettierignore index eb4dcb0e..ada29c5a 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,5 +1,3 @@ *.py* *.jupyter *.json -# prettier-plugin-sh is very unhappy with it -rc/zshrc diff --git a/conf/pastebinit.xml b/conf/pastebinit.xml index 2b76721e..e2e8d487 100644 --- a/conf/pastebinit.xml +++ b/conf/pastebinit.xml @@ -1,6 +1,6 @@ http://sprunge.us - - + + text diff --git a/etc/fahclient/config.xml b/etc/fahclient/config.xml index 8209119c..4539f7bb 100644 --- a/etc/fahclient/config.xml +++ b/etc/fahclient/config.xml @@ -1,21 +1,21 @@ - - + + - - + + - + - - - + + + - - + + diff --git a/etc/opt/chromium/policies/managed/.gitattributes b/etc/opt/chromium/policies/managed/.gitattributes index 4c008437..f5d3158f 100644 --- a/etc/opt/chromium/policies/managed/.gitattributes +++ b/etc/opt/chromium/policies/managed/.gitattributes @@ -1 +1 @@ -*.json.badidea linguist-language=json +*.json.badidea linguist-language=json diff --git a/etc/systemd-resolv.conf-generate.bash b/etc/systemd-resolv.conf-generate.bash index 8aec07ab..3d5bf655 100755 --- a/etc/systemd-resolv.conf-generate.bash +++ b/etc/systemd-resolv.conf-generate.bash @@ -7,7 +7,7 @@ set -x # I know there are old versions that used something else, but I don't remember # that name and they are ancient. -if ! hash resolvectl 2>/dev/null; then +if ! hash resolvectl 2> /dev/null; then echo "You don't seem to have systemd-resolved (or resolvectl) installed." 1>&2 exit 1 fi diff --git a/install b/install index a8b49df2..e701dff6 100755 --- a/install +++ b/install @@ -13,42 +13,42 @@ fi export MIKAELA_GREP=$HOME/.MIKAELA_GREP -cat rc/bashrc >~/.bashrc -cat conf/tmux.conf >~/.tmux.conf -cat rc/zshrc >~/.zshrc -cat rc/profile >~/.profile +cat rc/bashrc > ~/.bashrc +cat conf/tmux.conf > ~/.tmux.conf +cat rc/zshrc > ~/.zshrc +cat rc/profile > ~/.profile mkdir -p ~/.config/git -cat conf/gitconfig >~/.config/git/config +cat conf/gitconfig > ~/.config/git/config touch ~/.gitconfig rm ~/.gitconfig ln -nsfv ~/.config/git/config ~/.gitconfig mkdir -p ~/.git-template -cat rc/vimrc >~/.vimrc +cat rc/vimrc > ~/.vimrc mkdir -p ~/.config/nvim/ -cat conf/init.vim >~/.config/nvim/init.vim -cat conf/makepkg.conf >~/.makepkg.conf +cat conf/init.vim > ~/.config/nvim/init.vim +cat conf/makepkg.conf > ~/.makepkg.conf mkdir -p ~/.config/mpv/ -cat conf/mpv.conf >~/.config/mpv/mpv.conf +cat conf/mpv.conf > ~/.config/mpv/mpv.conf if [ ! -f ~/.oidentd.conf ]; then - cat conf/oidentd.conf >~/.oidentd.conf + cat conf/oidentd.conf > ~/.oidentd.conf fi mkdir -p ~/.gnupg -cat gpg/gpg.conf >~/.gnupg/gpg.conf -cat gpg/gpg-agent.conf >~/.gnupg/gpg-agent.conf -cat gpg/dirmngr.conf >~/.gnupg/dirmngr.conf +cat gpg/gpg.conf > ~/.gnupg/gpg.conf +cat gpg/gpg-agent.conf > ~/.gnupg/gpg-agent.conf +cat gpg/dirmngr.conf > ~/.gnupg/dirmngr.conf killall -HUP dirmngr #cat rc/xinitrc > ~/.xinitrc -cat conf/pastebinit.xml >~/.pastebinit.xml -cat conf/Xresources >~/.Xresources +cat conf/pastebinit.xml > ~/.pastebinit.xml +cat conf/Xresources > ~/.Xresources mkdir -p ~/.inxi -cat conf/inxi.conf >~/.inxi/inxi.conf +cat conf/inxi.conf > ~/.inxi/inxi.conf gpg --quiet --import .mikaela/keys/*.asc & mkdir -p ~/.ssh/sockets/ chmod a+xr chmod bash -x ./chmod & git submodule update --init & -if hash pre-commit 2>/dev/null; then +if hash pre-commit 2> /dev/null; then pre-commit init-templatedir ~/.git-template pre-commit gc fi diff --git a/rc/profile b/rc/profile index 36e64d43..cfc9ed5a 100644 --- a/rc/profile +++ b/rc/profile @@ -2,7 +2,7 @@ PATH=$HOME/.local/bin:$HOME/bin:$HOME/go/bin:$HOME/.local/share/flatpak/exports/bin:/var/lib/flatpak/exports/bin:/snap/bin:/usr/local/bin:/usr/local/sbin:/usr/local/games:/usr/bin:/usr/sbin:/usr/games:/bin:/sbin:/games:$PATH # Add RubyGems to PATH -if hash ruby 2>/dev/null; then +if hash ruby 2> /dev/null; then PATH="$(ruby -e 'print Gem.user_dir')/bin:$PATH" fi @@ -21,7 +21,7 @@ PATH=$(echo "$PATH" | awk -v RS=':' -v ORS=":" '!a[$1]++{if (NR > 1) printf ORS; ulimit -c unlimited # Numlock on at boot -if hash numlockx 2>/dev/null; then +if hash numlockx 2> /dev/null; then numlockx on fi