olexsmir/dotfiles
1
Fork 0
mirror of https://github.com/olexsmir/dotfiles.git synced 2026-01-15 08:41:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Update bspwm theme, lvim

Browse source
This commit is contained in:
neoteny 2021-09-20 16:50:53 +03:00
parent 50a524dbc5
commit 6e3359255f
15 changed files with 62 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -1,6 +1,6 @@
<h1 align="center">dotfiles</h1> <h1 align="center">dotfiles</h1>
[](screen.png) ![](./config/bspwm/screen.png)
-------------- --------------
### System configuration ### System configuration
@ -23,8 +23,8 @@ yay -S rcm
Install dependency: Install dependency:
```bash ```bash
sudo pacman -S git bspwm sxhkd dunst kitty picom rofi zsh ranger ttf-font-awesome ttf-jetbrains-mono sudo pacman -S git bspwm sxhkd dunst alacritty neovim picom rofi zsh ranger ttf-font-awesome ttf-jetbrains-mono
yay -S neovim-nightly-bin polybar yay -S polybar
``` ```
And install configs: And install configs:

4
config/bspwm/README.md
View file

@ -1,10 +1,10 @@
# BSPWM # BSPWM
[](./screen.png) ![](./screen.png)
-------------- --------------
### Install ### Install
```bash ```bash
sudo pacman -S bspwm sxhkd kitty sudo pacman -S bspwm sxhkd alacritty
yay -S polybar yay -S polybar
``` ```

11
config/bspwm/bspwmrc
View file

@ -35,20 +35,17 @@ C single_monocle true
C focus_follows_pointer true C focus_follows_pointer true
# Colors # Colors
C normal_border_color "#090909" C normal_border_color "#1f2227"
C active_border_color "#1F2324" C active_border_color "#61AFEF"
C focused_border_color "#008DCD" C focused_border_color "#e06c75"
C urgent_border_color "#FF6C6B" C urgent_border_color "#5c6370"
#== BSPWM Rules #== BSPWM Rules
R kitty desktop='^1' focus=on follow=on R kitty desktop='^1' focus=on follow=on
R Google-chrome desktop='^2' focus=on follow=on R Google-chrome desktop='^2' focus=on follow=on
R Brave desktop='^2' focus=on follow=on
R Code desktop='^3' focus=on follow=on state=fullscreen R Code desktop='^3' focus=on follow=on state=fullscreen
R jetbrains-webstorm desktop='^3' focus=on follow=on R jetbrains-webstorm desktop='^3' focus=on follow=on
R Postman desktop='^4' focus=off follow=off R Postman desktop='^4' focus=off follow=off
R Simplenote desktop='^4' focus=off follow=off
R Zathura desktop='^4' focus=on follow=on state=tiled
R discord desktop='^5' focus=on follow=off R discord desktop='^5' focus=on follow=off
R TelegramDesktop desktop='^5' focus=off follow=on R TelegramDesktop desktop='^5' focus=off follow=on
R Nemo desktop='^5' focus=on follow=on R Nemo desktop='^5' focus=on follow=on

11
config/bspwm/polybar/polybar
View file

@ -4,11 +4,12 @@ enable-ipc = true
format-padding = 1 format-padding = 1
[colors] [colors]
background = #202020 background = #1f2227
foreground = #ABB2BF foreground = #abb2bf
cyan = #5f8ccd cyan = #61AFEF
alert = #D16969 alert = #e06c75
empty = #262626 empty = #5c6370
[bar/bar] [bar/bar]
width = 100% width = 100%

2
config/bspwm/sxhkd
View file

@ -1,6 +1,6 @@
#== Users hotkeys #== Users hotkeys
super + {_, shift} Return super + {_, shift} Return
{kitty, rofi -show drun} {alacritty, rofi -show drun}
super + shift + {w, e, f, z, q} super + shift + {w, e, f, z, q}
{google-chrome-stable, \ {google-chrome-stable, \

41
config/lvim/config.lua
View file

@ -1,45 +1,44 @@
lvim.leader = "space"
lvim.format_on_save = false lvim.format_on_save = false
lvim.lint_on_save = false lvim.lint_on_save = false
lvim.colorscheme = "onedarker" lvim.colorscheme = "onedarker"
-- Terminal -- Default fatures
lvim.builtin.terminal.active = true lvim.builtin.terminal.active = true
lvim.builtin.dashboard.active = true
lvim.builtin.dap.active = true
-- GitSigns -- GitSigns
lvim.builtin.gitsigns.opts.current_line_blame = true lvim.builtin.gitsigns.opts.current_line_blame = true
lvim.builtin.gitsigns.opts.current_line_blame_opts = { delay = 200 } lvim.builtin.gitsigns.opts.current_line_blame_opts = { delay = 200 }
-- TreeSitter -- TreeSitter
lvim.builtin.treesitter.ensure_installed = { "javascript", "typescript", "jsdoc", "lua" } lvim.builtin.treesitter.ensure_installed = { "javascript", "typescript", "jsdoc", "lua", "go" }
lvim.builtin.treesitter.indent.disable = { "clojure", "java", "python" } lvim.builtin.treesitter.indent.disable = { "clojure", "java", "python" }
require("user.treesitter")
-- Telescope -- Telescope
lvim.builtin.telescope.defaults.layout_config.prompt_position = "top" lvim.builtin.telescope.defaults.layout_config.prompt_position = "top"
lvim.builtin.telescope.defaults.file_ignore_patterns = { ".git", "node_modules", "env" } lvim.builtin.telescope.defaults.file_ignore_patterns = { ".git", "node_modules", "env" }
-- Debugger
lvim.builtin.dap.active = true
-- Mappings -- Mappings
lvim.keys.normal_mode["<C-w>"] = "<cmd>BufferClose<cr>" lvim.keys.normal_mode["<C-w>"] = "<cmd>BufferClose<cr>"
lvim.keys.normal_mode["<C-s>"] = "<cmd>w<cr>" lvim.keys.normal_mode["<C-s>"] = "<cmd>w<cr>"
lvim.builtin.which_key.mappings.l.a = { "<cmd>Telescope lsp_code_actions<cr>", "Code Actions" }
lvim.builtin.which_key.mappings.l.d = { "<cmd>TroubleToggle<cr>", "Diagnostics" } lvim.builtin.which_key.mappings.l.d = { "<cmd>TroubleToggle<cr>", "Diagnostics" }
lvim.builtin.which_key.mappings.l.R = { "<cmd>TroubleToggle lsp_references<cr>", "References" } lvim.builtin.which_key.mappings.l.R = { "<cmd>TroubleToggle lsp_references<cr>", "References" }
lvim.builtin.which_key.mappings["t"] = { lvim.builtin.which_key.mappings["t"] = {
name = "Test", name = "Test",
t = { "<cmd>Ultest<cr>", "Run test" }, t = { "<cmd>Ultest<cr>", "Run test" },
s = { "<cmd>UltestStop<cr>", "Stop test" }, s = { "<cmd>UltestStop<cr>", "Stop test" },
c = { "<cmd>UltestClear<cr>", "Clear test result" }, c = { "<cmd>UltestClear<cr>", "Clear test result" },
n = { "<cmd>UltestNearest<cr>", "Run test order by cursor" }, n = { "<cmd>UltestNearest<cr>", "Run test order by cursor" },
o = { "<cmd>UltestOutput<cr>", "Show output order by cursor" }, o = { "<cmd>UltestOutput<cr>", "Show output order by cursor" },
j = { "<Plug>(ultest-next-fail)", "Next fail" }, j = { "<Plug>(ultest-next-fail)", "Next fail" },
k = { "<Plug>(ultest-prev-fail)", "Prev fail" }, k = { "<Plug>(ultest-prev-fail)", "Prev fail" },
} }
local fmt = string.format
for i = 1, 9 do for i = 1, 9 do
lvim.keys.normal_mode[fmt("<A-%d>", i)] = fmt("<cmd>BufferGoto %d<cr>", i) lvim.keys.normal_mode[string.format("<A-%d>", i)] = string.format("<cmd>BufferGoto %d<cr>", i)
end end
-- Pluginos -- Pluginos
@ -50,11 +49,11 @@ lvim.plugins = {
{ "folke/trouble.nvim", cmd = { "TroubleToggle" } }, { "folke/trouble.nvim", cmd = { "TroubleToggle" } },
{ "folke/todo-comments.nvim", event = "BufRead" }, { "folke/todo-comments.nvim", event = "BufRead" },
{ "theHamsta/nvim-dap-virtual-text", config = "require[[user.dap-virtual-text]].setup()" }, { "theHamsta/nvim-dap-virtual-text", config = "require[[user.dap-virtual-text]].setup()" },
{ "vim-test/vim-test", cmd = { "TestNearest", "TestFile", "TestSuite", "TestLast", "TestVisit" } },
{ {
"rcarriga/vim-ultest", "rcarriga/vim-ultest",
config = "require[[user.ultest]].setup()", requires = { "vim-test/vim-test" },
requires = { "vim-test/vim-test" }, cmd = { "Ultest", "UltestStop", "UltestClear", "UltestNearest", "UltestOutput" },
cmd = { "Ultest", "UltestStop", "UltestClear", "UltestNearest", "UltestOutput" }, run = ":UpdateRemotePlugins",
run = ":UpdateRemotePlugins",
}, },
} }

1
config/lvim/ftplugin/python.lua
View file

@ -1,4 +1,3 @@
lvim.format_on_save = true
lvim.lang.python.formatters = { lvim.lang.python.formatters = {
{ exe = "black" }, { exe = "black" },
{ exe = "isort" }, { exe = "isort" },

3
config/lvim/lsp-settings/gopls.json
View file

@ -1,5 +1,6 @@
{ {
"go.lintTool": "golint", "go.logging.level": "error",
"go.lintOnSave": "file", "go.lintOnSave": "file",
"go.lintTool": "golint",
"go.formatTool": "gofmt" "go.formatTool": "gofmt"
} }

84
config/lvim/lsp-settings/jsonls.json
View file

@ -1,77 +1,15 @@
{ {
"json.schemas": [ "json.schemas": [
{ {"url": "https://json.schemastore.org/package.json", "fileMatch": ["package.json"]},
"fileMatch": [ {"url": "http://json.schemastore.org/tsconfig", "fileMatch": ["tsconfig.json", "tsconfig.*.json"]},
"package.json" {"url": "http://json.schemastore.org/lerna", "fileMatch": ["lerna.json"]},
], {"url": "http://json.schemastore.org/babelrc.json", "fileMatch": [".babelrc.json", ".babelrc", "babel.config.json"]},
"url": "https://json.schemastore.org/package.json" {"url": "http://json.schemastore.org/eslintrc", "fileMatch": [".eslintrc.json", ".eslintrc"]},
}, {"url": "https://bucklescript.github.io/bucklescript/docson/build-schema.json", "fileMatch": ["bsconfig.json"]},
{ {"url": "http://json.schemastore.org/prettierrc", "fileMatch": [".prettierrc", ".prettierrc.json", "prettier.config.json"]},
"fileMatch": [ {"url": "http://json.schemastore.org/now", "fileMatch": ["now.json"]},
"tsconfig.json", {"url": "https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/schemas/v3.1/schema.json", "fileMatch": ["openapi.json", "swagger.json"]},
"tsconfig.*.json" {"url": "https://json.schemastore.org/nest-cli.json", "fileMatch": ["nest-cli.json"]},
], {"url": "https://json.schemastore.org/nodemon.json", "fileMatch": ["nodemon.json"]}
"url": "http://json.schemastore.org/tsconfig"
},
{
"fileMatch": [
"lerna.json"
],
"url": "http://json.schemastore.org/lerna"
},
{
"fileMatch": [
".babelrc.json",
".babelrc",
"babel.config.json"
],
"url": "http://json.schemastore.org/lerna"
},
{
"fileMatch": [
".eslintrc.json",
".eslintrc"
],
"url": "http://json.schemastore.org/eslintrc"
},
{
"fileMatch": [
"bsconfig.json"
],
"url": "https://bucklescript.github.io/bucklescript/docson/build-schema.json"
},
{
"fileMatch": [
".prettierrc",
".prettierrc.json",
"prettier.config.json"
],
"url": "http://json.schemastore.org/prettierrc"
},
{
"fileMatch": [
"now.json"
],
"url": "http://json.schemastore.org/now"
},
{
"fileMatch": [
"openapi.json",
"swagger.json"
],
"url": "https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/schemas/v3.1/schema.json"
},
{
"fileMatch": [
"nest-cli.json"
],
"url": "https://json.schemastore.org/nest-cli.json"
},
{
"fileMatch": [
"nodemon.json"
],
"url": "https://json.schemastore.org/nodemon.json"
}
] ]
} }

4
config/lvim/lsp-settings/pyright.json
View file

@ -1,3 +1,5 @@
{ {
"python.analysis.typeCheckingMode": "off" "python.analysis.typeCheckingMode": "off",
"python.analysis.autoImportCompletions": true,
"python.analysis.diagnosticMode": "workspace"
} }

39
config/lvim/lsp-settings/yamlls.json
View file

@ -1,36 +1,11 @@
{ {
"yaml.schemas": { "yaml.schemas": {
"https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json": [ "https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json": ["docker-compose.yml", "docker-compose.yaml"],
"docker-compose.yml", "https://json.schemastore.org/ansible-playbook.json": ["*/playbook/**/*.yml", "*/playbooks/**/*.yml", "*/playbook/**/*.yaml", "*/playbooks/**/*.yaml", "ansible-playbook.yml"],
"docker-compose.yaml" "https://json.schemastore.org/yamllint.json": [".yamllint", ".yamllint.yml", ".yamllint.yaml"],
], "https://yarnpkg.com/configuration/yarnrc.json": [".yarnrc", ".yarnrc.yml"],
"https://json.schemastore.org/ansible-playbook.json": [ "https://json.schemastore.org/github-action.json": ["*/.github/workflows/**/*.yml", "*/.github/workflows/**/*.yaml" ],
"*/playbook/**/*.yml", "https://json.schemastore.org/gitlab-ci.json": [".gitlab-ci.yml"],
"*/playbooks/**/*.yml", "https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/schemas/v3.1/schema.json": ["openapi.yaml", "openapi.yml", "swagger.yml", "swagger.yal"]
"*/playbook/**/*.yaml",
"*/playbooks/**/*.yaml"
],
"https://json.schemastore.org/yamllint.json": [
".yamllint",
".yamllint.yml",
".yamllint.yaml"
],
"https://yarnpkg.com/configuration/yarnrc.json": [
".yarnrc",
".yarnrc.yml"
],
"https://json.schemastore.org/github-action.json": [
"*/.github/workflows/**/*.yml",
"*/.github/workflows/**/*.yaml"
],
"https://json.schemastore.org/gitlab-ci.json": [
".gitlab-ci.yml"
],
"https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/schemas/v3.1/schema.json": [
"openapi.yaml",
"openapi.yml",
"swagger.yml",
"swagger.yal"
]
} }
} }

7
config/lvim/lua/user/conjure.lua
View file

@ -1,7 +0,0 @@
local M = {}
M.config = function ()
vim.cmd [[ let maplocalleader = "," ]]
end
return M

8
config/lvim/lua/user/ultest.lua
View file

@ -1,8 +0,0 @@
local M = {}
M.setup = function()
-- Go
vim.g["test#go#gotest#options"] = "-v"
end
return M

2
gitconfig
View file

@ -1,5 +1,5 @@
[user] [user]
name = Smirnov-O name = neoteny
email = ss2316544@gmail.com email = ss2316544@gmail.com
[github] [github]

3
zshrc
View file

@ -3,7 +3,7 @@
## Variables ## Variables
export GOPATH="$HOME/go" export GOPATH="$HOME/go"
export PATH="$HOME/bin:$HOME/.local/bin:$HOME/.golang/bin:$GOPATH/bin:$HOME/.yarn/bin:$HOME/.luarocks/bin:$PATH" export PATH="$HOME/bin:$HOME/.local/bin:$HOME/.golang/bin:$GOPATH/bin:$HOME/.yarn/bin:$HOME/.luarocks/bin:$HOME/.cargo/bin:$PATH"
export EDITOR="lvim" export EDITOR="lvim"
## FzF ## FzF
@ -27,6 +27,7 @@ alias cls="clear" cp="cp -r" mkdir="mkdir -p" open="open_command" lg="lazygit"
alias lv="lvim" vim="lvim" alias lv="lvim" vim="lvim"
alias ...="cd ../.." .3="cd ../../.." alias ...="cd ../.." .3="cd ../../.."
alias gor="go run" gob="go build" gog="go get" goi="go install" got="go test" alias gor="go run" gob="go build" gog="go get" goi="go install" got="go test"
alias n="npm"
if [[ -f "/bin/exa" ]]; then if [[ -f "/bin/exa" ]]; then
alias ls="exa -l" ll="ls" la="ls -a" alias ls="exa -l" ll="ls" la="ls -a"