From 5a56982063ae4243936e3d97e2fa4a72f6fb5ee6 Mon Sep 17 00:00:00 2001
From: dhvcc <alexey.artishevskiy@gmail.com>
Date: Tue, 2 Jul 2024 19:07:40 +0300
Subject: [PATCH] Set new Dockerfile

---
 .cfg/Dockerfile           | 57 +++++++++++++++++++--------------------
 .cfg/Dockerfile.test.brew | 41 ----------------------------
 2 files changed, 28 insertions(+), 70 deletions(-)
 delete mode 100644 .cfg/Dockerfile.test.brew

diff --git a/.cfg/Dockerfile b/.cfg/Dockerfile
index 40c0514..16214d7 100644
--- a/.cfg/Dockerfile
+++ b/.cfg/Dockerfile
@@ -2,41 +2,40 @@ FROM ubuntu:22.04
 
 WORKDIR /root
 
-RUN apt-get update
+# ubuntu only
+RUN apt update
+RUN apt install -y curl git build-essential
 
-RUN apt-get install -y curl wget git gcc g++ libffi-dev
 
-RUN apt-get install -y htop xclip make vim curl \
-    python3-dev python3-pip python3-venv \
-    libpq-dev libsqlite3-dev \
-    lzma-dev libreadline6-dev libbz2-dev
+# Install brew
+RUN curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh | env NONINTERACTIVE=1 bash
 
-RUN apt-get install -y cargo bash zsh neofetch unzip ripgrep
+RUN echo 'export PATH="$PATH:/home/linuxbrew/.linuxbrew/bin"' >> "$HOME/.bashrc"
+ENV PATH="$PATH:/home/linuxbrew/.linuxbrew/bin"
 
-RUN mkdir -p ~/.local/bin
-RUN wget https://github.com/lsd-rs/lsd/releases/download/v1.0.0/lsd-musl_1.0.0_amd64.deb && \
-    dpkg -i lsd-musl_1.0.0_amd64.deb && rm lsd-musl_1.0.0_amd64.deb
-RUN  apt-get install -y fd-find && ln -s $(which fdfind) ~/.local/bin/fd
-RUN apt-get install -y bat && ln -s $(which batcat) ~/.local/bin/bat
+RUN brew doctor
 
-COPY . .
+# Xclip ubuntu only
+RUN brew install unzip xclip vim neovim
 
-RUN curl https://pyenv.run | bash
-RUN curl -fsSL https://fnm.vercel.app/install | bash && /bin/zsh -i -c 'fnm install 16'
-RUN git clone --depth 1 https://github.com/junegunn/fzf.git ~/.fzf && ~/.fzf/install --all
+RUN brew install starship neofetch fzf btop wget \
+      pyenv nvm \
+      lsd fd ripgrep bat `# rust utils`
 
-RUN ./.cfg/scripts/install-neovim.sh
-RUN ./.cfg/scripts/install-omb.sh
-RUN ./.cfg/scripts/install-omz.sh
-RUN sh -c "$(curl -fsSL https://starship.rs/install.sh)" "" -f
-RUN pip install pipx && \
-    pipx install ansible --include-deps && \
-    pipx install git+https://github.com/politeauthority/docker-pretty-ps.git#egg=docker-pretty-ps && \
-    pipx install ranger-fm --include-deps && \
-    pipx install poetry --include-deps && \
-    pipx install ipython --include-deps
+# INSTALL VIM THINGS
+RUN curl -fLo '~/.vim/autoload/plug.vim' --create-dirs \
+    'https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
 
-COPY .bashrc .zshrc ./
-RUN rm -rf .cfg
+RUN curl -Lks https://raw.githubusercontent.com/dhvcc/configs/master/.cfg/install.sh | /bin/sh
 
-CMD zsh
+# Install manually or in script
+#ENV NVM_DIR="$HOME/.nvm"
+#RUN test -s "/home/linuxbrew/.linuxbrew/opt/nvm/nvm.sh" && . "/home/linuxbrew/.linuxbrew/opt/nvm/nvm.sh"; nvm install 16
+
+# ubuntu only
+RUN apt install -y zsh
+#
+RUN "$HOME/.cfg/scripts/install-omb.sh"
+RUN "$HOME/.cfg/scripts/install-omz.sh"
+
+CMD bash
diff --git a/.cfg/Dockerfile.test.brew b/.cfg/Dockerfile.test.brew
deleted file mode 100644
index 16214d7..0000000
--- a/.cfg/Dockerfile.test.brew
+++ /dev/null
@@ -1,41 +0,0 @@
-FROM ubuntu:22.04
-
-WORKDIR /root
-
-# ubuntu only
-RUN apt update
-RUN apt install -y curl git build-essential
-
-
-# Install brew
-RUN curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh | env NONINTERACTIVE=1 bash
-
-RUN echo 'export PATH="$PATH:/home/linuxbrew/.linuxbrew/bin"' >> "$HOME/.bashrc"
-ENV PATH="$PATH:/home/linuxbrew/.linuxbrew/bin"
-
-RUN brew doctor
-
-# Xclip ubuntu only
-RUN brew install unzip xclip vim neovim
-
-RUN brew install starship neofetch fzf btop wget \
-      pyenv nvm \
-      lsd fd ripgrep bat `# rust utils`
-
-# INSTALL VIM THINGS
-RUN curl -fLo '~/.vim/autoload/plug.vim' --create-dirs \
-    'https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
-
-RUN curl -Lks https://raw.githubusercontent.com/dhvcc/configs/master/.cfg/install.sh | /bin/sh
-
-# Install manually or in script
-#ENV NVM_DIR="$HOME/.nvm"
-#RUN test -s "/home/linuxbrew/.linuxbrew/opt/nvm/nvm.sh" && . "/home/linuxbrew/.linuxbrew/opt/nvm/nvm.sh"; nvm install 16
-
-# ubuntu only
-RUN apt install -y zsh
-#
-RUN "$HOME/.cfg/scripts/install-omb.sh"
-RUN "$HOME/.cfg/scripts/install-omz.sh"
-
-CMD bash