From 02268d08296f5b0dc71064059321fd9ed82d5733 Mon Sep 17 00:00:00 2001 From: Junya Okabe Date: Sun, 25 Sep 2022 02:13:57 +0900 Subject: [PATCH 1/3] =?UTF-8?q?conflict=E3=81=AE=E8=A7=A3=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index a22cb05..4d2ac16 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,7 @@ *.pyc # nvim submodules .config/nvim/plugged + +# nvim node_modules +.config/coc/extensions/* +!.config/coc/extensions/package.json From e0994fd6e27eb57b7e7afbc6e3eb2ce543bdf264 Mon Sep 17 00:00:00 2001 From: Junya Okabe Date: Mon, 10 Oct 2022 15:52:28 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E6=94=B9=E8=A1=8C=E3=81=AE=E5=89=8A?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .zshrc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.zshrc b/.zshrc index 4158fdc..594f707 100644 --- a/.zshrc +++ b/.zshrc @@ -71,8 +71,7 @@ GIT_PS1_SHOWUNTRACKEDFILES=true GIT_PS1_SHOWSTASHSTATE=true GIT_PS1_SHOWUPSTREAM=auto setopt PROMPT_SUBST -PS1='%F{green}%n@%m%f: %F{cyan}%~%f %F{red}$(__git_ps1 "(%s)")%f -\$ ' +PS1='%F{green}%n@%m%f: %F{cyan}%~%f %F{red}$(__git_ps1 "(%s)")%f $ ' # >>> fig >>> From 33b2485d84ddf58dec277d5032441fadf8256d27 Mon Sep 17 00:00:00 2001 From: Junya Okabe Date: Thu, 13 Oct 2022 02:11:48 +0900 Subject: [PATCH 3/3] flake8 --- .config/flake8 | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .config/flake8 diff --git a/.config/flake8 b/.config/flake8 new file mode 100644 index 0000000..3b8ff28 --- /dev/null +++ b/.config/flake8 @@ -0,0 +1,3 @@ +[flake8] +extend-ignore = E203 +max-line-length = 119