diff --git a/Hack/HackNerdFont-Bold.ttf b/Hack/HackNerdFont-Bold.ttf new file mode 100644 index 0000000..64dd1a2 Binary files /dev/null and b/Hack/HackNerdFont-Bold.ttf differ diff --git a/Hack/HackNerdFont-BoldItalic.ttf b/Hack/HackNerdFont-BoldItalic.ttf new file mode 100644 index 0000000..e919267 Binary files /dev/null and b/Hack/HackNerdFont-BoldItalic.ttf differ diff --git a/Hack/HackNerdFont-Italic.ttf b/Hack/HackNerdFont-Italic.ttf new file mode 100644 index 0000000..7990cc2 Binary files /dev/null and b/Hack/HackNerdFont-Italic.ttf differ diff --git a/Hack/HackNerdFont-Regular.ttf b/Hack/HackNerdFont-Regular.ttf new file mode 100644 index 0000000..e484463 Binary files /dev/null and b/Hack/HackNerdFont-Regular.ttf differ diff --git a/Hack/HackNerdFontMono-Bold.ttf b/Hack/HackNerdFontMono-Bold.ttf new file mode 100644 index 0000000..2f15af2 Binary files /dev/null and b/Hack/HackNerdFontMono-Bold.ttf differ diff --git a/Hack/HackNerdFontMono-BoldItalic.ttf b/Hack/HackNerdFontMono-BoldItalic.ttf new file mode 100644 index 0000000..21d4773 Binary files /dev/null and b/Hack/HackNerdFontMono-BoldItalic.ttf differ diff --git a/Hack/HackNerdFontMono-Italic.ttf b/Hack/HackNerdFontMono-Italic.ttf new file mode 100644 index 0000000..70b5ff7 Binary files /dev/null and b/Hack/HackNerdFontMono-Italic.ttf differ diff --git a/Hack/HackNerdFontMono-Regular.ttf b/Hack/HackNerdFontMono-Regular.ttf new file mode 100644 index 0000000..1fdaee9 Binary files /dev/null and b/Hack/HackNerdFontMono-Regular.ttf differ diff --git a/Hack/HackNerdFontPropo-Bold.ttf b/Hack/HackNerdFontPropo-Bold.ttf new file mode 100644 index 0000000..596630f Binary files /dev/null and b/Hack/HackNerdFontPropo-Bold.ttf differ diff --git a/Hack/HackNerdFontPropo-BoldItalic.ttf b/Hack/HackNerdFontPropo-BoldItalic.ttf new file mode 100644 index 0000000..38ac498 Binary files /dev/null and b/Hack/HackNerdFontPropo-BoldItalic.ttf differ diff --git a/Hack/HackNerdFontPropo-Italic.ttf b/Hack/HackNerdFontPropo-Italic.ttf new file mode 100644 index 0000000..990ef72 Binary files /dev/null and b/Hack/HackNerdFontPropo-Italic.ttf differ diff --git a/Hack/HackNerdFontPropo-Regular.ttf b/Hack/HackNerdFontPropo-Regular.ttf new file mode 100644 index 0000000..830aa89 Binary files /dev/null and b/Hack/HackNerdFontPropo-Regular.ttf differ diff --git a/Hack/LICENSE.md b/Hack/LICENSE.md new file mode 100644 index 0000000..08927e5 --- /dev/null +++ b/Hack/LICENSE.md @@ -0,0 +1,45 @@ +The work in the Hack project is Copyright 2018 Source Foundry Authors and licensed under the MIT License + +The work in the DejaVu project was committed to the public domain. + +Bitstream Vera Sans Mono Copyright 2003 Bitstream Inc. and licensed under the Bitstream Vera License with Reserved Font Names "Bitstream" and "Vera" + +### MIT License + +Copyright (c) 2018 Source Foundry Authors + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +### BITSTREAM VERA LICENSE + +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license ("Fonts") and associated documentation files (the "Font Software"), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions: + +The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces. + +The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the fonts are renamed to names not containing either the words "Bitstream" or the word "Vera". + +This License becomes null and void to the extent applicable to Fonts or Font Software that has been modified and is distributed under the "Bitstream Vera" names. + +The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. + +Except as contained in this notice, the names of Gnome, the Gnome Foundation, and Bitstream Inc., shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from the Gnome Foundation or Bitstream Inc., respectively. For further information, contact: fonts at gnome dot org. diff --git a/Hack/readme.md b/Hack/readme.md new file mode 100644 index 0000000..9f2e700 --- /dev/null +++ b/Hack/readme.md @@ -0,0 +1,8 @@ + +# Nerd Fonts + +This is an archived font from a Nerd Fonts release. + +For more information see: +* https://github.com/ryanoasis/nerd-fonts/ +* https://github.com/ryanoasis/nerd-fonts/releases/latest/ diff --git a/aliases.zsh b/aliases.zsh index ce68aca..4f6bff8 100755 --- a/aliases.zsh +++ b/aliases.zsh @@ -57,8 +57,8 @@ alias tmuxreload='source ~/.tmux.conf' alias zshreload='source ~/.zshrc' # nvim -alias vim=nvim -alias vi=nvim +alias vim=micro +alias vi=micro # Configuration alias vimrc='nvim ~/.vimrc' diff --git a/gitconfig b/gitconfig index 8894300..0a1e1b3 100644 --- a/gitconfig +++ b/gitconfig @@ -2,7 +2,7 @@ email = blake@blakeridgway.dev name = Blake Ridgway [commit] - template = /home/bridgway/dotfiles/commit-conventions.txt + template = /home/blake/dotfiles/commit-conventions.txt [core] editor = nvim +14 -c +startinsert [init] diff --git a/post_install b/post_install.sh similarity index 70% rename from post_install rename to post_install.sh index 4bc7e38..5d55c05 100755 --- a/post_install +++ b/post_install.sh @@ -1,40 +1,37 @@ -#!/usr/bin/env bash +#!/bin/bash + # A script for setting up post install # Relies on Flatpak to be installed # Created by Blake Ridgway -# Enable RPM Fusion +# Check to see if running as sudo/root -sudo dnf install \ - https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm +#if [ "$(id -u)" -ne 0 ]; then +# echo 'This script must be run by root' >&2 +# exit 1 +#fi -sudo dnf install \ - https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm +# Update system +sudo apt update && sudo apt upgrade -# Update system after confirming RPM Fusion is enabled -sudo dnf update -sudo dnf upgrade - -# Verify flatpak is engaged properly -flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo PACKAGE_LIST=( bpytop cargo - gcc-c++ + curl git golang fd-find - kitty - java-openjdk + flatpak + #kitty + micro neofetch - neovim - protonup + #neovim + plasma-discover-backend-flatpak python3 python3-pip ripgrep - ruby - rust + #ruby solaar tilix virt-manager @@ -43,28 +40,29 @@ PACKAGE_LIST=( FLATPAK_LIST=( com.bitwarden.desktop - com.discordapp.Discord - com.slack.Slack net.davidotek.pupgui2 - md.obsidian.Obsidian - net.veloren.airshipper + #net.veloren.airshipper ) echo ####################### echo # Installing Packages # echo ####################### + for package_name in ${PACKAGE_LIST[@]}; do - if ! sudo dnf list --installed | grep -q "^\<$package_name\>"; then + if ! apt list --installed | grep -q "^\<$package_name\>"; then echo "Installing $package_name..." sleep .5 - sudo dnf install "$package_name" -y + sudo apt install "$package_name" -y echo "$package_name has been installed" else echo "$package_name already installed" fi done +# Verify flatpak is engaged properly +flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + for flatpak_name in ${FLATPAK_LIST[@]}; do if ! flatpak list | grep -q $flatpak_name; then flatpak install "$flatpak_name" -y @@ -74,21 +72,11 @@ for flatpak_name in ${FLATPAK_LIST[@]}; do done echo ####### -echo # NVM # +echo # SSH # echo ####### -curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash -echo ######## -echo # Node # -echo ######## +ssh-keygen -t ed25519 -C ${USER}@$(hostname --fqdn) -# nvm install node - -echo ######### -echo # Rails # -echo ######### - -gem install rails echo ########## echo # pynvim # @@ -96,18 +84,12 @@ echo ########## /usr/bin/python3 -m pip install pynvim -echo ####### -echo # SSH # -echo ####### - -ssh-keygen -t ed25519 -C ${USER}@$(hostname --fqdn) - echo ##################### echo # Install Nerd Font # echo ##################### wget https://github.com/ryanoasis/nerd-fonts/releases/download/v3.0.2/Hack.zip && unzip Hack.zip -d Hack -mkdir -p ~/.local/share/fonts && cp Hack/HackNerdFont-regular.ttf ~/.local/share/fonts +mkdir -p ~/.local/share/fonts && cp Hack/HackNerdFont-Regular.ttf ~/.local/share/fonts fc-cache -f -v echo ###################### @@ -138,14 +120,14 @@ echo ####################### echo # Cleanup and Updates # echo ####################### -sudo dnf upgrade --refresh +sudo apt upgrade flatpak update echo ################ echo # File Cleanup # echo ################ -rm -r *.ttf *.tar.gz *.rpm +rm -r *.ttf *.zip # Symlink files