diff --git a/.config/nvim/lua/bumpsoo/plugins/avante.lua b/.config/nvim/lua/bumpsoo/plugins/avante.lua deleted file mode 100644 index 8cf2e82..0000000 --- a/.config/nvim/lua/bumpsoo/plugins/avante.lua +++ /dev/null @@ -1,35 +0,0 @@ -return { - "bumpsoo/avante.nvim", - event = "VeryLazy", - version = false, - opts = { - provider = "ollama", - ollama = { - endpoint = os.getenv("OLLAMA_API_BASE"), - model = "gemma3:27b-it-qat", - api_key_name = "OLLAMA_API_KEY", - }, - vendors = { - groq = { - __inherited_from = "openai", - api_key_name = "GROQ_API_KEY", - endpoint = "https://api.groq.com/openai/v1/", - model = "meta-llama/llama-4-maverick-17b-128e-instruct", - max_tokens = 8192, - }, - } - }, - dependencies = { - "nvim-treesitter/nvim-treesitter", - "stevearc/dressing.nvim", - "nvim-lua/plenary.nvim", - "MunifTanjim/nui.nvim", - { - 'MeanderingProgrammer/render-markdown.nvim', - opts = { - file_types = { "markdown", "Avante" }, - }, - ft = { "markdown", "Avante" }, - }, - }, -} diff --git a/.config/nvim/lua/bumpsoo/plugins/osc_yank.lua b/.config/nvim/lua/bumpsoo/plugins/osc_yank.lua deleted file mode 100644 index 56f0664..0000000 --- a/.config/nvim/lua/bumpsoo/plugins/osc_yank.lua +++ /dev/null @@ -1,27 +0,0 @@ -return { - 'ojroques/vim-oscyank', - config = function() - local valid_registers = { - [''] = true, - ['+'] = true, - ['*'] = true, - } - - local valid_operators = { - ['y'] = true, - ['d'] = true, - } - - vim.api.nvim_create_autocmd('TextYankPost', { - callback = function() - local regname = vim.v.event.regname - local operator = vim.v.event.operator - - if valid_registers[regname] and valid_operators[operator] then - vim.fn.OSCYankRegister(regname) - end - end, - }) - end -} - diff --git a/.config/nvim/lua/bumpsoo/plugins/treesitter.lua b/.config/nvim/lua/bumpsoo/plugins/treesitter.lua index 0c182f0..c7c2c6f 100644 --- a/.config/nvim/lua/bumpsoo/plugins/treesitter.lua +++ b/.config/nvim/lua/bumpsoo/plugins/treesitter.lua @@ -20,7 +20,6 @@ return { "yaml", 'python', "terraform", - "markdown", }, }) end diff --git a/.tmux.conf b/.tmux.conf index 9231750..2b9e582 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -3,9 +3,5 @@ setw -g mode-keys vi bind-key -T copy-mode-vi v send-keys -X begin-selection bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel bind-key -T copy-mode-vi 'r' send -X rectangle-toggle - -set-option -s set-clipboard on - -bind-key -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "tmux save-buffer - | tmux load-buffer - && tmux show-buffer | osc52_copy" -bind-key -T copy-mode y send-keys -X copy-pipe-and-cancel "tmux save-buffer - | tmux load-buffer - && tmux show-buffer | osc52_copy" +set -s copy-command 'wl-copy' diff --git a/Dockerfile b/Dockerfile index 28c7e2d..fc22584 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,8 +16,7 @@ RUN apt-get update && apt-get install -y \ python3-venv \ sudo -RUN echo "ko_KR.UTF-8 UTF-8" | sudo tee -a /etc/locale.gen -RUN locale-gen +RUN locale-gen ko_KR.UTF-8 ARG UID ARG GID @@ -58,7 +57,7 @@ ENV NVM_DIR=${HOME}/.nvm RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash \ && . $NVM_DIR/nvm.sh \ && nvm install --lts \ - && npm install -g typescript typescript-language-server + && npm install -g typescript-language-server COPY --chown=${USERNAME}:${GID} ${CONFIG_PREFIX}.gitconfig /home/${USERNAME}/.gitconfig @@ -66,10 +65,7 @@ COPY --chown=${USERNAME}:${GID} .config/nvim /home/${USERNAME}/.config/nvim COPY --chown=${USERNAME}:${GID} .tmux.conf /home/${USERNAME}/.tmux.conf -COPY --chown=${USERNAME}:${GID} bin/osc52_copy /home/${USERNAME}/.local/bin/osc52_copy - -RUN echo 'export LANG=ko_KR.UTF-8' >> ~/.bashrc \ - && echo 'export LC_ALL=ko_KR.UTF-8' >> ~/.bashrc +RUN locale-gen ko_KR.UTF-8 && echo 'export LANG=ko_KR.UTF-8' >> ~/.bashrc CMD ["/bin/bash"] diff --git a/Makefile b/Makefile index c96dceb..2574f08 100644 --- a/Makefile +++ b/Makefile @@ -1,24 +1,15 @@ RUN_OPTION=\ -it \ - --rm \ -v ${HOME}/.ssh:/home/$(shell id -un)/.ssh \ -v ${PWD}:/workspace -ifdef HOST +ifdef WAYLAND_DISPLAY RUN_OPTION += \ - --network host + -e WAYLAND_DISPLAY=${WAYLAND_DISPLAY} \ + -e XDG_RUNTIME_DIR=/run/user/$(shell id -u) \ + -v /run/user/$(shell id -u)/wayland-0:/run/user/$(shell id -u)/wayland-0 endif -ENV_VARS := GROQ_API_KEY OLLAMA_API_BASE OLLAMA_API_KEY - -define CHECK_AND_APPEND -ifneq ($($(1)),) - RUN_OPTION += -e $(1)=$($(1)) -endif -endef - -$(foreach VAR,$(ENV_VARS),$(eval $(call CHECK_AND_APPEND,$(VAR)))) - BUILD_OPTION=\ --build-arg USERNAME=$(shell id -un) \ --build-arg UID=$(shell id -u) diff --git a/bin/osc52_copy b/bin/osc52_copy deleted file mode 100755 index 617eb33..0000000 --- a/bin/osc52_copy +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -# OSC52로 클립보드에 복사하는 스크립트 -if [ -t 0 ]; then - input="$*" -else - input="$(cat)" -fi -printf '\033]52;c;%s\a' "$(printf "%s" "$input" | base64 | tr -d '\r\n')" -