all repos

dotfiles @ 6e33592

i use rach linux btw
15 files changed, 62 insertions(+), 164 deletions(-)
Update bspwm theme, lvim
Author: neoteny ss2316544@gmail.com
Committed at: 2021-09-20 16:50:53 +0300
Parent: 50a524d
M README.md
···
        1
        1
         <h1 align="center">dotfiles</h1>

      
        2
        2
         

      
        3
        
        -[](screen.png)

      
        
        3
        +![](./config/bspwm/screen.png)

      
        4
        4
         --------------

      
        5
        5
         

      
        6
        6
         ### System configuration

      ···
        23
        23
         

      
        24
        24
         Install dependency:

      
        25
        25
         ```bash

      
        26
        
        -sudo pacman -S git bspwm sxhkd dunst kitty picom rofi zsh ranger ttf-font-awesome ttf-jetbrains-mono

      
        27
        
        -yay -S neovim-nightly-bin polybar

      
        
        26
        +sudo pacman -S git bspwm sxhkd dunst alacritty neovim picom rofi zsh ranger ttf-font-awesome ttf-jetbrains-mono

      
        
        27
        +yay -S polybar

      
        28
        28
         ```

      
        29
        29
         

      
        30
        30
         And install configs:

      
M config/bspwm/README.md
···
        1
        1
         # BSPWM

      
        2
        2
         

      
        3
        
        -[](./screen.png)

      
        
        3
        +![](./screen.png)

      
        4
        4
         --------------

      
        5
        5
         

      
        6
        6
         ### Install

      
        7
        7
         ```bash

      
        8
        
        -sudo pacman -S bspwm sxhkd kitty

      
        
        8
        +sudo pacman -S bspwm sxhkd alacritty

      
        9
        9
         yay -S polybar

      
        10
        10
         ```

      
M config/bspwm/bspwmrc
···
        35
        35
         C focus_follows_pointer true

      
        36
        36
         

      
        37
        37
         # Colors

      
        38
        
        -C normal_border_color  "#090909"

      
        39
        
        -C active_border_color  "#1F2324"

      
        40
        
        -C focused_border_color "#008DCD"

      
        41
        
        -C urgent_border_color  "#FF6C6B"

      
        
        38
        +C normal_border_color  "#1f2227"

      
        
        39
        +C active_border_color  "#61AFEF"

      
        
        40
        +C focused_border_color "#e06c75"

      
        
        41
        +C urgent_border_color  "#5c6370"

      
        42
        42
         

      
        43
        43
         #== BSPWM Rules

      
        44
        44
         R kitty               desktop='^1' focus=on  follow=on

      
        45
        45
         R Google-chrome       desktop='^2' focus=on  follow=on

      
        46
        
        -R Brave               desktop='^2' focus=on  follow=on

      
        47
        46
         R Code                desktop='^3' focus=on  follow=on state=fullscreen

      
        48
        47
         R jetbrains-webstorm  desktop='^3' focus=on  follow=on

      
        49
        48
         R Postman             desktop='^4' focus=off follow=off

      
        50
        
        -R Simplenote          desktop='^4' focus=off follow=off

      
        51
        
        -R Zathura             desktop='^4' focus=on  follow=on state=tiled

      
        52
        49
         R discord             desktop='^5' focus=on  follow=off

      
        53
        50
         R TelegramDesktop     desktop='^5' focus=off follow=on

      
        54
        51
         R Nemo                desktop='^5' focus=on  follow=on

      
M config/bspwm/polybar/polybar
···
        4
        4
         format-padding = 1

      
        5
        5
         

      
        6
        6
         [colors]

      
        7
        
        -background = #202020

      
        8
        
        -foreground = #ABB2BF

      
        9
        
        -cyan       = #5f8ccd

      
        10
        
        -alert      = #D16969

      
        11
        
        -empty      = #262626

      
        
        7
        +background = #1f2227

      
        
        8
        +foreground = #abb2bf

      
        
        9
        +cyan  = #61AFEF

      
        
        10
        +alert = #e06c75

      
        
        11
        +empty = #5c6370

      
        
        12
        +

      
        12
        13
         

      
        13
        14
         [bar/bar]

      
        14
        15
         width = 100%

      
M config/bspwm/sxhkd
···
        1
        1
         #== Users hotkeys

      
        2
        2
         super + {_, shift} Return

      
        3
        
        -    {kitty, rofi -show drun}

      
        
        3
        +    {alacritty, rofi -show drun}

      
        4
        4
         

      
        5
        5
         super + shift + {w, e, f, z, q}

      
        6
        6
             {google-chrome-stable, \

      
M config/lvim/config.lua
···
        1
        
        -lvim.leader = "space"

      
        2
        1
         lvim.format_on_save = false

      
        3
        2
         lvim.lint_on_save = false

      
        4
        3
         lvim.colorscheme = "onedarker"

      
        5
        4
         

      
        6
        
        --- Terminal

      
        
        5
        +-- Default fatures

      
        7
        6
         lvim.builtin.terminal.active = true

      
        
        7
        +lvim.builtin.dashboard.active = true

      
        
        8
        +lvim.builtin.dap.active = true

      
        8
        9
         

      
        9
        10
         -- GitSigns

      
        10
        11
         lvim.builtin.gitsigns.opts.current_line_blame = true

      
        11
        12
         lvim.builtin.gitsigns.opts.current_line_blame_opts = { delay = 200 }

      
        12
        13
         

      
        13
        14
         -- TreeSitter

      
        14
        
        -lvim.builtin.treesitter.ensure_installed = { "javascript", "typescript", "jsdoc", "lua" }

      
        
        15
        +lvim.builtin.treesitter.ensure_installed = { "javascript", "typescript", "jsdoc", "lua", "go" }

      
        15
        16
         lvim.builtin.treesitter.indent.disable = { "clojure", "java", "python" }

      
        
        17
        +require("user.treesitter")

      
        16
        18
         

      
        17
        19
         -- Telescope

      
        18
        20
         lvim.builtin.telescope.defaults.layout_config.prompt_position = "top"

      
        19
        21
         lvim.builtin.telescope.defaults.file_ignore_patterns = { ".git", "node_modules", "env" }

      
        20
        
        -

      
        21
        
        --- Debugger

      
        22
        
        -lvim.builtin.dap.active = true

      
        23
        22
         

      
        24
        23
         -- Mappings

      
        25
        24
         lvim.keys.normal_mode["<C-w>"] = "<cmd>BufferClose<cr>"

      
        26
        25
         lvim.keys.normal_mode["<C-s>"] = "<cmd>w<cr>"

      
        
        26
        +lvim.builtin.which_key.mappings.l.a = { "<cmd>Telescope lsp_code_actions<cr>", "Code Actions" }

      
        27
        27
         lvim.builtin.which_key.mappings.l.d = { "<cmd>TroubleToggle<cr>", "Diagnostics" }

      
        28
        28
         lvim.builtin.which_key.mappings.l.R = { "<cmd>TroubleToggle lsp_references<cr>", "References" }

      
        29
        29
         lvim.builtin.which_key.mappings["t"] = {

      
        30
        
        -  name = "Test",

      
        31
        
        -  t = { "<cmd>Ultest<cr>", "Run test" },

      
        32
        
        -  s = { "<cmd>UltestStop<cr>", "Stop test" },

      
        33
        
        -  c = { "<cmd>UltestClear<cr>", "Clear test result" },

      
        34
        
        -  n = { "<cmd>UltestNearest<cr>", "Run test order by cursor" },

      
        35
        
        -  o = { "<cmd>UltestOutput<cr>", "Show output order by cursor" },

      
        36
        
        -  j = { "<Plug>(ultest-next-fail)", "Next fail" },

      
        37
        
        -  k = { "<Plug>(ultest-prev-fail)", "Prev fail" },

      
        
        30
        +	name = "Test",

      
        
        31
        +	t = { "<cmd>Ultest<cr>", "Run test" },

      
        
        32
        +	s = { "<cmd>UltestStop<cr>", "Stop test" },

      
        
        33
        +	c = { "<cmd>UltestClear<cr>", "Clear test result" },

      
        
        34
        +	n = { "<cmd>UltestNearest<cr>", "Run test order by cursor" },

      
        
        35
        +	o = { "<cmd>UltestOutput<cr>", "Show output order by cursor" },

      
        
        36
        +	j = { "<Plug>(ultest-next-fail)", "Next fail" },

      
        
        37
        +	k = { "<Plug>(ultest-prev-fail)", "Prev fail" },

      
        38
        38
         }

      
        39
        39
         

      
        40
        
        -local fmt = string.format

      
        41
        40
         for i = 1, 9 do

      
        42
        
        -	lvim.keys.normal_mode[fmt("<A-%d>", i)] = fmt("<cmd>BufferGoto %d<cr>", i)

      
        
        41
        +	lvim.keys.normal_mode[string.format("<A-%d>", i)] = string.format("<cmd>BufferGoto %d<cr>", i)

      
        43
        42
         end

      
        44
        43
         

      
        45
        44
         -- Pluginos

      ···
        50
        49
         	{ "folke/trouble.nvim", cmd = { "TroubleToggle" } },

      
        51
        50
         	{ "folke/todo-comments.nvim", event = "BufRead" },

      
        52
        51
         	{ "theHamsta/nvim-dap-virtual-text", config = "require[[user.dap-virtual-text]].setup()" },

      
        
        52
        +	{ "vim-test/vim-test", cmd = { "TestNearest", "TestFile", "TestSuite", "TestLast", "TestVisit" } },

      
        53
        53
         	{

      
        54
        
        -    "rcarriga/vim-ultest",

      
        55
        
        -    config = "require[[user.ultest]].setup()",

      
        56
        
        -    requires = { "vim-test/vim-test" },

      
        57
        
        -    cmd = { "Ultest", "UltestStop", "UltestClear", "UltestNearest", "UltestOutput" },

      
        58
        
        -    run = ":UpdateRemotePlugins",

      
        
        54
        +		"rcarriga/vim-ultest",

      
        
        55
        +		requires = { "vim-test/vim-test" },

      
        
        56
        +		cmd = { "Ultest", "UltestStop", "UltestClear", "UltestNearest", "UltestOutput" },

      
        
        57
        +		run = ":UpdateRemotePlugins",

      
        59
        58
         	},

      
        60
        59
         }

      
M config/lvim/ftplugin/python.lua
···
        1
        
        -lvim.format_on_save = true

      
        2
        1
         lvim.lang.python.formatters = {

      
        3
        2
         	{ exe = "black" },

      
        4
        3
         	{ exe = "isort" },

      
M config/lvim/lsp-settings/gopls.json
···
        1
        1
         {

      
        
        2
        +  "go.logging.level": "error",

      
        
        3
        +  "go.lintOnSave": "file",

      
        2
        4
           "go.lintTool": "golint",

      
        3
        
        -  "go.lintOnSave": "file",

      
        4
        5
           "go.formatTool": "gofmt"

      
        5
        6
         }

      
M config/lvim/lsp-settings/jsonls.json
···
        1
        1
         {

      
        2
        2
           "json.schemas": [

      
        3
        
        -    {

      
        4
        
        -      "fileMatch": [

      
        5
        
        -        "package.json"

      
        6
        
        -      ],

      
        7
        
        -      "url": "https://json.schemastore.org/package.json"

      
        8
        
        -    },

      
        9
        
        -    {

      
        10
        
        -      "fileMatch": [

      
        11
        
        -        "tsconfig.json",

      
        12
        
        -        "tsconfig.*.json"

      
        13
        
        -      ],

      
        14
        
        -      "url": "http://json.schemastore.org/tsconfig"

      
        15
        
        -    },

      
        16
        
        -    {

      
        17
        
        -      "fileMatch": [

      
        18
        
        -        "lerna.json"

      
        19
        
        -      ],

      
        20
        
        -      "url": "http://json.schemastore.org/lerna"

      
        21
        
        -    },

      
        22
        
        -    {

      
        23
        
        -      "fileMatch": [

      
        24
        
        -        ".babelrc.json",

      
        25
        
        -        ".babelrc",

      
        26
        
        -        "babel.config.json"

      
        27
        
        -      ],

      
        28
        
        -      "url": "http://json.schemastore.org/lerna"

      
        29
        
        -    },

      
        30
        
        -    {

      
        31
        
        -      "fileMatch": [

      
        32
        
        -        ".eslintrc.json",

      
        33
        
        -        ".eslintrc"

      
        34
        
        -      ],

      
        35
        
        -      "url": "http://json.schemastore.org/eslintrc"

      
        36
        
        -    },

      
        37
        
        -    {

      
        38
        
        -      "fileMatch": [

      
        39
        
        -        "bsconfig.json"

      
        40
        
        -      ],

      
        41
        
        -      "url": "https://bucklescript.github.io/bucklescript/docson/build-schema.json"

      
        42
        
        -    },

      
        43
        
        -    {

      
        44
        
        -      "fileMatch": [

      
        45
        
        -        ".prettierrc",

      
        46
        
        -        ".prettierrc.json",

      
        47
        
        -        "prettier.config.json"

      
        48
        
        -      ],

      
        49
        
        -      "url": "http://json.schemastore.org/prettierrc"

      
        50
        
        -    },

      
        51
        
        -    {

      
        52
        
        -      "fileMatch": [

      
        53
        
        -        "now.json"

      
        54
        
        -      ],

      
        55
        
        -      "url": "http://json.schemastore.org/now"

      
        56
        
        -    },

      
        57
        
        -    {

      
        58
        
        -      "fileMatch": [

      
        59
        
        -        "openapi.json",

      
        60
        
        -        "swagger.json"

      
        61
        
        -      ],

      
        62
        
        -      "url": "https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/schemas/v3.1/schema.json"

      
        63
        
        -    },

      
        64
        
        -    {

      
        65
        
        -      "fileMatch": [

      
        66
        
        -        "nest-cli.json"

      
        67
        
        -      ],

      
        68
        
        -      "url": "https://json.schemastore.org/nest-cli.json"

      
        69
        
        -    },

      
        70
        
        -    {

      
        71
        
        -      "fileMatch": [

      
        72
        
        -        "nodemon.json"

      
        73
        
        -      ],

      
        74
        
        -      "url": "https://json.schemastore.org/nodemon.json"

      
        75
        
        -    }

      
        
        3
        +    {"url": "https://json.schemastore.org/package.json", "fileMatch": ["package.json"]},

      
        
        4
        +    {"url": "http://json.schemastore.org/tsconfig", "fileMatch": ["tsconfig.json", "tsconfig.*.json"]},

      
        
        5
        +    {"url": "http://json.schemastore.org/lerna", "fileMatch": ["lerna.json"]},

      
        
        6
        +    {"url": "http://json.schemastore.org/babelrc.json", "fileMatch": [".babelrc.json", ".babelrc", "babel.config.json"]},

      
        
        7
        +    {"url": "http://json.schemastore.org/eslintrc", "fileMatch": [".eslintrc.json", ".eslintrc"]},

      
        
        8
        +    {"url": "https://bucklescript.github.io/bucklescript/docson/build-schema.json", "fileMatch": ["bsconfig.json"]},

      
        
        9
        +    {"url": "http://json.schemastore.org/prettierrc", "fileMatch": [".prettierrc", ".prettierrc.json", "prettier.config.json"]},

      
        
        10
        +    {"url": "http://json.schemastore.org/now", "fileMatch": ["now.json"]},

      
        
        11
        +    {"url": "https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/schemas/v3.1/schema.json", "fileMatch": ["openapi.json", "swagger.json"]},

      
        
        12
        +    {"url": "https://json.schemastore.org/nest-cli.json", "fileMatch": ["nest-cli.json"]},

      
        
        13
        +    {"url": "https://json.schemastore.org/nodemon.json", "fileMatch": ["nodemon.json"]}

      
        76
        14
           ]

      
        77
        15
         }

      
M config/lvim/lsp-settings/pyright.json
···
        1
        1
         {

      
        2
        
        -  "python.analysis.typeCheckingMode": "off"

      
        
        2
        +  "python.analysis.typeCheckingMode": "off",

      
        
        3
        +  "python.analysis.autoImportCompletions": true,

      
        
        4
        +  "python.analysis.diagnosticMode": "workspace"

      
        3
        5
         }

      
M config/lvim/lsp-settings/yamlls.json
···
        1
        1
         {

      
        2
        2
           "yaml.schemas": {

      
        3
        
        -    "https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json": [

      
        4
        
        -      "docker-compose.yml",

      
        5
        
        -      "docker-compose.yaml"

      
        6
        
        -    ],

      
        7
        
        -    "https://json.schemastore.org/ansible-playbook.json": [

      
        8
        
        -      "*/playbook/**/*.yml",

      
        9
        
        -      "*/playbooks/**/*.yml",

      
        10
        
        -      "*/playbook/**/*.yaml",

      
        11
        
        -      "*/playbooks/**/*.yaml"

      
        12
        
        -    ],

      
        13
        
        -    "https://json.schemastore.org/yamllint.json": [

      
        14
        
        -      ".yamllint",

      
        15
        
        -      ".yamllint.yml",

      
        16
        
        -      ".yamllint.yaml"

      
        17
        
        -    ],

      
        18
        
        -    "https://yarnpkg.com/configuration/yarnrc.json": [

      
        19
        
        -      ".yarnrc",

      
        20
        
        -      ".yarnrc.yml"

      
        21
        
        -    ],

      
        22
        
        -    "https://json.schemastore.org/github-action.json": [

      
        23
        
        -      "*/.github/workflows/**/*.yml",

      
        24
        
        -      "*/.github/workflows/**/*.yaml"

      
        25
        
        -    ],

      
        26
        
        -    "https://json.schemastore.org/gitlab-ci.json": [

      
        27
        
        -      ".gitlab-ci.yml"

      
        28
        
        -    ],

      
        29
        
        -    "https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/schemas/v3.1/schema.json": [

      
        30
        
        -      "openapi.yaml",

      
        31
        
        -      "openapi.yml",

      
        32
        
        -      "swagger.yml",

      
        33
        
        -      "swagger.yal"

      
        34
        
        -    ]

      
        
        3
        +    "https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json": ["docker-compose.yml", "docker-compose.yaml"],

      
        
        4
        +    "https://json.schemastore.org/ansible-playbook.json": ["*/playbook/**/*.yml", "*/playbooks/**/*.yml", "*/playbook/**/*.yaml", "*/playbooks/**/*.yaml", "ansible-playbook.yml"],

      
        
        5
        +    "https://json.schemastore.org/yamllint.json": [".yamllint", ".yamllint.yml", ".yamllint.yaml"],

      
        
        6
        +    "https://yarnpkg.com/configuration/yarnrc.json": [".yarnrc", ".yarnrc.yml"],

      
        
        7
        +    "https://json.schemastore.org/github-action.json": ["*/.github/workflows/**/*.yml", "*/.github/workflows/**/*.yaml" ],

      
        
        8
        +    "https://json.schemastore.org/gitlab-ci.json": [".gitlab-ci.yml"],

      
        
        9
        +    "https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/schemas/v3.1/schema.json": ["openapi.yaml", "openapi.yml", "swagger.yml", "swagger.yal"]

      
        35
        10
           }

      
        36
        11
         }

      
D config/lvim/lua/user/conjure.lua
···
        1
        
        -local M = {}

      
        2
        
        -

      
        3
        
        -M.config = function ()

      
        4
        
        -  vim.cmd [[ let maplocalleader = "," ]]

      
        5
        
        -end

      
        6
        
        -

      
        7
        
        -return M

      
D config/lvim/lua/user/ultest.lua
···
        1
        
        -local M = {}

      
        2
        
        -

      
        3
        
        -M.setup = function()

      
        4
        
        -  -- Go

      
        5
        
        -  vim.g["test#go#gotest#options"] = "-v"

      
        6
        
        -end

      
        7
        
        -

      
        8
        
        -return M

      
M gitconfig
···
        1
        1
         [user]

      
        2
        
        -  name = Smirnov-O

      
        
        2
        +	name = neoteny

      
        3
        3
           email = ss2316544@gmail.com

      
        4
        4
         

      
        5
        5
         [github]

      
M zshrc
···
        3
        3
         

      
        4
        4
         ## Variables

      
        5
        5
         export GOPATH="$HOME/go"

      
        6
        
        -export PATH="$HOME/bin:$HOME/.local/bin:$HOME/.golang/bin:$GOPATH/bin:$HOME/.yarn/bin:$HOME/.luarocks/bin:$PATH"

      
        
        6
        +export PATH="$HOME/bin:$HOME/.local/bin:$HOME/.golang/bin:$GOPATH/bin:$HOME/.yarn/bin:$HOME/.luarocks/bin:$HOME/.cargo/bin:$PATH"

      
        7
        7
         export EDITOR="lvim"

      
        8
        8
         

      
        9
        9
         ## FzF

      ···
        27
        27
         alias lv="lvim" vim="lvim"

      
        28
        28
         alias ...="cd ../.." .3="cd ../../.."

      
        29
        29
         alias gor="go run" gob="go build" gog="go get" goi="go install" got="go test"

      
        
        30
        +alias n="npm"

      
        30
        31
         

      
        31
        32
         if [[ -f "/bin/exa" ]]; then

      
        32
        33
            alias ls="exa -l" ll="ls" la="ls -a"