Compare commits

..

No commits in common. "7eafb322155af9f90c76c7e37c4ba6307c3ff0f9" and "4307fa28dbd4deca41fc71f55702d53701971ea4" have entirely different histories.

10 changed files with 76 additions and 90 deletions

View File

@ -34,7 +34,7 @@
origin = top-right
# Offset from the origin
offset = 12x54
offset = 9x48
# Scale factor. It is auto-detected if value is 0.
scale = 0
@ -113,7 +113,7 @@
### Text ###
font = "JetBrainsMono Nerd Font Complete" 12
font = "mononoki-Regular Nerd Font Complete" 12
# The spacing between lines. If the height is smaller than the
# font height, it will get raised to the font height.

View File

@ -30,7 +30,7 @@ set showmatch
set list
set listchars=tab:\ ,trail:
" set path from current directory and all directories under
" set path=$PWD/**
set path=$PWD/**
set encoding=UTF-8
set guifont=FiraCode\ Nerd\ Font\ 18
set expandtab
@ -78,7 +78,6 @@ let g:maplocalleader = ','
if has('nvim')
Plug 'nvim-lua/plenary.nvim'
Plug 'nvim-lua/popup.nvim'
Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
" Plug 'nvim-telescope/telescope.nvim'
" Plug 'TimUntersberger/neogit'
@ -92,6 +91,7 @@ if has('nvim')
Plug 'lewis6991/gitsigns.nvim'
Plug 'lewis6991/gitsigns.nvim'
Plug 'nvim-lualine/lualine.nvim'
Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
Plug 'ojroques/nvim-lspfuzzy'
Plug 'L3MON4D3/LuaSnip'
@ -139,7 +139,6 @@ if has('nvim')
let g:fzf_command = 'fzf --height 90% --width=85% --layout=reverse --preview "bat --color=always {}"'
source ~/.config/nvim/keybindings.vim
" nvim plugins
source ~/.config/nvim/plugin-confs/bufferline.lua
source ~/.config/nvim/plugin-confs/dashboard-art.vim
source ~/.config/nvim/plugin-confs/dashboard-nvim.lua
@ -164,7 +163,6 @@ if has('nvim')
source ~/.config/nvim/plugin-confs/symbols-outline.lua
source ~/.config/nvim/plugin-confs/trouble.lua
" nvim and vim plugins
source ~/.vim/plugin-confs/floaterm.vim
source ~/.vim/plugin-confs/fzf.vim
source ~/.vim/plugin-confs/lightline.vim

View File

@ -93,7 +93,7 @@ nmap <leader>ob :FloatermNew --title=bpytop --opener=vsplit bpytop<CR>
nmap <leader>od :FloatermNew --title=lazydocker --opener=vsplit lazydocker<CR>
nmap <leader>on :FloatermNew --title=ncmpcpp --opener=vsplit ncmpcpp<CR>
nmap <leader>or :FloatermNew --title=ranger --opener=vsplit ranger --cmd="cd $PWD"<CR>
nmap <leader>ot :FloatermNew --title=floaterm --name=vsplit-term --opener=edit --wintype=vsplit --position=botright --width=0.5<CR>
nmap <leader>ot :FloatermNew --title=floaterm --name=vsplit-term --wintype=vsplit --position=botright --width=0.5<CR>
nmap <leader>r :NvimTreeRefresh<CR>

View File

@ -176,7 +176,7 @@ end)
-- Use a loop to conveniently call 'setup' on multiple servers and
-- map buffer local keybindings when the language server attaches
local servers = { 'pyright', 'bashls', 'vimls', 'yamlls', 'dockerls', 'html', 'sumneko_lua', 'dotls', 'rust_analyzer', 'clangd' }
local servers = { 'pyright', 'bashls', 'sqls', 'vimls', 'yamlls', 'dockerls', 'html', 'sumneko_lua', 'jsonls', 'dotls', 'rust_analyzer', 'clangd' }
for _, lsp in pairs(servers) do
require('lspconfig')[lsp].setup {
on_attach = on_attach,

View File

@ -5,16 +5,15 @@ require('lualine').setup {
-- theme = 'dracula',
-- theme = 'horizon',
-- theme = 'onedark',
component_separators = { left = '', right = '' },
component_separators = { left = '', right = ''},
section_separators = { left = '', right = ''},
-- section_separators = { left = '', right = '' },
disabled_filetypes = {},
always_divide_middle = true,
},
sections = {
lualine_a = { 'mode' },
lualine_b = { 'branch', 'diff' },
lualine_c = { 'filename' },
lualine_b = {'branch', 'diff'},
lualine_c = {'filename'},
lualine_x = {
{
'diagnostics',
@ -24,9 +23,9 @@ require('lualine').setup {
dos = '', -- e70f
mac = '', -- e711
}
}, 'encoding', 'fileformat', { 'filetype', colored = true, icon_only = false } },
lualine_y = { 'progress' },
lualine_z = { 'location' }
}, 'encoding', 'fileformat', {'filetype', colored=true, icon_only=false}},
lualine_y = {'progress'},
lualine_z = {'location'}
},
inactive_sections = {
lualine_a = {},
@ -44,10 +43,10 @@ require('lualine').setup {
}
},
},
lualine_x = { 'location' },
lualine_x = {'location'},
lualine_y = {},
lualine_z = {}
},
tabline = {},
extensions = { 'quickfix', 'fzf', 'nvim-tree', 'symbols-outline', 'fugitive' }
extensions = {'quickfix', 'fzf', 'nvim-tree', 'symbols-outline', 'fugitive'}
}

View File

@ -20,7 +20,7 @@ require("null-ls").setup({
require("null-ls").builtins.diagnostics.cppcheck,
require("null-ls").builtins.diagnostics.gitlint,
require("null-ls").builtins.diagnostics.jsonlint,
-- require("null-ls").builtins.diagnostics.luacheck,
require("null-ls").builtins.diagnostics.luacheck,
require("null-ls").builtins.diagnostics.markdownlint,
require("null-ls").builtins.diagnostics.pylint,
require("null-ls").builtins.diagnostics.pydocstyle.with({
@ -28,14 +28,13 @@ require("null-ls").setup({
}),
require("null-ls").builtins.diagnostics.vint,
require("null-ls").builtins.formatting.json_tool,
-- require("null-ls").builtins.formatting.lua_format,
require("null-ls").builtins.formatting.lua_format,
require("null-ls").builtins.formatting.markdownlint,
require("null-ls").builtins.formatting.prettier,
-- handled by lsp server
-- require("null-ls").builtins.formatting.rustfmt,
require("null-ls").builtins.formatting.rustfmt,
require("null-ls").builtins.formatting.shfmt.with({
filetypes = {"sh", "bash"},
extra_args = { "-i", "0", "-ci", "-sr" }
extra_args = { "-i", "4", "-ci", "-sr" }
}),
require("null-ls").builtins.diagnostics.shellcheck.with({
extra_args = { "-s", "bash", "-o", "check-extra-masked-returns, check-set-e-suppressed, check-unassigned-uppercase, deprecate-which, quote-safe-variables" }

View File

@ -20,8 +20,8 @@ onedarkpro.setup({
styles = {
comments = "italic",
functions = "bold",
keywords = "italic,bold",
strings = "NONE",
keywords = "bold,italic",
strings = "italic",
variables = "bold"
},
options = {

View File

@ -7,12 +7,12 @@
# (windows with '_NET_WM_WINDOW_TYPE_DESKTOP') never get shadow,
# unless explicitly requested using the wintypes option.
#
shadow = true
# shadow = true;
# shadow = false
shadow = true;
# The blur radius for shadows, in pixels. (defaults to 12)
shadow-radius = 12
# shadow-radius = 24;
# shadow-radius = 12
shadow-radius = 24;
# The opacity of shadows. (0.0 - 1.0, defaults to 0.75)
# shadow-opacity = .75
@ -163,31 +163,23 @@ opacity-rule = [
"100:class_g = 'mpv'",
"95:class_g = 'firefoxdeveloperedition' && focused",
"95:class_g = 'xfreerdp' && focused",
"90:class_g = 'Alacritty' && focused",
"90:class_g = 'discord' && focused",
"90:class_g = 'Emacs' && focused",
"90:class_g = 'Jellyfin Media Player' && focused",
"90:class_g = 'Steam' && focused",
"90:class_g = 'Thunar' && focused",
"90:class_g = 'Thunderbird' && focused",
"90:class_g = 'qutebrowser' && focused",
"90:class_g = 'DBeaver' && !focused",
"90:class_g = 'firefoxdeveloperedition' && !focused",
"90:class_g = 'xfreerdp' && !focused",
"85:class_g = 'Alacritty' && !focused",
"85:class_g = 'Bitwarden' && !focused",
"85:class_g = 'discord' && !focused",
"85:class_g = 'Emacs' && !focused",
"85:class_g = 'Jellyfin Media Player' && !focused",
"85:class_g = 'Joplin' && !focused",
"85:class_g = 'Microsoft Teams - Preview' && !focused",
"85:class_g = 'Notepadqq' && !focused",
"85:class_g = 'Polybar' && !focused",
"85:class_g = 'Steam' && !focused",
"85:class_g = 'Thunar' && !focused",
"85:class_g = 'Thunderbird' && !focused",
"85:class_g = 'qutebrowser' && !focused",
@ -241,8 +233,7 @@ blur-background-exclude = [
"window_type = 'desktop'",
"_GTK_FRAME_EXTENTS@:c",
"name *= 'rect-overlay'",
"name *= 'mpv'",
"name *= 'Peek'"
"name *= 'mpv'"
];
#################################
@ -279,7 +270,7 @@ mark-ovredir-focused = true;
# shaped windows. The accuracy is not very high, unfortunately.
#
# detect-rounded-corners = false
detect-rounded-corners = true;
detect-rounded-corners = false;
# Detect '_NET_WM_OPACITY' on client windows, useful for window managers
# not passing '_NET_WM_OPACITY' of client windows to frame windows.
@ -355,14 +346,14 @@ detect-client-leader = true
# practically happened) and may not work with blur-background.
# My tests show a 15% performance boost. Recommended.
#
glx-no-stencil = true
glx-no-stencil = false
# GLX backend: Avoid rebinding pixmap on window damage.
# Probably could improve performance on rapid window content changes,
# but is known to break things on some drivers (LLVMpipe, xf86-video-intel, etc.).
# Recommended if it works.
#
glx-no-rebind-pixmap = true
glx-no-rebind-pixmap = false
# Disable the use of damage information.
# This cause the whole screen to be redrawn everytime, instead of the part of the screen
@ -376,7 +367,7 @@ glx-no-rebind-pixmap = true
# calls are finished before picom starts drawing. Needed on nvidia-drivers
# with GLX backend for some users.
#
xrender-sync-fence = true
xrender-sync-fence = false
# GLX backend: Use specified GLSL fragment shader for rendering window contents.
# See `compton-default-fshader-win.glsl` and `compton-fake-transparency-fshader-win.glsl`
@ -463,6 +454,7 @@ log-level = "warn";
#stop tearing on fullscreen windows
unredir-if-possible = false;
wintypes:
{
tooltip = { fade = true; shadow = true; opacity = 0.95; focus = true; full-shadow = false; };
@ -495,8 +487,7 @@ rounded-corners-exclude = [
blur: {
method = "dual_kawase";
# method = "kawase";
# strength = 4;
# strength = 12;
strength = 2;
background = true;
background-frame = false;
background-fixed = false;

View File

@ -179,7 +179,7 @@ locale = en_US.UTF-8
; right
; none
; tray-position = center
tray-position = center
tray-position = none
; If true, the bar will not shift its
; contents when the tray changes

View File

@ -15,7 +15,6 @@ c.url.searchengines["ap"] = "https://www.archlinux.org/packages/?sort=&q={}"
c.url.searchengines["aur"] = "https://aur.archlinux.org/packages/?K={}"
c.url.searchengines["gh"] = "https://github.com/search?q={}&type=Code"
c.url.searchengines["r"] = "https://www.reddit.com/r/{}"
c.url.searchengines["p"] = "https://docs.python.org/3/library/{}"
c.aliases["gd"] = "open -t http://192.168.4.77:4000"