From 58026910845ab98b564382df4ec9a66098624866 Mon Sep 17 00:00:00 2001 From: Ryan Kes Date: Sun, 9 Feb 2020 01:22:49 +0100 Subject: [PATCH] converted markdown to org and now use zplug --- LICENSE.md | 22 --------------- LICENSE.org | 25 +++++++++++++++++ README.md | 28 ------------------- README.org | 73 ++++++++++++++++++++++++++++++++++++++++++++++++ zsh/.zshenv | 22 +++++++++++++++ zsh/.zshrc | 80 +++++++++++++++++++++++++++++------------------------ 6 files changed, 164 insertions(+), 86 deletions(-) delete mode 100644 LICENSE.md create mode 100644 LICENSE.org delete mode 100644 README.md create mode 100644 README.org create mode 100644 zsh/.zshenv diff --git a/LICENSE.md b/LICENSE.md deleted file mode 100644 index 7218fc0..0000000 --- a/LICENSE.md +++ /dev/null @@ -1,22 +0,0 @@ -The MIT License (MIT) -===================== - -Copyright (c) `2019` `Ryan Kes` - -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. diff --git a/LICENSE.org b/LICENSE.org new file mode 100644 index 0000000..de8a8d5 --- /dev/null +++ b/LICENSE.org @@ -0,0 +1,25 @@ +* The MIT License (MIT) + :PROPERTIES: + :CUSTOM_ID: the-mit-license-mit + :END: + +Copyright © =<2019>= == + +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. diff --git a/README.md b/README.md deleted file mode 100644 index 6ab1392..0000000 --- a/README.md +++ /dev/null @@ -1,28 +0,0 @@ -# Server Dotfiles - -A repository of my personal server configuration files. - -# Requirements - -[stow](http://www.gnu.org/software/stow/) - -# Installation - -```shell -./install.sh -``` -# Packages - -======= -* [git](https://git-scm.com/) -* [lf](https://github.com/gokcehan/lf) -* [neovim](https://neovim.io/) -* [tmux](https://tmux.github.io/) -* [vifm](https://vifm.info/) -* [zsh](https://www.zsh.org/) - -# License - -This theme is released under the MIT License. For more information read the [license][license]. - -[license]: LICENSE.md diff --git a/README.org b/README.org new file mode 100644 index 0000000..eb4e88a --- /dev/null +++ b/README.org @@ -0,0 +1,73 @@ +#+TITLE: Server Dotfiles +#+DATE: February 9, 2020 +#+SINCE: {replace with next tagged release version} +#+STARTUP: inlineimages nofold + +* Table of Contents :TOC_3:noexport: +- [[#description][Description]] + - [[#maintainers][Maintainers]] +- [[#prerequisites][Prerequisites]] +- [[#applications][Applications]] +- [[#zsh][Zsh]] + - [[#theme][Theme]] + - [[#plugin-manager][Plugin Manager]] + - [[#plugins][Plugins]] +- [[#configuration][Configuration]] + - [[#installation][Installation]] + - [[#find--delete-orphaned-symlinks][Find & delete orphaned symlinks]] +- [[#license][License]] + +* Description +A repository of my personal configuration files. + +** Maintainers ++ [[https://github.com/alrayyes][@alrayyes]] + +* Prerequisites +- [[http://www.gnu.org/software/stow/][stow]] + +* Applications +- [[https://the.exa.website/][exa]] +- [[https://git-scm.com/][git]] +- [[https://gnupg.org/][gnupg]] +- [[https://github.com/gokcehan/lf][lf]] +- [[https://neovim.io/][neovim]] +- [[https://tmux.github.io/][tmux]] +- [[https://vifm.info/][vifm]] + +* Zsh +** Theme +- [[https://github.com/denysdovhan/spaceship-prompt][spaceship zsh]] +** Plugin Manager +- [[https://github.com/zplug/zplug][zplug]] +** Plugins +- [[https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/docker][docker]] +- [[https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/docker-compose][docker-compose]] +- [[https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/extract][extract]] +- [[https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/git][git]] +- [[https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/gitignore][gitignore]] +- [[https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/ripgrep][ripgrep]] +- [[https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/rsync][rsync]] +- [[https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/sudo][sudo]] +- [[https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/systemd][systemd]] +- [[https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/tmux][tmux]] +- [[https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/vi-mode][vi-mode]] +- [[https://github.com/zsh-users/zsh-autosuggestions][zsh-autosuggestions]] +- [[https://github.com/zsh-users/zsh-syntax-highlighting][zsh-syntax-highlighting]] + +* Configuration +** Installation +#+BEGIN_SRC shell +./install.sh +#+END_SRC +** Find & delete orphaned symlinks +#+BEGIN_SRC shell +./clean-dead-symlinks +#+END_SRC + +* License +:PROPERTIES: +:CUSTOM_ID: license +:END: +This theme is released under the MIT License. For more information read +the [[file:LICENSE.org][license]]. diff --git a/zsh/.zshenv b/zsh/.zshenv new file mode 100644 index 0000000..bcd1efe --- /dev/null +++ b/zsh/.zshenv @@ -0,0 +1,22 @@ +path_if_exists() { + if [[ -d $1 ]]; then + export PATH="$1:$PATH" + fi +} + +# Stop tmux bitching about 256 colours +TERM="xterm-256color" + +# PATH +path_if_exists ~/.config/yarn/global/node_modules/.bin +path_if_exists ~/.local/bin +path_if_exists ~/.emacs.d/bin + +# Set GPG TTY +export GPG_TTY="$(tty)" + +# editor +export EDITOR="nvim" + +# Save history file in proper place +HISTFILE=~/.cache/zsh/history diff --git a/zsh/.zshrc b/zsh/.zshrc index ba56e5e..50ffe98 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -1,52 +1,60 @@ -# Stop tmux bitching about 256 colours -TERM="xterm-256color" +source_if_exists() { + if [[ -f $1 ]]; then + source $1 + fi +} -# Path to your oh-my-zsh installation. -ZSH="/home/alrayyes/.oh-my-zsh" +# Check if zplug is installed +if [[ ! -d ~/.zplug ]]; then + git clone https://github.com/b4b4r07/zplug ~/.zplug +fi +source ~/.zplug/init.zsh -# Set name of the theme to load. Optionally, if you set this to "random" -# it'll load a random theme each time that oh-my-zsh is loaded. -# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes -#ZSH_THEME="robbyrussell" -ZSH_THEME="powerlevel9k/powerlevel9k" +# Spaceship theme +zplug "denysdovhan/spaceship-prompt", use:spaceship.zsh, from:github, as:theme -# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*) -# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ -# Example format: plugins=(rails git textmate ruby lighthouse) -# Add wisely, as too many plugins slow down shell startup. -plugins=(aws common-aliases composer docker extract git git-flow gitignore httpie rsync symfony2 systemd tmux vi-mode fzf sudo yarn zsh-syntax-highlighting ) +# Oh my zsh lugins +# sudo must start after vi-mode for it to work properly +zplug "plugins/docker", from:oh-my-zsh +zplug "plugins/docker-compose", from:oh-my-zsh +zplug "plugins/extract", from:oh-my-zsh +zplug "plugins/git", from:oh-my-zsh +zplug "plugins/gitignore", from:oh-my-zsh +zplug "plugins/ripgrep", from:oh-my-zsh +zplug "plugins/rsync", from:oh-my-zsh +zplug "plugins/systemd", from:oh-my-zsh +zplug "plugins/tmux", from:oh-my-zsh +zplug "plugins/vi-mode", from:oh-my-zsh +zplug "plugins/sudo", from:oh-my-zsh +zplug "zsh-users/zsh-autosuggestions", from:github, defer:3 +zplug "zsh-users/zsh-syntax-highlighting", from:github, defer:3 -source $ZSH/oh-my-zsh.sh +# Install packages +if ! zplug check --verbose; then + printf "Install zplug plugins? [y/N]: " + if read -q; then + echo + zplug install + fi +fi + +zplug load # nvim alias alias vim="nvim" alias vi="nvim" +# ls alias +alias ls="exa" +alias l="exa -al" + # vifm alias alias vifm="vifmrun" -# Add yarn path -export PATH="$PATH:/home/alrayyes/.config/yarn/global/node_modules/.bin:/home/alrayyes/.scripts" - -# Set GPG TTY -export GPG_TTY="$(tty)" - -# Set default browser -export BROWSER="firefox" - -# Set default terminal -export TERMINAL="st" - -# pkg editor -export VISUAL="vim" - -# Enable password store extensions -export PASSWORD_STORE_ENABLE_EXTENSIONS="true" - -# Set gopath -export GOPATH=$HOME/go - # Refresh gpg-agent tty in case user switches into an X session gpg-connect-agent updatestartuptty /bye >/dev/null +source_if_exists ~/.fzf/key-bindings.zsh +source_if_exists ~/.fzf/completion.zsh + neofetch