pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix mac specific lazygit, add nvim install script to main install

Browse source
This commit is contained in:
Evie Litherland-Smith 2023-01-10 21:41:50 +00:00
parent 7254653515
commit bf837aeedb
3 changed files with 7 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/nvim/install.sh
View file

@ -7,6 +7,8 @@ if [ ! -d $PACKER_DIR ]; then
fi fi
NVIM_DIR=$(dirname $(readlink -f $0)) NVIM_DIR=$(dirname $(readlink -f $0))
/usr/bin/env python3 -m venv "$NVIM_DIR/venv" /usr/bin/env python3 -m venv --clear "$NVIM_DIR/venv"
$NVIM_DIR/venv/bin/python -m pip install -U pip setuptools wheel || exit 1 $NVIM_DIR/venv/bin/python -m pip install -U pip setuptools wheel || exit 1
$NVIM_DIR/venv/bin/python -m pip install -U pynvim $NVIM_DIR/venv/bin/python -m pip install -U pynvim
nvim -c "PackerInstall" -c "qa"

1
config/nvim/lua/config_plugins/config_treesitter.lua
View file

@ -1,5 +1,4 @@
require 'nvim-treesitter.configs'.setup { require 'nvim-treesitter.configs'.setup {
ensure_installed = { "python" },
highlight = { highlight = {
enable = true, enable = true,
additional_vim_regex_highlighting = false, additional_vim_regex_highlighting = false,

27
install.sh
View file

@ -1,17 +1,6 @@
#! /usr/bin/env sh #! /usr/bin/env sh
# Install various dotfiles into their proper places # Install various dotfiles into their proper places
# Get machine for specific config locations
unameOut="$(uname -s)"
case "${unameOut}" in
Linux*) machine=Linux;;
Darwin*) machine=Mac;;
CYGWIN*) machine=Cygwin;;
MINGW*) machine=MinGw;;
*) machine="UNKNOWN:${unameOut}"
esac
echo "Machine: ${machine}"
# .config files # .config files
CONFIG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}" CONFIG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}"
mkdir -p "$CONFIG_DIR" mkdir -p "$CONFIG_DIR"
@ -22,18 +11,10 @@ for FILE in config/*; do
then then
ln -s $(readlink -f "$FILE") "$CONFIG_DIR/$FILENAME" ln -s $(readlink -f "$FILE") "$CONFIG_DIR/$FILENAME"
echo "$(readlink -f $FILE) -> $CONFIG_DIR/$FILENAME" echo "$(readlink -f $FILE) -> $CONFIG_DIR/$FILENAME"
else
echo "$CONFIG_DIR/$FILENAME already exists"
fi fi
done done
# Mac specific lazygit setup (because of course) # nvim setup
# UPDATE: not needed if XDG_CONFIG_HOME is set ./config/nvim/install.sh
# if [ $machine == "Mac" ]
# then
# rm "$CONFIG_DIR/lazygit"
# echo "Removed $CONFIG_DIR/lazygit"
# if [ ! -e "$HOME/Library/Application Support/lazygit" ]
# then
# ln -s "$(readlink -f config/lazygit)" "$HOME/Library/Application Support/lazygit"
# echo "$(readlink -f config/lazygit) -> $HOME/Library/Application Support/lazygit"
# fi
# fi