commit e7500610117c9e94b5ca948d625faaeccbd9e69c
parent 23d2727915d7b07a01313ef240a7c7c0ce5ada6e
Author: Alex Balgavy <a.balgavy@gmail.com>
Date: Sat, 19 Oct 2019 14:39:35 -0400
shell: update structure
Former-commit-id: eb455add5992e69bec6e00c55321743ab4f6e9fe
Diffstat:
4 files changed, 66 insertions(+), 27 deletions(-)
diff --git a/shell-old/commonprofile b/shell-old/commonprofile
@@ -29,7 +29,7 @@ fi
# Golang
if command -v go &> /dev/null; then
GOPATH="$HOME"/.go
- GO111MODULE=on
+ GO111MODULE=off
if [[ $PATH != *"$GOPATH"* ]]; then
PATH=$PATH:"$GOPATH"/bin
fi
@@ -44,6 +44,11 @@ if [[ $PATH != *"/usr/local/opt/gnu-sed/libexec/gnubin"* ]]; then
PATH="/usr/local/opt/gnu-sed/libexec/gnubin:$PATH"
fi
+# Haskell
+if [[ $PATH != *"$HOME/.ghcup/bin"* ]]; then
+ PATH="$HOME/.ghcup/bin:$PATH"
+fi
+
# Set a variable for my confidr
DOTFILES="$HOME/.dotfiles"
diff --git a/shell-old/zshrc b/shell-old/zshrc
@@ -1,4 +1,30 @@
#!/usr/bin/env zsh
+# oh-my-zsh {{{
+# Path to your oh-my-zsh installation.
+export ZSH="$HOME"/.oh-my-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="powerlevel10k/powerlevel10k"
+
+# 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=(
+ git
+ sudo
+ zsh-syntax-highlighting
+ gitignore
+)
+
+#POWERLEVEL9K
+POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(user dir virtualenv vcs)
+POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(status root_indicator background_jobs history ram time battery)
+
+source $ZSH/oh-my-zsh.sh
+# }}}
# ZSH config {{{
export LANG=en_US.UTF-8
export LC_ALL=en_US.UTF-8
@@ -34,31 +60,10 @@ lfcd () {
fi
}
bindkey -s '^o' 'lfcd\n'
-# }}}
-# oh-my-zsh {{{
-# Path to your oh-my-zsh installation.
-export ZSH="$HOME"/.oh-my-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="powerlevel10k/powerlevel10k"
-
-# 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=(
- git
- sudo
- zsh-syntax-highlighting
-)
-
-#POWERLEVEL9K
-POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(user dir virtualenv vcs)
-POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(status root_indicator background_jobs history ram time battery)
-source $ZSH/oh-my-zsh.sh
+fpath=($HOME/.dotfiles/shell/zsh-completions $fpath)
+autoload -U compinit
+compinit
# }}}
# Other scripts {{{
# FZF
diff --git a/shell/zsh-completions/_lf b/shell/zsh-completions/_lf
@@ -0,0 +1,29 @@
+#compdef lf
+
+# For using these completions you must:
+# - rename this file to _lf
+# - add the containing folder to $fpath in .zshrc, like this:
+# '''
+# fpath=(/path/to/folder/containing_lf $fpath)
+# autoload -U compinit
+# compinit
+# '''
+#
+# zsh completions for 'lf'
+# automatically generated with http://github.com/RobSis/zsh-completion-generator
+local arguments
+
+arguments=(
+ '-command[command to execute on client initialization]'
+ '-cpuprofile[path to the file to write the CPU profile]'
+ '-doc[show documentation]'
+ '-last-dir-path[path to the file to write the last dir on exit (to use for cd)]'
+ '-memprofile[path to the file to write the memory profile]'
+ '-remote[send remote command to server]'
+ '-selection-path[path to the file to write selected files on open (to use as open file dialog)]'
+ '-server[start server (automatic)]'
+ '-version[show version]'
+ '*:filename:_files'
+)
+
+_arguments -s $arguments
diff --git a/shell/zshrc b/shell/zshrc
@@ -1,4 +1,4 @@
-export ZSH="/home/zeroalpha/.oh-my-zsh"
+export ZSH="$HOME/.dotfiles/oh-my-zsh"
ZSH_THEME="powerlevel10k/powerlevel10k"
# Import colorscheme from 'wal' asynchronously
@@ -9,7 +9,7 @@ ZSH_THEME="powerlevel10k/powerlevel10k"
# # To add support for TTYs this line can be optionally added.
source ~/.cache/wal/colors-tty.sh
-. $HOME/.dotfiles/bin/z/z.sh
+. $HOME/.dotfiles/shell/z/z.sh
plugins=(git gitignore zsh-syntax-highlighting)
source $ZSH/oh-my-zsh.sh
