From 7122baebd7c1c4ec964351b5a06432dbc8abdc36 Mon Sep 17 00:00:00 2001 From: Max Bucknell Date: Tue, 4 Jun 2019 12:40:38 +0100 Subject: [PATCH] Add dark mode support --- bin/isdark | 6 ++++++ nvim/nvim.symlink/init.vim | 10 +++++++++- zsh/zshrc.symlink | 28 ++++++++++++++++++++-------- 3 files changed, 35 insertions(+), 9 deletions(-) create mode 100755 bin/isdark diff --git a/bin/isdark b/bin/isdark new file mode 100755 index 0000000..3b7ed62 --- /dev/null +++ b/bin/isdark @@ -0,0 +1,6 @@ +#! /usr/bin/env osascript +tell application "System Events" + tell appearance preferences + dark mode + end tell +end tell diff --git a/nvim/nvim.symlink/init.vim b/nvim/nvim.symlink/init.vim index 042530f..9975288 100644 --- a/nvim/nvim.symlink/init.vim +++ b/nvim/nvim.symlink/init.vim @@ -141,8 +141,16 @@ syntax on filetype plugin indent on " Theme configuration + +if $MACOS_DARKMODE + set background=dark +else + set background=light +endif + let g:gruvbox_italic = 1 -colorscheme maxbucknell + +colorscheme gruvbox " I want floating windows to have the same syntax highlighting as normal vim " things. diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink index 6032a1b..c23a067 100644 --- a/zsh/zshrc.symlink +++ b/zsh/zshrc.symlink @@ -30,11 +30,14 @@ PATH="/usr/local/opt/ruby/bin:/usr/local/lib/ruby/gems/2.6.0/bin:$PATH" export PYTHONPATH="$PYTHONPATH:$HOME/dotfiles/lib/python" # Rust -source $HOME/.cargo/env +# source $HOME/.cargo/env # Go PATH="$HOME/go/bin:$PATH" +# Yarn ffs +export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH" + ## Completion # Load up the extra Z Shell completions @@ -160,6 +163,15 @@ setopt extended_history # to do things correctly and see if it's slow. setopt hist_lex_words +# Dark Mode Support +isdark="$($HOME/dotfiles/bin/isdark)" +if [[ "$isdark" == 'true' ]] +then + export MACOS_DARKMODE=1 +else + export MACOS_DARKMODE=0 +fi + # Liquid Prompt! source "$HOME/.zsh/liquidprompt/liquidprompt" @@ -197,11 +209,11 @@ function select_session { fi } -if [ -z "$TMUX" ] -then - neofetch -fi +# Disabling the below because Tmux has been playing up. +# +# if [ -z "$TMUX" ] +# then +# neofetch +# fi -select_session - -export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH" +# select_session