diff --git a/apps/htop/rc b/apps/htop/rc index 6e36e4c..6c59ad8 100644 --- a/apps/htop/rc +++ b/apps/htop/rc @@ -20,7 +20,7 @@ update_process_names=0 account_guest_in_cpu_meter=0 color_scheme=0 delay=15 -left_meters=AllCPUs Memory Swap +left_meters=LeftCPUs2 Memory Swap left_meter_modes=1 1 1 right_meters=RightCPUs2 Tasks LoadAverage Uptime right_meter_modes=1 2 2 2 diff --git a/apps/neovim/init.vim b/apps/neovim/init.vim index 148d814..e9d7256 100644 --- a/apps/neovim/init.vim +++ b/apps/neovim/init.vim @@ -50,9 +50,6 @@ exec 'source ' . commandsfile let bindingsfile=$vimdir.'/bindings.vim' exec 'source ' . bindingsfile -" colors -let &t_Co=16 - " load a per-environment file if one exists if filereadable(expand('$HOME/.env_init_after.vim')) source "$HOME/.env_init_after.vim" diff --git a/apps/neovim/settings.vim b/apps/neovim/settings.vim index b2f39aa..b332e90 100644 --- a/apps/neovim/settings.vim +++ b/apps/neovim/settings.vim @@ -91,6 +91,7 @@ endif " color scheme let base16colorspace=16 +let &t_Co=16 set background=dark syntax enable colorscheme base16-donokai diff --git a/apps/shell/fish/fish_variables b/apps/shell/fish/fish_variables index 7fdf4c6..f7e6ac6 100755 --- a/apps/shell/fish/fish_variables +++ b/apps/shell/fish/fish_variables @@ -46,4 +46,4 @@ SETUVAR fish_pager_color_completion:\x1d SETUVAR fish_pager_color_description:yellow\x1eyellow SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dunderline SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan -SETUVAR fish_user_paths:/home/daniel/\x2ehome/\x2elocal/bin\x1e/home/daniel/\x2ehome/\x2elocal/bin\x1e/home/daniel/\x2ehome/\x2elocal/bin\x1e/home/daniel/\x2ehome/\x2ego\x1e/home/daniel/\x2ehome/\x2ego/bin\x1e/home/daniel/\x2ehome/\x2econfig/dotfiles/bin\x1e/home/daniel/\x2ehome/\x2eenv/bin\x1e/home/daniel/\x2ehome/\x2ebin\x1e/home/daniel/\x2ehome/\x2ecargo/bin\x1e/home/daniel/\x2ehome/\x2eyarn/bin +SETUVAR fish_user_paths:/home/daniel/\x2ehome/\x2elocal/bin\x1e/home/daniel/\x2ehome/\x2elocal/bin\x1e/home/daniel/\x2ehome/\x2elocal/bin\x1e/home/daniel/\x2ehome/\x2ego\x1e/home/daniel/\x2ehome/\x2econfig/dotfiles/bin\x1e/home/daniel/\x2ehome/\x2eenv/bin\x1e/home/daniel/\x2ehome/\x2ebin\x1e/home/daniel/\x2ehome/\x2ecargo/bin\x1e/home/daniel/\x2ehome/\x2eyarn/bin diff --git a/bin/lib/colors/generator/templates/shell b/bin/lib/colors/generator/templates/shell index 55f2dbc..b9d353c 100755 --- a/bin/lib/colors/generator/templates/shell +++ b/bin/lib/colors/generator/templates/shell @@ -1,4 +1,3 @@ -[[ #!/bin/sh # Base16 <%= @.scheme %> - Shell color setup script # <%= @author %> diff --git a/bin/upload b/bin/upload index 18882c7..596d179 100755 --- a/bin/upload +++ b/bin/upload @@ -15,7 +15,8 @@ uuid="$(uuidgen -t)" [ ! -f "${f}" ] && echo "File '$f' does not exist. Exiting." >&2 && exit 1 ssh ld mkdir -p "${internal_dir}" -rsync_output="$(rsync --stats --ignore-existing "${f}" "${HOST}:${internal_dir}/${fname}")" +rsync_output="$(rsync --no-owner --no-group --no-perms --stats --ignore-existing "${f}" "${HOST}:${internal_dir}/${fname}")" +ssh ld chmod a+r "${internal_dir}/${fname}" num_uploaded="$(<<< "${rsync_output}" grep -oP "Number of created files: \K\d+")" if [[ $num_uploaded -eq 1 ]]; then