Compare commits
No commits in common. "83fdfa8af85ea761881d136234adb64b7d8ce379" and "149f441bbeb02b79c73427e7f2d5641dcc30cccf" have entirely different histories.
83fdfa8af8
...
149f441bbe
7 changed files with 14 additions and 113 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -158,4 +158,5 @@ cython_debug/
|
|||
|
||||
# End of https://www.toptal.com/developers/gitignore/api/python
|
||||
|
||||
.task.mk
|
||||
# pdm
|
||||
__pypackages__
|
||||
|
|
31
Makefile
31
Makefile
|
@ -1,40 +1,9 @@
|
|||
.PHONY: lint lint.py lint.sh
|
||||
|
||||
## lint | lint.*
|
||||
lint: lint.py lint.sh
|
||||
|
||||
## lint.python | lint python files
|
||||
lint.python:
|
||||
black $(shell find -type f -name "*.py")
|
||||
|
||||
## lint.sh | lint shell files
|
||||
lint.sh:
|
||||
shfmt -s -w $(shell shfmt -f .)
|
||||
|
||||
.PHONY: $(addprefix d-,b r build run)
|
||||
|
||||
## db, d-build | build docker image
|
||||
db d-build:
|
||||
docker build -f docker/Dockerfile -t dots .
|
||||
|
||||
## dr, d-run | run docker image
|
||||
dr d-run:
|
||||
docker run --rm -it dots
|
||||
|
||||
.PHONY: dr-keep
|
||||
dr-keep:
|
||||
docker run -it dots
|
||||
|
||||
.DEFAULT_GOAL := help
|
||||
# ## h, help | show this help
|
||||
# .PHONY: help h
|
||||
# help h: Makefile
|
||||
# @awk -v fill=$(shell sed -n 's/^## \(.*\) | .*/\1/p' $< | wc -L)\
|
||||
# 'match($$0,/^## (.*) \|/,name) && match($$0,/\| (.*)$$/,help)\
|
||||
# {printf "\033[1;93m%*s\033[0m | \033[30m%s\033[0m\n",\
|
||||
# fill,name[1],help[1];} match($$0,/^### (.*)/,str) \
|
||||
# {printf "%*s \033[30m%s\033[0m\n",fill," ",str[1];}' $<
|
||||
GOAL_COLOR=b_magenta
|
||||
HELP_SEP= ->>
|
||||
-include .task.mk
|
||||
$(if $(filter help,$(MAKECMDGOALS)),.task.mk: ; curl -fsSL https://raw.githubusercontent.com/daylinmorgan/task.mk/v22.9.5/task.mk -o .task.mk)
|
||||
|
|
|
@ -1,42 +0,0 @@
|
|||
FROM debian:bookworm-20220822-slim
|
||||
|
||||
ENV TERM='xterm-256color' \
|
||||
HOME='/root'
|
||||
|
||||
COPY ./docker/install_packages.sh /usr/bin/install_packages
|
||||
|
||||
RUN install_packages \
|
||||
ca-certificates \
|
||||
locales \
|
||||
tmux \
|
||||
curl \
|
||||
gawk \
|
||||
zsh \
|
||||
vim \
|
||||
git \
|
||||
neovim
|
||||
|
||||
RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
|
||||
locale-gen
|
||||
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
|
||||
|
||||
WORKDIR /root
|
||||
|
||||
RUN sh -c "$(curl -fsLS https://chezmoi.io/get)"
|
||||
|
||||
COPY . .dotfiles
|
||||
RUN ./bin/chezmoi init --apply -S ~/.dotfiles
|
||||
|
||||
ENV DOTFILES_DIR="$HOME/.dotfiles" \
|
||||
PATH="$PATH:$HOME/bin:$HOME/.dotfiles/bin"
|
||||
|
||||
# setup eget for tools script
|
||||
RUN curl https://zyedidia.github.io/eget.sh | sh && mv ./eget ./bin/eget
|
||||
|
||||
# use eget to fetch yq and some needed tools
|
||||
RUN tools $(cat .dotfiles/docker/tools.txt)
|
||||
|
||||
# get shell extensions
|
||||
RUN sheldon -q --config-file ~/.config/sheldon/plugins.toml lock
|
||||
|
||||
CMD ["zsh"]
|
|
@ -1,24 +0,0 @@
|
|||
#!/bin/sh
|
||||
set -e
|
||||
set -u
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
n=0
|
||||
max=2
|
||||
until [ $n -gt $max ]; do
|
||||
set +e
|
||||
(
|
||||
apt-get update -qq &&
|
||||
apt-get install -y --no-install-recommends "$@"
|
||||
)
|
||||
CODE=$?
|
||||
set -e
|
||||
if [ $CODE -eq 0 ]; then
|
||||
break
|
||||
fi
|
||||
if [ $n -eq $max ]; then
|
||||
exit $CODE
|
||||
fi
|
||||
echo "apt failed, retrying"
|
||||
n=$((n + 1))
|
||||
done
|
||||
rm -r /var/lib/apt/lists /var/cache/apt/archives
|
|
@ -1,4 +0,0 @@
|
|||
starship
|
||||
sheldon
|
||||
ripgrep
|
||||
lsd
|
|
@ -19,6 +19,7 @@ INSTALL_NO=${RED}✗${NORMAL}
|
|||
shopt -s nullglob
|
||||
BINARY_FILES=($HOME/bin/*)
|
||||
|
||||
|
||||
export EGET_BIN=$HOME/bin
|
||||
alias eget="eget --system linux/amd64"
|
||||
|
||||
|
|
|
@ -24,9 +24,9 @@ fi
|
|||
|
||||
# >>> mamba initialize >>>
|
||||
# !! Contents within this block are managed by 'mamba init' !!
|
||||
export MAMBA_EXE="/home/daylin/.local/bin/micromamba"
|
||||
export MAMBA_ROOT_PREFIX="/home/daylin/micromamba"
|
||||
__mamba_setup="$('/home/daylin/.local/bin/micromamba' shell hook --shell zsh --prefix '/home/daylin/micromamba' 2>/dev/null)"
|
||||
export MAMBA_EXE="/home/daylin/.local/bin/micromamba";
|
||||
export MAMBA_ROOT_PREFIX="/home/daylin/micromamba";
|
||||
__mamba_setup="$('/home/daylin/.local/bin/micromamba' shell hook --shell zsh --prefix '/home/daylin/micromamba' 2> /dev/null)"
|
||||
if [ $? -eq 0 ]; then
|
||||
eval "$__mamba_setup"
|
||||
else
|
||||
|
|
Loading…
Reference in a new issue