Merge pull request #9 from altescy/renew

Author: altescy

Dockerfile

@@ -1,54 +1,40 @@
 FROM homebrew/ubuntu24.04
 
-ARG username="user"
-ARG password="password"
-
 # Install requirements
-RUN apt-get update && \
-    apt-get install -y \
-        build-essential \
-        curl \
-        wget \
-        file \
-        git \
-        locales \
-        locales-all \
-        zsh \
-        libssl-dev \
-        zlib1g-dev \
-        libbz2-dev \
-        libreadline-dev \
-        libsqlite3-dev \
-        llvm \
-        libncurses5-dev \
-        libncursesw5-dev \
-        xz-utils \
-        tk-dev \
-        libffi-dev \
-        liblzma-dev \
-        python3-openssl
-RUN locale-gen ja_JP.UTF-8 && update-locale
-RUN apt-get autoremove -y && \
-    apt-get clean && \
+RUN sudo apt-get update && \
+    sudo apt-get install -y \
+    build-essential \
+    curl \
+    wget \
+    file \
+    git \
+    locales \
+    locales-all \
+    zsh \
+    libssl-dev \
+    zlib1g-dev \
+    libbz2-dev \
+    libreadline-dev \
+    libsqlite3-dev \
+    llvm \
+    libncurses5-dev \
+    libncursesw5-dev \
+    xz-utils \
+    tk-dev \
+    libffi-dev \
+    liblzma-dev \
+    python3-openssl
+RUN sudo apt-get autoremove -y && \
+    sudo apt-get clean && \
     rm -rf /usr/local/src/*
-RUN brew install tmux anyenv neovim
+RUN brew install tmux anyenv neovim hub
 
-# Setup user
-ENV USER  $username
-ENV HOME /home/${USER}
+# Set up shell
 ENV SHELL /usr/bin/zsh
 
-# Create user
-RUN useradd -m ${USER} && \
-    gpasswd -a ${USER} sudo && \
-    echo "${USER}:${password}" | chpasswd
-RUN chown -R ${USER} /home/linuxbrew/.linuxbrew
-
 # Install dotfiles
 WORKDIR ${HOME}
 COPY    ./ ./.dotfiles
-RUN     chown -R ${USER} ${HOME}/.dotfiles
-USER    ${USER}
 RUN     cd .dotfiles && make
 
 CMD ["/bin/zsh"]

Makefile

@@ -7,9 +7,9 @@ DOCKER_CONTAINER_NAME = dotfiles
 DOCKERFILE_PATH       = $(PWD)/Dockerfile
 
 .PHONY: all brew \
-        apps anyenv_app fzf_app git_app nvim_app poetry_app tmux_app zsh_app efm_app \
+        apps anyenv_app fzf_app git_app nvim_app tmux_app zsh_app efm_app \
         languages clang golang node python rust nim ruby vala zig crystal \
-        configs editorconfig git nvim poetry tmux zsh efm \
+        configs editorconfig git nvim tmux zsh efm \
         docker docker_attach docker_build docker_run docker_stop \
         clean editorconfig_clean git_clean nvim_clean tmux_clean zsh_clean
 
@@ -36,9 +36,6 @@ git_app:
 nvim_app:
 	$(PWD)/nvim/bin/install.sh
 
-poetry_app: python
-	$(PWD)/poetry/bin/install.sh
-
 tmux_app:
 	$(PWD)/tmux/bin/install.sh
 
@@ -91,7 +88,7 @@ lua:
 #  CONFIGS
 #
 
-configs: git editorconfig nvim poetry tmux zsh
+configs: git editorconfig nvim tmux zsh
 
 editorconfig:
 	$(PWD)/editorconfig/bin/setup.sh
@@ -102,9 +99,6 @@ git: git_app
 nvim: node nvim_app
 	$(PWD)/nvim/bin/setup.sh
 
-poetry: poetry_app
-	$(PWD)/poetry/bin/setup.sh
-
 tmux: tmux_app
 	$(PWD)/tmux/bin/setup.sh
 

bin/python_install.sh

@@ -19,7 +19,7 @@ fi
 
 if (type "pyenv" > /dev/null 2>&1); then
     # Install latest conda
-    PYTHON_VERSION="3.11.6"
+    PYTHON_VERSION="3.13"
     pyenv install $PYTHON_VERSION
     pyenv rehash
     pyenv global $PYTHON_VERSION
@@ -29,4 +29,4 @@ fi
 python --version
 pip --version
 
-pip install flake8 mypy black isort refurb 'python-lsp-server[mypy,flake8,isort,black]'
+pip install refurb

editorconfig/conf.d/editorconfig

@@ -20,6 +20,9 @@ indent_size = 2
 [*.{html,xml}]
 indent_size = 2
 
+[*.{css,scss,sass}]
+indent_size = 2
+
 [*.{json,jsonnet,libsonnet,yml,yaml}]
 indent_size = 2
 
@@ -41,5 +44,8 @@ indent_size = 2
 [*.tsv]
 indent_style = tab
 
+[*.plist]
+indent_style = tab
+
 [Makefile]
 indent_style = tab

nvim/bin/setup.sh

@@ -1,19 +1,9 @@
 #!/bin/bash
 
-rm -rf $HOME/.config/nvim $HOME/.config/coc $HOME/.cache/dein
+rm -rf $HOME/.config/nvim
 mkdir -p $HOME/.config/nvim
 
 ln -s `pwd`/nvim/conf.d/init.lua $HOME/.config/nvim/init.lua
 ln -s `pwd`/nvim/conf.d/lua $HOME/.config/nvim/lua
-ln -s `pwd`/nvim/conf.d/coc-settings.json $HOME/.config/nvim/coc-settings.json
 
 nvim --headless -u $HOME/.config/nvim/init.lua +qall
-
-# Install coc.nvim extensions
-if (type "anyenv" > /dev/null 2>&1); then
-    eval "$(anyenv init -)"
-fi
-mkdir -p $HOME/.config/coc/extensions
-cp `pwd`/nvim/conf.d/coc-package.json $HOME/.config/coc/extensions/package.json
-cd $HOME/.config/coc/extensions
-npm install --global-style --ignore-scripts --no-bin-links --no-package-lock --only=prod

nvim/conf.d/coc-package.json

@@ -1,2 +1,5 @@
-require("base")
-require("plugins")
+require("config.base")
+require("config.lazy")
+
+vim.o.exrc = true
+vim.o.secure = true