diff --git a/Containerfile b/Containerfile index f6b9e00..fd78003 100644 --- a/Containerfile +++ b/Containerfile @@ -1,7 +1,10 @@ FROM docker.io/fedora:41 # === setup system === -RUN dnf -y install neovim zoxide unzip git go procps bash-completion +ENV TZ="Europe/Amsterdam" +RUN dnf -y install neovim unzip \ + bash-completion zoxide fd-find procps \ + git go npm # === setup container user === RUN useradd -ms /bin/bash user && usermod -aG wheel user && sed -i '/NOPASSWD/s/^#//g' /etc/sudoers @@ -10,6 +13,6 @@ WORKDIR /home/user COPY config/user/bashrc /home/user/.bashrc # === setup neovim === -RUN git clone --depth 1 https://github.com/AstroNvim/template ~/.config/nvim -COPY config/nvim/lua/community.lua /home/user/.config/nvim/lua/community.lua -COPY config/nvim/lua/polish.lua /home/user/.config/nvim/lua/polish.lua +RUN git clone --depth 1 https://github.com/LazyVim/starter ~/.config/nvim +COPY config/nvim/plugins /home/user/.config/nvim/lua/plugins +COPY config/nvim/config/options.lua /home/user/.config/nvim/config/lua/options.lua diff --git a/config/nvim/config/options.lua b/config/nvim/config/options.lua new file mode 100644 index 0000000..b07e455 --- /dev/null +++ b/config/nvim/config/options.lua @@ -0,0 +1 @@ +vim.o.textwidth = 60 diff --git a/config/nvim/lua/community.lua b/config/nvim/lua/community.lua deleted file mode 100644 index 0e498b4..0000000 --- a/config/nvim/lua/community.lua +++ /dev/null @@ -1,5 +0,0 @@ ----@type LazySpec -return { - "AstroNvim/astrocommunity", - { import = "astrocommunity.completion.copilot-lua-cmp" }, -} diff --git a/config/nvim/lua/polish.lua b/config/nvim/lua/polish.lua deleted file mode 100644 index f22e7c4..0000000 --- a/config/nvim/lua/polish.lua +++ /dev/null @@ -1,2 +0,0 @@ -vim.opt.relativenumber = false -vim.opt.textwidth = 60 diff --git a/config/nvim/plugins/colorscheme.lua b/config/nvim/plugins/colorscheme.lua new file mode 100644 index 0000000..ae476d6 --- /dev/null +++ b/config/nvim/plugins/colorscheme.lua @@ -0,0 +1,9 @@ +return { + { "rose-pine/neovim", name = "rose-pine" }, + { + "LazyVim/LazyVim", + opts = { + colorscheme = "rose-pine-dawn", + }, + }, +} diff --git a/config/nvim/plugins/dashboard.lua b/config/nvim/plugins/dashboard.lua new file mode 100644 index 0000000..c0a2989 --- /dev/null +++ b/config/nvim/plugins/dashboard.lua @@ -0,0 +1,6 @@ +return { + { + "nvimdev/dashboard-nvim", + enabled = false, + }, +} diff --git a/config/user/bashrc b/config/user/bashrc index 830d90c..b91814a 100644 --- a/config/user/bashrc +++ b/config/user/bashrc @@ -4,13 +4,8 @@ export EDITOR=nvim \ WAYLAND_DISPLAY=wayland-0 \ XDG_RUNTIME_DIR=/run/user/1000 \ - SSH_AUTH_SOCK=/run/user/1000/ssh-auth-sock - -if [ -n "$MYVIMRC" ]; then - PS1='\[\e[90;42m\] container | \w \[\e[40;32m\]\[\e[m\] ' -else + SSH_AUTH_SOCK=/run/user/1000/ssh-auth-sock \ PS1='\[\e[97;42m\] container | \w \[\e[49;32m\]\[\e[m\] ' -fi # === aliases and functions === alias vi=nvim diff --git a/container.sh b/container.sh index 9ff2682..b9f7161 100755 --- a/container.sh +++ b/container.sh @@ -1,11 +1,12 @@ #!/bin/sh + podman run -it \ - --name "${dev:-dev}" \ - -v /run/user/1000/wayland-0:/run/user/1000/wayland-0 \ - -v "$SSH_AUTH_SOCK":/run/user/1000/ssh-auth-sock \ - -v ~/Documents:/home/user/Documents \ - -v ~/.ssh:/home/user/.ssh \ - -v ~/.config/git:/home/user/.config/git \ - --security-opt label=disable \ - --userns=keep-id \ - dev + --name "${1:-dev}" \ + -v /run/user/1000/wayland-0:/run/user/1000/wayland-0 \ + -v "$SSH_AUTH_SOCK":/run/user/1000/ssh-auth-sock \ + -v ~/Documents:/home/user/Documents \ + -v ~/.ssh:/home/user/.ssh \ + -v ~/.config/git:/home/user/.config/git \ + --security-opt label=disable \ + --userns=keep-id \ + dev