Update
This commit is contained in:
parent
d96cff8e1a
commit
b37e5084aa
9 changed files with 81 additions and 106 deletions
|
|
@ -9,10 +9,6 @@
|
|||
sc = pull --rebase upstream master
|
||||
st = status -sb
|
||||
un = reset --hard HEAD~1
|
||||
[user]
|
||||
name = Dmitry Zakharchenko
|
||||
email = dmitz@disroot.org
|
||||
username = dmitz
|
||||
[core]
|
||||
editor = nvim
|
||||
[push]
|
||||
|
|
@ -23,3 +19,6 @@
|
|||
smtpencryption = tls
|
||||
smtpserverport = 587
|
||||
annotate = yes
|
||||
[user]
|
||||
email = dmitz@disroot.org
|
||||
username = dmitz
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
urls-source "miniflux"
|
||||
miniflux-url "http://ec2-52-28-123-182.eu-central-1.compute.amazonaws.com/"
|
||||
miniflux-url "http://18.199.80.209"
|
||||
miniflux-login "dmitz"
|
||||
miniflux-tokeneval "pass oss/miniflux"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,20 +1,36 @@
|
|||
require "paq" {
|
||||
"tiagovla/scope.nvim",
|
||||
"RRethy/nvim-base16",
|
||||
"hrsh7th/cmp-buffer",
|
||||
"hrsh7th/cmp-nvim-lsp",
|
||||
"hrsh7th/nvim-cmp",
|
||||
"lukas-reineke/indent-blankline.nvim",
|
||||
"neovim/nvim-lspconfig",
|
||||
"nvim-lua/plenary.nvim",
|
||||
"nvim-telescope/telescope.nvim",
|
||||
{ "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" }
|
||||
}
|
||||
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
||||
if not (vim.uv or vim.loop).fs_stat(lazypath) then
|
||||
vim.fn.system({
|
||||
"git",
|
||||
"clone",
|
||||
"--filter=blob:none",
|
||||
"https://github.com/folke/lazy.nvim.git",
|
||||
"--branch=stable", -- latest stable release
|
||||
lazypath,
|
||||
})
|
||||
end
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
|
||||
map = vim.keymap.set
|
||||
tlp_builtin = require("telescope.builtin")
|
||||
|
||||
require("colors")
|
||||
require("sets")
|
||||
require("maps")
|
||||
require("plugins")
|
||||
require("lazy").setup({
|
||||
spec = "plugins",
|
||||
change_detection = { notify = false },
|
||||
ui = {
|
||||
icons = vim.g.have_nerd_font and {} or {
|
||||
cmd = "⌘",
|
||||
config = "🛠",
|
||||
event = "📅",
|
||||
ft = "📂",
|
||||
init = "⚙",
|
||||
keys = "🗝",
|
||||
plugin = "🔌",
|
||||
runtime = "💻",
|
||||
require = "🌙",
|
||||
source = "📄",
|
||||
start = "🚀",
|
||||
task = "📌",
|
||||
lazy = "💤 ",
|
||||
},
|
||||
},
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
vim.cmd('colorscheme base16-eighties')
|
||||
|
||||
local hl = vim.cmd.highlight
|
||||
local base16 = require('base16-colorscheme')
|
||||
|
||||
base16.setup({
|
||||
base00 = '#1a1a1a', base01 = '#262626', base02 = '#515151', base03 = '#747369',
|
||||
base04 = '#a09f93', base05 = '#d3d0c8', base06 = '#e8e6df', base07 = '#f2f0ec',
|
||||
base08 = '#f2f0ec', base09 = '#f99157', base0A = '#ffcc66', base0B = '#99cc99',
|
||||
base0C = '#66cccc', base0D = '#538cc6', base0E = '#cc99cc', base0F = '#d27b53'
|
||||
})
|
||||
|
||||
hl({'NormalFloat', 'guibg=' .. base16.colors.base01})
|
||||
hl({'LineNr', 'guifg=' .. base16.colors.base03})
|
||||
hl({'StatusLine', 'guibg=' .. base16.colors.base01})
|
||||
hl({'TabLine', 'guifg=' .. base16.colors.base0D})
|
||||
hl({'TabLineSel', 'guifg=' .. base16.colors.base0A})
|
||||
|
||||
hl({'TelescopeBorder', 'guifg=' .. base16.colors.base02, 'guibg=none'})
|
||||
hl({'TelescopeMatching', 'guibg=' .. base16.colors.base09, 'guifg=' .. base16.colors.base01})
|
||||
hl({'TelescopeNormal', 'guifg=' .. base16.colors.base0D, 'guibg=none'})
|
||||
hl({'TelescopePreviewLine', 'guibg=' .. base16.colors.base02})
|
||||
hl({'TelescopePreviewTitle', 'guifg=' .. base16.colors.base05, 'guibg=none'})
|
||||
hl({'TelescopePromptBorder', 'guibg=none'})
|
||||
hl({'TelescopePromptNormal', 'guibg=' .. base16.colors.base01})
|
||||
hl({'TelescopePromptTitle', 'guifg=' .. base16.colors.base05, 'guibg=none'})
|
||||
hl({'TelescopeResultsTitle', 'guifg=' .. base16.colors.base05, 'guibg=none'})
|
||||
hl({'TelescopeSelection', 'guifg=' .. base16.colors.base0A, 'guibg=none', 'gui=bold'})
|
||||
|
||||
hl({'LspInlayHint', 'gui=none'})
|
||||
hl({'TSConstBuiltin', 'gui=none'})
|
||||
hl({'TSFuncBuiltin', 'gui=none'})
|
||||
hl({'TSTypeBuiltin', 'gui=none'})
|
||||
hl({'TSVariableBuiltin', 'gui=none'})
|
||||
hl({'TreesitterContext', 'gui=none'})
|
||||
|
|
@ -1,38 +1,32 @@
|
|||
map = vim.keymap.set
|
||||
silent = { silent = true }
|
||||
vim.g.mapleader = " "
|
||||
|
||||
map("n", "<C-h>", "<C-w>W")
|
||||
map("n", "<C-l>", "<C-w>w")
|
||||
map("n", '<C-t>', '<C-w>r')
|
||||
map("n", '<C-s>', '<C-w>T')
|
||||
map("v", '.', ':normal .<CR>')
|
||||
map("n", "<C-h>", "<C-w>w")
|
||||
map("n", "<C-l>", "<C-w>W" )
|
||||
map("n", "<C-c>", "<C-w>c")
|
||||
|
||||
map("n", "<C-j>", ":tabn<CR>")
|
||||
map("n", "<C-k>", ":tabp<CR>")
|
||||
map("n", "g0", ":tabfir<CR>")
|
||||
map("n", "gJ", ":+tabm<CR>")
|
||||
map("n", "gK", ":-tabm<CR>")
|
||||
map("n", "<C-k>", "<cmd>cnext<CR>zz")
|
||||
map("n", "<C-j>", "<cmd>cprev<CR>zz")
|
||||
|
||||
map("v", "J", ":m '>+1<CR>gv=gv")
|
||||
map("v", "K", ":m '<-2<CR>gv=gv")
|
||||
|
||||
map("n", "<C-d>", "<C-d>zz")
|
||||
map("n", "<C-u>", "<C-u>zz")
|
||||
map("v", "J", ":m '>+1<CR>gv=gv", silent)
|
||||
map("v", "K", ":m '<-2<CR>gv=gv", silent)
|
||||
|
||||
map("n", "n", "nzzzv")
|
||||
map("n", "N", "Nzzzv")
|
||||
|
||||
map("n", "<leader>d", "\"_d")
|
||||
map("x", "<leader>d", "\"_d")
|
||||
map("x", "<leader>p", "\"_dP")
|
||||
map("n", "<C-d>", "<C-d>zz")
|
||||
map("n", "<C-u>", "<C-u>zz")
|
||||
|
||||
map("n", "<C-o>", ":bprevious<cr>")
|
||||
map("n", "<C-p>", ":bnext<cr>")
|
||||
map("n", "<C-x>", ":bdelete<CR>")
|
||||
map("n", "X", ":bd<CR>", silent)
|
||||
map("n", "H", ":bp<CR>", silent)
|
||||
map("n", "L", ":bn<CR>", silent)
|
||||
|
||||
map("n", "<leader>b", tlp_builtin.buffers)
|
||||
map("n", "<leader>f", tlp_builtin.find_files)
|
||||
map("n", "<leader>g", tlp_builtin.live_grep)
|
||||
map("n", "<leader>c", ":w! | !compiler '<c-r>%'<CR>")
|
||||
map("n", "<leader>s", ":Explore<CR>")
|
||||
map("n", "<leader>op", ":!opout <c-r>%<CR><CR>")
|
||||
map("n", "<leader>se", ":setlocal spell! spelllang=en_us<CR>")
|
||||
|
||||
map('n', 'ge', vim.diagnostic.open_float)
|
||||
map('n', '[d', vim.diagnostic.goto_prev)
|
||||
map('n', ']d', vim.diagnostic.goto_next)
|
||||
map('n', '<leader>q', vim.diagnostic.setloclist)
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ o.completeopt = "menu,menuone,noselect"
|
|||
o.hlsearch = false
|
||||
o.incsearch = true
|
||||
o.ignorecase = true
|
||||
o.showmode = false
|
||||
|
||||
o.listchars="nbsp:¬,tab:┆ ,trail:·,extends:>"
|
||||
o.mouse = "a"
|
||||
|
||||
o.number = true
|
||||
|
|
@ -21,11 +21,6 @@ o.softtabstop = 4
|
|||
o.shiftwidth = 4
|
||||
o.smartindent = true
|
||||
|
||||
o.showcmd = true
|
||||
o.showmode = true
|
||||
o.showtabline = 2
|
||||
o.laststatus = 3
|
||||
|
||||
o.smartcase = true
|
||||
o.splitright = true
|
||||
|
||||
|
|
@ -33,10 +28,9 @@ o.swapfile = false
|
|||
o.undofile = true
|
||||
|
||||
o.termguicolors = true
|
||||
o.undofile = true
|
||||
wo.wrap = false
|
||||
|
||||
|
||||
au("BufWritePre", { pattern = "*", command = [[%s/\n\+\%$//e]] })
|
||||
au("TextYankPost", { pattern = "*", callback = function() vim.highlight.on_yank({ higroup="Visual", timeout=150 }) end })
|
||||
au("BufWritePre", { pattern = "*", command = [[%s/\s\+$//e]] })
|
||||
au("FileType", { pattern = "help", command = ":wincmd L | :vert" })
|
||||
au("FileType", { pattern = "lua", command = "setlocal ts=3 sw=3 et" })
|
||||
|
|
|
|||
|
|
@ -6,26 +6,27 @@ riverctl border-color-focused 0x005577
|
|||
riverctl border-color-unfocused 0x262626
|
||||
|
||||
# General binds
|
||||
riverctl map normal Super Return spawn foot
|
||||
riverctl map normal Super B spawn "echo 'all toggle-visibility' > $XDG_RUNTIME_DIR/sandbar-0"
|
||||
riverctl map normal Super C spawn "foot pipe-viewer"
|
||||
riverctl map normal Super Return spawn $TERMINAL
|
||||
riverctl map normal Super B spawn "echo 'all toggle-visibility' > $XDG_RUNTIME_DIR/sandbar"
|
||||
riverctl map normal Super C spawn "$TERMINAL pipe-viewer"
|
||||
riverctl map normal Super D spawn passmenu
|
||||
riverctl map normal Super E spawn "foot aerc"
|
||||
riverctl map normal Super V spawn "$TERMINAL $EDITOR"
|
||||
riverctl map normal Super E spawn "$TERMINAL aerc"
|
||||
riverctl map normal Super F toggle-fullscreen
|
||||
riverctl map normal Super F2 spawn "wlopm --toggle '*'"
|
||||
riverctl map normal Super M spawn "foot -T float ncmpcpp"
|
||||
riverctl map normal Super N spawn "foot newsboat"
|
||||
riverctl map normal Super M spawn "$TERMINAL -T float ncmpcpp"
|
||||
riverctl map normal Super N spawn "$TERMINAL newsboat"
|
||||
riverctl map normal Super Q close
|
||||
riverctl map normal Super R spawn "foot vifm"
|
||||
riverctl map normal Super R spawn "$TERMINAL vifm"
|
||||
riverctl map normal Super T spawn "torwrap open"
|
||||
riverctl map normal Super W spawn qutebrowser
|
||||
riverctl map normal Super+Shift B spawn "foot -T float bluetuith --no-warning"
|
||||
riverctl map normal Super+Shift B spawn "$TERMINAL -T float bluetuith --no-warning"
|
||||
riverctl map normal Super+Shift BackSpace spawn "sysact reb"
|
||||
riverctl map normal Super+Shift D spawn "tofi-drun --drun-launch=true"
|
||||
riverctl map normal Super+Shift F toggle-float
|
||||
riverctl map normal Super+Shift M spawn "foot -T float pulsemixer"
|
||||
riverctl map normal Super+Shift M spawn "$TERMINAL -T float pulsemixer"
|
||||
riverctl map normal Super+Shift Q spawn "sysact rest"
|
||||
riverctl map normal Super+Shift R spawn "foot btm"
|
||||
riverctl map normal Super+Shift R spawn "$TERMINAL btm"
|
||||
riverctl map normal Super+Shift T spawn "torwrap toggle"
|
||||
riverctl map normal Super+Shift W spawn "qutebrowser --temp-basedir -s content.private_browsing true"
|
||||
riverctl map normal Super+Shift X spawn "sysact shut"
|
||||
|
|
@ -109,6 +110,7 @@ riverctl input $pad natural-scroll disabled
|
|||
riverctl xcursor-theme Adwaita
|
||||
riverctl focus-follows-cursor normal
|
||||
riverctl hide-cursor timeout 5000
|
||||
riverctl hide-cursor when-typing enabled
|
||||
|
||||
riverctl keyboard-layout -options "grp:ctrl_shift_toggle,altwin:menu_win" "us,ua"
|
||||
riverctl set-repeat 50 300
|
||||
|
|
@ -118,7 +120,7 @@ riverctl map-pointer normal Super BTN_MIDDLE toggle-float
|
|||
riverctl map-pointer normal Super BTN_RIGHT resize-view
|
||||
|
||||
# Rules
|
||||
riverctl float-filter-add title "float"
|
||||
riverctl rule-add -title float "float"
|
||||
|
||||
# Autostart
|
||||
autostart="pipewire mpd mako"
|
||||
|
|
@ -126,10 +128,11 @@ for program in $autostart; do
|
|||
pidof -sx "$program" || riverctl spawn "$program" &
|
||||
done
|
||||
|
||||
riverctl spawn "sbar"
|
||||
riverctl spawn "$XDG_CONFIG_HOME/river/status"
|
||||
riverctl spawn "$XDG_CONFIG_HOME/river/bar"
|
||||
riverctl spawn "gpg-agent --daemon"
|
||||
|
||||
riverctl declare-mode normal
|
||||
riverctl default-layout rivertile
|
||||
riverctl attach-mode bottom
|
||||
riverctl default-attach-mode below
|
||||
rivertile -view-padding 0 -outer-padding 0 &
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
alias f="$FILE" \
|
||||
v="$EDITOR" \
|
||||
ad="$EDITOR $XDG_DOCUMENTS_DIR/backup/anki" \
|
||||
cp="cp -i" \
|
||||
yt="pipe-viewer" \
|
||||
mkd="mkdir -p" \
|
||||
|
|
@ -21,7 +22,7 @@ cfa="$EDITOR $XDG_CONFIG_HOME/shell/aliases" \
|
|||
cfz="$EDITOR $XDG_CONFIG_HOME/zsh/.zshrc" \
|
||||
cfp="$EDITOR $XDG_CONFIG_HOME/zsh/.zprofile" \
|
||||
cfq="$EDITOR $XDG_CONFIG_HOME/qutebrowser/config.py" \
|
||||
cfv="$EDITOR $XDG_CONFIG_HOME/nvim/init.lua" \
|
||||
cfv="cd $XDG_CONFIG_HOME/nvim/ && $EDITOR init.lua" \
|
||||
hist="$EDITOR $XDG_CACHE_HOME/history"
|
||||
|
||||
for program in zathura mpv imv ; do
|
||||
|
|
|
|||
|
|
@ -22,12 +22,15 @@ export FILE="vifm"
|
|||
export READER="zathura"
|
||||
export TERMINAL="foot"
|
||||
|
||||
export GOBIN="$HOME/.local/bin/go"
|
||||
export GOMODCACHE="$XDG_CACHE_HOME/go/mod"
|
||||
export GOPROXY=direct
|
||||
export GOSUMDB=off
|
||||
export GOTELEMETRY=off
|
||||
export GOTOOLCHAIN=local
|
||||
|
||||
export GRADLE_USER_HOME="$XDG_DATA_HOME"/gradle
|
||||
|
||||
export GNUPGHOME="$XDG_DATA_HOME/gnupg"
|
||||
export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc-2.0"
|
||||
export INPUTRC="$XDG_CONFIG_HOME/shell/inputrc"
|
||||
|
|
@ -43,4 +46,4 @@ export LESS_TERMCAP_us="$(printf '%b' '[1;32m')"
|
|||
export PASSWORD_STORE_DIR="$XDG_DATA_HOME/password-store"
|
||||
export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
|
||||
|
||||
[ "$(tty)" = "/dev/tty1" ] && ! pidof -s river >/dev/null 2>&1 && dbus-run-session river
|
||||
[ "$(tty)" = "/dev/tty1" ] && ! pidof -s river >/dev/null 2>&1 && dbus-run-session river -no-xwayland
|
||||
|
|
|
|||
Loading…
Reference in a new issue