merge: work

This commit is contained in:
AngeD 2022-10-17 21:02:33 +02:00
commit b0d91bc2da
6 changed files with 9 additions and 6 deletions

View File

@ -5,11 +5,12 @@
vim.g.mapleader = " " vim.g.mapleader = " "
vim.o.expandtab = true vim.o.expandtab = true
vim.o.shiftwidth = 4
vim.o.smartindent = true vim.o.smartindent = true
vim.o.shiftwidth = 4
vim.o.tabstop = 4 vim.o.tabstop = 4
vim.o.list = true vim.o.list = true
vim.o.number = true vim.o.number = true
vim.o.relativenumber = true vim.o.relativenumber = true
@ -28,6 +29,8 @@ vim.o.grepprg = "grep -rn"
vim.o.scrolloff = 2 vim.o.scrolloff = 2
vim.wo.colorcolumn = "80" vim.wo.colorcolumn = "80"
vim.g.netrw_banner = 0
-------------------- --------------------
----- packages ----- ----- packages -----
-------------------- --------------------

@ -1 +1 @@
Subproject commit b60b85b234d6a575f636d0a125478115f993c90c Subproject commit 575220f460fc3a5eeb05673e9cc7d8e80b6b7147

@ -1 +1 @@
Subproject commit 0a8064eda0c7a4475c4a8ceb39199e975308797b Subproject commit 2dd9e060f21eecd403736bef07ec83b73341d955

@ -1 +1 @@
Subproject commit 7ddc2b54db9b92846292e081a337dce2ed4f66a1 Subproject commit 8f927a4d50716e534c5845e835625962adf878e1

@ -1 +1 @@
Subproject commit 11daa7dd5f22acadef1135000e92cc899e22c134 Subproject commit 65a1e4edbe678cdac37ad96ca4bc4f6d77e27adf

2
.pyenv

@ -1 +1 @@
Subproject commit bb0f2ae1a7867a06c1692e00efd3abe2113b8f83 Subproject commit 03a5d65387db282f77a8bc92581cd734133329b5