Merge branch 'master' of git.nixy.moe:nixy/dotfiles

This commit is contained in:
Andrew R. M 2019-12-15 17:25:20 -05:00
commit 341fdb8e2a
18 changed files with 26 additions and 13 deletions

3
.gitmodules vendored
View File

@ -40,3 +40,6 @@
[submodule "vim/.vim/bundle/vinegar"] [submodule "vim/.vim/bundle/vinegar"]
path = vim/.vim/bundle/vinegar path = vim/.vim/bundle/vinegar
url = https://github.com/tpope/vim-vinegar url = https://github.com/tpope/vim-vinegar
[submodule "vim/.vim/bundle/direnv"]
path = vim/.vim/bundle/direnv
url = https://github.com/direnv/direnv.vim.git

View File

@ -55,3 +55,7 @@ fi
if [ -f "$HOME/.private_functions" ] && [ -r "$HOME/.private_functions" ]; then if [ -f "$HOME/.private_functions" ] && [ -r "$HOME/.private_functions" ]; then
. "$HOME/.private_functions" . "$HOME/.private_functions"
fi fi
if $(which direnv &> /dev/null); then
eval "$(direnv hook bash)"
fi

View File

@ -36,3 +36,7 @@ fi
export HISTSIZE=5000 export HISTSIZE=5000
export HISTFILE="$HOME/.history/sh" export HISTFILE="$HOME/.history/sh"
export HISTFILESIZE=10000 export HISTFILESIZE=10000
if [ -r "$HOME/.nix-profile/etc/profile.d/nix.sh" ]; then
. "$HOME/.nix-profile/etc/profile.d/nix.sh"
fi

@ -1 +1 @@
Subproject commit be79030b3e8c0ee3c5f45b4333919e4830531e80 Subproject commit 141d9d32a9fb58fe474fcc89cd7221eb2dd57b3a

@ -0,0 +1 @@
Subproject commit 5e75084465ad37dd0a4d4b1198b5ffa8978ae4e1

@ -1 +1 @@
Subproject commit dcd29a00eb708be211d856afd3fddfbff7bc6208 Subproject commit e066a0999e442d9d96f24ad9d203b1bd030ef72e

@ -1 +1 @@
Subproject commit b06cccd8ff61149b13d3fc8b7e0d06caa55c9888 Subproject commit a3eed01f4de995a51dfdd06287e44fcb231f6adf

@ -1 +1 @@
Subproject commit 4f24757df2a57fc01900334114b1790fcb75ad54 Subproject commit f5a94cbc811aee12ad99cc82ee8092406aa94faf

@ -1 +1 @@
Subproject commit 020ab25c38f62627c1dab6c7a851176c6ad309f9 Subproject commit e9fb0914dba5bdfe2feaa364dda2e9495c5620a2

@ -1 +1 @@
Subproject commit 2826bc17ef1820f68dfe6e43574a567e3c67a56d Subproject commit 7a104e34c10c6f3581c6e98da7834d765d0b067c

@ -1 +1 @@
Subproject commit 7d0374935e7bd4a3a3c2c5d7ac7d70c2650b89ae Subproject commit dc8ca22cef3f87999d926e18e2e230145e013838

@ -1 +1 @@
Subproject commit f1432b6022c9815cd89b9197b06e3efdc3596b78 Subproject commit 17ac70ef00982b7b4865e2ff0efc34a4a5b59cab

@ -1 +1 @@
Subproject commit 0c5612fa31ee434ba055e21c76f456244b3b5109 Subproject commit 295862ba6be47ec3b11b6c85c10d982ffd9bc0b2

@ -1 +1 @@
Subproject commit c14442db8c019c73e1c5717fde10e157950152b6 Subproject commit 19c98450af64fd9d875e009e0868cb119db01755

@ -1 +1 @@
Subproject commit cdaa5c27c5a7f8b08a43d0b2e65929512299e33a Subproject commit 40fe711e088e2ab346738233dd5adbb1be355172

@ -1 +1 @@
Subproject commit 959f48798136bfd4ce60075d3c86c580fcf5e5c5 Subproject commit 387bbadda98e1376ff3871aa461b1f0abd4ece70

@ -1 +1 @@
Subproject commit bd7f7b7929260072864462c04dde3b9f4c5e0d23 Subproject commit 09ac84c4d152a944caa341e913220087211c72ef

View File

@ -32,6 +32,7 @@ set nocompatible
" Colors and syntax highlighting " " Colors and syntax highlighting "
colorscheme peachpuff colorscheme peachpuff
set background=dark
filetype plugin on filetype plugin on
syntax on syntax on