diff options
| -rw-r--r-- | Makefile | 34 | ||||
| -rw-r--r-- | README.org | 6 | ||||
| -rw-r--r-- | config/git/config | 29 | ||||
| -rw-r--r-- | config/git/ignore | 24 | ||||
| -rw-r--r-- | tmux.conf | 14 | ||||
| -rw-r--r-- | zshenv | 6 | ||||
| -rw-r--r-- | zshrc | 47 |
7 files changed, 6 insertions, 154 deletions
@@ -1,5 +1,4 @@ XDG_CONFIG=$(HOME)/.config/ -WORKSPACE=$(HOME)/workspace LN = @ln -sf .PHONY: xdg_config @@ -13,42 +12,13 @@ go: @go install github.com/go-delve/delve/cmd/dlv@latest .PHONY: emacs -emacs: xdg_config git go +emacs: xdg_config go $(LN) $(PWD)/emacs $(XDG_CONFIG) $(LN) $(PWD)/aspell.en.pws $(HOME)/.aspell.en.pws -.PHONY: zsh -zsh: - $(LN) $(PWD)/zshenv $(HOME)/.zshenv - $(LN) $(PWD)/zshrc $(HOME)/.zshrc - -.PHONY: git -git: xdg_config - $(LN) $(PWD)/config/git $(XDG_CONFIG) - -.PHONY: tmux -tmux: - $(LN) $(PWD)/tmux.conf $(HOME)/.tmux.conf - -.PHONY: workspace -workspace: - @mkdir -p $(WORKSPACE) - -.PHONY: ssh -ssh: - @curl -s https://fcuny.net/ssh.pub.sig -o $(HOME)/.ssh/authorized_keys - -.PHONY: check-dead -check-dead: - @find ~ -maxdepth 1 -name '.*' -type l -exec test ! -e {} \; -print - -.PHONY: clean-dead -clean-dead: - @find ~ -maxdepth 1 -name '.*' -type l -exec test ! -e {} \; -delete - .PHONY: setup setup: @git config --local user.email "franck@fcuny.net" @git config --local user.name "Franck Cuny" -all: setup xdg_config workspace emacs zsh git tmux ssh check-dead +all: setup xdg_config emacs check-dead @@ -1,8 +1,10 @@ -#+TITLE: Personal configurations, scripts and tools. +#+TITLE: Personal Emacs configurations +#+AUTHOR: Franck Cuny +#+EMAIL: franck@fcuny.net * Goals - keep it simple -- configurations work the same way, everywhere +- do within Emacs only what makes sense * Emacs ** go *** compile diff --git a/config/git/config b/config/git/config deleted file mode 100644 index 3b3a83b..0000000 --- a/config/git/config +++ /dev/null @@ -1,29 +0,0 @@ -[color] - ui = true - -[push] - default = simple - -[core] - whitespace = trailing-space,space-before-tab - -[branch] - autosetuprebase = remote - sort = authordate - -[http] - postBuffer = 524288000 - -[alias] - s = status --short --branch - amend = commit --amend --no-edit - -[init] - defaultBranch = main - -[credential "https://github.com"] - username = fcuny - -[credential "https://git.fcuny.net"] - username = fcuny - helper = "!echo -n 'password='; pass git/git.fcuny.net" diff --git a/config/git/ignore b/config/git/ignore deleted file mode 100644 index c8124cb..0000000 --- a/config/git/ignore +++ /dev/null @@ -1,24 +0,0 @@ -# osx stuff -.DS_Store -Icon - -# ide -.idea -*.iml -/env/* - -# python stuff -.flake8rc -*pyc - -# ctags stuff -TAGS -tags - -# emacs stuff -.projectile -.dir-locals.el -.pytest_cache/ - -.reviewboardrc -ui/package-lock.json diff --git a/tmux.conf b/tmux.conf deleted file mode 100644 index d5493f8..0000000 --- a/tmux.conf +++ /dev/null @@ -1,14 +0,0 @@ -set-option -g prefix C-z -bind-key a send-prefix - -set-option -g base-index 1 -set-option -g renumber-windows on -set-option -g set-titles on -set-option -g set-titles-string '@#h' - -set-option -g default-terminal "xterm-256color" -set-option -g xterm-keys on -set-option -g mouse on - -set -g status-left "" -set -g status-right "" @@ -1,6 +0,0 @@ -export EDITOR="mg" -export PATH=~/workspace/go/bin:~/.fly/bin:$PATH -export GOPATH=~/workspace/go -export PAGER='less -R' - -alias add="arc diff --draft" @@ -1,47 +0,0 @@ -autoload -U compinit -compinit -C - -HISTFILE=~/.zhistory -SAVEHIST=1000 -setopt append_history -setopt hist_ignore_space -setopt share_history - -setopt auto_menu # show completion menu on successive tab press -setopt complete_in_word -setopt always_to_end - -zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*' - -autoload -U select-word-style -autoload -U colors && colors - -autoload -Uz vcs_info add-zsh-hook -setopt prompt_subst - -add-zsh-hook precmd vcs_info -# Enable checking for (un)staged changes, enabling use of %u and %c -zstyle ':vcs_info:*' check-for-changes true -# Set custom strings for an unstaged vcs repo changes (*) and staged changes (+) -zstyle ':vcs_info:*' unstagedstr "%F{yellow}●%f" -zstyle ':vcs_info:*' stagedstr "%F{green}●%f" -# Set the format of the Git information for vcs_info -zstyle ':vcs_info:git:*' formats " (%b%c%u)" -zstyle ':vcs_info:git:*' actionformats " (%b|%a%u%c)" - -# Print timing statistics for everything which takes longer than 5 seconds of -# user + system time ('sleep 6' does not work because of 0% user/system time!). -REPORTTIME=5 - -# Explicitly select Emacs line editing mode (independent of zsh’s best guess -# based on EDITOR/VISUAL). -bindkey -e - -PROMPT='%K{cyan}%F{black}%m%k%f %~%F{red}${vcs_info_msg_0_}%f %# ' - -# For tramp (emacs). -if [ "$TERM" = "dumb" ]; then - unset PROMPT - PS1='$ ' - unsetopt zle -fi |