Merge branch 'main' into jpd-add-treesitter-parsers

Dockerfile

@@ -1,10 +1,18 @@
 FROM ubuntu:mantic-20240216
 
-# system deps
+# user setup
 ARG USER_UID=1000
 ARG USER_GID=1000
 ARG DOCKER_GID=999
 ARG WHEEL_GID=980
+RUN echo 'remove existing ubuntu user' \
+  && groupdel --force ubuntu \
+  && userdel --force ubuntu \
+  && echo 'setup extra groups' \
+  && groupadd --gid ${WHEEL_GID} wheel \
+  && groupadd --gid ${DOCKER_GID} docker
+
+# system deps
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update \
   && apt-get install -y software-properties-common \
@@ -83,15 +91,7 @@ RUN apt-get update \
     zlib1g-dev \
   && rm -rf /var/lib/apt/lists/* \
   && locale-gen en_US.UTF-8 \
-  && echo 'remove existing ubuntu user' \
-  && groupdel --force ubuntu \
-  && userdel --force ubuntu \
-  && echo 'update gid from systemd-journal group' \
-  && groupmod -g 994 systemd-journal \
-  && chgrp --recursive systemd-journal /var/log/journal \
   && echo 'setup unprivileged user' \
-  && groupadd --gid ${WHEEL_GID} wheel \
-  && groupadd --gid ${DOCKER_GID} docker \
   && groupadd --gid ${USER_GID} coder \
   && useradd \
     --uid ${USER_UID} \
@@ -188,6 +188,7 @@ RUN git clone https://github.com/nvim-lua/kickstart.nvim.git "${XDG_CONFIG_HOME}
 RUN ${LOCAL_BIN_HOME}/mise plugins install --force --yes \
     awscli \
     bat \
+    bitwarden \
     dagger \
     elixir \
     erlang \
@@ -202,6 +203,7 @@ RUN ${LOCAL_BIN_HOME}/mise plugins install --force --yes \
     lefthook \
     poetry \
     ripgrep \
+    rust \
     starship \
     terraform \
     tilt \
@@ -215,6 +217,7 @@ ARG GIT_USER_EMAIL
 ARG GIT_USER_NAME
 RUN git config --global user.email "${GIT_USER_EMAIL}" \
   && git config --global user.name "${GIT_USER_NAME}" \
+  && git config --global gpg.ssh.allowedSignersFile "${XDG_CONFIG_HOME}/git/allowed_signers" \
   && git config --global core.editor nvim \
   && git config --global diff.tool nvimdiff \
   && git config --global difftool.nvimdiff.layout "LOCAL,REMOTE" \

config/git/.exists

@@ -0,0 +1,9 @@
+[commit]
+	gpgsign = true
+[gpg]
+	format = ssh
+[user]
+	email = {{email}}
+	name = {{name}}
+	signingKey = {{path-to-pub-ssh-key}}
+

config/mise/config.toml

@@ -1,6 +1,7 @@
 [tools]
 awscli = "2.15.30"
 bat = "0.24.0"
+bitwarden = "2024.2.1"
 dagger = "0.10.2"
 elixir = "1.16.2-otp-26"
 erlang = "26.2.3"

config/tmux/tmux.conf

@@ -43,8 +43,8 @@ set -g status-fg white
 # set -g status-left "#$"
 
 # Highlight the active window in the status bar
-set-window-option -g window-status-current-bg yellow
+# set-window-option -g window-status-current-bg yellow
-set-window-option -g window-status-current-fg black
+# set-window-option -g window-status-current-fg black
 
 # Don't prompt to kill panes/windows
 bind-key x kill-pane
@@ -62,34 +62,34 @@ set -sg terminal-overrides ",*:RGB"
 #### COLOUR (Solarized 256)
 
 # default statusbar colors
-set-option -g status-bg colour235 #base02
+# set-option -g status-bg colour235 #base02
-set-option -g status-fg colour136 #yellow
+# set-option -g status-fg colour136 #yellow
-set-option -g status-attr default
+# set-option -g status-attr default
 
 # default window title colors
-set-window-option -g window-status-fg colour244 #base0
+# set-window-option -g window-status-fg colour244 #base0
-set-window-option -g window-status-bg default
+# set-window-option -g window-status-bg default
-#set-window-option -g window-status-attr dim
+# set-window-option -g window-status-attr dim
 
 # active window title colors
-set-window-option -g window-status-current-fg colour166 #orange
+# set-window-option -g window-status-current-fg colour166 #orange
-set-window-option -g window-status-current-bg default
+# set-window-option -g window-status-current-bg default
-#set-window-option -g window-status-current-attr bright
+# set-window-option -g window-status-current-attr bright
 
 # pane border
-set-option -g pane-border-fg colour235 #base02
+# set-option -g pane-border-fg colour235 #base02
-set-option -g pane-active-border-fg colour240 #base01
+# set-option -g pane-active-border-fg colour240 #base01
 
 # message text
-set-option -g message-bg colour235 #base02
+# set-option -g message-bg colour235 #base02
-set-option -g message-fg colour166 #orange
+# set-option -g message-fg colour166 #orange
 
 # pane number display
-set-option -g display-panes-active-colour colour33 #blue
+# set-option -g display-panes-active-colour colour33 #blue
-set-option -g display-panes-colour colour166 #orange
+# set-option -g display-panes-colour colour166 #orange
 
 # clock
-set-window-option -g clock-mode-colour colour64 #green
+# set-window-option -g clock-mode-colour colour64 #green
 
 # buffer size
 set -g history-limit 50000
@@ -99,12 +99,12 @@ set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'fabioluciano/tmux-tokyo-night'
 set -g @plugin 'Morantron/tmux-fingers'
 set -g @plugin 'tmux-plugins/tmux-yank'
-set -g @plugin 'tmux-plugins/tmux-resurrect'
+# set -g @plugin 'tmux-plugins/tmux-resurrect'
-set -g @plugin 'tmux-plugins/tmux-continuum'
+# set -g @plugin 'tmux-plugins/tmux-continuum'
 
 # configure resurrect/continuum
-set -g @continuum-save-interval '15'
+# set -g @continuum-save-interval '15'
-set -g @continuum-restore 'on'
+# set -g @continuum-restore 'on'
 
 # load/install plugins
 run '~/.config/tmux/plugins/tpm/tpm'