Compare commits
2 Commits
wip
...
ed1b480dd9
| Author | SHA1 | Date | |
|---|---|---|---|
| ed1b480dd9 | |||
| 61fd7607c0 |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -4,11 +4,8 @@ shell/.config/zsh/plugins/zsh-syntax-highlighting
|
||||
shell/.config/zsh/plugins/zsh-vi-mode
|
||||
qtile/.config/qtile/theme.txt
|
||||
lupan-clock/lupan-clock
|
||||
lupan-clock/stdout-clock
|
||||
lupan-wm/target
|
||||
*~
|
||||
__pycache__
|
||||
/dwm
|
||||
/st
|
||||
/vis/.config/vis/plugins/
|
||||
/tools/.local/bin/
|
||||
|
||||
20
Makefile
20
Makefile
@@ -1,7 +1,7 @@
|
||||
all:
|
||||
@echo "run: make clone build install"
|
||||
|
||||
clone: dwm st
|
||||
clone: ~/.local/share/zap dwm st
|
||||
|
||||
build: build-dwm build-st build-lupan-clock
|
||||
|
||||
@@ -14,38 +14,32 @@ install: install-dwm install-st install-lupan-clock install-other
|
||||
|
||||
dwm:
|
||||
git clone https://git.suckless.org/dwm
|
||||
cd dwm && \
|
||||
git remote add lupan.pl https://gitea.lupan.pl/lupan/dwm.git && \
|
||||
git fetch lupan.pl && \
|
||||
git checkout -b wip --track lupan.pl/wip
|
||||
cp -i patches/dwm/config.h dwm/
|
||||
|
||||
build-dwm:
|
||||
make -C dwm
|
||||
|
||||
install-dwm:
|
||||
make -C dwm install PREFIX="${HOME}/.local/stow/dwm"
|
||||
stow -d ~/.local/stow dwm
|
||||
make -C dwm install PREFIX="${HOME}/.local"
|
||||
|
||||
st:
|
||||
git clone https://git.suckless.org/st
|
||||
cd st && \
|
||||
git remote add lupan.pl https://gitea.lupan.pl/lupan/st.git && \
|
||||
git fetch lupan.pl && \
|
||||
git checkout -b patched-5 --track lupan.pl/patched-5
|
||||
git checkout -b patched --track lupan.pl/patched
|
||||
|
||||
build-st:
|
||||
make -C st
|
||||
|
||||
install-st:
|
||||
make -C st install PREFIX="${HOME}/.local/stow/st"
|
||||
stow -d ~/.local/stow st
|
||||
make -C st install PREFIX="${HOME}/.local"
|
||||
|
||||
build-lupan-clock:
|
||||
make -C lupan-clock
|
||||
|
||||
install-lupan-clock:
|
||||
make -C lupan-clock install PREFIX="${HOME}/.local/stow/lupan-clock"
|
||||
stow -d ~/.local/stow lupan-clock
|
||||
make -C lupan-clock install PREFIX="${HOME}/.local"
|
||||
|
||||
install-other:
|
||||
stow -Rv lazygit shell tmux nvim vis xsession
|
||||
stow -Rv shell tmux xsession nvim
|
||||
|
||||
@@ -1,266 +0,0 @@
|
||||
# Session settings
|
||||
# Name used for the default session
|
||||
session = default
|
||||
# Key press used to detatch from a session. Typically a Control key specified
|
||||
# with prefix C-, for example C-\ for Control-backslash. Single keys are also
|
||||
# allowed but not Meta (M-) keys.
|
||||
detach_key = C-\
|
||||
|
||||
# Application Theming
|
||||
# Colors are specified as -1 for default, 0-7 for standard, 8-15 for bright,
|
||||
# 16-231 for extended, 232-255 for gray scale, 0xRRGGBB for 24-bit RGB colors,
|
||||
# or you can use any of the X11 or Web Color Names. One or more comma separated
|
||||
# font attributes may optionally be specified: bold, italic, reverse, strike,
|
||||
# and blink. The attributes may also optionally include one of three underline
|
||||
# types single, double, or curly.
|
||||
include = theme_blue.ini
|
||||
#statusbar_attr = white 0x5F636A
|
||||
#tag_unoccupied = white 0x5F636A
|
||||
#titlebar_unselected = white 0x004C6C
|
||||
titlebar_unselected = 0x808080 0x000000
|
||||
#tag_occupied = white 0x004C6C
|
||||
#tag_urgent = white 0x004C6C bold,blink
|
||||
#titlebar_selected = white 0x00AEEF
|
||||
titlebar_selected = white 0x004C6C
|
||||
#tag_selected = white 0x00AEEF bold
|
||||
# Read only settings are overlayed onto the three titlebar settings above. Set
|
||||
# either fg or bg to -1 to retain that titlebar setting. Any specified
|
||||
# attributes are combined with those from above. These must be in this order
|
||||
# and must be after all other titlebar definitions!
|
||||
#titlebar_urgent = 0xE7DDB4 -1 blink
|
||||
#titlebar_readonly = 0xA56815 -1 bold,italic
|
||||
|
||||
# Define up to 9 alphanumeric tag names, how they will be displayed on the
|
||||
# status bar, and the types of colors and font attributes.
|
||||
tagnames = 1 2 3 4 5 6 7 8 9
|
||||
#tagnames = play dev test stage prod
|
||||
tag_printf = " %s "
|
||||
# Number of lines saved for each terminal's scroll back history
|
||||
scroll_history = 5000
|
||||
# The size of the layout zoom area is a number from .1 to .9, and the number of
|
||||
# terminals in the zoom area is a number 1 or more.
|
||||
zoomsize = .5
|
||||
zoomnum = 1
|
||||
|
||||
# Specify one or more status bar commands to cycle through at the given number
|
||||
# of interval seconds. Set interval to 0 to have the command run once and not
|
||||
# refresh. Set interval to -1 to not have any status bar text.
|
||||
statusbar_cmd = date; echo " | a4/$A4_SESSION" $A4
|
||||
statusbar_cmd = uptime; echo " | a4/$A4_SESSION" $A4
|
||||
#statusbar_cmd = cat ~/.cache/status/statusbar.txt; echo ' | a4' $A4
|
||||
statusbar_interval = 10
|
||||
statusbar_display = true
|
||||
statusbar_top = true
|
||||
#statusbar_begin = [
|
||||
#statusbar_end = ]
|
||||
|
||||
# The terminal cursor can be set to visible or hidden, blinking or solid, and
|
||||
# the shape can be 1-block, 2-underline, or 3-bar.
|
||||
cursorvis = true
|
||||
cursorblink = true
|
||||
cursorshape = 1
|
||||
|
||||
# Any number of actions assigned to the optional special keyword "startup" are
|
||||
# run when a4 is started, in the order specified.
|
||||
#include = startup.ini
|
||||
startup = create
|
||||
#startup = view 2
|
||||
#startup = create
|
||||
#startup = keysequence ssh example.com\n
|
||||
|
||||
[Layouts]
|
||||
# Layout symbol string in the status bar. First layout is the default. Order
|
||||
# determines layout toggle cycle.
|
||||
zoom_left = " │├┤ "
|
||||
zoom_right = " ├┤│ "
|
||||
fullscreen = " │ │ "
|
||||
grid = " ├┼┤ "
|
||||
columns = " │││ "
|
||||
rows = " ─── "
|
||||
zoom_top = " ├┬┤ "
|
||||
zoom_bottom = " ├┴┤ "
|
||||
|
||||
[KeyboardActions]
|
||||
# Keyboard actions have a key combination of no more than three keys assigned
|
||||
# to them. A key can be raw or can include modifiers Meta or Alt, M-, Control,
|
||||
# C-, Shift, S-, or with combinations of those. Any modifier keys must be put
|
||||
# in the order of M-C-S-. Two special keys that must be fully spelled out are
|
||||
# "Space" and "Hyphen".
|
||||
C-g c = create
|
||||
C-g x x = destroy
|
||||
C-g Enter = zoom
|
||||
C-g . = minimize
|
||||
C-g q q = quit
|
||||
C-g C-l = redraw
|
||||
C-g s = statusbar vis
|
||||
C-g S = statusbar pos
|
||||
|
||||
# The four actions view, tag, viewtoggle, and tagtoggle each take tag name as a
|
||||
# parameter. You can use the special '#' character as a shortcut to assign
|
||||
# mappings for up to 9 digits to the list of tag names. For the key
|
||||
# combination, the last occurrence of '#' is replaced with the digit 'n' and
|
||||
# then the 'nth' tag name is passed as the action parameter. For example,
|
||||
# "C-g # F# = view #" expands to "C-g F1 = view 1", "C-g F2 = view 2", ....
|
||||
C-g v # = view #
|
||||
C-g F# = view #
|
||||
C-g t # = tag #
|
||||
C-g V # = viewtoggle #
|
||||
C-g T # = tagtoggle #
|
||||
|
||||
C-g v 0 = view _all
|
||||
C-g v Tab = view _swap
|
||||
C-g t 0 = tag _all
|
||||
|
||||
# The focus action takes several possible parameters, including window number.
|
||||
# You can use the special '#' character as a shortcut to assign mappings for
|
||||
# all digits 1-9. in the key combination and the action parameter to assign
|
||||
# that combo/action pairing to digits 1-9. For the key combination, the last
|
||||
# occurrence of '#' is replaced with the digit 'n' and the same digit 'n' is
|
||||
# passed as the action parameter. For example, "C-g # = focus #" is expanded
|
||||
# out to "C-g 1 = focus 1", "C-g 2 = focus 2", ....
|
||||
C-g # = focus #
|
||||
|
||||
C-g j = focus next
|
||||
C-g C-j = focus NEXT
|
||||
C-g k = focus prev
|
||||
C-g C-k = focus PREV
|
||||
C-g Tab = focus swap
|
||||
C-g H = focus left
|
||||
C-g J = focus down
|
||||
C-g K = focus up
|
||||
C-g L = focus right
|
||||
C-g ) = focus group
|
||||
C-g 0 = focus groupall
|
||||
C-g * = readonly
|
||||
|
||||
C-a # = view #
|
||||
|
||||
C-a f = layout fullscreen
|
||||
C-a g = layout grid
|
||||
C-a h = layout zoom_left
|
||||
C-a j = layout zoom_bottom
|
||||
C-a k = layout zoom_top
|
||||
C-a l = layout zoom_right
|
||||
C-a c = layout columns
|
||||
C-a r = layout rows
|
||||
# Cycle through all layouts in order listed in the [Layouts] section
|
||||
C-a Space = layout +1
|
||||
C-a C-Space = layout -1
|
||||
C-a Tab = layout swap
|
||||
|
||||
C-a i = zoomnum +1
|
||||
C-a d = zoomnum -1
|
||||
C-a I = zoomsize +.05
|
||||
C-a D = zoomsize -.05
|
||||
|
||||
S-PageUp = scrollback .5
|
||||
S-PageDown = scrollback -.5
|
||||
C-g PageUp = scrollback 1.0
|
||||
C-g PageDown = scrollback -1.0
|
||||
|
||||
# Specify ANSI escape or other key sequence overrides
|
||||
#include = vt220.ini
|
||||
#Home = keysequence \e[1~
|
||||
#End = keysequence \e[4~
|
||||
#C-g Space = keysequence Hello world!
|
||||
|
||||
[MouseTermwinActions]
|
||||
click-1 = focus
|
||||
C-click-1 = zoom
|
||||
click-3 = focus group
|
||||
C-click-3 = focus 0
|
||||
wheel-up = scrollback 3
|
||||
wheel-dn = scrollback -3
|
||||
S-wheel-up = scrollback 0.5
|
||||
S-wheel-dn = scrollback -0.5
|
||||
C-wheel-up = scrollback 1.0
|
||||
C-wheel-dn = scrollback -1.0
|
||||
|
||||
[MouseTitlebarActions]
|
||||
click-1 = minimize
|
||||
click-3 = readonly
|
||||
|
||||
[MouseTagNamesActions]
|
||||
click-1 = view
|
||||
C-click-1 = viewtoggle
|
||||
click-3 = tag
|
||||
C-click-3 = tagtoggle
|
||||
|
||||
[MouseLayoutSymbolActions]
|
||||
click-1 = layout +1
|
||||
click-3 = layout -1
|
||||
C-click-1 = zoomnum +1
|
||||
C-click-3 = zoomnum -1
|
||||
M-C-click-1 = zoomsize +.05
|
||||
M-C-click-3 = zoomsize -.05
|
||||
|
||||
[MouseStatusTextActions]
|
||||
click-1 = statusbar next
|
||||
|
||||
[MouseFrameLinesActions]
|
||||
click-1 = layout fullscreen
|
||||
|
||||
# Terminals typically have a default foreground (fg) color, background (bg)
|
||||
# color, and 16 standard colors that are used by terminal applications. They
|
||||
# can also define color numbers up to 255, but the are used less often. In a4,
|
||||
# you can define ColorSchemes that are then applied to terminal windows
|
||||
# dynamically by comparing the terminal's title text to defined ColorRules (see
|
||||
# below). The first defined ColorScheme is used by default for all windows.
|
||||
# (The cursor color is not yet implemented.)
|
||||
#include = cs_gruvbox.ini
|
||||
#include = cs_solarized.ini
|
||||
#include = cs_redsands.ini
|
||||
#include = cs_fairyfloss.ini
|
||||
#include = cs_kokuban.ini
|
||||
#include = cs_frontend_fun_forrest.ini
|
||||
#include = cs_seafoam_pastel.ini
|
||||
[ColorScheme Basic]
|
||||
fg = 7
|
||||
bg = 0
|
||||
#color123 = DarkOrange1
|
||||
|
||||
[ColorScheme BasicRed]
|
||||
fg = 0
|
||||
bg = 1
|
||||
|
||||
[ColorScheme Red160]
|
||||
fg = 232
|
||||
bg = 160
|
||||
|
||||
[ColorScheme Crimson]
|
||||
fg = MidnightBlue
|
||||
bg = Crimson
|
||||
|
||||
[colorscheme RedSands]
|
||||
color00 = 0x000000
|
||||
color01 = 0xff3f00
|
||||
color02 = 0x00bb00
|
||||
color03 = 0xe7b000
|
||||
color04 = 0x0072ff
|
||||
color05 = 0xbb00bb
|
||||
color06 = 0x00bbbb
|
||||
color07 = 0xbbbbbb
|
||||
color08 = 0x555555
|
||||
color09 = 0xbb0000
|
||||
color10 = 0x00bb00
|
||||
color11 = 0xe7b000
|
||||
color12 = 0x0072ae
|
||||
color13 = 0xff55ff
|
||||
color14 = 0x55ffff
|
||||
color15 = 0xffffff
|
||||
fg = 0xd7c9a7
|
||||
bg = 0x7a251e
|
||||
cursor = 0xd7c9a7
|
||||
|
||||
# Color rules pair text with a colorscheme. A terminal window's title bar text
|
||||
# is compared with each ColorRule text, in the order specified, until one
|
||||
# matches, and then that colorscheme is applied to the terminal. If none of the
|
||||
# rules match, then the first colorscheme defined in a4.ini is used.
|
||||
# <pattern> = <colorscheme name> [<fg color|-1> [<bg color>]]
|
||||
#[ColorRules]
|
||||
#root@appdev.com = FairyFloss red
|
||||
#@appdev.com = FairyFloss
|
||||
#root@appprd = redsands red
|
||||
#appprd = redsands
|
||||
#root@appprddr = redsands red 0x521914
|
||||
#appprddr = redsands -1 0x521914
|
||||
@@ -1,3 +1,4 @@
|
||||
|
||||
[colors]
|
||||
draw_bold_text_with_bright_colors = false
|
||||
|
||||
@@ -5,13 +6,13 @@ draw_bold_text_with_bright_colors = false
|
||||
TERM = "xterm-256color"
|
||||
|
||||
[font]
|
||||
size = 10
|
||||
size = 9
|
||||
|
||||
[font.bold]
|
||||
family = "HurmitNerdFont"
|
||||
family = "Fira Code Nerd Font"
|
||||
|
||||
[font.normal]
|
||||
family = "HurmitNerdFont"
|
||||
family = "Fira Code Nerd Font"
|
||||
|
||||
[general]
|
||||
import = ["~/.config/alacritty/dark.toml"]
|
||||
|
||||
@@ -1,31 +1,26 @@
|
||||
# https://github.com/alacritty/alacritty-theme/blob/master/themes/nordic.toml
|
||||
|
||||
# Colors (Nordic)
|
||||
|
||||
[colors.primary]
|
||||
background = '#242933'
|
||||
foreground = '#BBBDAF'
|
||||
|
||||
[colors.normal]
|
||||
black = '#191C1D'
|
||||
red = '#BD6062'
|
||||
green = '#A3D6A9'
|
||||
yellow = '#F0DFAF'
|
||||
blue = '#8FB4D8'
|
||||
magenta = '#C7A9D9'
|
||||
cyan = '#B6D7A8'
|
||||
white = '#BDC5BD'
|
||||
|
||||
# https://github.com/zenbones-theme/zenbones.nvim/blob/main/extras/alacritty/zenbones_dark.toml
|
||||
# This file is auto-generated by shipwright.nvim
|
||||
[colors.bright]
|
||||
black = '#727C7C'
|
||||
red = '#D18FAF'
|
||||
green = '#B7CEB0'
|
||||
yellow = '#BCBCBC'
|
||||
blue = '#E0CF9F'
|
||||
magenta = '#C7A9D9'
|
||||
cyan = '#BBDA97'
|
||||
white = '#BDC5BD'
|
||||
|
||||
[colors.selection]
|
||||
text = '#000000'
|
||||
background = '#F0DFAF'
|
||||
black = "#403833"
|
||||
red = "#E8838F"
|
||||
green = "#8BAE68"
|
||||
yellow = "#D68C67"
|
||||
blue = "#61ABDA"
|
||||
magenta = "#CF86C1"
|
||||
cyan = "#65B8C1"
|
||||
white = "#888F94"
|
||||
[colors.cursor]
|
||||
cursor = "#C4CACF"
|
||||
text = "#1C1917"
|
||||
[colors.normal]
|
||||
black = "#1C1917"
|
||||
blue = "#6099C0"
|
||||
cyan = "#66A5AD"
|
||||
green = "#819B69"
|
||||
magenta = "#B279A7"
|
||||
red = "#DE6E7C"
|
||||
white = "#B4BDC3"
|
||||
yellow = "#B77E64"
|
||||
[colors.primary]
|
||||
background = "#141D1C"
|
||||
foreground = "#9BAFAC"
|
||||
|
||||
@@ -1,35 +1,26 @@
|
||||
# https://github.com/alacritty/alacritty-theme/blob/master/themes/night_owlish_light.toml
|
||||
|
||||
# Colors (Night Owlish Light)
|
||||
|
||||
[colors.primary]
|
||||
background = '#ffffff'
|
||||
foreground = '#403f53'
|
||||
|
||||
[colors.normal]
|
||||
black = '#011627'
|
||||
red = '#d3423e'
|
||||
green = '#2aa298'
|
||||
yellow = '#daaa01'
|
||||
blue = '#4876d6'
|
||||
magenta = '#403f53'
|
||||
cyan = '#08916a'
|
||||
white = '#7a8181'
|
||||
|
||||
# https://github.com/zenbones-theme/zenbones.nvim/blob/main/extras/alacritty/zenbones_light.toml
|
||||
# This file is auto-generated by shipwright.nvim
|
||||
[colors.bright]
|
||||
black = '#7a8181'
|
||||
red = '#f76e6e'
|
||||
green = '#49d0c5'
|
||||
yellow = '#dac26b'
|
||||
blue = '#5ca7e4'
|
||||
magenta = '#697098'
|
||||
cyan = '#00c990'
|
||||
white = '#989fb1'
|
||||
|
||||
black = "#CFC1BA"
|
||||
red = "#94253E"
|
||||
green = "#3F5A22"
|
||||
yellow = "#803D1C"
|
||||
blue = "#1D5573"
|
||||
magenta = "#7B3B70"
|
||||
cyan = "#2B747C"
|
||||
white = "#4F5E68"
|
||||
[colors.cursor]
|
||||
cursor = '#403f53'
|
||||
text = '#fbfbfb'
|
||||
|
||||
[colors.selection]
|
||||
background = '#f2f2f2'
|
||||
text = '#403f53'
|
||||
cursor = "#2C363C"
|
||||
text = "#F0EDEC"
|
||||
[colors.normal]
|
||||
black = "#F0EDEC"
|
||||
blue = "#286486"
|
||||
cyan = "#3B8992"
|
||||
green = "#4F6C31"
|
||||
magenta = "#88507D"
|
||||
red = "#A8334C"
|
||||
white = "#2C363C"
|
||||
yellow = "#944927"
|
||||
[colors.primary]
|
||||
background = "#F0F1F1"
|
||||
foreground = "#141D1C"
|
||||
|
||||
@@ -1,158 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
wlr-randr --output DP-1 --mode 3840x2160 --scale 2
|
||||
wlr-randr --output HDMI-A-1 --mode 3840x2160 --scale 2 --left-of DP-1
|
||||
|
||||
foot --server &
|
||||
|
||||
argenctl config set label-mode modifier
|
||||
|
||||
# Terminal
|
||||
#argenctl binding set normal Super Return sh "kitty --single-instance --instance-group default"
|
||||
argenctl binding set normal Super Return sh "
|
||||
if [ -e ~/.lightmode ]; then
|
||||
exec footclient -o initial-color-theme=light
|
||||
else
|
||||
exec footclient -o initial-color-theme=dark
|
||||
fi
|
||||
"
|
||||
|
||||
# Reload config
|
||||
argenctl binding set normal Super+Shift R exec "$0"
|
||||
|
||||
argenctl binding set normal Super P exec fuzzel
|
||||
argenctl binding set normal Super+Shift L exec waylock
|
||||
argenctl binding set normal Super+Shift T sh "lupan-set-theme toggle"
|
||||
|
||||
# Window focus and swap
|
||||
argenctl binding set normal Super J window focus next
|
||||
argenctl binding set normal Super K window focus prev
|
||||
argenctl binding set normal Super+Shift J window swap next
|
||||
argenctl binding set normal Super+Shift K window swap prev
|
||||
|
||||
argenctl binding set normal Super F window fullscreen
|
||||
argenctl binding set normal Super W window float
|
||||
|
||||
argenctl binding set normal Super+Shift C window close
|
||||
argenctl binding set normal Super+Shift X window detach
|
||||
|
||||
# Output focus and send
|
||||
argenctl binding set normal Super Period output focus next
|
||||
argenctl binding set normal Super Comma output focus prev
|
||||
argenctl binding set normal Super+Shift Period window send next
|
||||
argenctl binding set normal Super+Shift Comma window send prev
|
||||
|
||||
# Layout
|
||||
argenctl binding set normal Super M layout switch monocle
|
||||
argenctl binding set normal Super S layout switch stacktile
|
||||
argenctl binding set normal Super H layout set primary-ratio -0.05
|
||||
argenctl binding set normal Super L layout set primary-ratio +0.05
|
||||
argenctl binding set normal Super+Control K layout set secondary-ratio -0.05
|
||||
argenctl binding set normal Super+Control J layout set secondary-ratio +0.05
|
||||
|
||||
# Pointer
|
||||
argenctl pointer-binding set normal Super BTN_LEFT move-window
|
||||
argenctl pointer-binding set normal Super BTN_RIGHT resize-window
|
||||
|
||||
# Context
|
||||
argenctl binding set normal Super+Shift+Control X context close
|
||||
argenctl binding set normal Super Tab context switch --last
|
||||
|
||||
# Switch contexts interactively
|
||||
argenctl binding set normal Super Space sh 'argenctl context switch "$(argenctl context list | fuzzel -d)"'
|
||||
|
||||
# Create new context interactively
|
||||
argenctl binding set normal Super+Shift Space sh '
|
||||
set -eu
|
||||
prompt="$(fuzzel -dl0 -p"new > ")"
|
||||
argenctl context new "$prompt"
|
||||
'
|
||||
|
||||
# Rename current context interactively
|
||||
argenctl binding set normal Super+Control Space sh '
|
||||
set -eu
|
||||
prompt="$(fuzzel -dl0 -p"rename > ")"
|
||||
argenctl context rename "$prompt"
|
||||
'
|
||||
|
||||
# Assign currently focused window to be toggled with Super U
|
||||
argenctl binding set normal Super+Shift U sh '
|
||||
set -eu
|
||||
window_id=$(argenctl window list --json | jq -r ".[] | select(.focused) | .id")
|
||||
argenctl binding set normal Super U window toggle $window_id
|
||||
'
|
||||
|
||||
# Attach window interactively
|
||||
argenctl binding set normal Super+Shift D sh '
|
||||
set -eu
|
||||
id=$(argenctl window list | fuzzel -d --with-nth 2 --accept-nth 1)
|
||||
argenctl window attach "$id"
|
||||
'
|
||||
|
||||
# Adopt all orphans
|
||||
argenctl binding set normal Super+Control D sh '
|
||||
argenctl window list --json | jq -r ".[] | select(.contexts | length == 0) | .id" | while read -r id; do
|
||||
argenctl window attach "$id"
|
||||
done
|
||||
'
|
||||
|
||||
# Quit after confirmed with 'yes'
|
||||
argenctl binding set normal Super+Shift Q sh '
|
||||
set -eu
|
||||
confirm="$(fuzzel -dl0 -p"quit? > ")"
|
||||
if [ "$confirm" = yes ]; then
|
||||
argenctl exit
|
||||
fi
|
||||
'
|
||||
|
||||
# Audio and brightness controls
|
||||
VOL_DEC='wpctl set-volume @DEFAULT_SINK@ --limit 1.5 5%-'
|
||||
VOL_INC='wpctl set-mute @DEFAULT_SINK@ 0 && wpctl set-volume @DEFAULT_SINK@ --limit 1.5 5%+'
|
||||
VOL_TOGGLE='wpctl set-mute @DEFAULT_SINK@ toggle'
|
||||
for mode in normal locked; do
|
||||
argenctl binding set $mode Super Bracketleft sh "$VOL_DEC"
|
||||
argenctl binding set $mode Super Bracketright sh "$VOL_INC"
|
||||
argenctl binding set $mode Super+Shift M sh "$VOL_TOGGLE"
|
||||
argenctl binding set $mode None XF86AudioLowerVolume sh "$VOL_DEC"
|
||||
argenctl binding set $mode None XF86AudioRaiseVolume sh "$VOL_INC"
|
||||
argenctl binding set $mode None XF86AudioMute sh "$VOL_TOGGLE"
|
||||
argenctl binding set $mode None XF86MonBrightnessDown sh "brightnessctl s 5%-"
|
||||
argenctl binding set $mode None XF86MonBrightnessUp sh "brightnessctl s +5%"
|
||||
argenctl binding set $mode Super+Shift Bracketleft sh "brightnessctl s 5%-"
|
||||
argenctl binding set $mode Super+Shift Bracketright sh "brightnessctl s +5%"
|
||||
done
|
||||
|
||||
# Passthrough mode
|
||||
argenctl mode declare passthrough
|
||||
argenctl binding set normal Super Grave mode enter passthrough
|
||||
argenctl binding set passthrough Super Grave mode enter normal
|
||||
|
||||
# Select/swap window by index
|
||||
for num in 1 2 3 4 5 6 7 8 9; do
|
||||
idx=$((num - 1))
|
||||
argenctl binding set normal Super $num sh "
|
||||
argenctl window focus \$(argenctl context list --json | jq -r '.[] | select(.current) | .windows | .[$idx]')
|
||||
"
|
||||
argenctl binding set normal Super+Shift $num sh "
|
||||
context_id=\$(argenctl context list --json | jq -r '.[] | select(.current) | .id')
|
||||
length=\$(argenctl context list --json | jq -r '.[] | select(.current) | .windows | length')
|
||||
focused_window=\$(argenctl context list --json | jq -r '.[] | select(.current) | .focused_window')
|
||||
dest_window=\$(argenctl context list --json | jq -r '.[] | select(.current) | .windows | .[$idx]')
|
||||
focused_output_id=\$(argenctl window list --json | jq -r \".[] | select(.id == \\\"\$focused_window\\\") | .contexts[] | select(.id = \$context_id) | .output_id\")
|
||||
dest_output_id=\$(argenctl window list --json | jq -r \".[] | select(.id == \\\"\$dest_window\\\") | .contexts[] | select(.id = \$context_id) | .output_id\")
|
||||
if [ -n \"\$focused_output_id\" -a \"\$focused_output_id\" = \"\$dest_output_id\" ]; then
|
||||
for i in \$(seq \$length); do
|
||||
if [ \"\$focused_window\" = \"\$dest_window\" ]; then
|
||||
break
|
||||
fi
|
||||
argenctl window swap next
|
||||
dest_window=\$(argenctl context list --json | jq -r '.[] | select(.current) | .windows | .[$idx]')
|
||||
done
|
||||
fi
|
||||
"
|
||||
done
|
||||
|
||||
argenctl binding set normal Super+Shift S exec ~/.config/argen/session.sh
|
||||
|
||||
# Rules
|
||||
argenctl rule add float --app-id "my-app"
|
||||
@@ -1,29 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
set -eu
|
||||
|
||||
id=$(for name in $(ls ~/.config/argen/sessions/*.sh); do echo $(basename "${name%.sh}"); done | fuzzel -d -p'session> ')
|
||||
if argenctl context list | grep "^${id}\$"; then
|
||||
argenctl context switch "${id}"
|
||||
exit
|
||||
fi
|
||||
argenctl context new "$id"
|
||||
|
||||
first=$(argenctl output list --json | jq -r 'min_by(80000 * .y + .x).id')
|
||||
length=$(argenctl output list --json | jq -r 'length')
|
||||
for n in $(seq $length); do
|
||||
current=$(argenctl output list --json | jq -r '.[] | select(.focused).id')
|
||||
if [ "$current" = "$first" ]; then
|
||||
break
|
||||
fi
|
||||
argenctl output focus next
|
||||
done
|
||||
|
||||
if [ -e ~/.lightmode ]; then
|
||||
THEME=light
|
||||
else
|
||||
THEME=dark
|
||||
fi
|
||||
export TERMINAL="footclient -o initial-color-theme=$THEME"
|
||||
|
||||
exec sh ~/.config/argen/sessions/"${id}.sh"
|
||||
@@ -1,3 +0,0 @@
|
||||
argenctl output focus next
|
||||
|
||||
argenctl sh "$TERMINAL -D ~/dotfiles kak -s dotfiles"
|
||||
@@ -1,6 +0,0 @@
|
||||
argenctl exec librewolf
|
||||
|
||||
sleep 1
|
||||
argenctl output focus next
|
||||
|
||||
argenctl exec qutebrowser
|
||||
@@ -51,18 +51,7 @@ end
|
||||
|
||||
-- {{{ Variable definitions
|
||||
-- Themes define colours, icons, font and wallpapers.
|
||||
|
||||
local function read_theme()
|
||||
local theme = "theme_dark.lua"
|
||||
local f = io.open(os.getenv('HOME') .. '/.lightmode')
|
||||
if f then
|
||||
theme = 'theme_light.lua'
|
||||
f:close()
|
||||
end
|
||||
return theme
|
||||
end
|
||||
|
||||
local theme = read_theme()
|
||||
local theme = "theme_dark.lua"
|
||||
beautiful.init(gears.filesystem.get_configuration_dir() .. theme)
|
||||
|
||||
local function set_wallpaper(s)
|
||||
@@ -86,7 +75,7 @@ local function switch_theme()
|
||||
end
|
||||
|
||||
-- This is used later as the default terminal and editor to run.
|
||||
local terminal = "kitty --single-instance --instance-group default"
|
||||
local terminal = "alacritty"
|
||||
|
||||
-- Default modkey.
|
||||
local modkey = "Mod4"
|
||||
@@ -121,7 +110,7 @@ local mykeyboardlayout = awful.widget.keyboardlayout()
|
||||
|
||||
-- {{{ Wibar
|
||||
-- Create a textclock widget
|
||||
local mytextclock = wibox.widget.textclock('%H:%M ')
|
||||
local mytextclock = wibox.widget.textclock()
|
||||
|
||||
-- Create a wibox for each screen and add it
|
||||
local taglist_buttons = gears.table.join(
|
||||
@@ -234,17 +223,6 @@ local function layout_menu()
|
||||
awful.menu(layouts):show()
|
||||
end
|
||||
|
||||
local function focus_nth_window(n)
|
||||
local cc = {}
|
||||
for _, c in ipairs(client.get()) do
|
||||
if awful.widget.tasklist.filter.currenttags(c, mouse.screen) then cc[#cc + 1] = c end
|
||||
end
|
||||
local new_focused = cc[n]
|
||||
if new_focused then
|
||||
client.focus = new_focused; new_focused:raise()
|
||||
end
|
||||
end
|
||||
|
||||
-- {{{ Key bindings
|
||||
local globalkeys = gears.table.join(
|
||||
awful.key({ modkey, }, "s", hotkeys_popup.show_help,
|
||||
@@ -296,7 +274,7 @@ local globalkeys = gears.table.join(
|
||||
{ description = "open a terminal", group = "launcher" }),
|
||||
awful.key({ modkey, "Control", "Shift" }, "s", function() awful.spawn("systemctl suspend") end,
|
||||
{ description = "open a terminal", group = "launcher" }),
|
||||
awful.key({ modkey, "Control", "Shift" }, "t", switch_theme,
|
||||
awful.key({ modkey, "Shift" }, "F6", switch_theme,
|
||||
{ description = "switch theme", group = "launcher" }),
|
||||
awful.key({ modkey, }, "q", awesome.restart,
|
||||
{ description = "reload awesome", group = "awesome" }),
|
||||
@@ -347,8 +325,8 @@ local globalkeys = gears.table.join(
|
||||
end,
|
||||
{ description = "lua execute prompt", group = "awesome" }),
|
||||
-- Menubar
|
||||
awful.key({ modkey }, "p", function() awful.spawn("dmenu_run -fn 'HurmitNerdFont:size=16'") end,
|
||||
{ description = "run command", group = "launcher" })
|
||||
awful.key({ modkey, }, "p", function() menubar.show() end,
|
||||
{ description = "show the menubar", group = "launcher" })
|
||||
)
|
||||
|
||||
local clientkeys = gears.table.join(
|
||||
@@ -377,11 +355,8 @@ local clientkeys = gears.table.join(
|
||||
{ description = "minimize", group = "client" }),
|
||||
awful.key({ modkey, }, "m",
|
||||
function(c)
|
||||
if awful.layout.getname() == "max" then
|
||||
awful.layout.set(awful.layout.suit.tile)
|
||||
else
|
||||
awful.layout.set(awful.layout.suit.max)
|
||||
end
|
||||
c.maximized = not c.maximized
|
||||
c:raise()
|
||||
end,
|
||||
{ description = "(un)maximize", group = "client" }),
|
||||
awful.key({ modkey, }, "v",
|
||||
@@ -444,11 +419,7 @@ for i = 1, 9 do
|
||||
end
|
||||
end
|
||||
end,
|
||||
{ description = "toggle focused client on tag #" .. i, group = "tag" }),
|
||||
--- Focus nth window
|
||||
awful.key({ "Control" }, "#" .. i + 9,
|
||||
function() focus_nth_window(i) end,
|
||||
{ description = "focus window index #" .. i, group = "client" })
|
||||
{ description = "toggle focused client on tag #" .. i, group = "tag" })
|
||||
)
|
||||
end
|
||||
|
||||
@@ -484,8 +455,7 @@ awful.rules.rules = {
|
||||
keys = clientkeys,
|
||||
buttons = clientbuttons,
|
||||
screen = awful.screen.preferred,
|
||||
placement = awful.placement.no_overlap + awful.placement.no_offscreen,
|
||||
size_hints_honor = false,
|
||||
placement = awful.placement.no_overlap + awful.placement.no_offscreen
|
||||
}
|
||||
},
|
||||
|
||||
@@ -537,19 +507,6 @@ awful.rules.rules = {
|
||||
-- }}}
|
||||
|
||||
-- {{{ Signals
|
||||
|
||||
local function set_border_width(c)
|
||||
local t = awful.screen.focused().selected_tag
|
||||
if #t:clients() == 1 or t.layout.name == 'max' then
|
||||
c = c or client.focus
|
||||
c.border_width = 0
|
||||
else
|
||||
for _, cl in ipairs(t:clients()) do
|
||||
cl.border_width = beautiful.border_width
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- Signal function to execute when a new client appears.
|
||||
client.connect_signal("manage", function(c)
|
||||
-- Set the windows at the slave,
|
||||
@@ -562,7 +519,6 @@ client.connect_signal("manage", function(c)
|
||||
-- Prevent clients from being unreachable after screen count changes.
|
||||
awful.placement.no_offscreen(c)
|
||||
end
|
||||
set_border_width(c)
|
||||
end)
|
||||
|
||||
-- Enable sloppy focus, so that focus follows mouse.
|
||||
@@ -570,23 +526,6 @@ client.connect_signal("mouse::enter", function(c)
|
||||
c:emit_signal("request::activate", "mouse_enter", { raise = false })
|
||||
end)
|
||||
|
||||
-- local function set_border(c)
|
||||
-- local s = awful.screen.focused()
|
||||
-- if c.maximized
|
||||
-- or (#s.tiled_clients == 1 and not c.floating)
|
||||
-- or (s.selected_tag and s.selected_tag.layout.name == 'max')
|
||||
-- then
|
||||
-- c.border_width = 0
|
||||
-- else
|
||||
-- c.border_width = beautiful.border_width
|
||||
-- end
|
||||
-- end
|
||||
|
||||
client.connect_signal("focus", function(c)
|
||||
c.border_color = beautiful.border_focus
|
||||
set_border_width(c)
|
||||
end)
|
||||
client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal; end)
|
||||
tag.connect_signal("property::layout", function() set_border_width(nil) end)
|
||||
|
||||
client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)
|
||||
client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
|
||||
-- }}}
|
||||
|
||||
@@ -1,57 +1,51 @@
|
||||
local themes_path = require("gears.filesystem").get_themes_dir()
|
||||
local themes_path = require("gears.filesystem").get_themes_dir()
|
||||
|
||||
local xresources = require("beautiful.xresources")
|
||||
local dpi = xresources.apply_dpi
|
||||
local xresources = require("beautiful.xresources")
|
||||
local dpi = xresources.apply_dpi
|
||||
|
||||
local theme = {}
|
||||
local theme = {}
|
||||
|
||||
theme.font = "HurmitNerdFont 10"
|
||||
theme.tasklist_disable_icon = true
|
||||
theme.wibar_height = 30
|
||||
theme.font = "Fira Code Nerd Font 10.5"
|
||||
theme.tasklist_disable_icon = true
|
||||
theme.wibar_height = 40
|
||||
|
||||
theme.bg_normal = "#111c22" -- hsl(200 35% 10%)
|
||||
theme.bg_focus = "#316781" -- hsl(200 45% 35%)
|
||||
theme.bg_urgent = "#814c31" -- hsl(20 45% 35%)
|
||||
theme.bg_minimize = "#454f54" -- hsl(200 10% 30%)
|
||||
theme.bg_systray = theme.bg_normal
|
||||
theme.tasklist_bg_focus = "#1c3b4a" -- hsl(200 45% 20%)
|
||||
theme.bg_normal = "#283538"
|
||||
theme.bg_focus = "#36537d" -- hsl(215deg 40% 35%)
|
||||
theme.bg_urgent = "#d8aeb5"
|
||||
theme.bg_minimize = "#363e49" -- hsl(215deg 15% 25%)
|
||||
theme.bg_systray = theme.bg_normal
|
||||
theme.tasklist_bg_focus = "#263c59" -- hsl(215deg 40% 25%)
|
||||
|
||||
theme.fg_normal = "#8f9ca3" -- hsl(200 10% 60%)
|
||||
theme.fg_focus = "#abb5ba" -- hsl(200 10% 70%)
|
||||
theme.fg_urgent = theme.bg_focus
|
||||
theme.fg_minimize = theme.fg_normal
|
||||
theme.taglist_fg_empty = "#454f54" -- hsl(200 10% 30%)
|
||||
theme.fg_normal = "#9ea7aa"
|
||||
theme.fg_focus = "#b1babd"
|
||||
theme.fg_urgent = theme.bg_focus
|
||||
theme.fg_minimize = "#8a9294"
|
||||
theme.taglist_fg_empty = "#798082"
|
||||
|
||||
theme.gap_single_client = false
|
||||
theme.useless_gap = dpi(1)
|
||||
theme.border_width = dpi(2)
|
||||
theme.border_normal = "#73848c" -- hsl(200 10% 50%)
|
||||
theme.border_focus = "#b25e34" -- hsl(20 55% 45%)
|
||||
theme.border_marked = "#3488b2" -- hsl(200 55% 45%)
|
||||
theme.useless_gap = dpi(1)
|
||||
theme.border_width = dpi(2)
|
||||
theme.border_normal = "#708090"
|
||||
theme.border_focus = "#a0522d"
|
||||
theme.border_marked = "#91231c"
|
||||
|
||||
theme.bg_wallpaper = "#454f54" -- hsl(200 10% 30%)
|
||||
|
||||
theme.hotkeys_font = theme.font
|
||||
theme.hotkeys_description_font = theme.font
|
||||
theme.hotkeys_bg = theme.bg_minimize
|
||||
theme.hotkeys_modifiers_fg = theme.border_focus
|
||||
theme.bg_wallpaper = "#424a4c"
|
||||
|
||||
-- You can use your own layout icons like this:
|
||||
theme.layout_fairh = themes_path .. "default/layouts/fairhw.png"
|
||||
theme.layout_fairv = themes_path .. "default/layouts/fairvw.png"
|
||||
theme.layout_floating = themes_path .. "default/layouts/floatingw.png"
|
||||
theme.layout_magnifier = themes_path .. "default/layouts/magnifierw.png"
|
||||
theme.layout_max = themes_path .. "default/layouts/maxw.png"
|
||||
theme.layout_fullscreen = themes_path .. "default/layouts/fullscreenw.png"
|
||||
theme.layout_tilebottom = themes_path .. "default/layouts/tilebottomw.png"
|
||||
theme.layout_tileleft = themes_path .. "default/layouts/tileleftw.png"
|
||||
theme.layout_tile = themes_path .. "default/layouts/tilew.png"
|
||||
theme.layout_tiletop = themes_path .. "default/layouts/tiletopw.png"
|
||||
theme.layout_spiral = themes_path .. "default/layouts/spiralw.png"
|
||||
theme.layout_dwindle = themes_path .. "default/layouts/dwindlew.png"
|
||||
theme.layout_cornernw = themes_path .. "default/layouts/cornernww.png"
|
||||
theme.layout_cornerne = themes_path .. "default/layouts/cornernew.png"
|
||||
theme.layout_cornersw = themes_path .. "default/layouts/cornersww.png"
|
||||
theme.layout_cornerse = themes_path .. "default/layouts/cornersew.png"
|
||||
theme.layout_fairh = themes_path .. "default/layouts/fairhw.png"
|
||||
theme.layout_fairv = themes_path .. "default/layouts/fairvw.png"
|
||||
theme.layout_floating = themes_path .. "default/layouts/floatingw.png"
|
||||
theme.layout_magnifier = themes_path .. "default/layouts/magnifierw.png"
|
||||
theme.layout_max = themes_path .. "default/layouts/maxw.png"
|
||||
theme.layout_fullscreen = themes_path .. "default/layouts/fullscreenw.png"
|
||||
theme.layout_tilebottom = themes_path .. "default/layouts/tilebottomw.png"
|
||||
theme.layout_tileleft = themes_path .. "default/layouts/tileleftw.png"
|
||||
theme.layout_tile = themes_path .. "default/layouts/tilew.png"
|
||||
theme.layout_tiletop = themes_path .. "default/layouts/tiletopw.png"
|
||||
theme.layout_spiral = themes_path .. "default/layouts/spiralw.png"
|
||||
theme.layout_dwindle = themes_path .. "default/layouts/dwindlew.png"
|
||||
theme.layout_cornernw = themes_path .. "default/layouts/cornernww.png"
|
||||
theme.layout_cornerne = themes_path .. "default/layouts/cornernew.png"
|
||||
theme.layout_cornersw = themes_path .. "default/layouts/cornersww.png"
|
||||
theme.layout_cornerse = themes_path .. "default/layouts/cornersew.png"
|
||||
|
||||
return theme
|
||||
|
||||
@@ -1,57 +1,51 @@
|
||||
local themes_path = require("gears.filesystem").get_themes_dir()
|
||||
local themes_path = require("gears.filesystem").get_themes_dir()
|
||||
|
||||
local xresources = require("beautiful.xresources")
|
||||
local dpi = xresources.apply_dpi
|
||||
local xresources = require("beautiful.xresources")
|
||||
local dpi = xresources.apply_dpi
|
||||
|
||||
local theme = {}
|
||||
local theme = {}
|
||||
|
||||
theme.font = "HurmitNerdFont 10"
|
||||
theme.tasklist_disable_icon = true
|
||||
theme.wibar_height = 30
|
||||
theme.font = "Fira Code Nerd Font 10.5"
|
||||
theme.tasklist_disable_icon = true
|
||||
theme.wibar_height = 40
|
||||
|
||||
theme.bg_normal = "#111c22" -- hsl(200 35% 10%)
|
||||
theme.bg_focus = "#d0e3fb" -- hsl(214 85% 90%)
|
||||
theme.bg_urgent = "#f2d1a6" -- hsl(34 75% 80%)
|
||||
theme.bg_minimize = "#8596ad" -- hsl(214 20% 60%)
|
||||
theme.bg_systray = theme.bg_normal
|
||||
theme.tasklist_bg_focus = "#a6c7f2" -- hsl(214 75% 80%)
|
||||
theme.bg_normal = "#283538"
|
||||
theme.bg_focus = "#82a0c9" -- hsl(215deg 40% 65%)
|
||||
theme.bg_urgent = "#d0426a"
|
||||
theme.bg_minimize = "#7b899d" -- hsl(215deg 15% 55%)
|
||||
theme.bg_systray = theme.bg_normal
|
||||
theme.tasklist_bg_focus = "#5e85ba" -- hsl(215deg 40% 55%)
|
||||
|
||||
theme.fg_normal = "#8f9ca3" -- hsl(200 10% 60%)
|
||||
theme.fg_focus = "#454b54" -- hsl(214 10% 30%)
|
||||
theme.fg_urgent = "#70675c" -- hsl(34 10% 40%)
|
||||
theme.fg_minimize = "#70675c" -- hsl(34 10% 40%)
|
||||
theme.taglist_fg_empty = theme.fg_minimize
|
||||
theme.fg_normal = "#616c6f"
|
||||
theme.fg_focus = "#363d3e"
|
||||
theme.fg_urgent = "#e9f2f5"
|
||||
theme.fg_minimize = "#4b5456"
|
||||
theme.taglist_fg_empty = "#566063"
|
||||
|
||||
theme.gap_single_client = false
|
||||
theme.useless_gap = dpi(1)
|
||||
theme.border_width = dpi(2)
|
||||
theme.border_normal = theme.bg_minimize
|
||||
theme.border_focus = "#df8c20" -- hsl(34 75% 50%)
|
||||
theme.border_marked = "#2073df" -- hsl(214 75% 50%)
|
||||
theme.useless_gap = dpi(1)
|
||||
theme.border_width = dpi(2)
|
||||
theme.border_normal = "#bebebe"
|
||||
theme.border_focus = "#ff7f50"
|
||||
theme.border_marked = "#91231c"
|
||||
|
||||
theme.bg_wallpaper = theme.fg_normal
|
||||
|
||||
theme.hotkeys_font = theme.font
|
||||
theme.hotkeys_description_font = theme.font
|
||||
theme.hotkeys_bg = theme.border_normal
|
||||
theme.hotkeys_modifiers_fg = theme.bg_focus
|
||||
theme.bg_wallpaper = "#b0bec2"
|
||||
|
||||
-- You can use your own layout icons like this:
|
||||
theme.layout_fairh = themes_path .. "default/layouts/fairhw.png"
|
||||
theme.layout_fairv = themes_path .. "default/layouts/fairvw.png"
|
||||
theme.layout_floating = themes_path .. "default/layouts/floatingw.png"
|
||||
theme.layout_magnifier = themes_path .. "default/layouts/magnifierw.png"
|
||||
theme.layout_max = themes_path .. "default/layouts/maxw.png"
|
||||
theme.layout_fullscreen = themes_path .. "default/layouts/fullscreenw.png"
|
||||
theme.layout_tilebottom = themes_path .. "default/layouts/tilebottomw.png"
|
||||
theme.layout_tileleft = themes_path .. "default/layouts/tileleftw.png"
|
||||
theme.layout_tile = themes_path .. "default/layouts/tilew.png"
|
||||
theme.layout_tiletop = themes_path .. "default/layouts/tiletopw.png"
|
||||
theme.layout_spiral = themes_path .. "default/layouts/spiralw.png"
|
||||
theme.layout_dwindle = themes_path .. "default/layouts/dwindlew.png"
|
||||
theme.layout_cornernw = themes_path .. "default/layouts/cornernww.png"
|
||||
theme.layout_cornerne = themes_path .. "default/layouts/cornernew.png"
|
||||
theme.layout_cornersw = themes_path .. "default/layouts/cornersww.png"
|
||||
theme.layout_cornerse = themes_path .. "default/layouts/cornersew.png"
|
||||
theme.layout_fairh = themes_path .. "default/layouts/fairhw.png"
|
||||
theme.layout_fairv = themes_path .. "default/layouts/fairvw.png"
|
||||
theme.layout_floating = themes_path .. "default/layouts/floatingw.png"
|
||||
theme.layout_magnifier = themes_path .. "default/layouts/magnifierw.png"
|
||||
theme.layout_max = themes_path .. "default/layouts/maxw.png"
|
||||
theme.layout_fullscreen = themes_path .. "default/layouts/fullscreenw.png"
|
||||
theme.layout_tilebottom = themes_path .. "default/layouts/tilebottomw.png"
|
||||
theme.layout_tileleft = themes_path .. "default/layouts/tileleftw.png"
|
||||
theme.layout_tile = themes_path .. "default/layouts/tilew.png"
|
||||
theme.layout_tiletop = themes_path .. "default/layouts/tiletopw.png"
|
||||
theme.layout_spiral = themes_path .. "default/layouts/spiralw.png"
|
||||
theme.layout_dwindle = themes_path .. "default/layouts/dwindlew.png"
|
||||
theme.layout_cornernw = themes_path .. "default/layouts/cornernww.png"
|
||||
theme.layout_cornerne = themes_path .. "default/layouts/cornernew.png"
|
||||
theme.layout_cornersw = themes_path .. "default/layouts/cornersww.png"
|
||||
theme.layout_cornerse = themes_path .. "default/layouts/cornersew.png"
|
||||
|
||||
return theme
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
mkdir -p tools/.local/bin
|
||||
|
||||
uid=$(id -u):$(id -g)
|
||||
|
||||
go-install() {
|
||||
echo "build $1"
|
||||
docker exec -u "$uid" dotfiles-go go install -ldflags="-s -w" "$@"
|
||||
}
|
||||
|
||||
cargo-install() {
|
||||
B="$1"
|
||||
shift
|
||||
echo "build $B"
|
||||
docker exec -u "$uid" dotfiles-rust cargo install --quiet "$@"
|
||||
docker exec -u "$uid" dotfiles-rust cp "/usr/local/cargo/bin/$B" /rust/bin
|
||||
strip "tools/.local/bin/$B"
|
||||
}
|
||||
|
||||
docker kill dotfiles-go && sleep 3 || :
|
||||
docker run --rm -d --name dotfiles-go -e HOME=/go -v ./tools/.local/bin:/go/bin golang:1.25.1-alpine3.22 tail -f /dev/null
|
||||
docker exec dotfiles-go chown "$uid" /go
|
||||
|
||||
go-install github.com/junegunn/fzf@latest
|
||||
go-install github.com/gokcehan/lf@latest
|
||||
go-install github.com/rs/curlie@latest
|
||||
|
||||
docker kill dotfiles-go
|
||||
|
||||
docker kill dotfiles-rust && sleep 3 || :
|
||||
docker run --rm -d --name dotfiles-rust -v ./tools/.local/bin:/rust/bin rust:1.90-bullseye tail -f /dev/null
|
||||
|
||||
cargo-install zoxide zoxide --locked
|
||||
cargo-install rg ripgrep
|
||||
cargo-install fd fd-find
|
||||
cargo-install bat bat --locked
|
||||
cargo-install eza eza
|
||||
cargo-install delta git-delta
|
||||
cargo-install jj --bin jj jj-cli --locked
|
||||
cargo-install lazyjj lazyjj --locked
|
||||
|
||||
docker kill dotfiles-rust
|
||||
@@ -1,175 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# determine where to place the log file
|
||||
logfile="$HOME/.dkrc.log"
|
||||
[ -d "$HOME/.local/share/xorg" ] && logfile="$HOME/.local/share/xorg/dkrc.log"
|
||||
: > "$logfile"
|
||||
|
||||
# load sxhkd for keybinds
|
||||
pgrep sxhkd || sxhkd -c "$HOME/.config/dk/sxhkdrc" &
|
||||
|
||||
# spawn a scratchpad terminal if not already (see sxhkdrc and rules for binds/setup)
|
||||
# pgrep -f "st -c scratchpad" || st -c scratchpad &
|
||||
|
||||
# adjust border widths based on the DPI of the monitor
|
||||
px=$(xrandr | grep ' connected' | tail -n1 | grep -o '[0-9]\+x[0-9]\+' | cut -d'x' -f2)
|
||||
mm=$(xrandr | grep ' connected' | tail -n1 | grep -o '[0-9]\+mm' | tail -n1 | sed 's/mm//')
|
||||
dpi=$(( (px / mm) * 25 ))
|
||||
|
||||
if [ $dpi -ge 140 ]; then
|
||||
border_width=5
|
||||
border_outer_width=3
|
||||
elif [ $dpi -ge 120 ]; then
|
||||
border_width=4
|
||||
border_outer_width=2
|
||||
else
|
||||
border_width=2
|
||||
border_outer_width=1
|
||||
fi
|
||||
|
||||
{ # compound command to redirect all output
|
||||
|
||||
# workspace settings
|
||||
# ------------------------
|
||||
|
||||
# initialize 6 workspaces (1-6) (default: 1/monitor)
|
||||
dkcmd set numws=10
|
||||
|
||||
# default workspace '_' values used when allocating new workspaces
|
||||
# can be applied to all existing workspaces when passed 'apply' after ws=_
|
||||
dkcmd set ws=_ apply layout=tile master=1 stack=3 gap=0 msplit=0.5 ssplit=0.5
|
||||
|
||||
# use grid layout, padding, and gaps on last workspace
|
||||
#dkcmd set ws=6 layout=grid pad left=200 right=200 top=100 bottom=100 gap=50
|
||||
|
||||
# change workspace names (default: number == name -> 1:1, 2:2, 3:3....)
|
||||
# dkcmd set \
|
||||
# ws=1 name="edit" \
|
||||
# ws=2 name="web" \
|
||||
# ws=3 name="😀" \
|
||||
# ws=4 name="😠" \
|
||||
# ws=5 name="5" \
|
||||
# ws=6 name="6" \
|
||||
|
||||
# enable static workspaces assigned to monitors (relevant for multiple monitors)
|
||||
monitors=$(polybar -m | sed 's/+/:/g' | awk -F: '{print $3, $1}' | sort -n | cut -d' ' -f2 | xargs)
|
||||
mon1=$(echo $monitors | cut -d' ' -f1)
|
||||
mon2=$(echo $monitors | cut -d' ' -f2)
|
||||
mon3=$(echo $monitors | cut -d' ' -f3)
|
||||
if [ -z "$mon2" ]; then
|
||||
mon2="$mon1"
|
||||
mon3="$mon1"
|
||||
elif [ -z "$mon3" ]; then
|
||||
mon3="$mon1"
|
||||
fi
|
||||
dkcmd set static_ws=true \
|
||||
ws=1 mon=$mon2 \
|
||||
ws=2 mon=$mon2 \
|
||||
ws=3 mon=$mon2 \
|
||||
ws=4 mon=$mon2 \
|
||||
ws=5 mon=$mon2 \
|
||||
ws=6 mon=$mon2 \
|
||||
ws=7 mon=$mon2 \
|
||||
ws=8 mon=$mon2 \
|
||||
ws=9 mon=$mon1 \
|
||||
ws=10 mon=$mon3
|
||||
|
||||
# global settings
|
||||
# ---------------------
|
||||
|
||||
# focus windows when receiving activation and enable focus-follows-mouse
|
||||
dkcmd set focus_open=true focus_urgent=true focus_mouse=true
|
||||
|
||||
# place clients at the tail and ignore size hints on tiled windows
|
||||
dkcmd set tile_tohead=0 tile_hints=false
|
||||
|
||||
# minimum width/height for resizing, and minimum allowed on-screen when moving
|
||||
dkcmd set win_minwh=50 win_minxy=10
|
||||
|
||||
# disable gaps and borders in single window layouts
|
||||
dkcmd set smart_gap=true smart_border=true
|
||||
|
||||
# define mouse mod and move/resize buttons
|
||||
dkcmd set mouse mod=mod4 move=button1 resize=button3
|
||||
|
||||
# obey motif border hints on windows that draw their own (steam, easyeffects, etc.)
|
||||
dkcmd set obey_motif=true
|
||||
|
||||
|
||||
# borders
|
||||
# ---------
|
||||
|
||||
# traditional
|
||||
# set border width and colour for each window state
|
||||
# dkcmd set border width=$border_width colour focus='#6699cc' unfocus='#000000' urgent='#ee5555'
|
||||
|
||||
# alternative
|
||||
# enable split borders and colours, width is overall width, outer_width consumes some of width.
|
||||
# outer_width must be less than width, outer_width of 0 will be single borders
|
||||
dkcmd set border width=$border_width outer_width=$border_outer_width \
|
||||
colour \
|
||||
focus='#6699cc' \
|
||||
unfocus='#444444' \
|
||||
urgent='#ee5555' \
|
||||
outer_focus='#222222' \
|
||||
outer_unfocus='#222222' \
|
||||
outer_urgent='#222222'
|
||||
|
||||
|
||||
# window rules
|
||||
# --------------
|
||||
|
||||
# rule class, instance, and title regex are *always* case INSENSITIVE
|
||||
|
||||
# open window(s) on a specific workspace (assigned monitor)
|
||||
# dkcmd rule class="^gimp$" ws=2
|
||||
|
||||
# open window(s) on a monitor by number or name (active workspace on monitor)
|
||||
# dkcmd rule class="^chromium$" mon="HDMI-A-0"
|
||||
|
||||
# open window(s) and use a callback function (user defined in config.h)
|
||||
# we also ignore_cfg=true to stop the window from being resized on it's own from events
|
||||
# eg. mpv --x11-name=albumart /path/to/media
|
||||
# dkcmd rule class="^mpv$" instance="^albumart$" float=true ignore_cfg=true callback=albumart bw=0
|
||||
|
||||
# open window(s) in a floating state
|
||||
dkcmd rule class="^(pavucontrol|transmission-gtk|steam|lxappearance)$" float=true
|
||||
|
||||
# open window(s) with a specific geometry and coordinates (floating only!)
|
||||
# dkcmd rule class="^google-chrome$" title="^open files$" float=true w=1280 h=720
|
||||
|
||||
# open window(s) with ignore_msg=true to avoid focus being grabbed and changing workspace
|
||||
# dkcmd rule class="^TelegramDesktop$" ignore_msg=true
|
||||
|
||||
# define some terminals and allow them to be absorbed by spawned windows
|
||||
dkcmd rule class="^(st|st-256color|urxvt|kitty|alacritty|xterm|xterm-256color)$" terminal=true
|
||||
|
||||
# set a window to never absorb other windows, like the xev event tester
|
||||
dkcmd rule title="^Event Tester$" no_absorb=true
|
||||
|
||||
# send a window to the scratchpad
|
||||
dkcmd rule class="^scratchpad$" scratch=true
|
||||
|
||||
# focus window and workspace on opening
|
||||
# dkcmd rule class="^firefox$" ws=1 focus=true
|
||||
|
||||
# update or remove an existing rule with the same match patterns
|
||||
# dkcmd rule class="^firefox$" mon="HDMI-A-0"
|
||||
# dkcmd rule remove class="^firefox$"
|
||||
|
||||
# apply current rule set to all existing windows (used mainly for WM restart)
|
||||
dkcmd rule apply '*'
|
||||
|
||||
# delete all rules
|
||||
# dkcmd rule remove '*'
|
||||
|
||||
} >> "$logfile" 2>&1 # append responses
|
||||
|
||||
# inform of any errors in a notification
|
||||
if grep -q 'error:' "$logfile"; then
|
||||
hash notify-send && notify-send -t 0 -u critical "dkrc has errors" \
|
||||
"$(awk '/error:/ {sub(/^error: /, ""); gsub(/</, "\<"); print}' "$logfile")"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
exit 0
|
||||
@@ -1,117 +0,0 @@
|
||||
# sxhkdrc for use with dk
|
||||
#########################################################
|
||||
|
||||
# launcher
|
||||
mod4 + p
|
||||
dmenu_run -fn 'Fira Code Nerd Font Ret:size=13'
|
||||
|
||||
# terminal
|
||||
mod4 + shift + Return
|
||||
st
|
||||
|
||||
mod4 + ctrl + shift + Return
|
||||
st-abduco-tabbed
|
||||
|
||||
# screenshot and selection capture
|
||||
{_,mod4 + }@Print
|
||||
scrot {_,-s}
|
||||
|
||||
# dedicated volume keys
|
||||
{XF86AudioRaiseVolume,XF86AudioLowerVolume}
|
||||
pamixer {-i,-d} 2
|
||||
|
||||
# dedicated backlight keys
|
||||
{XF86MonBrightnessUp,XF86MonBrightnessDown}
|
||||
xbacklight {+10,-10}
|
||||
|
||||
# alt volume keys
|
||||
mod4 + {Insert,Delete}
|
||||
pamixer {-i,-d} 2
|
||||
|
||||
# reload sxhkd
|
||||
mod4 + shift + x
|
||||
pkill -USR1 -x sxhkd
|
||||
|
||||
|
||||
|
||||
# quit dk
|
||||
mod4 + shift + q
|
||||
dkcmd exit
|
||||
|
||||
# reload dkrc
|
||||
mod4 + shift + r
|
||||
$HOME/.config/dk/dkrc
|
||||
|
||||
# restart dk
|
||||
mod4 + ctrl + shift + r
|
||||
dkcmd restart
|
||||
|
||||
# focus next or previous window
|
||||
mod4 + {j,k}
|
||||
dkcmd win focus {next,prev}
|
||||
|
||||
# close window, swap tiled window in/out of master, cycle tiled windows in place
|
||||
mod4 + {q,space,Tab}
|
||||
dkcmd win {kill,swap,cycle}
|
||||
|
||||
# toggle fullscreen and fake fullscreen (enable manipulating fullscreen window)
|
||||
{_,mod4 + }F11
|
||||
dkcmd win {full,fakefull}
|
||||
|
||||
# toggle floating, sticky, or scratchpad
|
||||
mod4 + shift + {space,s,u}
|
||||
dkcmd win {float,stick,scratch}
|
||||
# alternatively to scratch a window by class "scratchpad"
|
||||
#dkcmd win {float,stick,scratchpad scratch}
|
||||
|
||||
# move window, signed (+/-) for relative changes, for tiled windows
|
||||
# y coord changes will move the window up/down the stack
|
||||
mod4 + shift + {h,j,k,l}
|
||||
dkcmd win resize {x=-20,y=+20,y=-20,x=+20}
|
||||
|
||||
# resize window, signed (+/-) for relative changes
|
||||
mod4 + ctrl + {h,j,k,l}
|
||||
dkcmd win resize {w=-20,h=+20,h=-20,w=+20}
|
||||
|
||||
# view, send, or follow to a workspace (by number)
|
||||
mod4 + {_,shift + ,ctrl + }{1-9,0}
|
||||
dkcmd ws {view,send,follow} {1-9,10}
|
||||
|
||||
# view, send, or follow to the next, previous, last active,
|
||||
# next non-empty, or prev non-empty workspace
|
||||
mod4 + {_,shift + ,ctrl + }{bracketleft,bracketright,BackSpace,Left,Right}
|
||||
dkcmd ws {view,send,follow} {prev,next,last,prevne,nextne}
|
||||
|
||||
# view, send, or follow to the next, previous, or last active monitor
|
||||
mod4 + {_,shift + ,ctrl + }{comma,period,backslash}
|
||||
dkcmd mon {view,send,follow} {prev,next,last}
|
||||
|
||||
# change active workspace layout or cycle between them
|
||||
mod4 + {t,r,m,g,s,w,f,u,c}
|
||||
dkcmd set layout {tile,rtile,mono,grid,spiral,dwindle,none,tstack,cycle}
|
||||
|
||||
# change number of windows in master or first stack
|
||||
mod4 + {_,shift + }{i,d}
|
||||
dkcmd set {master,stack} {+1,-1}
|
||||
|
||||
# change gap width
|
||||
mod4 + {equal,minus}
|
||||
dkcmd set gap {+5,-5}
|
||||
|
||||
# change border widths
|
||||
mod4 + ctrl + {_,shift + }{equal,minus}
|
||||
dkcmd set border {width,outer_width} {+1,-1}
|
||||
|
||||
# lock screen
|
||||
mod4 + ctrl + shift + l
|
||||
slock
|
||||
|
||||
# suspend
|
||||
mod4 + ctrl + shift + s
|
||||
systemctl suspend
|
||||
|
||||
# toggle light/dark theme
|
||||
mod4 + F6
|
||||
lupan-set-theme toggle
|
||||
|
||||
# vim:ft=sxhkdrc
|
||||
@@ -1,60 +1,4 @@
|
||||
[main]
|
||||
font = HurmitNerdFont:size=10
|
||||
initial-color-theme = dark
|
||||
font = Fira Code Nerd Font:size=11
|
||||
|
||||
[colors-dark]
|
||||
foreground = a29e98
|
||||
background = 272117
|
||||
cursor = 272117 73d0b1
|
||||
selection-foreground = 272117
|
||||
selection-background = 276c9a
|
||||
|
||||
regular0 = 85919b
|
||||
regular1 = c37583
|
||||
regular2 = 44a386
|
||||
regular3 = af8842
|
||||
regular4 = 5396c7
|
||||
regular5 = a57cba
|
||||
regular6 = 2da0ad
|
||||
regular7 = b0bcc7
|
||||
|
||||
bright0 = 85919b
|
||||
bright1 = f2a0ae
|
||||
bright2 = 73d0b1
|
||||
bright3 = dcb46e
|
||||
bright4 = 7fc3f5
|
||||
bright5 = d2a8e8
|
||||
bright6 = 62cdda
|
||||
bright7 = a29e98
|
||||
|
||||
[colors-light]
|
||||
foreground = 696257
|
||||
background = faf8f5
|
||||
cursor = faf8f5 7ad6b7
|
||||
selection-foreground = faf8f5
|
||||
selection-background = 3a7ead
|
||||
|
||||
regular0 = 272117
|
||||
regular1 = d0818f
|
||||
regular2 = 52af92
|
||||
regular3 = bc944f
|
||||
regular4 = 60a3d4
|
||||
regular5 = b289c7
|
||||
regular6 = 3dadba
|
||||
regular7 = b6c3cd
|
||||
|
||||
bright0 = 919da7
|
||||
bright1 = 85c9fc
|
||||
bright2 = 7ad6b7
|
||||
bright3 = e3ba74
|
||||
bright4 = 60a3d4
|
||||
bright5 = d9aeee
|
||||
bright6 = 85c9fc
|
||||
bright7 = faf8f5
|
||||
|
||||
[key-bindings]
|
||||
color-theme-toggle = Control+Shift+t
|
||||
primary-paste = Shift+Insert Control+Shift+i
|
||||
|
||||
[search-bindings]
|
||||
primary-paste = Shift+Insert Control+Shift+i
|
||||
include = /usr/share/foot/themes/nord
|
||||
|
||||
@@ -1,164 +0,0 @@
|
||||
# name: kakoune_jump_mode
|
||||
# version: 0.1.0
|
||||
# description: Click with your keyboard.
|
||||
# authors: ["Mathieu Ablasou <alexherbo2@gmail.com>"]
|
||||
# kakoune: 2023-12-12
|
||||
# license: MIT
|
||||
# dependencies: []
|
||||
# doc: yes
|
||||
# tests: no
|
||||
declare-option range-specs jump_ranges
|
||||
declare-option str-to-str-map jump_label_selection_map
|
||||
declare-option str-list jump_selections
|
||||
declare-option str-list jump_labels \
|
||||
'aa' 'ab' 'ac' 'ad' 'ae' 'af' 'ag' 'ah' 'ai' 'aj' 'ak' 'al' 'am' 'an' 'ao' 'ap' 'aq' 'ar' 'as' 'at' 'au' 'av' 'aw' 'ax' 'ay' 'az' \
|
||||
'ba' 'bb' 'bc' 'bd' 'be' 'bf' 'bg' 'bh' 'bi' 'bj' 'bk' 'bl' 'bm' 'bn' 'bo' 'bp' 'bq' 'br' 'bs' 'bt' 'bu' 'bv' 'bw' 'bx' 'by' 'bz' \
|
||||
'ca' 'cb' 'cc' 'cd' 'ce' 'cf' 'cg' 'ch' 'ci' 'cj' 'ck' 'cl' 'cm' 'cn' 'co' 'cp' 'cq' 'cr' 'cs' 'ct' 'cu' 'cv' 'cw' 'cx' 'cy' 'cz' \
|
||||
'da' 'db' 'dc' 'dd' 'de' 'df' 'dg' 'dh' 'di' 'dj' 'dk' 'dl' 'dm' 'dn' 'do' 'dp' 'dq' 'dr' 'ds' 'dt' 'du' 'dv' 'dw' 'dx' 'dy' 'dz' \
|
||||
'ea' 'eb' 'ec' 'ed' 'ee' 'ef' 'eg' 'eh' 'ei' 'ej' 'ek' 'el' 'em' 'en' 'eo' 'ep' 'eq' 'er' 'es' 'et' 'eu' 'ev' 'ew' 'ex' 'ey' 'ez' \
|
||||
'fa' 'fb' 'fc' 'fd' 'fe' 'ff' 'fg' 'fh' 'fi' 'fj' 'fk' 'fl' 'fm' 'fn' 'fo' 'fp' 'fq' 'fr' 'fs' 'ft' 'fu' 'fv' 'fw' 'fx' 'fy' 'fz' \
|
||||
'ga' 'gb' 'gc' 'gd' 'ge' 'gf' 'gg' 'gh' 'gi' 'gj' 'gk' 'gl' 'gm' 'gn' 'go' 'gp' 'gq' 'gr' 'gs' 'gt' 'gu' 'gv' 'gw' 'gx' 'gy' 'gz' \
|
||||
'ha' 'hb' 'hc' 'hd' 'he' 'hf' 'hg' 'hh' 'hi' 'hj' 'hk' 'hl' 'hm' 'hn' 'ho' 'hp' 'hq' 'hr' 'hs' 'ht' 'hu' 'hv' 'hw' 'hx' 'hy' 'hz' \
|
||||
'ia' 'ib' 'ic' 'id' 'ie' 'if' 'ig' 'ih' 'ii' 'ij' 'ik' 'il' 'im' 'in' 'io' 'ip' 'iq' 'ir' 'is' 'it' 'iu' 'iv' 'iw' 'ix' 'iy' 'iz' \
|
||||
'ja' 'jb' 'jc' 'jd' 'je' 'jf' 'jg' 'jh' 'ji' 'jj' 'jk' 'jl' 'jm' 'jn' 'jo' 'jp' 'jq' 'jr' 'js' 'jt' 'ju' 'jv' 'jw' 'jx' 'jy' 'jz' \
|
||||
'ka' 'kb' 'kc' 'kd' 'ke' 'kf' 'kg' 'kh' 'ki' 'kj' 'kk' 'kl' 'km' 'kn' 'ko' 'kp' 'kq' 'kr' 'ks' 'kt' 'ku' 'kv' 'kw' 'kx' 'ky' 'kz' \
|
||||
'la' 'lb' 'lc' 'ld' 'le' 'lf' 'lg' 'lh' 'li' 'lj' 'lk' 'll' 'lm' 'ln' 'lo' 'lp' 'lq' 'lr' 'ls' 'lt' 'lu' 'lv' 'lw' 'lx' 'ly' 'lz' \
|
||||
'ma' 'mb' 'mc' 'md' 'me' 'mf' 'mg' 'mh' 'mi' 'mj' 'mk' 'ml' 'mm' 'mn' 'mo' 'mp' 'mq' 'mr' 'ms' 'mt' 'mu' 'mv' 'mw' 'mx' 'my' 'mz' \
|
||||
'na' 'nb' 'nc' 'nd' 'ne' 'nf' 'ng' 'nh' 'ni' 'nj' 'nk' 'nl' 'nm' 'nn' 'no' 'np' 'nq' 'nr' 'ns' 'nt' 'nu' 'nv' 'nw' 'nx' 'ny' 'nz' \
|
||||
'oa' 'ob' 'oc' 'od' 'oe' 'of' 'og' 'oh' 'oi' 'oj' 'ok' 'ol' 'om' 'on' 'oo' 'op' 'oq' 'or' 'os' 'ot' 'ou' 'ov' 'ow' 'ox' 'oy' 'oz' \
|
||||
'pa' 'pb' 'pc' 'pd' 'pe' 'pf' 'pg' 'ph' 'pi' 'pj' 'pk' 'pl' 'pm' 'pn' 'po' 'pp' 'pq' 'pr' 'ps' 'pt' 'pu' 'pv' 'pw' 'px' 'py' 'pz' \
|
||||
'qa' 'qb' 'qc' 'qd' 'qe' 'qf' 'qg' 'qh' 'qi' 'qj' 'qk' 'ql' 'qm' 'qn' 'qo' 'qp' 'qq' 'qr' 'qs' 'qt' 'qu' 'qv' 'qw' 'qx' 'qy' 'qz' \
|
||||
'ra' 'rb' 'rc' 'rd' 're' 'rf' 'rg' 'rh' 'ri' 'rj' 'rk' 'rl' 'rm' 'rn' 'ro' 'rp' 'rq' 'rr' 'rs' 'rt' 'ru' 'rv' 'rw' 'rx' 'ry' 'rz' \
|
||||
'sa' 'sb' 'sc' 'sd' 'se' 'sf' 'sg' 'sh' 'si' 'sj' 'sk' 'sl' 'sm' 'sn' 'so' 'sp' 'sq' 'sr' 'ss' 'st' 'su' 'sv' 'sw' 'sx' 'sy' 'sz' \
|
||||
'ta' 'tb' 'tc' 'td' 'te' 'tf' 'tg' 'th' 'ti' 'tj' 'tk' 'tl' 'tm' 'tn' 'to' 'tp' 'tq' 'tr' 'ts' 'tt' 'tu' 'tv' 'tw' 'tx' 'ty' 'tz' \
|
||||
'ua' 'ub' 'uc' 'ud' 'ue' 'uf' 'ug' 'uh' 'ui' 'uj' 'uk' 'ul' 'um' 'un' 'uo' 'up' 'uq' 'ur' 'us' 'ut' 'uu' 'uv' 'uw' 'ux' 'uy' 'uz' \
|
||||
'va' 'vb' 'vc' 'vd' 've' 'vf' 'vg' 'vh' 'vi' 'vj' 'vk' 'vl' 'vm' 'vn' 'vo' 'vp' 'vq' 'vr' 'vs' 'vt' 'vu' 'vv' 'vw' 'vx' 'vy' 'vz' \
|
||||
'wa' 'wb' 'wc' 'wd' 'we' 'wf' 'wg' 'wh' 'wi' 'wj' 'wk' 'wl' 'wm' 'wn' 'wo' 'wp' 'wq' 'wr' 'ws' 'wt' 'wu' 'wv' 'ww' 'wx' 'wy' 'wz' \
|
||||
'xa' 'xb' 'xc' 'xd' 'xe' 'xf' 'xg' 'xh' 'xi' 'xj' 'xk' 'xl' 'xm' 'xn' 'xo' 'xp' 'xq' 'xr' 'xs' 'xt' 'xu' 'xv' 'xw' 'xx' 'xy' 'xz' \
|
||||
'ya' 'yb' 'yc' 'yd' 'ye' 'yf' 'yg' 'yh' 'yi' 'yj' 'yk' 'yl' 'ym' 'yn' 'yo' 'yp' 'yq' 'yr' 'ys' 'yt' 'yu' 'yv' 'yw' 'yx' 'yy' 'yz' \
|
||||
'za' 'zb' 'zc' 'zd' 'ze' 'zf' 'zg' 'zh' 'zi' 'zj' 'zk' 'zl' 'zm' 'zn' 'zo' 'zp' 'zq' 'zr' 'zs' 'zt' 'zu' 'zv' 'zw' 'zx' 'zy' 'zz'
|
||||
|
||||
set-face global JumpLabel 'black,bright-yellow+F'
|
||||
|
||||
define-command enter_jump_mode_with_replace_select_mode %{
|
||||
enter_jump_mode 'jump (replace):' %{
|
||||
try %{
|
||||
execute-keys -save-regs 's' '<esc><a-,>"sZz"s<a-z>a<esc>'
|
||||
} catch %{
|
||||
execute-keys '<esc>z<esc>'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
define-command enter_jump_mode_with_extend_select_mode %{
|
||||
enter_jump_mode 'jump (extend):' %{
|
||||
execute-keys -save-regs 's' '<esc>"sZ,<a-z>u"s<a-z>a<esc>'
|
||||
}
|
||||
}
|
||||
|
||||
define-command enter_jump_mode_with_append_select_mode %{
|
||||
enter_jump_mode 'jump (append):' %{
|
||||
execute-keys -save-regs 's' '<esc>"sZz"s<a-z>a<esc>'
|
||||
}
|
||||
}
|
||||
|
||||
define-command enter_jump_mode -params 2 %{
|
||||
create_jump_state_from_words_in_viewport
|
||||
create_jump_label_selection_map_option_buffer
|
||||
execute-keys 'ga'
|
||||
render_jump_labels
|
||||
open_jump_prompt %arg{1} %arg{2}
|
||||
}
|
||||
|
||||
define-command exit_jump_mode %{
|
||||
unrender_jump_labels
|
||||
close_jump_label_selection_map_option_buffer
|
||||
}
|
||||
|
||||
define-command render_jump_labels %{
|
||||
add-highlighter window/jump_ranges replace-ranges jump_ranges
|
||||
}
|
||||
|
||||
define-command unrender_jump_labels %{
|
||||
remove-highlighter window/jump_ranges
|
||||
}
|
||||
|
||||
define-command open_jump_prompt -params 2 %{
|
||||
prompt %arg{1} %{
|
||||
exit_jump_mode
|
||||
} -on-change %{
|
||||
handle_jump_input %val{text} %arg{2}
|
||||
} -on-abort %{
|
||||
exit_jump_mode
|
||||
}
|
||||
}
|
||||
|
||||
define-command handle_jump_input -params 2 %{
|
||||
evaluate-commands -save-regs '^/' -draft -verbatim try %{
|
||||
open_jump_label_selection_map_option_buffer
|
||||
set-register / "\A\Q%arg{1}\E=(\d+\.\d+,\d+\.\d+)\z"
|
||||
execute-keys 's<ret>'
|
||||
evaluate-commands -draft -client %val{client} %exp{
|
||||
select %reg{1}
|
||||
execute-keys -save-regs '' 'Z'
|
||||
}
|
||||
evaluate-commands -client %val{client} %arg{2}
|
||||
}
|
||||
}
|
||||
|
||||
define-command create_jump_state_from_words_in_viewport %{
|
||||
create_jump_state_from_selections_in_viewport %{
|
||||
execute-keys 's\w+<ret><a-i>w'
|
||||
}
|
||||
}
|
||||
|
||||
define-command create_jump_state_from_selections_in_viewport -params 1 %{
|
||||
evaluate-commands -draft %{
|
||||
execute-keys 'gtGbx'
|
||||
evaluate-commands %arg{1}
|
||||
execute-keys '<a-k>\A.{2,}\z<ret>)'
|
||||
evaluate-commands -client %val{client} -verbatim create_jump_state %val{selections_desc}
|
||||
}
|
||||
}
|
||||
|
||||
define-command create_jump_state -params .. %{
|
||||
evaluate-commands -save-regs '"ab' %{
|
||||
set-register a %arg{@}
|
||||
set-register b %opt{jump_labels}
|
||||
evaluate-commands -draft %{
|
||||
edit -scratch
|
||||
execute-keys '"a<a-P>a<space><c-r>b<esc>'
|
||||
evaluate-commands -itersel %{
|
||||
execute-keys 's\A(\d+)\.(\d+),(\d+)\.(\d+) (.{2})\z<ret>'
|
||||
set-register dquote %exp{
|
||||
set-option -add window jump_ranges "%reg{1}.%reg{2}+2|{JumpLabel}%reg{5}"
|
||||
set-option -add window jump_label_selection_map "%reg{5}=%reg{1}.%reg{2},%reg{3}.%reg{4}"
|
||||
}
|
||||
execute-keys 'R'
|
||||
}
|
||||
execute-keys -save-regs '' '%y'
|
||||
delete-buffer
|
||||
}
|
||||
set-option window jump_ranges %val{timestamp}
|
||||
set-option window jump_label_selection_map
|
||||
evaluate-commands %reg{dquote}
|
||||
}
|
||||
}
|
||||
|
||||
define-command create_jump_label_selection_map_option_buffer %{
|
||||
evaluate-commands -save-regs '"' %{
|
||||
set-register dquote %opt{jump_label_selection_map}
|
||||
edit -scratch "jump_label_selection_map@%val{client}.option"
|
||||
execute-keys '<a-P>'
|
||||
set-option buffer jump_selections %val{selections_desc}
|
||||
}
|
||||
}
|
||||
|
||||
define-command open_jump_label_selection_map_option_buffer %{
|
||||
edit -scratch "jump_label_selection_map@%val{client}.option"
|
||||
select %opt{jump_selections}
|
||||
}
|
||||
|
||||
define-command close_jump_label_selection_map_option_buffer %{
|
||||
delete-buffer "jump_label_selection_map@%val{client}.option"
|
||||
}
|
||||
@@ -1,125 +0,0 @@
|
||||
# Five colors dark theme
|
||||
|
||||
evaluate-commands %sh{
|
||||
bg="rgb:272117"
|
||||
bgmenu="rgb:282e38"
|
||||
fg="rgb:a29e98"
|
||||
gray="rgb:767778"
|
||||
|
||||
red1="rgb:f2a0ae"
|
||||
red2="rgb:c37583"
|
||||
red3="rgb:954c5b"
|
||||
|
||||
yellow1="rgb:dcb46e"
|
||||
yellow2="rgb:af8842"
|
||||
yellow3="rgb:845f10"
|
||||
|
||||
green1="rgb:73d0b1"
|
||||
green2="rgb:44a386"
|
||||
green3="rgb:04785d"
|
||||
|
||||
blue1="rgb:7fc3f5"
|
||||
blue2="rgb:5396c7"
|
||||
blue3="rgb:276c9a"
|
||||
|
||||
violet1="rgb:d2a8e8"
|
||||
violet2="rgb:a57cba"
|
||||
violet3="rgb:7b548e"
|
||||
|
||||
echo "
|
||||
## CODE
|
||||
|
||||
set-face global value $violet2
|
||||
set-face global type $green2
|
||||
set-face global variable $yellow3
|
||||
set-face global module $red3
|
||||
set-face global function $blue2
|
||||
set-face global string $yellow2
|
||||
set-face global keyword $violet3
|
||||
set-face global operator $red2
|
||||
set-face global attribute $green3
|
||||
set-face global comment $gray
|
||||
set-face global documentation $gray
|
||||
set-face global meta $blue3
|
||||
set-face global builtin $violet1
|
||||
|
||||
## MARKUP
|
||||
|
||||
set-face global title $red3
|
||||
set-face global header $violet3
|
||||
set-face global mono $yellow2
|
||||
set-face global block $blue3
|
||||
set-face global link $blue2
|
||||
set-face global bullet $red2
|
||||
set-face global list $red2
|
||||
|
||||
## BUILTIN
|
||||
|
||||
set-face global Default $fg,$bg
|
||||
set-face global PrimarySelection $bg,$green3
|
||||
set-face global SecondarySelection $bg,$blue3
|
||||
set-face global PrimaryCursor $bg,$green1
|
||||
set-face global SecondaryCursor $bg,$blue1
|
||||
set-face global PrimaryCursorEol $bg,$red1
|
||||
set-face global SecondaryCursorEol $bg,$yellow1
|
||||
set-face global MenuForeground $green1,$green3
|
||||
set-face global MenuBackground $fg,$bgmenu
|
||||
set-face global MenuInfo $green2
|
||||
set-face global Information $fg,$bgmenu
|
||||
set-face global InlineInformation $blue2,$bgmenu
|
||||
set-face global Error $red2
|
||||
set-face global DiagnosticError default,default,$red2+c
|
||||
set-face global DiagnosticWarning default,default,$yellow2+c
|
||||
set-face global DiagnosticInfo default,default,$green2+c
|
||||
set-face global DiagnosticHint default,default,$blue2+c
|
||||
set-face global StatusLine $fg,$bgmenu
|
||||
set-face global StatusLineMode $green2
|
||||
set-face global StatusLineInfo $yellow2
|
||||
set-face global StatusLineValue $blue2
|
||||
set-face global StatusCursor $bg,$green1
|
||||
set-face global Prompt $green2
|
||||
set-face global BufferPadding $bg,$bg
|
||||
|
||||
# Built-in highlighter faces
|
||||
|
||||
set-face global LineNumbers $gray
|
||||
set-face global LineNumberCursor $green3
|
||||
set-face global LineNumbersWrapped $bg,$bg
|
||||
set-face global MatchingChar $red1
|
||||
set-face global Whitespace $gray
|
||||
set-face global WhitespaceIndent $gray
|
||||
set-face global WrapMarker $yellow1
|
||||
|
||||
# PLUGINS
|
||||
|
||||
# kak-lsp
|
||||
|
||||
set-face global InfoDefault default
|
||||
set-face global InfoBlock $green2
|
||||
set-face global InfoBlockQuote $yellow2
|
||||
set-face global InfoBullet $red2
|
||||
set-face global InfoHeader $red3
|
||||
set-face global InfoLink $blue2
|
||||
set-face global InfoLinkMono $blue3
|
||||
|
||||
set-face global InfoMono $blue2
|
||||
set-face global InfoRule $yellow2
|
||||
set-face global InfoDiagnosticError $red2
|
||||
set-face global InfoDiagnosticHint $blue2
|
||||
set-face global InfoDiagnosticInformation $green2
|
||||
set-face global InfoDiagnosticWarning $yellow2
|
||||
|
||||
set-face global LineFlagError $red2
|
||||
set-face global LineFlagHint $blue2
|
||||
set-face global LineFlagInfo $green2
|
||||
set-face global LineFlagWarning $yellow2
|
||||
|
||||
set-face global InlayDiagnosticError $red2
|
||||
set-face global InlayDiagnosticHint $blue2
|
||||
set-face global InlayDiagnosticInfo $green2
|
||||
set-face global InlayDiagnosticWarning $yellow2
|
||||
|
||||
set-face global SnippetsNextPlaceholders $bg,$green2
|
||||
set-face global SnippetsOtherPlaceholders $bg,$yellow2
|
||||
"
|
||||
}
|
||||
@@ -1,125 +0,0 @@
|
||||
# Five colors dark theme
|
||||
|
||||
evaluate-commands %sh{
|
||||
bg="rgb:faf8f5"
|
||||
bgmenu="rgb:f6ede0"
|
||||
fg="rgb:696257"
|
||||
gray="rgb:c0c1c2"
|
||||
|
||||
red1="rgb:f9a6b5"
|
||||
red2="rgb:d0818f"
|
||||
red3="rgb:a95d6c"
|
||||
|
||||
yellow1="rgb:e3ba74"
|
||||
yellow2="rgb:bc944f"
|
||||
yellow3="rgb:967028"
|
||||
|
||||
green1="rgb:7ad6b7"
|
||||
green2="rgb:52af92"
|
||||
green3="rgb:278a6e"
|
||||
|
||||
blue1="rgb:85c9fc"
|
||||
blue2="rgb:60a3d4"
|
||||
blue3="rgb:3a7ead"
|
||||
|
||||
violet1="rgb:d9aeee"
|
||||
violet2="rgb:b289c7"
|
||||
violet3="rgb:8d65a1"
|
||||
|
||||
echo "
|
||||
## CODE
|
||||
|
||||
set-face global value $violet2
|
||||
set-face global type $green2
|
||||
set-face global variable $yellow3
|
||||
set-face global module $red3
|
||||
set-face global function $blue2
|
||||
set-face global string $yellow2
|
||||
set-face global keyword $violet3
|
||||
set-face global operator $red2
|
||||
set-face global attribute $green3
|
||||
set-face global comment $gray
|
||||
set-face global documentation $gray
|
||||
set-face global meta $blue3
|
||||
set-face global builtin $violet1
|
||||
|
||||
## MARKUP
|
||||
|
||||
set-face global title $red3
|
||||
set-face global header $violet3
|
||||
set-face global mono $yellow2
|
||||
set-face global block $blue3
|
||||
set-face global link $blue2
|
||||
set-face global bullet $red2
|
||||
set-face global list $red2
|
||||
|
||||
## BUILTIN
|
||||
|
||||
set-face global Default $fg,$bg
|
||||
set-face global PrimarySelection $bg,$green3
|
||||
set-face global SecondarySelection $bg,$blue3
|
||||
set-face global PrimaryCursor $bg,$green1
|
||||
set-face global SecondaryCursor $bg,$blue1
|
||||
set-face global PrimaryCursorEol $bg,$red1
|
||||
set-face global SecondaryCursorEol $bg,$yellow1
|
||||
set-face global MenuForeground $green1,$green3
|
||||
set-face global MenuBackground $fg,$bgmenu
|
||||
set-face global MenuInfo $green2
|
||||
set-face global Information $fg,$bgmenu
|
||||
set-face global InlineInformation $blue2,$bgmenu
|
||||
set-face global Error $red2
|
||||
set-face global DiagnosticError default,default,$red2+c
|
||||
set-face global DiagnosticWarning default,default,$yellow2+c
|
||||
set-face global DiagnosticInfo default,default,$green2+c
|
||||
set-face global DiagnosticHint default,default,$blue2+c
|
||||
set-face global StatusLine $fg,$bgmenu
|
||||
set-face global StatusLineMode $green2
|
||||
set-face global StatusLineInfo $yellow2
|
||||
set-face global StatusLineValue $blue2
|
||||
set-face global StatusCursor $bg,$green1
|
||||
set-face global Prompt $green2
|
||||
set-face global BufferPadding $bg,$bg
|
||||
|
||||
# Built-in highlighter faces
|
||||
|
||||
set-face global LineNumbers $gray
|
||||
set-face global LineNumberCursor $green3
|
||||
set-face global LineNumbersWrapped $bg,$bg
|
||||
set-face global MatchingChar $red1
|
||||
set-face global Whitespace $gray
|
||||
set-face global WhitespaceIndent $gray
|
||||
set-face global WrapMarker $yellow1
|
||||
|
||||
# PLUGINS
|
||||
|
||||
# kak-lsp
|
||||
|
||||
set-face global InfoDefault default
|
||||
set-face global InfoBlock $green2
|
||||
set-face global InfoBlockQuote $yellow2
|
||||
set-face global InfoBullet $red2
|
||||
set-face global InfoHeader $red3
|
||||
set-face global InfoLink $blue2
|
||||
set-face global InfoLinkMono $blue3
|
||||
|
||||
set-face global InfoMono $blue2
|
||||
set-face global InfoRule $yellow2
|
||||
set-face global InfoDiagnosticError $red2
|
||||
set-face global InfoDiagnosticHint $blue2
|
||||
set-face global InfoDiagnosticInformation $green2
|
||||
set-face global InfoDiagnosticWarning $yellow2
|
||||
|
||||
set-face global LineFlagError $red2
|
||||
set-face global LineFlagHint $blue2
|
||||
set-face global LineFlagInfo $green2
|
||||
set-face global LineFlagWarning $yellow2
|
||||
|
||||
set-face global InlayDiagnosticError $red2
|
||||
set-face global InlayDiagnosticHint $blue2
|
||||
set-face global InlayDiagnosticInfo $green2
|
||||
set-face global InlayDiagnosticWarning $yellow2
|
||||
|
||||
set-face global SnippetsNextPlaceholders $bg,$green2
|
||||
set-face global SnippetsOtherPlaceholders $bg,$yellow2
|
||||
"
|
||||
}
|
||||
@@ -1,121 +0,0 @@
|
||||
# Four colors dark theme
|
||||
|
||||
evaluate-commands %sh{
|
||||
bg="rgb:272117"
|
||||
bgmenu="rgb:282e38"
|
||||
fg="rgb:a29e98"
|
||||
gray="rgb:58666d"
|
||||
|
||||
yellow1="rgb:dcb46e"
|
||||
yellow2="rgb:af8842"
|
||||
yellow3="rgb:845f10"
|
||||
|
||||
green1="rgb:73d0b1"
|
||||
green2="rgb:44a386"
|
||||
green3="rgb:04785d"
|
||||
|
||||
blue1="rgb:95bcfb"
|
||||
blue2="rgb:6b90cc"
|
||||
blue3="rgb:43669f"
|
||||
|
||||
pink1="rgb:eca0c4"
|
||||
pink2="rgb:bd7598"
|
||||
pink3="rgb:904c6e"
|
||||
|
||||
echo "
|
||||
## CODE
|
||||
|
||||
set-face global value $pink1
|
||||
set-face global type $green2
|
||||
set-face global variable $yellow3
|
||||
set-face global module $pink3
|
||||
set-face global function $blue2
|
||||
set-face global string $yellow2
|
||||
set-face global keyword $blue1
|
||||
set-face global operator $pink2
|
||||
set-face global attribute $green1
|
||||
set-face global comment $green3
|
||||
set-face global documentation $green3
|
||||
set-face global meta $blue3
|
||||
set-face global builtin $green2
|
||||
|
||||
## MARKUP
|
||||
|
||||
set-face global title $pink3
|
||||
set-face global header $pink2
|
||||
set-face global mono $yellow2
|
||||
set-face global block $blue2
|
||||
set-face global link $blue1
|
||||
set-face global bullet $pink1
|
||||
set-face global list $pink1
|
||||
|
||||
## BUILTIN
|
||||
|
||||
set-face global Default $fg,$bg
|
||||
set-face global PrimarySelection $bg,$green3
|
||||
set-face global SecondarySelection $bg,$blue3
|
||||
set-face global PrimaryCursor $bg,$green1
|
||||
set-face global SecondaryCursor $bg,$blue1
|
||||
set-face global PrimaryCursorEol $bg,$pink1
|
||||
set-face global SecondaryCursorEol $bg,$yellow1
|
||||
set-face global MenuForeground $green1,$green3
|
||||
set-face global MenuBackground $fg,$bgmenu
|
||||
set-face global MenuInfo $green2
|
||||
set-face global Information $fg,$bgmenu
|
||||
set-face global InlineInformation $blue2,$bgmenu
|
||||
set-face global Error $pink2
|
||||
set-face global DiagnosticError default,default,$pink2+c
|
||||
set-face global DiagnosticWarning default,default,$yellow2+c
|
||||
set-face global DiagnosticInfo default,default,$green2+c
|
||||
set-face global DiagnosticHint default,default,$blue2+c
|
||||
set-face global StatusLine $fg,$bgmenu
|
||||
set-face global StatusLineMode $green2
|
||||
set-face global StatusLineInfo $yellow2
|
||||
set-face global StatusLineValue $blue2
|
||||
set-face global StatusCursor $bg,$green1
|
||||
set-face global Prompt $green2
|
||||
set-face global BufferPadding $bg,$bg
|
||||
|
||||
# Built-in highlighter faces
|
||||
|
||||
set-face global LineNumbers $blue3
|
||||
set-face global LineNumberCursor $green3
|
||||
set-face global LineNumbersWrapped $bg,$bg
|
||||
set-face global MatchingChar $yellow1
|
||||
set-face global Whitespace $gray
|
||||
set-face global WhitespaceIndent $gray
|
||||
set-face global WrapMarker $yellow1
|
||||
|
||||
# PLUGINS
|
||||
|
||||
# kak-lsp
|
||||
|
||||
set-face global InfoDefault default
|
||||
set-face global InfoBlock $green2
|
||||
set-face global InfoBlockQuote $yellow2
|
||||
set-face global InfoBullet $pink1
|
||||
set-face global InfoHeader $pink3
|
||||
set-face global InfoLink $blue1
|
||||
set-face global InfoLinkMono $blue2
|
||||
|
||||
set-face global InfoMono $blue2
|
||||
set-face global InfoRule $yellow2
|
||||
set-face global InfoDiagnosticError $pink2
|
||||
set-face global InfoDiagnosticHint $blue2
|
||||
set-face global InfoDiagnosticInformation $green2
|
||||
set-face global InfoDiagnosticWarning $yellow2
|
||||
|
||||
set-face global LineFlagError $pink2
|
||||
set-face global LineFlagHint $blue2
|
||||
set-face global LineFlagInfo $green2
|
||||
set-face global LineFlagWarning $yellow2
|
||||
|
||||
set-face global InlayDiagnosticError $pink2
|
||||
set-face global InlayDiagnosticHint $blue2
|
||||
set-face global InlayDiagnosticInfo $green2
|
||||
set-face global InlayDiagnosticWarning $yellow2
|
||||
|
||||
set-face global SnippetsNextPlaceholders $bg,$green2
|
||||
set-face global SnippetsOtherPlaceholders $bg,$yellow2
|
||||
"
|
||||
}
|
||||
@@ -1,121 +0,0 @@
|
||||
# Four colors light theme
|
||||
|
||||
evaluate-commands %sh{
|
||||
bg="rgb:faf8f5"
|
||||
bgmenu="rgb:f6ede0"
|
||||
fg="rgb:696257"
|
||||
gray="rgb:58666d"
|
||||
|
||||
yellow1="rgb:dcb46e"
|
||||
yellow2="rgb:af8842"
|
||||
yellow3="rgb:845f10"
|
||||
|
||||
green1="rgb:73d0b1"
|
||||
green2="rgb:44a386"
|
||||
green3="rgb:04785d"
|
||||
|
||||
blue1="rgb:95bcfb"
|
||||
blue2="rgb:6b90cc"
|
||||
blue3="rgb:43669f"
|
||||
|
||||
pink1="rgb:eca0c4"
|
||||
pink2="rgb:bd7598"
|
||||
pink3="rgb:904c6e"
|
||||
|
||||
echo "
|
||||
## CODE
|
||||
|
||||
set-face global value $pink1
|
||||
set-face global type $green2
|
||||
set-face global variable $yellow3
|
||||
set-face global module $pink3
|
||||
set-face global function $blue2
|
||||
set-face global string $yellow2
|
||||
set-face global keyword $blue1
|
||||
set-face global operator $pink2
|
||||
set-face global attribute $green1
|
||||
set-face global comment $green3
|
||||
set-face global documentation $green3
|
||||
set-face global meta $blue3
|
||||
set-face global builtin $green2
|
||||
|
||||
## MARKUP
|
||||
|
||||
set-face global title $pink3
|
||||
set-face global header $pink2
|
||||
set-face global mono $yellow2
|
||||
set-face global block $blue2
|
||||
set-face global link $blue1
|
||||
set-face global bullet $pink1
|
||||
set-face global list $pink1
|
||||
|
||||
## BUILTIN
|
||||
|
||||
set-face global Default $fg,$bg
|
||||
set-face global PrimarySelection $bg,$green3
|
||||
set-face global SecondarySelection $bg,$blue3
|
||||
set-face global PrimaryCursor $bg,$green1
|
||||
set-face global SecondaryCursor $bg,$blue1
|
||||
set-face global PrimaryCursorEol $bg,$pink1
|
||||
set-face global SecondaryCursorEol $bg,$yellow1
|
||||
set-face global MenuForeground $green1,$green3
|
||||
set-face global MenuBackground $fg,$bgmenu
|
||||
set-face global MenuInfo $green2
|
||||
set-face global Information $fg,$bgmenu
|
||||
set-face global InlineInformation $blue2,$bgmenu
|
||||
set-face global Error $pink2
|
||||
set-face global DiagnosticError default,default,$pink2+c
|
||||
set-face global DiagnosticWarning default,default,$yellow2+c
|
||||
set-face global DiagnosticInfo default,default,$green2+c
|
||||
set-face global DiagnosticHint default,default,$blue2+c
|
||||
set-face global StatusLine $fg,$bgmenu
|
||||
set-face global StatusLineMode $green2
|
||||
set-face global StatusLineInfo $yellow2
|
||||
set-face global StatusLineValue $blue2
|
||||
set-face global StatusCursor $bg,$green1
|
||||
set-face global Prompt $green2
|
||||
set-face global BufferPadding $bg,$bg
|
||||
|
||||
# Built-in highlighter faces
|
||||
|
||||
set-face global LineNumbers $blue3
|
||||
set-face global LineNumberCursor $green2
|
||||
set-face global LineNumbersWrapped $bg,$bg
|
||||
set-face global MatchingChar $yellow1
|
||||
set-face global Whitespace $gray
|
||||
set-face global WhitespaceIndent $gray
|
||||
set-face global WrapMarker $yellow1
|
||||
|
||||
# PLUGINS
|
||||
|
||||
# kak-lsp
|
||||
|
||||
set-face global InfoDefault default
|
||||
set-face global InfoBlock $green2
|
||||
set-face global InfoBlockQuote $yellow2
|
||||
set-face global InfoBullet $pink1
|
||||
set-face global InfoHeader $pink3
|
||||
set-face global InfoLink $blue1
|
||||
set-face global InfoLinkMono $blue2
|
||||
|
||||
set-face global InfoMono $blue2
|
||||
set-face global InfoRule $yellow2
|
||||
set-face global InfoDiagnosticError $pink2
|
||||
set-face global InfoDiagnosticHint $blue2
|
||||
set-face global InfoDiagnosticInformation $green2
|
||||
set-face global InfoDiagnosticWarning $yellow2
|
||||
|
||||
set-face global LineFlagError $pink2
|
||||
set-face global LineFlagHint $blue2
|
||||
set-face global LineFlagInfo $green2
|
||||
set-face global LineFlagWarning $yellow2
|
||||
|
||||
set-face global InlayDiagnosticError $pink2
|
||||
set-face global InlayDiagnosticHint $blue2
|
||||
set-face global InlayDiagnosticInfo $green2
|
||||
set-face global InlayDiagnosticWarning $yellow2
|
||||
|
||||
set-face global SnippetsNextPlaceholders $bg,$green2
|
||||
set-face global SnippetsOtherPlaceholders $bg,$yellow2
|
||||
"
|
||||
}
|
||||
@@ -1,116 +0,0 @@
|
||||
# LP Dark
|
||||
|
||||
declare-option str bg "272117"
|
||||
declare-option str bgmenu "1c222b"
|
||||
declare-option str fg "a29e98"
|
||||
declare-option str comment "696257"
|
||||
declare-option str gray "58666d"
|
||||
|
||||
declare-option str red "d48490"
|
||||
declare-option str orange "d4896e"
|
||||
declare-option str yellow "bf9752"
|
||||
declare-option str yellow_green "96a85e"
|
||||
declare-option str green "62b289"
|
||||
declare-option str cyan "40b1b7"
|
||||
declare-option str blue "54aad1"
|
||||
declare-option str blue_violet "7a9fdd"
|
||||
declare-option str violet "9d94d9"
|
||||
declare-option str pink "ba8ac5"
|
||||
declare-option str pink_red "ce84a7"
|
||||
|
||||
declare-option str selectionalpha "90"
|
||||
|
||||
## CODE
|
||||
|
||||
set-face global value "rgb:%opt{yellow_green}"
|
||||
set-face global type "rgb:%opt{cyan}"
|
||||
set-face global variable "rgb:%opt{blue_violet}"
|
||||
set-face global module "rgb:%opt{red}"
|
||||
set-face global function "rgb:%opt{blue}"
|
||||
set-face global string "rgb:%opt{green}"
|
||||
set-face global keyword "rgb:%opt{pink}"
|
||||
set-face global operator "rgb:%opt{orange}"
|
||||
set-face global attribute "rgb:%opt{blue_violet}"
|
||||
set-face global comment "rgb:%opt{comment}"
|
||||
set-face global documentation "rgb:%opt{comment}"
|
||||
set-face global meta "rgb:%opt{violet}"
|
||||
set-face global bultin "rgb:%opt{pink_red}"
|
||||
|
||||
## MARKUP
|
||||
|
||||
set-face global title "rgb:%opt{pink_red}"
|
||||
set-face global header "rgb:%opt{orange}"
|
||||
set-face global mono "rgb:%opt{yellow_green}"
|
||||
set-face global block "rgb:%opt{cyan}"
|
||||
set-face global link "rgb:%opt{blue}"
|
||||
set-face global bullet "rgb:%opt{orange}"
|
||||
set-face global list "rgb:%opt{orange}"
|
||||
|
||||
## BUILTIN
|
||||
|
||||
set-face global Default "rgb:%opt{fg},rgb:%opt{bg}"
|
||||
set-face global PrimarySelection "rgb:%opt{bg},rgba:%opt{green}%opt{selectionalpha}"
|
||||
set-face global SecondarySelection "rgb:%opt{bg},rgba:%opt{blue}%opt{selectionalpha}"
|
||||
set-face global PrimaryCursor "rgb:%opt{bg},rgb:%opt{green}"
|
||||
set-face global SecondaryCursor "rgb:%opt{bg},rgb:%opt{blue}"
|
||||
set-face global PrimaryCursorEol "rgb:%opt{bg},rgb:%opt{pink_red}"
|
||||
set-face global SecondaryCursorEol "rgb:%opt{bg},rgb:%opt{violet}"
|
||||
set-face global MenuForeground "rgb:%opt{bg},rgb:%opt{fg}"
|
||||
set-face global MenuBackground "rgb:%opt{fg},rgb:%opt{bgmenu}"
|
||||
set-face global MenuInfo "rgb:%opt{comment}"
|
||||
set-face global Information "rgb:%opt{fg},rgb:%opt{bgmenu}"
|
||||
set-face global InlineInformation "rgb:%opt{yellow}"
|
||||
set-face global Error "rgb:%opt{orange}"
|
||||
set-face global DiagnosticError "default,default,rgb:%opt{red}+c"
|
||||
set-face global DiagnosticWarning "default,default,rgb:%opt{yellow}+c"
|
||||
set-face global StatusLine "rgb:%opt{fg},rgb:%opt{bgmenu}"
|
||||
set-face global StatusLineMode "rgb:%opt{green}"
|
||||
set-face global StatusLineInfo "rgb:%opt{yellow_green}"
|
||||
set-face global StatusLineValue "rgb:%opt{green}"
|
||||
set-face global StatusCursor "rgb:%opt{bg},rgb:%opt{green}"
|
||||
set-face global Prompt "rgb:%opt{green}"
|
||||
set-face global BufferPadding "rgb:%opt{bg},rgb:%opt{bg}"
|
||||
|
||||
# Built-in highlighter faces
|
||||
|
||||
set-face global LineNumbers "rgb:%opt{comment}"
|
||||
set-face global LineNumberCursor "rgb:%opt{comment}"
|
||||
set-face global LineNumbersWrapped "rgb:%opt{bg},rgb:%opt{bg}"
|
||||
set-face global MatchingChar "rgb:%opt{yellow_green}"
|
||||
set-face global Whitespace "rgb:%opt{gray}"
|
||||
set-face global WhitespaceIndent "rgb:%opt{gray}"
|
||||
set-face global WrapMarker "rgb:%opt{yellow_green}"
|
||||
|
||||
# PLUGINS
|
||||
|
||||
# kak-lsp
|
||||
|
||||
set-face global InfoDefault "default"
|
||||
set-face global InfoBlock "rgb:%opt{cyan}"
|
||||
set-face global InfoBlockQuote "rgb:%opt{orange}"
|
||||
set-face global InfoBullet "rgb:%opt{orange}"
|
||||
set-face global InfoHeader "rgb:%opt{orange}"
|
||||
set-face global InfoLink "rgb:%opt{blue}"
|
||||
set-face global InfoLinkMono "rgb:%opt{pink}"
|
||||
|
||||
set-face global InfoMono "rgb:%opt{cyan}"
|
||||
set-face global InfoRule "rgb:%opt{orange}"
|
||||
set-face global InfoDiagnosticError "rgb:%opt{red}"
|
||||
set-face global InfoDiagnosticHint "rgb:%opt{blue}"
|
||||
set-face global InfoDiagnosticInformation "rgb:%opt{yellow_green}"
|
||||
set-face global InfoDiagnosticWarning "rgb:%opt{yellow}"
|
||||
|
||||
set-face global LineFlagError "rgb:%opt{red}"
|
||||
set-face global LineFlagHint "rgb:%opt{blue}"
|
||||
set-face global LineFlagInfo "rgb:%opt{yellow_green}"
|
||||
set-face global LineFlagWarning "rgb:%opt{yellow}"
|
||||
|
||||
set-face global InlayDiagnosticError "rgb:%opt{red}"
|
||||
set-face global InlayDiagnosticHint "rgb:%opt{blue}"
|
||||
set-face global InlayDiagnosticInfo "rgb:%opt{yellow_green}"
|
||||
set-face global InlayDiagnosticWarning "rgb:%opt{yellow}"
|
||||
|
||||
set-face global LineFlagError "rgb:%opt{red}"
|
||||
set-face global LineFlagHint "rgb:%opt{blue}"
|
||||
set-face global LineFlagInfo "rgb:%opt{yellow_green}"
|
||||
set-face global LineFlagWarning "rgb:%opt{yellow}"
|
||||
@@ -1,117 +0,0 @@
|
||||
# LP light
|
||||
|
||||
declare-option str bg "faf8f5"
|
||||
declare-option str bgmenu "f6ede0"
|
||||
declare-option str fg "696257"
|
||||
declare-option str light_yellow "e0b771"
|
||||
declare-option str comment "a59d91"
|
||||
declare-option str gray "58666d"
|
||||
|
||||
declare-option str red "d48490"
|
||||
declare-option str orange "d4896e"
|
||||
declare-option str yellow "bf9752"
|
||||
declare-option str yellow_green "96a85e"
|
||||
declare-option str green "62b289"
|
||||
declare-option str cyan "40b1b7"
|
||||
declare-option str blue "54aad1"
|
||||
declare-option str blue_violet "7a9fdd"
|
||||
declare-option str violet "9d94d9"
|
||||
declare-option str pink "ba8ac5"
|
||||
declare-option str pink_red "ce84a7"
|
||||
|
||||
declare-option str selectionalpha "90"
|
||||
|
||||
## CODE
|
||||
|
||||
set-face global value "rgb:%opt{yellow_green}"
|
||||
set-face global type "rgb:%opt{cyan}"
|
||||
set-face global variable "rgb:%opt{blue_violet}"
|
||||
set-face global module "rgb:%opt{red}"
|
||||
set-face global function "rgb:%opt{blue}"
|
||||
set-face global string "rgb:%opt{green}"
|
||||
set-face global keyword "rgb:%opt{pink}"
|
||||
set-face global operator "rgb:%opt{orange}"
|
||||
set-face global attribute "rgb:%opt{blue_violet}"
|
||||
set-face global comment "rgb:%opt{comment}"
|
||||
set-face global documentation "rgb:%opt{comment}"
|
||||
set-face global meta "rgb:%opt{violet}"
|
||||
set-face global bultin "rgb:%opt{pink_red}"
|
||||
|
||||
## MARKUP
|
||||
|
||||
set-face global title "rgb:%opt{pink_red}"
|
||||
set-face global header "rgb:%opt{orange}"
|
||||
set-face global mono "rgb:%opt{yellow_green}"
|
||||
set-face global block "rgb:%opt{cyan}"
|
||||
set-face global link "rgb:%opt{blue}"
|
||||
set-face global bullet "rgb:%opt{orange}"
|
||||
set-face global list "rgb:%opt{orange}"
|
||||
|
||||
## BUILTIN
|
||||
|
||||
set-face global Default "rgb:%opt{fg},rgb:%opt{bg}"
|
||||
set-face global PrimarySelection "rgb:%opt{bg},rgba:%opt{green}%opt{selectionalpha}"
|
||||
set-face global SecondarySelection "rgb:%opt{bg},rgba:%opt{blue}%opt{selectionalpha}"
|
||||
set-face global PrimaryCursor "rgb:%opt{bg},rgb:%opt{green}"
|
||||
set-face global SecondaryCursor "rgb:%opt{bg},rgb:%opt{blue}"
|
||||
set-face global PrimaryCursorEol "rgb:%opt{bg},rgb:%opt{pink_red}"
|
||||
set-face global SecondaryCursorEol "rgb:%opt{bg},rgb:%opt{violet}"
|
||||
set-face global MenuForeground "rgb:%opt{fg},rgb:%opt{light_yellow}"
|
||||
set-face global MenuBackground "rgb:%opt{fg},rgb:%opt{bgmenu}"
|
||||
set-face global MenuInfo "rgb:%opt{comment}"
|
||||
set-face global Information "rgb:%opt{fg},rgb:%opt{bgmenu}"
|
||||
set-face global InlineInformation "rgb:%opt{yellow}"
|
||||
set-face global Error "rgb:%opt{orange}"
|
||||
set-face global DiagnosticError "default,default,rgb:%opt{red}+c"
|
||||
set-face global DiagnosticWarning "default,default,rgb:%opt{yellow}+c"
|
||||
set-face global StatusLine "rgb:%opt{fg},rgb:%opt{bgmenu}"
|
||||
set-face global StatusLineMode "rgb:%opt{green}"
|
||||
set-face global StatusLineInfo "rgb:%opt{yellow}"
|
||||
set-face global StatusLineValue "rgb:%opt{green}"
|
||||
set-face global StatusCursor "rgb:%opt{bg},rgb:%opt{green}"
|
||||
set-face global Prompt "rgb:%opt{comment}"
|
||||
set-face global BufferPadding "rgb:%opt{bg},rgb:%opt{bg}"
|
||||
|
||||
# Built-in highlighter faces
|
||||
|
||||
set-face global LineNumbers "rgb:%opt{comment}"
|
||||
set-face global LineNumberCursor "rgb:%opt{comment}"
|
||||
set-face global LineNumbersWrapped "rgb:%opt{bg},rgb:%opt{bg}"
|
||||
set-face global MatchingChar "rgb:%opt{yellow_green}"
|
||||
set-face global Whitespace "rgb:%opt{gray}"
|
||||
set-face global WhitespaceIndent "rgb:%opt{gray}"
|
||||
set-face global WrapMarker "rgb:%opt{yellow_green}"
|
||||
|
||||
# PLUGINS
|
||||
|
||||
# kak-lsp
|
||||
|
||||
set-face global InfoDefault "default"
|
||||
set-face global InfoBlock "rgb:%opt{cyan}"
|
||||
set-face global InfoBlockQuote "rgb:%opt{orange}"
|
||||
set-face global InfoBullet "rgb:%opt{orange}"
|
||||
set-face global InfoHeader "rgb:%opt{orange}"
|
||||
set-face global InfoLink "rgb:%opt{blue}"
|
||||
set-face global InfoLinkMono "rgb:%opt{pink}"
|
||||
|
||||
set-face global InfoMono "rgb:%opt{cyan}"
|
||||
set-face global InfoRule "rgb:%opt{orange}"
|
||||
set-face global InfoDiagnosticError "rgb:%opt{red}"
|
||||
set-face global InfoDiagnosticHint "rgb:%opt{blue}"
|
||||
set-face global InfoDiagnosticInformation "rgb:%opt{yellow_green}"
|
||||
set-face global InfoDiagnosticWarning "rgb:%opt{yellow}"
|
||||
|
||||
set-face global LineFlagError "rgb:%opt{red}"
|
||||
set-face global LineFlagHint "rgb:%opt{blue}"
|
||||
set-face global LineFlagInfo "rgb:%opt{yellow_green}"
|
||||
set-face global LineFlagWarning "rgb:%opt{yellow}"
|
||||
|
||||
set-face global InlayDiagnosticError "rgb:%opt{red}"
|
||||
set-face global InlayDiagnosticHint "rgb:%opt{blue}"
|
||||
set-face global InlayDiagnosticInfo "rgb:%opt{yellow_green}"
|
||||
set-face global InlayDiagnosticWarning "rgb:%opt{yellow}"
|
||||
|
||||
set-face global LineFlagError "rgb:%opt{red}"
|
||||
set-face global LineFlagHint "rgb:%opt{blue}"
|
||||
set-face global LineFlagInfo "rgb:%opt{yellow_green}"
|
||||
set-face global LineFlagWarning "rgb:%opt{yellow}"
|
||||
@@ -1,299 +0,0 @@
|
||||
# OPTIONS
|
||||
|
||||
set-option global startup_info_version 20260412
|
||||
set-option global ui_options terminal_assistant=none
|
||||
|
||||
hook global WinCreate .* %{
|
||||
add-highlighter window/number-lines number-lines -relative -hlcursor
|
||||
}
|
||||
add-highlighter global/ show-matching
|
||||
|
||||
# LOCAL
|
||||
|
||||
nop %sh{
|
||||
mkdir -p "$kak_config/autoload"
|
||||
[ -e "$kak_config/autoload/stdlib" ] || ln -s "$kak_runtime/autoload" "$kak_config/autoload/stdlib"
|
||||
}
|
||||
|
||||
map global -docstring 'Buffer' user ' ' ': buffer '
|
||||
|
||||
declare-user-mode file-mode
|
||||
map global -docstring 'Search/open' user 's' ': enter-user-mode file-mode<ret>'
|
||||
|
||||
map global -docstring 'Open (fd)' file-mode 'a' ': file-open<ret>'
|
||||
map global -docstring 'Open (fd -H)' file-mode 'h' ': file-open-with-hidden<ret>'
|
||||
map global -docstring 'Open (recent)' file-mode 'r' ': file-open-recent<ret>'
|
||||
map global -docstring 'Open (nnn)' file-mode 'd' ': nnn-open %val{buffile}<ret>'
|
||||
map global -docstring 'Open (nnn)' file-mode 'D' ': nnn-open .<ret>'
|
||||
map global -docstring 'Open/create in dir' file-mode 'c' ': open-create-in-dir<ret>'
|
||||
map global -docstring 'ctags file symbols' file-mode 's' ': ctags-file-symbols<ret>'
|
||||
map global -docstring 'ctags project symbols' file-mode 'w' ': ctags-project-symbols<ret>'
|
||||
map global -docstring 'Grep' file-mode 'g' ':grep '
|
||||
map global -docstring 'Grep next match' file-mode 'n' ': grep-next-match<ret>'
|
||||
map global -docstring 'Grep previous match' file-mode 'p' ': grep-prev-match<ret>'
|
||||
map global -docstring 'Grep current file' file-mode 'l' ':grep-file '
|
||||
map global -docstring 'Grep current file' file-mode 'L' ': grep-file %val{selection}<ret>'
|
||||
map global -docstring 'Delete buffer' file-mode 'x' ': delete-buffer '
|
||||
|
||||
declare-user-mode git-mode
|
||||
map global -docstring 'Git' user 'g' ': enter-user-mode git-mode<ret>'
|
||||
|
||||
map global -docstring 'Open file' git-mode 'a' ': file-open-git<ret>'
|
||||
map global -docstring 'Blame' git-mode 'b' ': git blame<ret>'
|
||||
map global -docstring 'Blame' git-mode 'B' ': git blame-jump<ret>'
|
||||
map global -docstring 'Diff file' git-mode 'd' ': git diff %val{buffile}<ret>'
|
||||
map global -docstring 'Diff' git-mode 'D' ': git diff<ret>'
|
||||
map global -docstring 'Grep' git-mode 'g' ':git grep '
|
||||
map global -docstring 'Grep' git-mode 'G' ': git grep %val{selection}<ret>'
|
||||
map global -docstring 'Log' git-mode 'l' ': git log -- %val{buffile}<ret>'
|
||||
map global -docstring 'Log' git-mode 'L' ': git log<ret>'
|
||||
map global -docstring 'Show branch' git-mode 'c' ': git show-branch<ret>'
|
||||
map global -docstring 'Status' git-mode 't' ': git status<ret>'
|
||||
map global -docstring 'Show diff' git-mode 's' ': git-show-diff<ret>'
|
||||
map global -docstring 'Show' git-mode 'S' ': git show<ret>'
|
||||
map global -docstring 'Hide diff' git-mode 'h' ': git-hide-diff<ret>'
|
||||
map global -docstring 'Next hunk' git-mode 'n' ': git next-hunk<ret>'
|
||||
map global -docstring 'Prev hunk' git-mode 'p' ': git prev-hunk<ret>'
|
||||
|
||||
declare-user-mode options-mode
|
||||
map global -docstring 'Options' user 'o' ': enter-user-mode options-mode<ret>'
|
||||
|
||||
map global -docstring 'Five Dark mode' options-mode 'd' ': colorscheme five-colors-dark<ret>'
|
||||
map global -docstring 'Five Light mode' options-mode 'l' ': colorscheme five-colors-light<ret>'
|
||||
map global -docstring 'Light mode' options-mode 'L' ': colorscheme one-light<ret>'
|
||||
map global -docstring 'Dark mode' options-mode 'D' ': colorscheme one-darker<ret>'
|
||||
|
||||
declare-user-mode make-mode
|
||||
map global -docstring 'Make' user 'k' ': enter-user-mode make-mode<ret>'
|
||||
|
||||
map global -docstring 'Make' make-mode 'a' ':make '
|
||||
map global -docstring 'Next' make-mode 'n' ': make-next-error<ret>'
|
||||
map global -docstring 'Previous' make-mode 'p' ': make-previous-error<ret>'
|
||||
map global -docstring 'General messages' make-mode 'g' ': set window make_error_pattern "^([^:\n]+):(\d+):(?:(\d+):)? ([^\n]+)?"<ret>'
|
||||
|
||||
evaluate-commands %sh{
|
||||
if [ -n "$WAYLAND_DISPLAY" ]; then
|
||||
echo "
|
||||
map global -docstring 'Paste clipboard (append)' user 'p' '<a-!> wl-paste -n<ret>'
|
||||
map global -docstring 'Paste clipboard (insert)' user 'P' '! wl-paste -n<ret>'
|
||||
map global -docstring 'Yank to clipboard' user 'y' '<a-|> wl-copy<ret>'
|
||||
"
|
||||
elif [ -n "$DISPLAY" ]; then
|
||||
echo "
|
||||
map global -docstring 'Paste clipboard (append)' user 'p' '<a-!> xsel -bo<ret>'
|
||||
map global -docstring 'Paste clipboard (insert)' user 'P' '! xsel -bo<ret>'
|
||||
map global -docstring 'Yank to clipboard' user 'y' '<a-|> xsel -bi<ret>'
|
||||
"
|
||||
fi
|
||||
}
|
||||
|
||||
map global -docstring 'Replace jump mode' user 'j' ': enter_jump_mode_with_replace_select_mode<ret>'
|
||||
map global -docstring 'Extend jump mode' user 'e' ': enter_jump_mode_with_extend_select_mode<ret>'
|
||||
map global -docstring 'Append jump mode' user 'a' ': enter_jump_mode_with_append_select_mode<ret>'
|
||||
|
||||
define-command -override file-open %{
|
||||
prompt -menu -shell-script-candidates %{ fd -t f } 'File: ' %{ edit -- %val{text} }
|
||||
}
|
||||
|
||||
define-command -override file-open-with-hidden %{
|
||||
prompt -menu -shell-script-candidates %{ fd -t f -H } 'File: ' %{ edit -- %val{text} }
|
||||
}
|
||||
|
||||
define-command -override file-open-git %{
|
||||
prompt -menu -shell-script-candidates %{ git ls-files } 'File (git): ' %{ edit -- %val{text} }
|
||||
}
|
||||
|
||||
define-command -override file-open-recent %{
|
||||
prompt -menu -shell-script-candidates %{ cat ~/.cache/kak-mru } 'File (recent): ' %{ edit -- %val{text} }
|
||||
}
|
||||
|
||||
define-command -override grep-file -params 1- %{
|
||||
grep %arg{@} -- %val{buffile}
|
||||
}
|
||||
|
||||
define-command -override -params 1 nnn-open %{
|
||||
terminal nnn-kak-edit %arg{1} %val{session} %val{client}
|
||||
}
|
||||
|
||||
define-command -override open-create-in-dir %{
|
||||
execute-keys ': edit ' %sh{dirname "$kak_buffile"}/
|
||||
}
|
||||
|
||||
define-command git-log-show-current-commit %{
|
||||
execute-keys ';<a-/>^commit\s[0-9a-f]+<ret>b'
|
||||
git show %val{selection}
|
||||
}
|
||||
|
||||
define-command -override git-show-diff %{
|
||||
hook buffer -group git-show-diff NormalIdle .* %{ git update-diff }
|
||||
git show-diff
|
||||
}
|
||||
|
||||
define-command -override git-hide-diff %{
|
||||
remove-hooks buffer git-show-diff
|
||||
git hide-diff
|
||||
}
|
||||
|
||||
define-command -override ctags-file-symbols %{
|
||||
prompt -menu -shell-script-candidates %{
|
||||
ctags -uo - -x "$kak_buffile" | awk -f "$kak_config/scripts/filesymbols.awk"
|
||||
} 'File symbols: ' %{
|
||||
evaluate-commands %sh{ awk -f "$kak_config/scripts/filesymbolscmd.awk" # "$kak_text" }
|
||||
}
|
||||
}
|
||||
|
||||
define-command -override ctags-project-symbols %{
|
||||
prompt -menu -shell-script-candidates %{
|
||||
git ls-files | xargs wc | awk '$1 > 0 && $3/$1 < 1024 { print $4 }' | xargs ctags -uo - -x | awk -f "$kak_config/scripts/projectsymbols.awk"
|
||||
} 'Project symbols: ' %{
|
||||
evaluate-commands %sh{ awk -f "$kak_config/scripts/projectsymbolscmd.awk" # "$kak_text" }
|
||||
}
|
||||
}
|
||||
|
||||
set-face global JumpLabel 'rgb:faf8f5,rgb:af8842+F'
|
||||
|
||||
# CHANGE STATUS BAR COLOR IN INSERT MODE
|
||||
|
||||
hook global ModeChange push:.*:insert %{
|
||||
set-face window StatusLine 'default,rgb:04785d'
|
||||
set-option window idle_timeout 500
|
||||
}
|
||||
|
||||
hook global ModeChange pop:insert:.* %{
|
||||
unset-face window StatusLine
|
||||
unset-option window idle_timeout
|
||||
}
|
||||
|
||||
# ODIN
|
||||
|
||||
hook global BufSetOption filetype=odin %{
|
||||
set-option buffer formatcmd 'odinfmt -stdin'
|
||||
}
|
||||
|
||||
hook global BufSetOption filetype=go %{
|
||||
hook -group buf-write-pre-fmt buffer BufWritePre .* %{
|
||||
lsp-formatting-sync
|
||||
}
|
||||
}
|
||||
|
||||
# LSP
|
||||
|
||||
eval %sh{kak-lsp}
|
||||
lsp-enable
|
||||
|
||||
set-option global modelinefmt "%opt{lsp_modeline} %opt{modelinefmt}"
|
||||
|
||||
map global user l ': enter-user-mode lsp<ret>' -docstring 'LSP mode'
|
||||
|
||||
map global goto d <esc>:lsp-definition<ret> -docstring 'LSP definition'
|
||||
map global goto r <esc>:lsp-references<ret> -docstring 'LSP references'
|
||||
map global goto y <esc>:lsp-type-definition<ret> -docstring 'LSP type definition'
|
||||
|
||||
map global insert <tab> '<a-;>:try lsp-snippets-select-next-placeholders catch %{ execute-keys -with-hooks <lt>tab> }<ret>' -docstring 'Select next snippet placeholder'
|
||||
|
||||
map global object a '<a-semicolon>lsp-object<ret>' -docstring 'LSP any symbol'
|
||||
map global object <a-a> '<a-semicolon>lsp-object<ret>' -docstring 'LSP any symbol'
|
||||
map global object f '<a-semicolon>lsp-object Function Method<ret>' -docstring 'LSP function or method'
|
||||
map global object t '<a-semicolon>lsp-object Class Interface Module Namespace Struct<ret>' -docstring 'LSP class or module'
|
||||
map global object d '<a-semicolon>lsp-diagnostic-object error warning<ret>' -docstring 'LSP errors and warnings'
|
||||
map global object D '<a-semicolon>lsp-diagnostic-object error<ret>' -docstring 'LSP errors'
|
||||
|
||||
map global lsp p '<esc>: lsp-find-error --previous error<ret>' -docstring 'find previous error'
|
||||
|
||||
# BUNDLE
|
||||
|
||||
source "%val{config}/bundle/kak-bundle/rc/kak-bundle.kak"
|
||||
bundle-noload kak-bundle https://codeberg.org/jdugan6240/kak-bundle
|
||||
|
||||
# COLORSCHEME
|
||||
|
||||
bundle-theme kak-one 'https://codeberg.org/raiguard/kak-one'
|
||||
|
||||
bundle-theme kakoune-themes 'https://codeberg.org/anhsirk0/kakoune-themes'
|
||||
|
||||
# FZF
|
||||
|
||||
bundle fzf.kak 'https://github.com/andreyorst/fzf.kak' %{
|
||||
map global -docstring 'FZF menu' user 'f' ': fzf-mode<ret>'
|
||||
require-module fzf
|
||||
set-option global fzf_highlight_command "bat"
|
||||
}
|
||||
|
||||
hook global BufCreate [^*].* %{
|
||||
nop %sh{
|
||||
mru=~/.cache/kak-mru
|
||||
echo "$kak_buffile" | awk '!seen[$0]++' - "$mru" | sponge "$mru"
|
||||
}}
|
||||
|
||||
# MATCH
|
||||
|
||||
bundle match 'https://github.com/kmafeni04/match.kak' %{
|
||||
declare-user-mode match
|
||||
map global user m ': enter-user-mode match<ret>' -docstring 'Match'
|
||||
map global match m m -docstring 'Match next matching pair'
|
||||
map global match i ': match-inside<ret>' -docstring 'Match inside object'
|
||||
map global match a ': match-around<ret>' -docstring 'Match around object'
|
||||
map global match n ': match-next<ret>' -docstring 'Match next object'
|
||||
map global match p ': match-prev<ret>' -docstring 'Match previous object'
|
||||
map global match s ': match-surround-add<ret>' -docstring 'Surround selection with character'
|
||||
map global match d ': match-surround-delete<ret>' -docstring "Delete selection's surrounding character"
|
||||
map global match r ': match-surround-replace<ret>' -docstring "Replace selection's surrounding character"
|
||||
map global match u ': match-surround-undo<ret>' -docstring "Undo"
|
||||
map global match U ': match-surround-redo<ret>' -docstring "Redo"
|
||||
}
|
||||
|
||||
# HARPOON
|
||||
|
||||
bundle kak-harpoon 'https://codeberg.org/raiguard/kak-harpoon' %{
|
||||
harpoon-add-bindings
|
||||
}
|
||||
|
||||
# PENEIRA
|
||||
|
||||
bundle 'luar' 'https://github.com/gustavo-hms/luar' %{
|
||||
require-module luar
|
||||
}
|
||||
|
||||
bundle 'peneira' 'https://github.com/gustavo-hms/peneira' %{
|
||||
require-module peneira
|
||||
|
||||
define-command buffers %{
|
||||
peneira 'buffers: ' %{ eval "printf '%s\n' $kak_quoted_buflist" } %{
|
||||
buffer %arg{1}
|
||||
}
|
||||
}
|
||||
define-command peneira-git-files %{
|
||||
peneira 'git files: ' %{ git ls-files } %{ edit -- %arg{1} }
|
||||
}
|
||||
define-command peneira-files-with-hidden %{
|
||||
peneira 'git files: ' %{ fd -t f -H } %{ edit -- %arg{1} }
|
||||
}
|
||||
define-command peneira-recent-files %{
|
||||
peneira 'mru files: ' %{ cat ~/.cache/kak-mru } %{ edit -- %arg{1} }
|
||||
}
|
||||
|
||||
map global -docstring 'Buffer' user ' ' ': buffers<ret>'
|
||||
|
||||
map global -docstring 'Git files' file-mode 'a' ': peneira-git-files<ret>'
|
||||
map global -docstring 'Buffers' file-mode 'b' ': buffers<ret>'
|
||||
map global -docstring 'Files' file-mode 'f' ': peneira-files<ret>'
|
||||
map global -docstring 'Files' file-mode 'F' ': peneira-local-files<ret>'
|
||||
map global -docstring 'Files (with hidden)' file-mode 'h' ': peneira-files-with-hidden<ret>'
|
||||
map global -docstring 'Lines' file-mode 'l' ': peneira-lines<ret>'
|
||||
map global -docstring 'Symbols' file-mode 's' ': peneira-symbols<ret>'
|
||||
map global -docstring 'Recent files' file-mode 'r' ': peneira-recent-files<ret>'
|
||||
}
|
||||
|
||||
# LOCAL
|
||||
|
||||
define-command set-dark-or-light-colorscheme %{
|
||||
colorscheme %sh{
|
||||
if [ -e ~/.lightmode ]; then
|
||||
echo five-colors-light
|
||||
else
|
||||
echo five-colors-dark
|
||||
fi
|
||||
}
|
||||
}
|
||||
|
||||
set-dark-or-light-colorscheme
|
||||
@@ -1,9 +0,0 @@
|
||||
{
|
||||
for (i = 3; i < NF; ++i) {
|
||||
if ($i ~ /^[0-9]+$/) {
|
||||
j = match($0, "[ ]+" $(i-1) "[ ]+" $i " ")
|
||||
print substr($0, 0, j - 1) "\u00a0" $(i-1) "\u00a0" $i
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
BEGIN {
|
||||
n = split(ENVIRON["kak_text"], a, "\u00a0")
|
||||
line = a[3]
|
||||
if (n == 3 && line ~ /^[0-9]+/) {
|
||||
pat = a[1]
|
||||
gsub(/'/, "''", pat)
|
||||
gsub(/\\/, "\\\\", pat)
|
||||
print "execute-keys " line " g vv x s '/\\b\\Q" pat "\\E\\b|\\Q" pat "<ret>' <a-)>,"
|
||||
}
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
{
|
||||
for (i = 3; i < NF; ++i) {
|
||||
if ($i ~ /^[0-9]+$/) {
|
||||
j = match($0, "[ ]+" $(i-1) "[ ]+" $i " ")
|
||||
print substr($0, 0, j - 1) "\u00a0" $(i-1) "\u00a0" $i "\u00a0" $(i+1)
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
BEGIN {
|
||||
n = split(ENVIRON["kak_text"], a, "\u00a0")
|
||||
line = a[3]
|
||||
if (n == 4 && line ~ /^[0-9]+/) {
|
||||
pat = a[1]
|
||||
gsub(/'/, "''", pat)
|
||||
gsub(/\\/, "\\\\", pat)
|
||||
print "edit --", a[4], line
|
||||
print "execute-keys vv x s %{/\\b\\Q" pat "\\E\\b|\\Q" pat "<ret>} <a-)>,"
|
||||
}
|
||||
}
|
||||
@@ -1,4 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
cd "$(dirname $1)"
|
||||
exec nnn -A -p - | awk "{print \"evaluate-commands -client $3 edit\", \$1 }" | kak -p "$2"
|
||||
@@ -1,27 +1,20 @@
|
||||
font_family HurmitNerdFont
|
||||
font_size 10
|
||||
font_family FiraCode Nerd
|
||||
font_size 11
|
||||
|
||||
cursor_blink_interval 0
|
||||
enable_audio_bell no
|
||||
visual_bell_duration 1.0
|
||||
|
||||
tab_bar_min_tabs 1
|
||||
tab_bar_style powerline
|
||||
tab_bar_edge top
|
||||
tab_bar_filter session:~ or session:^$
|
||||
tab_title_template "{index}:{session_name}:{bell_symbol}{activity_symbol}{title}"
|
||||
tab_powerline_style round
|
||||
tab_title_template "{fmt.fg.red}{bell_symbol}{activity_symbol}{fmt.fg.tab}{title} {index}"
|
||||
|
||||
open_url_with qutebrowser
|
||||
|
||||
action_alias launch_tab_home launch --type tab --cwd=~
|
||||
kitten_alias hints hints --hints-background-color red --hints-foreground-color white
|
||||
|
||||
allow_remote_control yes
|
||||
action_alias launch_tab launch --type=tab --cwd=current
|
||||
|
||||
map ctrl+shift+n launch_tab tmux
|
||||
map ctrl+shift+t launch_tab tmux attach
|
||||
map ctrl+shift+s launch_tab zsh
|
||||
map ctrl+shift+6 no_op
|
||||
map ctrl+shift+0 nth_window -1
|
||||
|
||||
map ctrl+shift+h previous_tab
|
||||
map ctrl+shift+l next_tab
|
||||
map ctrl+shift+p goto_tab -1
|
||||
map ctrl+alt+1 goto_tab 1
|
||||
map ctrl+alt+2 goto_tab 2
|
||||
map ctrl+alt+3 goto_tab 3
|
||||
@@ -31,43 +24,9 @@ map ctrl+alt+6 goto_tab 6
|
||||
map ctrl+alt+7 goto_tab 7
|
||||
map ctrl+alt+8 goto_tab 8
|
||||
map ctrl+alt+9 goto_tab 9
|
||||
map ctrl+alt+0 goto_tab -1
|
||||
|
||||
map ctrl+alt+h neighboring_window left
|
||||
map ctrl+alt+j neighboring_window down
|
||||
map ctrl+alt+k neighboring_window up
|
||||
map ctrl+alt+l neighboring_window right
|
||||
|
||||
map ctrl+alt+a last_used_layout
|
||||
map ctrl+alt+b goto_layout fat
|
||||
map ctrl+alt+g goto_layout grid
|
||||
map ctrl+alt+r goto_layout tall
|
||||
|
||||
map ctrl+alt+space goto_session -1
|
||||
map ctrl+alt+return new_window_with_cwd
|
||||
map ctrl+alt+d new_tab_with_cwd sh -c 'cd $(kitten choose-file --mode dir) && nvim'
|
||||
map ctrl+alt+e new_tab_with_cwd nvim
|
||||
map ctrl+alt+i new_tab_with_cwd lazygit
|
||||
map ctrl+alt+f new_tab_with_cwd sh -c 'nvim $(kitten choose-file)'
|
||||
map ctrl+alt+m toggle_layout stack
|
||||
map ctrl+alt+o goto_session ~/.config/kitty/sessions
|
||||
map ctrl+alt+/ goto_session --sort-by=alphabetical ~/.config/kitty/sessions
|
||||
map ctrl+alt+p new_tab_with_cwd spf
|
||||
map ctrl+alt+s launch --stdin-source=@screen_scrollback --type=overlay nvim -R -
|
||||
map ctrl+alt+w new_window_with_cwd
|
||||
map ctrl+alt+t new_tab_with_cwd
|
||||
map ctrl+alt+x close_window_with_confirmation
|
||||
map ctrl+alt+u>d launch_tab_home sh -c 'cd $(kitten choose-file --mode dir) && nvim'
|
||||
map ctrl+alt+u>f launch_tab_home sh -c 'nvim $(kitten choose-file)'
|
||||
map ctrl+alt+v focus_visible_window
|
||||
map ctrl+alt+y new_window nvim @selection
|
||||
|
||||
map ctrl+alt+shift+s save_as_session --base-dir ~/.config/kitty/sessions --match=session:.
|
||||
map ctrl+alt+shift+t detach_tab
|
||||
map ctrl+alt+shift+w detach_window
|
||||
map ctrl+alt+shift+x close_session .
|
||||
map ctrl+alt+0 goto_tab 10
|
||||
|
||||
# BEGIN_KITTY_THEME
|
||||
# Five-Colors-Dark
|
||||
# Afterglow
|
||||
include current-theme.conf
|
||||
# END_KITTY_THEME
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
# vim:ft=kitty
|
||||
|
||||
foreground #a29e98
|
||||
background #272117
|
||||
selection_foreground #272117
|
||||
selection_background #276c9a
|
||||
|
||||
cursor #73d0b1
|
||||
cursor_text_color #272117
|
||||
|
||||
active_border_color #276c9a
|
||||
inactive_border_color #b0bcc7
|
||||
|
||||
active_tab_foreground #9da0af
|
||||
active_tab_background #4d5580
|
||||
inactive_tab_foreground #1f212e
|
||||
inactive_tab_background #808080
|
||||
|
||||
color0 #85919b
|
||||
color1 #c37583
|
||||
color2 #44a386
|
||||
color3 #af8842
|
||||
color4 #5396c7
|
||||
color5 #a57cba
|
||||
color6 #2da0ad
|
||||
color7 #b0bcc7
|
||||
|
||||
color8 #85919b
|
||||
color9 #f2a0ae
|
||||
color10 #73d0b1
|
||||
color11 #dcb46e
|
||||
color12 #7fc3f5
|
||||
color13 #d2a8e8
|
||||
color14 #62cdda
|
||||
color15 #a29e98
|
||||
@@ -1,35 +0,0 @@
|
||||
# vim:ft=kitty
|
||||
|
||||
foreground #696257
|
||||
background #faf8f5
|
||||
selection_foreground #faf8f5
|
||||
selection_background #3a7ead
|
||||
|
||||
cursor #7ad6b7
|
||||
cursor_text_color #faf8f5
|
||||
|
||||
active_border_color #85c9fc
|
||||
inactive_border_color #919da7
|
||||
|
||||
active_tab_foreground #1f212e
|
||||
active_tab_background #a6c7f2
|
||||
inactive_tab_foreground #faf8f5
|
||||
inactive_tab_background #808080
|
||||
|
||||
color0 #272117
|
||||
color1 #d0818f
|
||||
color2 #52af92
|
||||
color3 #bc944f
|
||||
color4 #60a3d4
|
||||
color5 #b289c7
|
||||
color6 #3dadba
|
||||
color7 #b6c3cd
|
||||
|
||||
color8 #919da7
|
||||
color9 #85c9fc
|
||||
color10 #7ad6b7
|
||||
color11 #e3ba74
|
||||
color12 #60a3d4
|
||||
color13 #d9aeee
|
||||
color14 #85c9fc
|
||||
color15 #faf8f5
|
||||
@@ -1,33 +0,0 @@
|
||||
# vim:ft=kitty
|
||||
|
||||
foreground #9da0af
|
||||
background #1f212e
|
||||
selection_foreground #808080
|
||||
selection_background #4d5580
|
||||
|
||||
cursor #bf8040
|
||||
cursor_text_color #1f212e
|
||||
|
||||
active_border_color #862d2d
|
||||
inactive_border_color #4d5580
|
||||
|
||||
active_tab_foreground #9da0af
|
||||
active_tab_background #4d5580
|
||||
inactive_tab_foreground #1f212e
|
||||
inactive_tab_background #808080
|
||||
|
||||
color1 #862d2d
|
||||
color2 #3a783a
|
||||
color3 #707010
|
||||
color4 #345eb2
|
||||
color5 #cc66cc
|
||||
color6 #3a7878
|
||||
color7 #a1a3aa
|
||||
color8 #4d4d4d
|
||||
color9 #c27070
|
||||
color10 #40bf40
|
||||
color11 #acac53
|
||||
color12 #6b8ac7
|
||||
color13 #8f248f
|
||||
color14 #509595
|
||||
color15 #dbdff0
|
||||
@@ -1,34 +0,0 @@
|
||||
# vim:ft=kitty
|
||||
|
||||
foreground #1f212e
|
||||
background #faf8f5
|
||||
selection_foreground #1f212e
|
||||
selection_background #a6c7f2
|
||||
|
||||
cursor #1f212e
|
||||
cursor_text_color #faf8f5
|
||||
|
||||
active_border_color #862d2d
|
||||
inactive_border_color #a6c7f2
|
||||
|
||||
active_tab_foreground #1f212e
|
||||
active_tab_background #a6c7f2
|
||||
inactive_tab_foreground #faf8f5
|
||||
inactive_tab_background #808080
|
||||
|
||||
color0 #1f212e
|
||||
color1 #862d2d
|
||||
color2 #3a783a
|
||||
color3 #707010
|
||||
color4 #345eb2
|
||||
color5 #cc66cc
|
||||
color6 #3a7878
|
||||
color7 #a1a3aa
|
||||
color8 #73778c
|
||||
color9 #c27070
|
||||
color10 #40bf40
|
||||
color11 #acac53
|
||||
color12 #6b8ac7
|
||||
color13 #8f248f
|
||||
color14 #509595
|
||||
color15 #dae4f1
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,13 +0,0 @@
|
||||
os:
|
||||
edit: 'kak {{filename}}'
|
||||
editAtLine: 'kak +{{line}} {{filename}}'
|
||||
editAtLineAndWait: 'kak +{{line}} {{filename}}'
|
||||
editInTerminal: true
|
||||
openDirInEditor: 'kak -e "nnn-open {{dir}}"'
|
||||
|
||||
gui:
|
||||
nerdFontsVersion: "3"
|
||||
|
||||
theme:
|
||||
selectedLineBgColor:
|
||||
- reverse
|
||||
@@ -3,9 +3,6 @@ PREFIX = /usr/local
|
||||
lupan-clock: lupan-clock.c
|
||||
${CC} -o $@ $< -lX11 -Wall
|
||||
|
||||
stdout-clock: stdout-clock.c
|
||||
${CC} -o $@ $< -Wall
|
||||
|
||||
install:
|
||||
mkdir -p ${DESTDIR}${PREFIX}/bin
|
||||
cp -f lupan-clock ${DESTDIR}${PREFIX}/bin
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
#include <X11/Xlib.h>
|
||||
#include <stdio.h>
|
||||
#include <time.h>
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
|
||||
void show(struct tm *tm)
|
||||
{
|
||||
char s[6];
|
||||
strftime(s, sizeof(s), "%H:%M", tm);
|
||||
printf("%s\n", s);
|
||||
fflush(stdout);
|
||||
}
|
||||
|
||||
int main() {
|
||||
int h, m, init = 60;
|
||||
time_t t;
|
||||
struct tm *tm;
|
||||
|
||||
while (1) {
|
||||
t = time(NULL);
|
||||
tm = localtime(&t);
|
||||
if (tm->tm_hour != h || tm->tm_min != m || init > 0) {
|
||||
show(tm);
|
||||
h = tm->tm_hour;
|
||||
m = tm->tm_min;
|
||||
init = (init > 0) ? init - 1 : 0;
|
||||
}
|
||||
sleep(1);
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
@@ -1,325 +0,0 @@
|
||||
// This config is in the KDL format: https://kdl.dev
|
||||
// https://niri-wm.github.io/niri/Configuration:-Introduction
|
||||
|
||||
spawn-at-startup "waybar"
|
||||
|
||||
input {
|
||||
keyboard {
|
||||
xkb {
|
||||
layout "pl"
|
||||
}
|
||||
numlock
|
||||
}
|
||||
|
||||
touchpad {
|
||||
tap
|
||||
natural-scroll
|
||||
}
|
||||
|
||||
// mouse { }
|
||||
|
||||
// trackpoint { }
|
||||
|
||||
warp-mouse-to-focus
|
||||
}
|
||||
|
||||
output "HDMI-A-1" {
|
||||
scale 2
|
||||
}
|
||||
output "DP-1" {
|
||||
scale 2
|
||||
}
|
||||
|
||||
layout {
|
||||
gaps 16
|
||||
|
||||
center-focused-column "never"
|
||||
|
||||
preset-column-widths {
|
||||
proportion 0.33333
|
||||
proportion 0.5
|
||||
proportion 0.66667
|
||||
}
|
||||
|
||||
// preset-window-heights { }
|
||||
|
||||
default-column-width { proportion 0.5; }
|
||||
|
||||
focus-ring {
|
||||
width 4
|
||||
active-color "#7fc8ff"
|
||||
inactive-color "#505050"
|
||||
}
|
||||
|
||||
border {
|
||||
off
|
||||
|
||||
width 4
|
||||
active-color "#ffc87f"
|
||||
inactive-color "#505050"
|
||||
urgent-color "#9b0000"
|
||||
}
|
||||
|
||||
struts {
|
||||
// left 64
|
||||
// right 64
|
||||
// top 64
|
||||
// bottom 64
|
||||
}
|
||||
}
|
||||
|
||||
overview {
|
||||
zoom 0.25
|
||||
}
|
||||
|
||||
hotkey-overlay {
|
||||
skip-at-startup
|
||||
}
|
||||
|
||||
prefer-no-csd
|
||||
|
||||
screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"
|
||||
// screenshot-path null
|
||||
|
||||
animations {
|
||||
off
|
||||
}
|
||||
|
||||
// Work around WezTerm's initial configure bug
|
||||
// by setting an empty default-column-width.
|
||||
window-rule {
|
||||
match app-id=r#"^org\.wezfurlong\.wezterm$"#
|
||||
default-column-width {}
|
||||
}
|
||||
|
||||
// Open the Firefox picture-in-picture player as floating by default.
|
||||
window-rule {
|
||||
match app-id=r#"firefox$"# title="^Picture-in-Picture$"
|
||||
open-floating true
|
||||
}
|
||||
|
||||
// Example: block out two password managers from screen capture.
|
||||
// (This example rule is commented out with a "/-" in front.)
|
||||
/-window-rule {
|
||||
match app-id=r#"^org\.keepassxc\.KeePassXC$"#
|
||||
match app-id=r#"^org\.gnome\.World\.Secrets$"#
|
||||
|
||||
block-out-from "screen-capture"
|
||||
|
||||
// Use this instead if you want them visible on third-party screenshot tools.
|
||||
// block-out-from "screencast"
|
||||
}
|
||||
|
||||
window-rule {
|
||||
geometry-corner-radius 4
|
||||
clip-to-geometry true
|
||||
}
|
||||
|
||||
binds {
|
||||
// Mod-Shift-/, which is usually the same as Mod-?,
|
||||
// shows a list of important hotkeys.
|
||||
Mod+Shift+Slash { show-hotkey-overlay; }
|
||||
|
||||
// Suggested binds for running programs: terminal, app launcher, screen locker.
|
||||
Mod+T hotkey-overlay-title="Open a Terminal: alacritty" { spawn "kitty" "--single-instance" "--instance-group" "default"; }
|
||||
Mod+D hotkey-overlay-title="Run an Application: wmenu" { spawn "wmenu-run" "-f" "HurmitNerdFont 10"; }
|
||||
Mod+B hotkey-overlay-title="Toggle waybar" { spawn "killall" "-SIGUSR1" "waybar"; }
|
||||
Super+Alt+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock"; }
|
||||
Mod+Shift+T hotkey-overlay-title="Toggle theme" { spawn "lupan-set-theme" "toggle"; }
|
||||
|
||||
XF86AudioRaiseVolume allow-when-locked=true { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1+ -l 1.0"; }
|
||||
XF86AudioLowerVolume allow-when-locked=true { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1-"; }
|
||||
XF86AudioMute allow-when-locked=true { spawn-sh "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; }
|
||||
XF86AudioMicMute allow-when-locked=true { spawn-sh "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"; }
|
||||
|
||||
XF86AudioPlay allow-when-locked=true { spawn-sh "playerctl play-pause"; }
|
||||
XF86AudioStop allow-when-locked=true { spawn-sh "playerctl stop"; }
|
||||
XF86AudioPrev allow-when-locked=true { spawn-sh "playerctl previous"; }
|
||||
XF86AudioNext allow-when-locked=true { spawn-sh "playerctl next"; }
|
||||
|
||||
XF86MonBrightnessUp allow-when-locked=true { spawn "brightnessctl" "--class=backlight" "set" "+10%"; }
|
||||
XF86MonBrightnessDown allow-when-locked=true { spawn "brightnessctl" "--class=backlight" "set" "10%-"; }
|
||||
|
||||
Mod+O repeat=false { toggle-overview; }
|
||||
|
||||
Mod+Shift+C repeat=false { close-window; }
|
||||
|
||||
Mod+Left { focus-column-left; }
|
||||
Mod+Down { focus-window-down; }
|
||||
Mod+Up { focus-window-up; }
|
||||
Mod+Right { focus-column-right; }
|
||||
Mod+H { focus-column-left; }
|
||||
Mod+J { focus-window-down; }
|
||||
Mod+K { focus-window-up; }
|
||||
Mod+L { focus-column-right; }
|
||||
|
||||
Mod+Ctrl+Left { move-column-left; }
|
||||
Mod+Ctrl+Down { move-window-down; }
|
||||
Mod+Ctrl+Up { move-window-up; }
|
||||
Mod+Ctrl+Right { move-column-right; }
|
||||
Mod+Ctrl+H { move-column-left; }
|
||||
Mod+Ctrl+J { move-window-down; }
|
||||
Mod+Ctrl+K { move-window-up; }
|
||||
Mod+Ctrl+L { move-column-right; }
|
||||
|
||||
// Alternative commands that move across workspaces when reaching
|
||||
// the first or last window in a column.
|
||||
// Mod+J { focus-window-or-workspace-down; }
|
||||
// Mod+K { focus-window-or-workspace-up; }
|
||||
// Mod+Ctrl+J { move-window-down-or-to-workspace-down; }
|
||||
// Mod+Ctrl+K { move-window-up-or-to-workspace-up; }
|
||||
|
||||
Mod+Home { focus-column-first; }
|
||||
Mod+End { focus-column-last; }
|
||||
Mod+Ctrl+Home { move-column-to-first; }
|
||||
Mod+Ctrl+End { move-column-to-last; }
|
||||
|
||||
Mod+Shift+Left { focus-monitor-left; }
|
||||
Mod+Shift+Down { focus-monitor-down; }
|
||||
Mod+Shift+Up { focus-monitor-up; }
|
||||
Mod+Shift+Right { focus-monitor-right; }
|
||||
Mod+Shift+H { focus-monitor-left; }
|
||||
Mod+Shift+J { focus-monitor-down; }
|
||||
Mod+Shift+K { focus-monitor-up; }
|
||||
Mod+Shift+L { focus-monitor-right; }
|
||||
|
||||
Mod+Shift+Ctrl+Left { move-column-to-monitor-left; }
|
||||
Mod+Shift+Ctrl+Down { move-column-to-monitor-down; }
|
||||
Mod+Shift+Ctrl+Up { move-column-to-monitor-up; }
|
||||
Mod+Shift+Ctrl+Right { move-column-to-monitor-right; }
|
||||
Mod+Shift+Ctrl+H { move-column-to-monitor-left; }
|
||||
Mod+Shift+Ctrl+J { move-column-to-monitor-down; }
|
||||
Mod+Shift+Ctrl+K { move-column-to-monitor-up; }
|
||||
Mod+Shift+Ctrl+L { move-column-to-monitor-right; }
|
||||
|
||||
// Alternatively, there are commands to move just a single window:
|
||||
// Mod+Shift+Ctrl+Left { move-window-to-monitor-left; }
|
||||
// ...
|
||||
|
||||
// And you can also move a whole workspace to another monitor:
|
||||
// Mod+Shift+Ctrl+Left { move-workspace-to-monitor-left; }
|
||||
// ...
|
||||
|
||||
Mod+Page_Down { focus-workspace-down; }
|
||||
Mod+Page_Up { focus-workspace-up; }
|
||||
Mod+U { focus-workspace-down; }
|
||||
Mod+I { focus-workspace-up; }
|
||||
Mod+Ctrl+Page_Down { move-column-to-workspace-down; }
|
||||
Mod+Ctrl+Page_Up { move-column-to-workspace-up; }
|
||||
Mod+Ctrl+U { move-column-to-workspace-down; }
|
||||
Mod+Ctrl+I { move-column-to-workspace-up; }
|
||||
|
||||
Mod+Shift+Page_Down { move-workspace-down; }
|
||||
Mod+Shift+Page_Up { move-workspace-up; }
|
||||
Mod+Shift+U { move-workspace-down; }
|
||||
Mod+Shift+I { move-workspace-up; }
|
||||
|
||||
Mod+WheelScrollDown cooldown-ms=150 { focus-workspace-down; }
|
||||
Mod+WheelScrollUp cooldown-ms=150 { focus-workspace-up; }
|
||||
Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; }
|
||||
Mod+Ctrl+WheelScrollUp cooldown-ms=150 { move-column-to-workspace-up; }
|
||||
|
||||
Mod+WheelScrollRight { focus-column-right; }
|
||||
Mod+WheelScrollLeft { focus-column-left; }
|
||||
Mod+Ctrl+WheelScrollRight { move-column-right; }
|
||||
Mod+Ctrl+WheelScrollLeft { move-column-left; }
|
||||
|
||||
Mod+Shift+WheelScrollDown { focus-column-right; }
|
||||
Mod+Shift+WheelScrollUp { focus-column-left; }
|
||||
Mod+Ctrl+Shift+WheelScrollDown { move-column-right; }
|
||||
Mod+Ctrl+Shift+WheelScrollUp { move-column-left; }
|
||||
|
||||
Mod+1 { focus-workspace 1; }
|
||||
Mod+2 { focus-workspace 2; }
|
||||
Mod+3 { focus-workspace 3; }
|
||||
Mod+4 { focus-workspace 4; }
|
||||
Mod+5 { focus-workspace 5; }
|
||||
Mod+6 { focus-workspace 6; }
|
||||
Mod+7 { focus-workspace 7; }
|
||||
Mod+8 { focus-workspace 8; }
|
||||
Mod+9 { focus-workspace 9; }
|
||||
Mod+Ctrl+1 { move-column-to-workspace 1; }
|
||||
Mod+Ctrl+2 { move-column-to-workspace 2; }
|
||||
Mod+Ctrl+3 { move-column-to-workspace 3; }
|
||||
Mod+Ctrl+4 { move-column-to-workspace 4; }
|
||||
Mod+Ctrl+5 { move-column-to-workspace 5; }
|
||||
Mod+Ctrl+6 { move-column-to-workspace 6; }
|
||||
Mod+Ctrl+7 { move-column-to-workspace 7; }
|
||||
Mod+Ctrl+8 { move-column-to-workspace 8; }
|
||||
Mod+Ctrl+9 { move-column-to-workspace 9; }
|
||||
|
||||
Mod+Ctrl+Shift+1 { move-window-to-workspace 1; }
|
||||
Mod+Ctrl+Shift+2 { move-window-to-workspace 2; }
|
||||
Mod+Ctrl+Shift+3 { move-window-to-workspace 3; }
|
||||
Mod+Ctrl+Shift+4 { move-window-to-workspace 4; }
|
||||
Mod+Ctrl+Shift+5 { move-window-to-workspace 5; }
|
||||
Mod+Ctrl+Shift+6 { move-window-to-workspace 6; }
|
||||
Mod+Ctrl+Shift+7 { move-window-to-workspace 7; }
|
||||
Mod+Ctrl+Shift+8 { move-window-to-workspace 8; }
|
||||
Mod+Ctrl+Shift+9 { move-window-to-workspace 9; }
|
||||
|
||||
// Switches focus between the current and the previous workspace.
|
||||
// Mod+Tab { focus-workspace-previous; }
|
||||
|
||||
Mod+BracketLeft { consume-or-expel-window-left; }
|
||||
Mod+BracketRight { consume-or-expel-window-right; }
|
||||
|
||||
Mod+Comma { consume-window-into-column; }
|
||||
Mod+Period { expel-window-from-column; }
|
||||
|
||||
Mod+R { switch-preset-column-width; }
|
||||
Mod+Shift+R { switch-preset-column-width-back; }
|
||||
|
||||
Mod+Ctrl+Shift+R { switch-preset-window-height; }
|
||||
Mod+Ctrl+R { reset-window-height; }
|
||||
|
||||
Mod+F { maximize-column; }
|
||||
Mod+Shift+F { fullscreen-window; }
|
||||
|
||||
Mod+M { maximize-window-to-edges; }
|
||||
|
||||
Mod+Ctrl+F { expand-column-to-available-width; }
|
||||
|
||||
Mod+C { center-column; }
|
||||
Mod+Ctrl+C { center-visible-columns; }
|
||||
|
||||
Mod+Minus { set-column-width "-10%"; }
|
||||
Mod+Equal { set-column-width "+10%"; }
|
||||
|
||||
Mod+Shift+Minus { set-window-height "-10%"; }
|
||||
Mod+Shift+Equal { set-window-height "+10%"; }
|
||||
|
||||
Mod+V { toggle-window-floating; }
|
||||
Mod+Shift+V { switch-focus-between-floating-and-tiling; }
|
||||
|
||||
Mod+W { toggle-column-tabbed-display; }
|
||||
|
||||
// Actions to switch layouts.
|
||||
// Note: if you uncomment these, make sure you do NOT have
|
||||
// a matching layout switch hotkey configured in xkb options above.
|
||||
// Having both at once on the same hotkey will break the switching,
|
||||
// since it will switch twice upon pressing the hotkey (once by xkb, once by niri).
|
||||
// Mod+Space { switch-layout "next"; }
|
||||
// Mod+Shift+Space { switch-layout "prev"; }
|
||||
|
||||
Print { screenshot; }
|
||||
Ctrl+Print { screenshot-screen; }
|
||||
Alt+Print { screenshot-window; }
|
||||
|
||||
// Applications such as remote-desktop clients and software KVM switches may
|
||||
// request that niri stops processing the keyboard shortcuts defined here
|
||||
// so they may, for example, forward the key presses as-is to a remote machine.
|
||||
// It's a good idea to bind an escape hatch to toggle the inhibitor,
|
||||
// so a buggy application can't hold your session hostage.
|
||||
//
|
||||
// The allow-inhibiting=false property can be applied to other binds as well,
|
||||
// which ensures niri always processes them, even when an inhibitor is active.
|
||||
Mod+Escape allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; }
|
||||
|
||||
Mod+Shift+E { quit; }
|
||||
Ctrl+Alt+Delete { quit; }
|
||||
|
||||
Mod+Shift+P { power-off-monitors; }
|
||||
}
|
||||
|
||||
include "dark.kdl"
|
||||
@@ -1,9 +0,0 @@
|
||||
layout {
|
||||
background-color "#414853"
|
||||
|
||||
focus-ring {
|
||||
width 4
|
||||
active-color "#5396c7"
|
||||
inactive-color "#505050"
|
||||
}
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
layout {
|
||||
background-color "#c0c1c2"
|
||||
|
||||
focus-ring {
|
||||
width 4
|
||||
active-color "#85c9fc"
|
||||
inactive-color "#505050"
|
||||
}
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
{
|
||||
"layer": "top",
|
||||
"position": "top",
|
||||
"modules-left": [
|
||||
"niri/workspaces",
|
||||
"niri/window"
|
||||
],
|
||||
"modules-right": [
|
||||
"tray",
|
||||
"clock"
|
||||
],
|
||||
"reload_style_on_change": true,
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
* {
|
||||
background-color: #282e38;
|
||||
color: #a29e98;
|
||||
}
|
||||
|
||||
#workspaces button.active {
|
||||
border-bottom: 3px solid #04785d;
|
||||
}
|
||||
|
||||
#workspaces button.urgent {
|
||||
border-bottom: 3px solid #c37583;
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
* {
|
||||
background-color: #f6ede0;
|
||||
color: #696257;
|
||||
}
|
||||
|
||||
#workspaces button.active {
|
||||
border-bottom: 3px solid #278a6e;
|
||||
}
|
||||
|
||||
#workspaces button.urgent {
|
||||
border-bottom: 3px solid #d0818f;
|
||||
}
|
||||
@@ -1,25 +0,0 @@
|
||||
@import url("file:///home/lupan/.config/waybar/dark.css");
|
||||
|
||||
* {
|
||||
font-family: HurmitNerdFont;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
#workspaces {
|
||||
padding: 0 0.5rem;
|
||||
}
|
||||
|
||||
#workspaces button {
|
||||
padding: 0 3px;
|
||||
border-radius: 0;
|
||||
border-bottom: 3px solid transparent;
|
||||
}
|
||||
|
||||
#window {
|
||||
border-bottom: 3px solid transparent;
|
||||
}
|
||||
|
||||
#clock {
|
||||
padding: 0 0.5rem;
|
||||
border-bottom: 3px solid transparent;
|
||||
}
|
||||
@@ -1,55 +0,0 @@
|
||||
local colors_name = "lupanbones"
|
||||
vim.g.colors_name = colors_name -- Required when defining a colorscheme
|
||||
|
||||
local lush = require "lush"
|
||||
local hsluv = lush.hsluv -- Human-friendly hsl
|
||||
local util = require "zenbones.util"
|
||||
|
||||
local bg = vim.o.background
|
||||
|
||||
-- Define a palette. Use `palette_extend` to fill unspecified colors
|
||||
local palette
|
||||
if bg == "light" then
|
||||
palette = util.palette_extend({
|
||||
bg = hsluv "#faf8f5",
|
||||
fg = hsluv "#1f212e",
|
||||
rose = hsluv "#bf8040",
|
||||
leaf = hsluv "#3d8f66",
|
||||
wood = hsluv "#acac53",
|
||||
water = hsluv "#6b8ac7",
|
||||
blossom = hsluv "#93806c",
|
||||
sky = hsluv "#7461d1",
|
||||
}, bg)
|
||||
else
|
||||
palette = util.palette_extend({
|
||||
bg = hsluv "#1f212e",
|
||||
fg = hsluv "#9da0af",
|
||||
rose = hsluv "#bf8040",
|
||||
leaf = hsluv "#3d8f66",
|
||||
wood = hsluv "#d1d147",
|
||||
water = hsluv "#6b8ac7",
|
||||
blossom = hsluv "#93806c",
|
||||
sky = hsluv "#7461d1",
|
||||
}, bg)
|
||||
end
|
||||
|
||||
-- Generate the lush specs using the generator util
|
||||
local generator = require "zenbones.specs"
|
||||
local base_specs = generator.generate(palette, bg, generator.get_global_config(colors_name, bg))
|
||||
|
||||
-- Optionally extend specs using Lush
|
||||
local specs = lush.extends({ base_specs }).with(function()
|
||||
return {
|
||||
Statement { base_specs.Statement, fg = palette.rose },
|
||||
String { fg = palette.leaf },
|
||||
Special { fg = palette.water },
|
||||
Type { fg = palette.sky, gui = "italic" },
|
||||
Delimiter { fg = palette.blossom },
|
||||
}
|
||||
end)
|
||||
|
||||
-- Pass the specs to lush to apply
|
||||
lush(specs)
|
||||
|
||||
-- Optionally set term colors
|
||||
require("zenbones.term").apply_colors(palette)
|
||||
@@ -1,55 +0,0 @@
|
||||
local colors_name = "lupandimbones"
|
||||
vim.g.colors_name = colors_name -- Required when defining a colorscheme
|
||||
|
||||
local lush = require "lush"
|
||||
local hsluv = lush.hsluv -- Human-friendly hsl
|
||||
local util = require "zenbones.util"
|
||||
|
||||
local bg = vim.o.background
|
||||
|
||||
-- Define a palette. Use `palette_extend` to fill unspecified colors
|
||||
local palette
|
||||
if bg == "light" then
|
||||
palette = util.palette_extend({
|
||||
bg = hsluv "#ebeee8",
|
||||
fg = hsluv "#1f212e",
|
||||
rose = hsluv "#9d6948",
|
||||
leaf = hsluv "#66824a",
|
||||
wood = hsluv "#bd720f",
|
||||
water = hsluv "#3a7878",
|
||||
blossom = hsluv "#70675c",
|
||||
sky = hsluv "#463da9",
|
||||
}, bg)
|
||||
else
|
||||
palette = util.palette_extend({
|
||||
bg = hsluv "#0d0d0c",
|
||||
fg = hsluv "#5c6570",
|
||||
rose = hsluv "#814c31",
|
||||
leaf = hsluv "#526241",
|
||||
wood = hsluv "#d78c42",
|
||||
water = hsluv "#3a7878",
|
||||
blossom = hsluv "#70675c",
|
||||
sky = hsluv "#584b9b",
|
||||
}, bg)
|
||||
end
|
||||
|
||||
-- Generate the lush specs using the generator util
|
||||
local generator = require "zenbones.specs"
|
||||
local base_specs = generator.generate(palette, bg, generator.get_global_config(colors_name, bg))
|
||||
|
||||
-- Optionally extend specs using Lush
|
||||
local specs = lush.extends({ base_specs }).with(function()
|
||||
return {
|
||||
Statement { base_specs.Statement, fg = palette.rose },
|
||||
String { fg = palette.leaf },
|
||||
Special { fg = palette.water },
|
||||
Type { fg = palette.sky, gui = "italic" },
|
||||
Delimiter { fg = palette.blossom },
|
||||
}
|
||||
end)
|
||||
|
||||
-- Pass the specs to lush to apply
|
||||
lush(specs)
|
||||
|
||||
-- Optionally set term colors
|
||||
require("zenbones.term").apply_colors(palette)
|
||||
@@ -1,20 +1 @@
|
||||
require("config.options")
|
||||
require("config.remap")
|
||||
require("config.lsp")
|
||||
|
||||
require("plugins.arrow")
|
||||
require("plugins.auto-session")
|
||||
require("plugins.colorscheme")
|
||||
require("plugins.conform")
|
||||
require("plugins.flash")
|
||||
require("plugins.fzf-lua")
|
||||
require("plugins.guess-indent")
|
||||
require("plugins.luasnip")
|
||||
require("plugins.multicursor")
|
||||
require("plugins.nvim-various-textobjs")
|
||||
require("plugins.oil")
|
||||
require("plugins.slimline")
|
||||
require("plugins.snacks")
|
||||
require("plugins.surround")
|
||||
require("plugins.treesitter")
|
||||
require("plugins.which-key")
|
||||
require("lupan")
|
||||
|
||||
@@ -1,12 +1,63 @@
|
||||
{
|
||||
"arrow.nvim": { "branch": "master", "commit": "6e0f726f55f99332dd726a53effd6813786b6d49" },
|
||||
"conform.nvim": { "branch": "master", "commit": "1bf8b5b9caee51507aa51eaed3da5b0f2595c6b9" },
|
||||
"flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
|
||||
"multicursor.nvim": { "branch": "1.0", "commit": "a6cf4e7daaf10a6b14bb7838caf779f0de5070cd" },
|
||||
"nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
||||
"nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" },
|
||||
"oil.nvim": { "branch": "master", "commit": "7e1cd7703ff2924d7038476dcbc04b950203b902" },
|
||||
"snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" }
|
||||
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
|
||||
"LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
|
||||
"arrow.nvim": { "branch": "master", "commit": "5438c977e729a29d96bd54c8da3103154e80dbd1" },
|
||||
"better-escape.nvim": { "branch": "master", "commit": "199dcc2643dec5d8dbdab4ec672cf405224dcb3b" },
|
||||
"blame.nvim": { "branch": "main", "commit": "39bb4cda9e658d053a43919b10ca52c0a4d738e1" },
|
||||
"bookmarks.nvim": { "branch": "main", "commit": "42371a76cdd786452b537490926b1b6a041672e5" },
|
||||
"ccc.nvim": { "branch": "main", "commit": "b57cbaf8db3ac43c56c9e2c7f3812944638260ed" },
|
||||
"cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
|
||||
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
||||
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
|
||||
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
|
||||
"dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
|
||||
"feline.nvim": { "branch": "main", "commit": "c97c17dc56ca3cf2b9b9192c3447fc59347e8c0d" },
|
||||
"fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
|
||||
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "4c40357994f386e72be92a46f41fc1664c84c87d" },
|
||||
"global-note.nvim": { "branch": "main", "commit": "1e0d4bba425d971ed3ce40d182c574a25507115c" },
|
||||
"go.nvim": { "branch": "master", "commit": "6ad080424f4b96a584cf591721e8e13c102cce4e" },
|
||||
"guihua.lua": { "branch": "master", "commit": "d783191eaa75215beae0c80319fcce5e6b3beeda" },
|
||||
"hierarchy-tree-go.nvim": { "branch": "main", "commit": "9fab9ddefe81edab4a144824955d2d085db3f49a" },
|
||||
"indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
||||
"leap.nvim": { "branch": "main", "commit": "346a16ef942635a8ca5ff92e603d07e7e8be6cbe" },
|
||||
"lspsaga.nvim": { "branch": "main", "commit": "6063935cf68de9aa6dd79f8e1caf5df0a9385de3" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
|
||||
"mason-tool-installer.nvim": { "branch": "main", "commit": "5639d58a3d11ff7c05c8e31e159bfedae55d7961" },
|
||||
"mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
|
||||
"mellifluous.nvim": { "branch": "v1", "commit": "1637e46585435ebda7963248e0e65422effad8d9" },
|
||||
"neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
|
||||
"neogit": { "branch": "master", "commit": "12f78aaabb37b4946254dd5e47cf7b552904937a" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "c27370703e798666486e3064b64d59eaf4bdc6d5" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "fd26f8626c03b424f7140d454031d1dcb8d23513" },
|
||||
"nvim-surround": { "branch": "main", "commit": "ae298105122c87bbe0a36b1ad20b06d417c0433e" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "38959800c2439c890e3238af559f0dc3be45e393" },
|
||||
"nvim-treesitter-textobjects": { "branch": "master", "commit": "143856b1cee509a190cc8c17ddb0638002171235" },
|
||||
"nvim-various-textobjs": { "branch": "main", "commit": "ea78fbdac4a2ca10e2922721233a769770afb45b" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "ab4cfee554e501f497bce0856788d43cf2eb93d7" },
|
||||
"oil.nvim": { "branch": "master", "commit": "548587d68b55e632d8a69c92cefd981f360634fa" },
|
||||
"onenord.nvim": { "branch": "main", "commit": "af734ccc21847ce56830eed1f593ef320ffa27ff" },
|
||||
"orgmode": { "branch": "master", "commit": "dafb6aa6e2e09362e304a933974c563bab0b464f" },
|
||||
"persisted.nvim": { "branch": "main", "commit": "b4b7a281307f8b52d47b0fd5b6798a453681d44e" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
|
||||
"purescript-vim": { "branch": "main", "commit": "82348352e6568fcc0385bd7c99a8ead3a479feea" },
|
||||
"telescope-fzf-native.nvim": { "branch": "main", "commit": "2a5ceff981501cff8f46871d5402cd3378a8ab6a" },
|
||||
"telescope-git-grep.nvim": { "branch": "main", "commit": "cdd8215f15843a420b5c8e792395c403136626b6" },
|
||||
"telescope-tabs": { "branch": "master", "commit": "0a678eefcb71ebe5cb0876aa71dd2e2583d27fd3" },
|
||||
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
|
||||
"telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
|
||||
"tree-sitter-nu": { "branch": "main", "commit": "c9f04276e6b5bbbcdba7aa1810ea621ced5bed97" },
|
||||
"tree-sitter-templ": { "branch": "master", "commit": "7f7f06b3931ca00e8ddfbeab3fc08ad00d297fad" },
|
||||
"treesj": { "branch": "main", "commit": "48c1a7539f376fd40ceb9cf12d697040fcf90649" },
|
||||
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
|
||||
"undotree": { "branch": "master", "commit": "76c4e32d8f1aa493bb68d4a3fcd3c700395c303c" },
|
||||
"vim-ReplaceWithRegister": { "branch": "master", "commit": "b82bf59e5387b57d0125afb94fd7984061031136" },
|
||||
"vim-dadbod": { "branch": "master", "commit": "9f0ca8bcef704659820a95c3bbd2c262583a66a1" },
|
||||
"vim-dadbod-completion": { "branch": "master", "commit": "3f5783c12e184e4b6f05dfcbd7c1a6da05b4d66e" },
|
||||
"vim-dadbod-ui": { "branch": "master", "commit": "f4d37b7312ae6489e5c04bee654ca521baac188a" },
|
||||
"vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
|
||||
"vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },
|
||||
"whaler": { "branch": "main", "commit": "9e0b67e36250cb80e679563adcd4b7451eae26b2" },
|
||||
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
|
||||
}
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
return {
|
||||
cmd = { "clangd" },
|
||||
filetypes = { "c", "cpp" },
|
||||
root_markers = { ".git" },
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
return {
|
||||
cmd = { "gopls" },
|
||||
filetypes = { "go", "gomod", "gowork", "gosum", "gotmpl" },
|
||||
root_markers = { "go.mod", "go.work", ".git" },
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
return {
|
||||
cmd = { "lua-language-server" },
|
||||
filetypes = { "lua" },
|
||||
root_markers = { ".luarc.json", ".git" },
|
||||
settings = {
|
||||
Lua = {
|
||||
runtime = {
|
||||
version = "LuaJIT",
|
||||
},
|
||||
diagnostics = {
|
||||
globals = { "vim" },
|
||||
}
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
return {
|
||||
cmd = { "ols" },
|
||||
filetypes = { "odin" },
|
||||
root_markers = { ".git" },
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
return {
|
||||
cmd = { "templ", "lsp" },
|
||||
filetypes = { "templ" },
|
||||
root_markers = { "go.mod", "go.work", ".git" },
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
return {
|
||||
cmd = { "typescript-language-server", "--stdio" },
|
||||
filetypes = { "javascript", "typescript", "javascriptreact", "typescriptreact" },
|
||||
root_markers = { "package.json", "tsconfig.json", ".git" },
|
||||
}
|
||||
@@ -1,57 +0,0 @@
|
||||
local M = {}
|
||||
|
||||
local home = os.getenv("HOME")
|
||||
local filename = home .. "/.lightmode"
|
||||
|
||||
local colorschemes = nil
|
||||
|
||||
function M.set_colorschemes(dark, light)
|
||||
colorschemes = { dark = dark, light = light }
|
||||
end
|
||||
|
||||
function M.terminalbg()
|
||||
if vim.uv.fs_stat(filename) then
|
||||
return "light"
|
||||
else
|
||||
return "dark"
|
||||
end
|
||||
end
|
||||
|
||||
function M.update_colorscheme(only_if_changed)
|
||||
local next = M.terminalbg()
|
||||
if not only_if_changed or next ~= vim.o.background then
|
||||
vim.o.background = next
|
||||
if colorschemes then
|
||||
vim.cmd.colorscheme(colorschemes[next])
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function M.toggle_colorscheme()
|
||||
if vim.o.background == "dark" then
|
||||
vim.o.background = "light"
|
||||
else
|
||||
vim.o.background = "dark"
|
||||
end
|
||||
if colorschemes then
|
||||
vim.cmd.colorscheme(colorschemes[vim.o.background])
|
||||
end
|
||||
end
|
||||
|
||||
local w = vim.uv.new_fs_event()
|
||||
|
||||
local function watch(fname)
|
||||
w:start(
|
||||
fname,
|
||||
{},
|
||||
vim.schedule_wrap(function(...)
|
||||
M.update_colorscheme(true)
|
||||
w:stop()
|
||||
watch(fname)
|
||||
end)
|
||||
)
|
||||
end
|
||||
|
||||
watch(home)
|
||||
|
||||
return M
|
||||
@@ -1,17 +0,0 @@
|
||||
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
||||
if not (vim.uv or vim.loop).fs_stat(lazypath) then
|
||||
local lazyrepo = "https://github.com/folke/lazy.nvim.git"
|
||||
local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
|
||||
if vim.v.shell_error ~= 0 then
|
||||
vim.api.nvim_echo({
|
||||
{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
|
||||
{ out, "WarningMsg" },
|
||||
{ "\nPress any key to exit..." },
|
||||
}, true, {})
|
||||
vim.fn.getchar()
|
||||
os.exit(1)
|
||||
end
|
||||
end
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
|
||||
require("lazy").setup({ { import = "plugins" } })
|
||||
@@ -1,26 +0,0 @@
|
||||
vim.lsp.enable({
|
||||
"clangd",
|
||||
"gopls",
|
||||
"templ-lsp",
|
||||
"lua_ls",
|
||||
"ols",
|
||||
"typescript-language-server",
|
||||
})
|
||||
|
||||
vim.api.nvim_create_autocmd("LspAttach", {
|
||||
group = vim.api.nvim_create_augroup("lsp-keys-complete", { clear = true }),
|
||||
callback = function(event)
|
||||
vim.lsp.completion.enable(true, event.data.client_id, event.data.bufnr, {
|
||||
convert = function(item)
|
||||
return { abbr = item.label:gsub("%b()", "") }
|
||||
end,
|
||||
})
|
||||
vim.keymap.set("i", "<C-space>", vim.lsp.completion.get)
|
||||
vim.keymap.set("n", "<leader>k", function()
|
||||
vim.diagnostic.jump({ float = true, count = -1 })
|
||||
end)
|
||||
vim.keymap.set("n", "<leader>j", function()
|
||||
vim.diagnostic.jump({ float = true, count = 1 })
|
||||
end)
|
||||
end,
|
||||
})
|
||||
@@ -1,24 +0,0 @@
|
||||
vim.opt.shortmess = vim.opt.shortmess + "I"
|
||||
|
||||
vim.g.mapleader = " "
|
||||
vim.g.maplocalleader = " \\"
|
||||
|
||||
vim.opt.number = true
|
||||
vim.opt.relativenumber = true
|
||||
vim.opt.signcolumn = "yes"
|
||||
vim.opt.title = true
|
||||
|
||||
vim.opt.ignorecase = true
|
||||
vim.opt.smartcase = true
|
||||
|
||||
vim.opt.timeout = false
|
||||
|
||||
vim.o.undofile = true
|
||||
|
||||
vim.cmd([[autocmd TermOpen * startinsert]]);
|
||||
|
||||
vim.filetype.add({
|
||||
extension = {
|
||||
["kitty-session"] = 'kitty',
|
||||
},
|
||||
})
|
||||
@@ -1,19 +0,0 @@
|
||||
local set = vim.keymap.set
|
||||
|
||||
set("n", "<M-h>", "<C-w>h")
|
||||
set("n", "<M-k>", "<C-w>k")
|
||||
set("n", "<M-j>", "<C-w>j")
|
||||
set("n", "<M-l>", "<C-w>l")
|
||||
|
||||
set({ "n", 'v' }, "<leader>p", [["+p]])
|
||||
set({ "n", 'v' }, "<leader>P", [["+P]])
|
||||
set({ "n", 'v' }, "<leader>y", [["+y]])
|
||||
set({ "n", 'v' }, "<leader>Y", [["+Y]])
|
||||
|
||||
set("n", "<Esc>", "<cmd>nohlsearch<cr>")
|
||||
set("n", "<leader>K", "<cmd>cp<cr>")
|
||||
set("n", "<leader>J", "<cmd>cn<cr>")
|
||||
set("n", "<leader>x", "<cmd>copen<cr>")
|
||||
set("n", "<leader>X", "<cmd>cclose<cr>")
|
||||
|
||||
set("n", "<leader>ga", "<cmd>tabnew | terminal lazygit<cr>")
|
||||
26
nvim/.config/nvim/lua/lupan/autocmd.lua
Normal file
26
nvim/.config/nvim/lua/lupan/autocmd.lua
Normal file
@@ -0,0 +1,26 @@
|
||||
-- [[ Highlight on yank ]]
|
||||
-- See `:help vim.highlight.on_yank()`
|
||||
vim.api.nvim_create_autocmd('TextYankPost', {
|
||||
desc = 'Highlight when yanking (copying) text',
|
||||
group = vim.api.nvim_create_augroup('YankHighlight', { clear = true }),
|
||||
callback = function()
|
||||
vim.highlight.on_yank()
|
||||
end,
|
||||
})
|
||||
|
||||
vim.api.nvim_create_autocmd('BufWritePre', {
|
||||
desc = 'Format on saving buffer',
|
||||
callback = function()
|
||||
vim.lsp.buf.format()
|
||||
end,
|
||||
group = vim.api.nvim_create_augroup('BufWriteFormat', { clear = true }),
|
||||
pattern = { '*.go', '*.lua', '*.rs' },
|
||||
})
|
||||
|
||||
vim.api.nvim_create_autocmd('ColorScheme', {
|
||||
desc = 'Change feline theme',
|
||||
group = vim.api.nvim_create_augroup('ChangeFelineTheme', { clear = true }),
|
||||
callback = function()
|
||||
require('feline').use_theme(vim.o.background)
|
||||
end,
|
||||
})
|
||||
5
nvim/.config/nvim/lua/lupan/init.lua
Normal file
5
nvim/.config/nvim/lua/lupan/init.lua
Normal file
@@ -0,0 +1,5 @@
|
||||
require("lupan.remap")
|
||||
require("lupan.lazy")
|
||||
require("lupan.options")
|
||||
require("lupan.autocmd")
|
||||
require('lazy').setup('plugins')
|
||||
13
nvim/.config/nvim/lua/lupan/lazy.lua
Normal file
13
nvim/.config/nvim/lua/lupan/lazy.lua
Normal file
@@ -0,0 +1,13 @@
|
||||
-- Install package manager (`:help lazy.nvim.txt`)
|
||||
local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
|
||||
if not vim.loop.fs_stat(lazypath) then
|
||||
vim.fn.system {
|
||||
'git',
|
||||
'clone',
|
||||
'--filter=blob:none',
|
||||
'https://github.com/folke/lazy.nvim.git',
|
||||
'--branch=stable',
|
||||
lazypath,
|
||||
}
|
||||
end
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
54
nvim/.config/nvim/lua/lupan/options.lua
Normal file
54
nvim/.config/nvim/lua/lupan/options.lua
Normal file
@@ -0,0 +1,54 @@
|
||||
-- See `:help vim.o`
|
||||
|
||||
-- Disable intro message
|
||||
vim.opt.shortmess = vim.opt.shortmess + 'I'
|
||||
|
||||
vim.opt.showmode = false
|
||||
|
||||
-- Set highlight on search
|
||||
vim.o.hlsearch = true -- false
|
||||
vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
|
||||
|
||||
-- Make line numbers default
|
||||
vim.wo.number = true
|
||||
vim.wo.relativenumber = true
|
||||
|
||||
-- Enable mouse mode
|
||||
vim.o.mouse = 'a'
|
||||
|
||||
-- Enable break indent
|
||||
vim.o.breakindent = true
|
||||
|
||||
-- Save undo history
|
||||
vim.o.undofile = true
|
||||
|
||||
-- Case-insensitive searching UNLESS \C or capital in search
|
||||
vim.o.ignorecase = true
|
||||
vim.o.smartcase = true
|
||||
|
||||
-- Keep signcolumn on by default
|
||||
vim.wo.signcolumn = 'yes'
|
||||
|
||||
-- Decrease update time
|
||||
vim.o.updatetime = 250
|
||||
vim.o.timeoutlen = 300
|
||||
|
||||
-- Set completeopt to have a better completion experience
|
||||
vim.o.completeopt = 'menuone,noselect'
|
||||
|
||||
-- NOTE: You should make sure your terminal supports this
|
||||
vim.o.termguicolors = true
|
||||
|
||||
vim.o.scrolloff = 8
|
||||
|
||||
vim.o.tabstop = 8
|
||||
vim.o.softtabstop = 4
|
||||
vim.o.shiftwidth = 4
|
||||
vim.o.expandtab = true
|
||||
vim.o.expandtab = true
|
||||
|
||||
vim.g.lightspeed_no_default_keymaps = true
|
||||
|
||||
vim.o.cursorline = true
|
||||
|
||||
vim.opt.foldcolumn = '1'
|
||||
124
nvim/.config/nvim/lua/lupan/remap.lua
Normal file
124
nvim/.config/nvim/lua/lupan/remap.lua
Normal file
@@ -0,0 +1,124 @@
|
||||
vim.g.mapleader = ' '
|
||||
vim.g.maplocalleader = ' '
|
||||
|
||||
local key = vim.keymap.set
|
||||
local opts = { silent = true, noremap = true }
|
||||
|
||||
key('v', '<Space>', '<Nop>', { silent = true })
|
||||
|
||||
-- Remap for dealing with word wrap
|
||||
key('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
|
||||
key('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
|
||||
|
||||
key("n", "<leader>dd", "<cmd>Oil<CR>", { desc = "[D]isplay [d]irectory" })
|
||||
key("n", "<leader>df", "<cmd>Oil --float<CR>", { desc = "[D]isplay directory [f]loat" })
|
||||
key("n", "<leader>ut", "<cmd>UndotreeToggle<CR>", { desc = "[U]undotree [t]oggle" })
|
||||
|
||||
-- tabs
|
||||
|
||||
key('n', '<leader>td', function()
|
||||
require('lupan.ui').tab_change_dir()
|
||||
end, { desc = '[T]ab change [d]irectory' })
|
||||
|
||||
key('n', '<leader>tD', function()
|
||||
require('lupan.ui').tab_change_dir_newtab()
|
||||
end, { desc = '[T]ab change [D]irectory (new tab)' })
|
||||
|
||||
key('n', '<leader>tm', function()
|
||||
require('telescope-tabs').list_tabs(require 'telescope.themes'.get_dropdown())
|
||||
end, { desc = '[T]ab change [D]irectory (new tab)' })
|
||||
|
||||
key('n', '<leader>tt', function()
|
||||
require('telescope-tabs').go_to_previous()
|
||||
end, { desc = '[T]ab [t]oggle previous' })
|
||||
|
||||
for i = 1, 9, 1 do
|
||||
key('n', '<leader>t' .. i, '<cmd>' .. i .. 'tabnext<CR>', { desc = '[T]ab nr [' .. i .. ']' })
|
||||
end
|
||||
|
||||
-- translations
|
||||
|
||||
key('n', '<leader>tr', function()
|
||||
require('lupan.ui').find_translation_key()
|
||||
end, { desc = '[T][r]anlation key find' })
|
||||
|
||||
-- Diagnostic keymaps
|
||||
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous [D]iagnostic message' })
|
||||
vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next [D]iagnostic message' })
|
||||
vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Show diagnostic [E]rror messages' })
|
||||
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' })
|
||||
|
||||
key('n', '<leader>N', '<cmd>bn<CR>', { desc = '[N]ext buffer' })
|
||||
key('n', '<leader>P', '<cmd>bp<CR>', { desc = '[P]revious buffer' })
|
||||
|
||||
key('n', '<leader>tc', '<cmd>tabnew<CR>', { desc = '[T]ab [c]reate' })
|
||||
key('n', '<leader>tx', '<cmd>tabclose<CR>', { desc = '[T]ab close' })
|
||||
key('n', '<leader>ts', '<cmd>tab split<CR>', { desc = '[T]ab [s]plit' })
|
||||
key('n', '<leader>tn', '<cmd>tabnext<CR>', { desc = '[T]ab [n]ext' })
|
||||
key('n', '<leader>tp', '<cmd>tabprevious<CR>', { desc = '[T]ab [p]revious' })
|
||||
key('n', '<leader>tf', '<cmd>tabfirst<CR>', { desc = '[T]ab [f]irst' })
|
||||
key('n', '<leader>tl', '<cmd>tablast<CR>', { desc = '[T]tab [l]ast' })
|
||||
|
||||
key('v', 'J', ":m '>+1<CR>gv=gv", { desc = "Move lines down" })
|
||||
key('v', 'K', ":m '<-2<CR>gv=gv", { desc = "Move lines up" })
|
||||
|
||||
-- Change window
|
||||
key('n', '<C-j>', '<C-w>j', opts)
|
||||
key('n', '<C-k>', '<C-w>k', opts)
|
||||
key('n', '<C-h>', '<C-w>h', opts)
|
||||
key('n', '<C-l>', '<C-w>l', opts)
|
||||
|
||||
-- Stay in key mode
|
||||
key('v', '<', '<gv', opts)
|
||||
key('v', '>', '>gv', opts)
|
||||
|
||||
-- Keep old value of register
|
||||
key('v', 'P', '"_dP', opts)
|
||||
|
||||
-- LightSpeed
|
||||
key('n', 'g/', '<Plug>Lightspeed_s', { desc = "Lightspeed forward search" })
|
||||
key('n', 'g?', '<Plug>Lightspeed_S', { desc = "Lightspeed backward search" })
|
||||
|
||||
-- Clipboard and quickfix
|
||||
key({ 'n', 'v' }, '<leader>y', '"+y', { desc = "Yank to clipboard" })
|
||||
key('n', '<leader>j', '<cmd>cn<CR>', { desc = "Quickfix next" })
|
||||
key('n', '<leader>k', '<cmd>cp<CR>', { desc = "Quickfix previous" })
|
||||
key('n', '<leader>co', '<cmd>copen<CR>', { desc = "Quickfix [O]pen" })
|
||||
key('n', '<leader>cc', '<cmd>cclose<CR>', { desc = "Quickfix [C]lose" })
|
||||
key('n', '<leader>ct', '<cmd>TroubleToggle<CR>', { desc = "Toggle [T]rouble" })
|
||||
|
||||
-- luasnip
|
||||
|
||||
vim.keymap.set({ 'i', 's' }, "<c-k>", function()
|
||||
local ls = require "luasnip"
|
||||
if ls.expand_or_jumpable() then
|
||||
ls.expand_or_jump()
|
||||
end
|
||||
end, { silent = true })
|
||||
|
||||
vim.keymap.set({ 'i', 's' }, "<c-j>", function()
|
||||
local ls = require "luasnip"
|
||||
if ls.jumpable(-1) then
|
||||
ls.jump(-1)
|
||||
end
|
||||
end, { silent = true })
|
||||
|
||||
vim.keymap.set({ 'i', 's' }, "<c-l>", function()
|
||||
local ls = require "luasnip"
|
||||
if ls.choice_active() then
|
||||
ls.change_choice(1)
|
||||
end
|
||||
end, { silent = true })
|
||||
|
||||
vim.keymap.set("n", "<leader>ss", "<cmd>source ~/.config/nvim/after/plugin/luasnip.lua<CR>",
|
||||
{ desc = "[S]nippets [s]ource" })
|
||||
|
||||
-- colors
|
||||
|
||||
key('n', '<F6>', function()
|
||||
if vim.o.background == "dark" then
|
||||
vim.o.background = "light"
|
||||
else
|
||||
vim.o.background = "dark"
|
||||
end
|
||||
end)
|
||||
69
nvim/.config/nvim/lua/lupan/ui.lua
Normal file
69
nvim/.config/nvim/lua/lupan/ui.lua
Normal file
@@ -0,0 +1,69 @@
|
||||
local actions = require "telescope.actions"
|
||||
local action_state = require "telescope.actions.state"
|
||||
local finders = require "telescope.finders"
|
||||
local pickers = require "telescope.pickers"
|
||||
local sorters = require "telescope.sorters"
|
||||
local themes = require "telescope.themes"
|
||||
|
||||
local M = {}
|
||||
|
||||
local function enter(prompt_bufnr, action)
|
||||
local selected = action_state.get_selected_entry()
|
||||
actions.close(prompt_bufnr)
|
||||
action(selected[1])
|
||||
end
|
||||
|
||||
function M.tab_change_dir(opts)
|
||||
opts = opts or {}
|
||||
local action = opts.action or vim.cmd.tc
|
||||
local prompt_title = opts.prompt_title or "Tab change directory"
|
||||
local cmd = { 'find', os.getenv('HOME'), '-maxdepth', '5', '-type', 'd', '-not', '-path', '*/.git*' }
|
||||
local dropdown = themes.get_dropdown();
|
||||
local picker_opts = {
|
||||
prompt_title = prompt_title,
|
||||
finder = finders.new_oneshot_job(cmd, {}),
|
||||
sorter = sorters.get_fuzzy_file({}),
|
||||
attach_mappings = function(_, map)
|
||||
map({ "i", "n" }, "<CR>", function(prompt_bufnr) enter(prompt_bufnr, action) end)
|
||||
return true
|
||||
end
|
||||
}
|
||||
local change_dir = pickers.new(dropdown, picker_opts)
|
||||
change_dir:find()
|
||||
end
|
||||
|
||||
local function tabnew_tcd(dir)
|
||||
vim.cmd.tabnew(dir)
|
||||
vim.cmd.tc(dir)
|
||||
end
|
||||
|
||||
function M.tab_change_dir_newtab()
|
||||
M.tab_change_dir({ action = tabnew_tcd, prompt_title = "Tab change directory (new tab)" })
|
||||
end
|
||||
|
||||
local function append_text(text)
|
||||
text = string.gsub(text, "^ + %w+%.([%w%p]+) +.*", "%1")
|
||||
local row, col = unpack(vim.api.nvim_win_get_cursor(0))
|
||||
vim.api.nvim_buf_set_text(0, row - 1, col, row - 1, col, { text })
|
||||
end
|
||||
|
||||
function M.find_translation_key(opts)
|
||||
opts = opts or {}
|
||||
local action = opts.action or append_text
|
||||
local prompt_title = opts.prompt_title or "Get translation key"
|
||||
local cmd = { 'list-translation-keys' }
|
||||
local dropdown = themes.get_dropdown();
|
||||
local picker_opts = {
|
||||
prompt_title = prompt_title,
|
||||
finder = finders.new_oneshot_job(cmd, {}),
|
||||
sorter = sorters.get_fuzzy_file({}),
|
||||
attach_mappings = function(_, map)
|
||||
map({ "i", "n" }, "<CR>", function(prompt_bufnr) enter(prompt_bufnr, action) end)
|
||||
return true
|
||||
end
|
||||
}
|
||||
local find_translation_key = pickers.new(dropdown, picker_opts)
|
||||
find_translation_key:find()
|
||||
end
|
||||
|
||||
return M
|
||||
15
nvim/.config/nvim/lua/lupan/utils.lua
Normal file
15
nvim/.config/nvim/lua/lupan/utils.lua
Normal file
@@ -0,0 +1,15 @@
|
||||
local M = {}
|
||||
|
||||
function M.terminalbg()
|
||||
local ok, lines = pcall(io.lines, os.getenv('HOME') .. '/.config/alacritty/alacritty.toml')
|
||||
if ok then
|
||||
for line in lines do
|
||||
if string.find(line, 'light.toml') then
|
||||
return "light"
|
||||
end
|
||||
end
|
||||
end
|
||||
return "dark"
|
||||
end
|
||||
|
||||
return M
|
||||
33
nvim/.config/nvim/lua/plugins/appearance.lua
Normal file
33
nvim/.config/nvim/lua/plugins/appearance.lua
Normal file
@@ -0,0 +1,33 @@
|
||||
return {
|
||||
{
|
||||
"ramojus/mellifluous.nvim",
|
||||
branch = "v1",
|
||||
config = function()
|
||||
vim.o.background = require('lupan.utils').terminalbg()
|
||||
vim.cmd.colorscheme('mellifluous')
|
||||
end
|
||||
},
|
||||
{
|
||||
'rmehri01/onenord.nvim',
|
||||
},
|
||||
{
|
||||
-- Indentation guides (see `:help indent_blankline.txt`)
|
||||
'lukas-reineke/indent-blankline.nvim',
|
||||
main = "ibl",
|
||||
opts = {},
|
||||
},
|
||||
|
||||
{
|
||||
--- Create Color Code
|
||||
'uga-rosa/ccc.nvim',
|
||||
config = function(_, opts)
|
||||
require('ccc').setup(opts)
|
||||
end,
|
||||
cmd = { 'CccPick', 'CccHighlighterToggle' },
|
||||
keys = {
|
||||
{ "<leader>ct", "<cmd>CccHighlighterToggle<cr>", desc = "[C]olorizer [T]oggle" },
|
||||
{ "<leader>cp", "<cmd>CccPick<cr>", desc = "[C]olor [P]ick" },
|
||||
},
|
||||
},
|
||||
|
||||
}
|
||||
@@ -1,12 +1,22 @@
|
||||
vim.pack.add({ "https://github.com/otavioschwanck/arrow.nvim" })
|
||||
|
||||
local ok, arrow = pcall(require, "arrow")
|
||||
if ok then
|
||||
arrow.setup({
|
||||
show_icons = false,
|
||||
leader_key = "_",
|
||||
buffer_leader_key = " m",
|
||||
})
|
||||
else
|
||||
print("plugin arrow missing")
|
||||
end
|
||||
return {
|
||||
{
|
||||
"otavioschwanck/arrow.nvim",
|
||||
opts = {
|
||||
show_icons = true,
|
||||
leader_key = '<leader>;',
|
||||
buffer_leader_key = '<leader>m',
|
||||
},
|
||||
keys = {
|
||||
{ "<leader>1", function() require("arrow.persist").go_to(1) end },
|
||||
{ "<leader>2", function() require("arrow.persist").go_to(2) end },
|
||||
{ "<leader>3", function() require("arrow.persist").go_to(3) end },
|
||||
{ "<leader>4", function() require("arrow.persist").go_to(4) end },
|
||||
{ "<leader>5", function() require("arrow.persist").go_to(5) end },
|
||||
{ "<leader>6", function() require("arrow.persist").go_to(6) end },
|
||||
{ "<leader>7", function() require("arrow.persist").go_to(7) end },
|
||||
{ "<leader>8", function() require("arrow.persist").go_to(8) end },
|
||||
{ "<leader>9", function() require("arrow.persist").go_to(9) end },
|
||||
{ "<leader>0", function() require("arrow.persist").go_to(10) end },
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
vim.pack.add({ "https://github.com/rmagatti/auto-session" })
|
||||
|
||||
vim.keymap.set("n", "<leader>wy", "<cmd>AutoSession search<cr>")
|
||||
|
||||
local ok, sess = pcall(require, "auto-session")
|
||||
if ok then
|
||||
sess.setup({
|
||||
suppressed_dirs = { "~/", "~/src", "~/Downloads", "/" },
|
||||
})
|
||||
else
|
||||
print("plugin auto-session missing")
|
||||
end
|
||||
78
nvim/.config/nvim/lua/plugins/autocompletion.lua
Normal file
78
nvim/.config/nvim/lua/plugins/autocompletion.lua
Normal file
@@ -0,0 +1,78 @@
|
||||
return {
|
||||
'hrsh7th/nvim-cmp',
|
||||
event = 'InsertEnter',
|
||||
dependencies = {
|
||||
-- Snippet Engine & its associated nvim-cmp source
|
||||
{
|
||||
'L3MON4D3/LuaSnip',
|
||||
build = (function()
|
||||
if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then
|
||||
return
|
||||
end
|
||||
return 'make install_jsregexp'
|
||||
end)(),
|
||||
},
|
||||
'saadparwaiz1/cmp_luasnip',
|
||||
|
||||
-- Adds LSP completion capabilities
|
||||
'hrsh7th/cmp-nvim-lsp',
|
||||
'hrsh7th/cmp-path',
|
||||
|
||||
-- Adds a number of user-friendly snippets
|
||||
'rafamadriz/friendly-snippets',
|
||||
},
|
||||
config = function()
|
||||
-- See `:help cmp`
|
||||
local cmp = require 'cmp'
|
||||
local luasnip = require 'luasnip'
|
||||
require('luasnip.loaders.from_vscode').lazy_load()
|
||||
require('luasnip.loaders.from_lua').lazy_load({ paths = '~/.config/nvim/snippets' })
|
||||
luasnip.config.setup {}
|
||||
luasnip.filetype_extend('templ', { "html" })
|
||||
|
||||
cmp.setup {
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
luasnip.lsp_expand(args.body)
|
||||
end,
|
||||
},
|
||||
-- completion = { autocomplete = false },
|
||||
completion = { completeopt = 'menu,menuone,noinsert' },
|
||||
|
||||
-- See `:help ins-completion`
|
||||
mapping = cmp.mapping.preset.insert {
|
||||
-- ['<C-l>'] = cmp.mapping.confirm({ select = true }),
|
||||
['<C-n>'] = cmp.mapping.select_next_item(),
|
||||
['<C-p>'] = cmp.mapping.select_prev_item(),
|
||||
['<C-d>'] = cmp.mapping.scroll_docs(-4),
|
||||
['<C-f>'] = cmp.mapping.scroll_docs(4),
|
||||
['<C-y>'] = cmp.mapping.confirm { select = true },
|
||||
['<C-Space>'] = cmp.mapping.complete {},
|
||||
|
||||
-- <c-l> will move you to the right of each of the expansion locations.
|
||||
-- <c-h> is similar, except moving you backwards.
|
||||
['<C-l>'] = cmp.mapping(function()
|
||||
if luasnip.expand_or_locally_jumpable() then
|
||||
luasnip.expand_or_jump()
|
||||
end
|
||||
end, { 'i', 's' }),
|
||||
['<C-h>'] = cmp.mapping(function()
|
||||
if luasnip.locally_jumpable(-1) then
|
||||
luasnip.jump(-1)
|
||||
end
|
||||
end, { 'i', 's' }),
|
||||
},
|
||||
sources = {
|
||||
{ name = 'nvim_lsp' },
|
||||
{ name = 'luasnip' },
|
||||
{ name = 'path' },
|
||||
},
|
||||
}
|
||||
cmp.setup.filetype('sql', {
|
||||
sources = {
|
||||
{ name = 'vim-dadbod-completion' },
|
||||
{ name = 'buffer' },
|
||||
},
|
||||
})
|
||||
end,
|
||||
}
|
||||
18
nvim/.config/nvim/lua/plugins/bookmarks.lua
Normal file
18
nvim/.config/nvim/lua/plugins/bookmarks.lua
Normal file
@@ -0,0 +1,18 @@
|
||||
return {
|
||||
{
|
||||
"LintaoAmons/bookmarks.nvim",
|
||||
tag = "v0.5.3", -- optional, pin the plugin at specific version for stability
|
||||
dependencies = {
|
||||
{ "stevearc/dressing.nvim" } -- optional: to have the same UI shown in the GIF
|
||||
},
|
||||
event = 'VimEnter',
|
||||
keys = {
|
||||
{ "mm", "<cmd>BookmarksMark<cr>", mode = { "n", "v" }, desc = "Mark current line into active BookmarkList." },
|
||||
{ "mo", "<cmd>BookmarksGoto<cr>", mode = { "n", "v" }, desc = "Go to bookmark at current active BookmarkList" },
|
||||
{ "ma", "<cmd>BookmarksCommands<cr>", mode = { "n", "v" }, desc = "Find and trigger a bookmark command." },
|
||||
{ "mg", "<cmd>BookmarksGotoRecent<cr>", mode = { "n", "v" }, desc = "Go to latest visited/created Bookmark" },
|
||||
{ "ms", "<cmd>BookmarksSetActiveList<cr>", mode = { "n", "v" }, desc = "Go to latest visited/created Bookmark" },
|
||||
},
|
||||
},
|
||||
{ "nvim-telescope/telescope.nvim", lazy = true },
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
vim.pack.add({
|
||||
"https://github.com/EdenEast/nightfox.nvim",
|
||||
"https://github.com/rebelot/kanagawa.nvim",
|
||||
"https://github.com/kepano/flexoki-neovim",
|
||||
"https://github.com/rktjmp/lush.nvim",
|
||||
"https://github.com/zenbones-theme/zenbones.nvim",
|
||||
"https://github.com/xero/miasma.nvim",
|
||||
})
|
||||
|
||||
local cs = require("config.colorscheme")
|
||||
cs.set_colorschemes("lupanbones", "lupanbones")
|
||||
cs.update_colorscheme()
|
||||
@@ -1,36 +0,0 @@
|
||||
vim.pack.add({ "https://github.com/stevearc/conform.nvim" })
|
||||
|
||||
local ok, conform = pcall(require, "conform")
|
||||
if ok then
|
||||
conform.setup({
|
||||
formatters_by_ft = {
|
||||
lua = { "stylua" },
|
||||
},
|
||||
format_on_save = function(bufnr)
|
||||
-- Disable with a global or buffer-local variable
|
||||
if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
|
||||
return
|
||||
end
|
||||
return { timeout_ms = 500, lsp_format = "fallback" }
|
||||
end,
|
||||
})
|
||||
vim.api.nvim_create_user_command("FormatDisable", function(args)
|
||||
if args.bang then
|
||||
-- FormatDisable! will disable formatting just for this buffer
|
||||
vim.b.disable_autoformat = true
|
||||
else
|
||||
vim.g.disable_autoformat = true
|
||||
end
|
||||
end, {
|
||||
desc = "Disable autoformat-on-save",
|
||||
bang = true,
|
||||
})
|
||||
vim.api.nvim_create_user_command("FormatEnable", function()
|
||||
vim.b.disable_autoformat = false
|
||||
vim.g.disable_autoformat = false
|
||||
end, {
|
||||
desc = "Re-enable autoformat-on-save",
|
||||
})
|
||||
else
|
||||
print("plugin conform missing")
|
||||
end
|
||||
25
nvim/.config/nvim/lua/plugins/convenience.lua
Normal file
25
nvim/.config/nvim/lua/plugins/convenience.lua
Normal file
@@ -0,0 +1,25 @@
|
||||
return {
|
||||
{
|
||||
'folke/which-key.nvim',
|
||||
event = 'VimEnter',
|
||||
config = function(_, opts)
|
||||
require('which-key').setup(opts)
|
||||
|
||||
-- Document existing key chains
|
||||
require('which-key').add {
|
||||
{ "<leader>c", group = "[C]ode/Color" },
|
||||
{ "<leader>d", group = "[D]ocument" },
|
||||
{ "<leader>g", group = "[G]it" },
|
||||
{ "<leader>r", group = "[R]ename" },
|
||||
{ "<leader>s", group = "[S]earch" },
|
||||
{ "<leader>w", group = "[W]orkspace" },
|
||||
}
|
||||
end,
|
||||
},
|
||||
{
|
||||
"max397574/better-escape.nvim",
|
||||
config = function(_, opts)
|
||||
require("better_escape").setup(opts)
|
||||
end,
|
||||
},
|
||||
}
|
||||
36
nvim/.config/nvim/lua/plugins/editing.lua
Normal file
36
nvim/.config/nvim/lua/plugins/editing.lua
Normal file
@@ -0,0 +1,36 @@
|
||||
return {
|
||||
-- "gc" to comment visual regions/lines
|
||||
{
|
||||
'numToStr/Comment.nvim',
|
||||
opts = {}
|
||||
},
|
||||
|
||||
-- Undo browsing
|
||||
'mbbill/undotree',
|
||||
|
||||
-- Tabstops autodetected
|
||||
'tpope/vim-sleuth',
|
||||
|
||||
{
|
||||
"kylechui/nvim-surround",
|
||||
version = "*", -- Use for stability; omit to use `main` branch for the latest features
|
||||
event = "VeryLazy",
|
||||
config = function(_, opts)
|
||||
require("nvim-surround").setup(opts)
|
||||
end
|
||||
},
|
||||
|
||||
{
|
||||
'inkarkat/vim-ReplaceWithRegister',
|
||||
keys = {
|
||||
{ '<leader>r', '<Plug>ReplaceWithRegisterOperator' },
|
||||
{ '<leader>rr', '<Plug>ReplaceWithRegisterLine' },
|
||||
{ '<leader>r', '<Plug>ReplaceWithRegisterVisual', mode = 'x' },
|
||||
},
|
||||
},
|
||||
{
|
||||
"chrisgrieser/nvim-various-textobjs",
|
||||
lazy = false,
|
||||
opts = { keymaps = { useDefaults = true } },
|
||||
},
|
||||
}
|
||||
243
nvim/.config/nvim/lua/plugins/feline.lua
Normal file
243
nvim/.config/nvim/lua/plugins/feline.lua
Normal file
@@ -0,0 +1,243 @@
|
||||
local function feline_config(_, opts)
|
||||
local feline = require('feline')
|
||||
|
||||
local dark_theme = {
|
||||
bg = '#5a605f',
|
||||
bg2 = '#2b3231',
|
||||
black = '#403833',
|
||||
skyblue = '#61abda',
|
||||
cyan = '#65b8c1',
|
||||
fg = '#9bafac',
|
||||
green = '#8bae68',
|
||||
oceanblue = '#6099c0',
|
||||
magenta = '#cf86c1',
|
||||
orange = '#d68c67',
|
||||
red = '#e8838f',
|
||||
violet = '#b279a7',
|
||||
white = '#b4bdc3',
|
||||
yellow = '#b77e64',
|
||||
}
|
||||
feline.add_theme('dark', dark_theme)
|
||||
|
||||
local light_theme = {
|
||||
bg = '#dde4e3',
|
||||
bg2 = '#b3cbc8',
|
||||
black = '#c4b6af',
|
||||
skyblue = '#1d5573',
|
||||
cyan = '#2b747c',
|
||||
fg = '#2c3131',
|
||||
green = '#3f5a22',
|
||||
oceanblue = '#286486',
|
||||
magenta = '#7b3b70',
|
||||
orange = '#803d1c',
|
||||
red = '#94253e',
|
||||
violet = '#88507d',
|
||||
white = '#4f5e68',
|
||||
yellow = '#944927',
|
||||
}
|
||||
feline.add_theme('light', light_theme)
|
||||
|
||||
local statusline = require('arrow.statusline')
|
||||
local vimode = require('feline.providers.vi_mode')
|
||||
local c = {
|
||||
vi_mode = {
|
||||
provider = 'vi_mode',
|
||||
hl = function()
|
||||
return {
|
||||
name = vimode.get_mode_highlight_name(),
|
||||
fg = vimode.get_mode_color(),
|
||||
bg = 'bg2',
|
||||
style = 'bold',
|
||||
}
|
||||
end,
|
||||
left_sep = {
|
||||
str = ' █',
|
||||
always_visible = true,
|
||||
hl = {
|
||||
fg = 'bg2',
|
||||
},
|
||||
},
|
||||
right_sep = {
|
||||
str = '',
|
||||
always_visible = true,
|
||||
hl = {
|
||||
fg = 'bg2',
|
||||
},
|
||||
}
|
||||
},
|
||||
file_info = {
|
||||
provider = 'file_info',
|
||||
hl = {
|
||||
fg = 'fg',
|
||||
},
|
||||
left_sep = {
|
||||
str = ' ',
|
||||
},
|
||||
right_sep = {
|
||||
str = ' ',
|
||||
},
|
||||
},
|
||||
arrow = {
|
||||
provider = function() return statusline.text_for_statusline_with_icons() end,
|
||||
hl = {
|
||||
fg = 'red',
|
||||
style = 'bold',
|
||||
},
|
||||
},
|
||||
file_size = {
|
||||
provider = 'file_size',
|
||||
hl = {
|
||||
fg = 'fg',
|
||||
bg = 'bg2',
|
||||
style = 'bold',
|
||||
},
|
||||
left_sep = {
|
||||
str = ' █',
|
||||
always_visible = true,
|
||||
hl = {
|
||||
fg = 'bg2',
|
||||
},
|
||||
},
|
||||
},
|
||||
line_percentage = {
|
||||
provider = 'line_percentage',
|
||||
hl = {
|
||||
fg = 'fg',
|
||||
bg = 'bg2',
|
||||
style = 'bold',
|
||||
},
|
||||
left_sep = {
|
||||
str = ' │ ',
|
||||
hl = {
|
||||
fg = 'fg',
|
||||
bg = 'bg2',
|
||||
},
|
||||
},
|
||||
right_sep = {
|
||||
str = ' │ ',
|
||||
hl = {
|
||||
fg = 'fg',
|
||||
bg = 'bg2',
|
||||
},
|
||||
},
|
||||
},
|
||||
position = {
|
||||
provider = 'position',
|
||||
hl = {
|
||||
fg = 'fg',
|
||||
bg = 'bg2',
|
||||
style = 'bold',
|
||||
},
|
||||
right_sep = {
|
||||
str = '█ ',
|
||||
always_visible = true,
|
||||
hl = {
|
||||
fg = 'bg2',
|
||||
},
|
||||
}
|
||||
},
|
||||
|
||||
diagnostic_errors = {
|
||||
provider = 'diagnostic_errors',
|
||||
hl = {
|
||||
fg = 'red',
|
||||
},
|
||||
},
|
||||
diagnostic_warnings = {
|
||||
provider = 'diagnostic_warnings',
|
||||
hl = {
|
||||
fg = 'yellow',
|
||||
},
|
||||
},
|
||||
diagnostic_hints = {
|
||||
provider = 'diagnostic_hints',
|
||||
hl = {
|
||||
fg = 'cyan',
|
||||
},
|
||||
},
|
||||
diagnostic_info = {
|
||||
provider = 'diagnostic_info',
|
||||
hl = {
|
||||
fg = 'skyblue',
|
||||
},
|
||||
},
|
||||
|
||||
git_diff_added = {
|
||||
provider = 'git_diff_added',
|
||||
hl = {
|
||||
fg = 'green',
|
||||
},
|
||||
},
|
||||
git_diff_removed = {
|
||||
provider = 'git_diff_removed',
|
||||
hl = {
|
||||
fg = 'red',
|
||||
},
|
||||
},
|
||||
git_diff_changed = {
|
||||
provider = 'git_diff_changed',
|
||||
hl = {
|
||||
fg = 'yellow',
|
||||
},
|
||||
},
|
||||
git_branch = {
|
||||
provider = 'git_branch',
|
||||
hl = {
|
||||
fg = 'fg',
|
||||
bg = 'bg2',
|
||||
style = 'bold',
|
||||
},
|
||||
left_sep = {
|
||||
str = ' █',
|
||||
hl = {
|
||||
fg = 'bg2',
|
||||
},
|
||||
},
|
||||
right_sep = {
|
||||
str = ' ',
|
||||
hl = {
|
||||
fg = 'bg2',
|
||||
},
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
local active = {
|
||||
{
|
||||
c.vi_mode,
|
||||
c.file_info,
|
||||
c.arrow,
|
||||
c.file_size,
|
||||
c.line_percentage,
|
||||
c.position,
|
||||
c.diagnostic_errors,
|
||||
c.diagnostic_warnings,
|
||||
c.diagnostic_info,
|
||||
c.diagnostic_hints,
|
||||
},
|
||||
{
|
||||
c.git_diff_added,
|
||||
c.git_diff_removed,
|
||||
c.git_diff_changed,
|
||||
c.git_branch,
|
||||
},
|
||||
}
|
||||
|
||||
local inactive = {
|
||||
{
|
||||
c.file_info,
|
||||
},
|
||||
{},
|
||||
}
|
||||
|
||||
opts.components = { active = active, inactive = inactive }
|
||||
feline.setup(opts)
|
||||
feline.use_theme(require('lupan.utils').terminalbg())
|
||||
end
|
||||
|
||||
return {
|
||||
-- Statusline
|
||||
'freddiehaddad/feline.nvim',
|
||||
opts = {},
|
||||
config = feline_config,
|
||||
}
|
||||
@@ -1,30 +0,0 @@
|
||||
vim.pack.add({ "https://github.com/folke/flash.nvim" })
|
||||
|
||||
local ok, flash = pcall(require, "flash")
|
||||
|
||||
if ok then
|
||||
flash.setup({
|
||||
modes = {
|
||||
char = {
|
||||
enabled = false,
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
local set = vim.keymap.set
|
||||
|
||||
set({ "n", "x", "o" }, "\\", function()
|
||||
require("flash").jump()
|
||||
end, { desc = "Flash" })
|
||||
set({ "n", "x", "o" }, "=", function()
|
||||
require("flash").treesitter()
|
||||
end, { desc = "Flash Treesitter" })
|
||||
set({ "o" }, "r", function()
|
||||
require("flash").remote()
|
||||
end, { desc = "Remote Flash" })
|
||||
set({ "n", "x", "o" }, " t", function()
|
||||
require("flash").treesitter_search()
|
||||
end, { desc = "Treesitter Search" })
|
||||
else
|
||||
print("plugin flash missing")
|
||||
end
|
||||
@@ -1,232 +0,0 @@
|
||||
vim.pack.add({
|
||||
"https://github.com/ibhagwan/fzf-lua",
|
||||
"https://github.com/elanmed/fzf-lua-frecency.nvim",
|
||||
})
|
||||
|
||||
local ok, fzf = pcall(require, "fzf-lua")
|
||||
local ok2, frecency = pcall(require, "fzf-lua-frecency")
|
||||
if ok then
|
||||
fzf.setup({
|
||||
keymap = {
|
||||
builtin = {
|
||||
true,
|
||||
["<M-m>"] = "toggle-fullscreen",
|
||||
},
|
||||
fzf = {
|
||||
true,
|
||||
-- Use <c-q> to select all items and add them to the quickfix list
|
||||
["ctrl-q"] = "select-all+accept",
|
||||
},
|
||||
}
|
||||
})
|
||||
fzf.register_ui_select()
|
||||
local odin_pkg = "~/cloned/Odin"
|
||||
local function go_root()
|
||||
return vim.fn.trim(vim.fn.system("go env GOROOT"))
|
||||
end
|
||||
local go_root_pkg = nil
|
||||
local function go_mod()
|
||||
return vim.fs.joinpath(vim.fn.trim(vim.fn.system("go env GOPATH")), "pkg/mod")
|
||||
end
|
||||
local go_mod_pkg = nil
|
||||
local function go_grep(cwd)
|
||||
local input = vim.fn.input("Go grep declarations> ")
|
||||
if #input == 0 then
|
||||
return
|
||||
end
|
||||
local search1 = "^(func|type) .*(?<= )(?=[A-Z])[a-zA-Z0-9_]*" .. input .. "[a-zA-Z0-9_]*( |\\()"
|
||||
local search2 = "^[\\t]+(?=[A-Z])[a-zA-Z0-9_]*" .. input .. "[a-zA-Z0-9_]* +="
|
||||
local search = "(" .. search1 .. "|" .. search2 .. ")"
|
||||
fzf.grep({
|
||||
cwd = cwd,
|
||||
cmd = "rg -P -g '*.go'",
|
||||
search = search,
|
||||
no_esc = true,
|
||||
profile = 'ivy',
|
||||
})
|
||||
end
|
||||
local function odin_grep(cwd)
|
||||
local input = vim.fn.input("Odin grep declarations> ")
|
||||
if #input == 0 then
|
||||
return
|
||||
end
|
||||
local search = "^[ \\t]*[a-zA-Z0-9_]*" .. input .. "[a-zA-Z0-9_]* +::"
|
||||
fzf.grep({
|
||||
cwd = cwd,
|
||||
cmd = "rg -g '*.odin'",
|
||||
search = search,
|
||||
no_esc = true,
|
||||
profile = 'ivy',
|
||||
})
|
||||
end
|
||||
local set = vim.keymap.set
|
||||
set("n", "<leader>ba", fzf.buffers, { desc = "FzfLua buffers" })
|
||||
set("n", "<leader>bh", fzf.history, { desc = "FzfLua history" })
|
||||
set("n", "<leader>bj", fzf.jumps, { desc = "FzfLua jumps" })
|
||||
set("n", "<leader>ca", fzf.lsp_code_actions, { desc = "FzfLua LSP code actions" })
|
||||
set("n", "<leader>cb", fzf.complete_bline, { desc = "FzfLua complete buffer line" })
|
||||
set("n", "<leader>cc", fzf.commands, { desc = "FzfLua commands" })
|
||||
set("n", "<leader>cf", fzf.complete_file, { desc = "FzfLua complete file" })
|
||||
set("n", "<leader>cF", fzf.complete_path, { desc = "FzfLua complete path" })
|
||||
set("n", "<leader>ch", fzf.command_history, { desc = "FzfLua command history" })
|
||||
set("n", "<leader>cH", fzf.highlights, { desc = "FzfLua color highlights" })
|
||||
set("n", "<leader>cl", fzf.complete_line, { desc = "FzfLua complete line" })
|
||||
set("n", "<leader>co", fzf.nvim_options, { desc = "FzfLua nvim options" })
|
||||
set("n", "<leader>cr", fzf.profiles, { desc = "FzfLua fzf profiles" })
|
||||
set("n", "<leader>cs", fzf.colorschemes, { desc = "FzfLua color schemes" })
|
||||
set("n", "<leader>ct", fzf.tabs, { desc = "FzfLua tabs" })
|
||||
set("n", "<leader>da", fzf.diagnostics_document, { desc = "FzfLua document diagnostics" })
|
||||
set("n", "<leader>dw", fzf.diagnostics_workspace, { desc = "FzfLua workspace diagnostics" })
|
||||
set("n", "<leader>ec", function()
|
||||
fzf.files({ cwd = vim.fn.stdpath("config") })
|
||||
end, { desc = "FzfLua nvim config files" })
|
||||
set("n", "<leader>ep", function()
|
||||
fzf.files({ cwd = vim.fs.joinpath(vim.fn.stdpath("data"), "site") })
|
||||
end, { desc = "FzfLua find files" })
|
||||
set("n", "<leader>es", function()
|
||||
fzf.files({ cwd = '~/.config/kitty/sessions' })
|
||||
end, { desc = "FzfLua kitty sessions" })
|
||||
set("n", "<leader>eS", "<cmd>Oil ~/.config/kitty/sessions<cr>", { desc = "Kitty sessions (dir)" })
|
||||
set("n", "<leader>fa", fzf.git_files, { desc = "FzfLua git files" })
|
||||
set("n", "<leader>ff", fzf.files, { desc = "FzfLua find files" })
|
||||
set("n", "<leader>fg", fzf.global, { desc = "FzfLua global" })
|
||||
set("n", "<leader>fo", frecency.frecency, { desc = "FzfLua frecency oldfiles" })
|
||||
set("n", "<leader>ft", fzf.filetypes, { desc = "FzfLua file types" })
|
||||
set("n", "<leader>;", function()
|
||||
frecency.frecency({ cwd_only = true })
|
||||
end, { desc = "FzfLua frecency files" })
|
||||
set("n", "<leader>gb", fzf.git_branches, { desc = "FzfLua git branches" })
|
||||
set("n", "<leader>gB", fzf.git_blame, { desc = "FzfLua git blame" })
|
||||
set("n", "<leader>gc", fzf.git_bcommits, { desc = "FzfLua git buffer commits" })
|
||||
set("n", "<leader>gC", fzf.git_commits, { desc = "FzfLua git commits" })
|
||||
set("n", "<leader>gd", fzf.git_diff, { desc = "FzfLua git diff" })
|
||||
set("n", "<leader>gh", fzf.git_hunks, { desc = "FzfLua git hunks" })
|
||||
set("n", "<leader>gC", fzf.git_commits, { desc = "FzfLua git commits" })
|
||||
set("n", "<leader>gs", fzf.git_status, { desc = "FzfLua git status" })
|
||||
set("n", "<leader>gS", fzf.git_stash, { desc = "FzfLua git stash" })
|
||||
set("n", "<leader>gt", fzf.git_tags, { desc = "FzfLua git tags" })
|
||||
set("n", "<leader>gw", fzf.git_worktrees, { desc = "FzfLua git worktrees" })
|
||||
set("n", "<leader>ha", fzf.helptags, { desc = "FzfLua help tags" })
|
||||
set("n", "<leader>hk", fzf.keymaps, { desc = "FzfLua keymaps" })
|
||||
set("n", "<leader>ma", fzf.marks, { desc = "FzfLua marks" })
|
||||
set("n", "<leader>mp", fzf.manpages, { desc = "FzfLua man pages" })
|
||||
set("n", "<leader>qa", fzf.quickfix, { desc = "FzfLua quickfix" })
|
||||
set("n", "<leader>qs", fzf.quickfix_stack, { desc = "FzfLua quickfix stack" })
|
||||
set("n", "<leader>ql", fzf.loclist, { desc = "FzfLua loclist" })
|
||||
set("n", "<leader>qh", fzf.loclist_stack, { desc = "FzfLua loclist stack" })
|
||||
set("n", "<leader>ra", fzf.resume, { desc = "FzfLua resume" })
|
||||
set("n", "<leader>rr", fzf.registers, { desc = "FzfLua registers" })
|
||||
set("n", "<leader>ta", fzf.treesitter, { desc = "FzfLua treesitter symbols" })
|
||||
set("n", "<leader>sa", fzf.live_grep, { desc = "FzfLua live grep" })
|
||||
set("n", "<leader>sb", fzf.blines, { desc = "FzfLua buffer lines" })
|
||||
set("n", "<leader>sB", fzf.grep_curbuf, { desc = "FzfLua grep current buffer" })
|
||||
set("n", "<leader>sg", fzf.grep, { desc = "FzfLua grep" })
|
||||
set("n", "<leader>sh", fzf.search_history, { desc = "FzfLua search history" })
|
||||
set("n", "<leader>sl", fzf.grep_loclist, { desc = "FzfLua grep loclist" })
|
||||
set("n", "<leader>sn", fzf.live_grep_native, { desc = "FzfLua live grep native" })
|
||||
set("n", "<leader>so", fzf.lines, { desc = "FzfLua open buffers lines" })
|
||||
set("n", "<leader>sp", fzf.grep_project, { desc = "FzfLua grep project" })
|
||||
set("n", "<leader>sq", fzf.grep_quickfix, { desc = "FzfLua grep quickfix" })
|
||||
set("n", "<leader>sr", function() fzf.grep({ resume = true }) end, { desc = "FzfLua grep resume" })
|
||||
set("n", "<leader>sc", fzf.spellcheck, { desc = "FzfLua spell check" })
|
||||
set("n", "<leader>ss", fzf.spell_suggest, { desc = "FzfLua spell suggest" })
|
||||
set({ "n", "v" }, "<leader>sv", fzf.grep_visual, { desc = "FzfLua grep visual" })
|
||||
set("n", "<leader>sw", fzf.grep_cword, { desc = "FzfLua grep cword" })
|
||||
set("n", "<leader>sW", fzf.grep_cWORD, { desc = "FzfLua grep cword" })
|
||||
set("n", "<leader>U", fzf.undotree, { desc = "FzfLua undo tree" })
|
||||
set("n", "<leader>wa", fzf.lsp_live_workspace_symbols, { desc = "FzfLua document symbols" })
|
||||
set("n", "<leader>wd", fzf.lsp_document_symbols, { desc = "FzfLua document symbols" })
|
||||
set("n", "<leader>wf", fzf.lsp_finder, { desc = "FzfLua LSP finder" })
|
||||
set("n", "<leader>wp", fzf.lsp_workspace_symbols, { desc = "FzfLua workspace symbols" })
|
||||
set("n", "<leader>wz", fzf.zoxide, { desc = "FzfLua zoxide" })
|
||||
set("n", "gd", fzf.lsp_definitions, { desc = "Goto Definition" })
|
||||
set("n", "gD", fzf.lsp_declarations, { desc = "Goto Declarations" })
|
||||
set("n", "grr", fzf.lsp_references, { desc = "References" })
|
||||
set("n", "gri", fzf.lsp_implementations, { desc = "Goto Implementation" })
|
||||
set("n", "grI", fzf.lsp_incoming_calls, { desc = "Incomming calls" })
|
||||
set("n", "grO", fzf.lsp_outgoing_calls, { desc = "Outgouing calls" })
|
||||
set("n", "grs", fzf.lsp_type_sub, { desc = "Outgouing calls" })
|
||||
set("n", "grp", fzf.lsp_type_super, { desc = "Outgouing calls" })
|
||||
set("n", "grt", fzf.lsp_typedefs, { desc = "Goto Type Definition" })
|
||||
|
||||
set("n", "<leader>Gf", function()
|
||||
fzf.files({ cwd = go_root(), cmd = "fd --type f -e go" })
|
||||
end, { desc = "FzfLua Go files" })
|
||||
set("n", "<leader>GF", function()
|
||||
fzf.files({ cwd = go_mod(), cmd = "fd --type f -e go" })
|
||||
end, { desc = "FzfLua Go mod files" })
|
||||
set("n", "<leader>Gl", function()
|
||||
fzf.files({ cmd = "fd --type f -e go" })
|
||||
end, { desc = "FzfLua Go current dir files" })
|
||||
set("n", "<leader>Gs", function()
|
||||
go_grep(go_root())
|
||||
end, { desc = "FzfLua Go grep declarations" })
|
||||
set("n", "<leader>GS", function()
|
||||
go_grep(go_mod())
|
||||
end, { desc = "FzfLua Go grep mod declarations" })
|
||||
set("n", "<leader>Gd", function()
|
||||
go_grep(nil)
|
||||
end, { desc = "FzfLua Go current dir grep declarations" })
|
||||
set("n", "<leader>Gm", function()
|
||||
go_grep(go_mod_pkg or go_mod())
|
||||
end, { desc = "FzfLua Go grep mod declarations" })
|
||||
set("n", "<leader>GM", function()
|
||||
fzf.zoxide({
|
||||
cmd = "fd '' --type d " .. vim.fn.shellescape(go_mod()) .. [[ | awk '{print "\t"$1}']],
|
||||
actions = {
|
||||
["enter"] = function(a)
|
||||
go_mod_pkg = vim.fn.trim(a[1])
|
||||
go_grep(go_mod_pkg)
|
||||
end
|
||||
}
|
||||
})
|
||||
end, { desc = "FzfLua Go select package and grep package declarations" })
|
||||
set("n", "<leader>Gp", function()
|
||||
go_grep(go_root_pkg or go_root())
|
||||
end, { desc = "FzfLua Go grep package declarations" })
|
||||
set("n", "<leader>GP", function()
|
||||
fzf.zoxide({
|
||||
cmd = "fd '' --type d " .. vim.fn.shellescape(go_root()) .. [[ | awk '{print "\t"$1}']],
|
||||
actions = {
|
||||
["enter"] = function(a)
|
||||
go_root_pkg = vim.fn.trim(a[1])
|
||||
go_grep(go_root_pkg)
|
||||
end
|
||||
}
|
||||
})
|
||||
end, { desc = "FzfLua Go select package and grep package declarations" })
|
||||
|
||||
set("n", "<leader>of", function()
|
||||
fzf.files({ cwd = "~/cloned/Odin", cmd = "fd --type f -e odin" })
|
||||
end, { desc = "FzfLua Odin files" })
|
||||
set("n", "<leader>ol", function()
|
||||
fzf.files({ cmd = "fd --type f -e odin" })
|
||||
end, { desc = "FzfLua Odin current dir files" })
|
||||
set("n", "<leader>os", function()
|
||||
odin_grep("~/cloned/Odin")
|
||||
end, { desc = "FzfLua Odin grep declarations" })
|
||||
set("n", "<leader>od", function()
|
||||
odin_grep(nil)
|
||||
end, { desc = "FzfLua Odin grep declarations" })
|
||||
set("n", "<leader>op", function()
|
||||
odin_grep(odin_pkg)
|
||||
end, { desc = "FzfLua Odin grep package declarations" })
|
||||
set("n", "<leader>oP", function()
|
||||
fzf.zoxide({
|
||||
cmd = [[fd '' --type d ~/cloned/Odin | awk '{print "\t"$1}']],
|
||||
actions = {
|
||||
["enter"] = function(a)
|
||||
odin_pkg = vim.fn.trim(a[1])
|
||||
odin_grep(odin_pkg)
|
||||
end
|
||||
}
|
||||
})
|
||||
end, { desc = "FzfLua Odin select package and grep package declarations" })
|
||||
else
|
||||
print("plugin fzf-lua missing")
|
||||
end
|
||||
if not ok2 then
|
||||
print("plugin fzf-lua-frecency missing")
|
||||
end
|
||||
|
||||
--vim.keymap.set("n", "<leader>-", "<cmd>Oil<cr>", { desc = "Oil file manager" })
|
||||
74
nvim/.config/nvim/lua/plugins/git.lua
Normal file
74
nvim/.config/nvim/lua/plugins/git.lua
Normal file
@@ -0,0 +1,74 @@
|
||||
return {
|
||||
-- Git
|
||||
{
|
||||
'NeogitOrg/neogit',
|
||||
dependencies = {
|
||||
'nvim-lua/plenary.nvim',
|
||||
'sindrets/diffview.nvim',
|
||||
'nvim-telescope/telescope.nvim',
|
||||
},
|
||||
opts = {
|
||||
graph_style = 'unicode',
|
||||
use_per_project_settings = false,
|
||||
},
|
||||
keys = {
|
||||
{
|
||||
'<leader>go',
|
||||
function() require('neogit').open() end,
|
||||
desc = 'Neo[g]it [O]pen'
|
||||
},
|
||||
{
|
||||
'<leader>g.',
|
||||
function() require('neogit').open({ cwd = '%:p:h' }) end,
|
||||
desc = 'Neo[g]it open in current file repository'
|
||||
},
|
||||
{
|
||||
'<leader>gh',
|
||||
function() require('diffview').file_history() end,
|
||||
desc = '[G]it [H]istory',
|
||||
},
|
||||
{
|
||||
'<leader>g%',
|
||||
function() require('diffview').file_history(nil, { '%' }) end,
|
||||
desc = '[G]it history for [%] current file'
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
'FabijanZulj/blame.nvim',
|
||||
config = true,
|
||||
cmd = 'BlameToggle',
|
||||
keys = {
|
||||
{ '<leader>gb', '<cmd>BlameToggle<cr>', desc = '[G]it [B]lame toggle' },
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
-- Adds git releated signs to the gutter, as well as utilities for managing changes
|
||||
'lewis6991/gitsigns.nvim',
|
||||
opts = {
|
||||
-- See `:help gitsigns.txt`
|
||||
signs = {
|
||||
add = { text = '+' },
|
||||
change = { text = '~' },
|
||||
delete = { text = '_' },
|
||||
topdelete = { text = '‾' },
|
||||
changedelete = { text = '~' },
|
||||
},
|
||||
on_attach = function(bufnr)
|
||||
local gs = require('gitsigns')
|
||||
vim.keymap.set('n', '<leader>gp', gs.prev_hunk,
|
||||
{ buffer = bufnr, desc = '[G]o to [P]revious Hunk' })
|
||||
vim.keymap.set('n', '<leader>gn', gs.next_hunk,
|
||||
{ buffer = bufnr, desc = '[G]o to [N]ext Hunk' })
|
||||
vim.keymap.set('n', '<leader>ph', gs.preview_hunk,
|
||||
{ buffer = bufnr, desc = '[P]review [H]unk' })
|
||||
vim.keymap.set('n', '<leader>sh', gs.stage_hunk,
|
||||
{ buffer = bufnr, desc = '[S]tage [H]unk' })
|
||||
vim.keymap.set('n', '<leader>HD', function() gs.diffthis('~') end,
|
||||
{ buffer = bufnr, desc = '[H]unk [D]iff' })
|
||||
end,
|
||||
},
|
||||
},
|
||||
}
|
||||
12
nvim/.config/nvim/lua/plugins/global-note.lua
Normal file
12
nvim/.config/nvim/lua/plugins/global-note.lua
Normal file
@@ -0,0 +1,12 @@
|
||||
return {
|
||||
'backdround/global-note.nvim',
|
||||
keys = {
|
||||
{
|
||||
"<leader>n",
|
||||
function()
|
||||
require('global-note').toggle_note()
|
||||
end,
|
||||
desc = 'Toggle global [N]ote',
|
||||
},
|
||||
},
|
||||
}
|
||||
13
nvim/.config/nvim/lua/plugins/go.lua
Normal file
13
nvim/.config/nvim/lua/plugins/go.lua
Normal file
@@ -0,0 +1,13 @@
|
||||
return {
|
||||
"ray-x/go.nvim",
|
||||
dependencies = {
|
||||
"ray-x/guihua.lua",
|
||||
"neovim/nvim-lspconfig",
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
},
|
||||
config = function(_, opts)
|
||||
require("go").setup(opts)
|
||||
end,
|
||||
event = { "CmdlineEnter" },
|
||||
ft = { "go", 'gomod' },
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
vim.pack.add({ "https://github.com/NMAC427/guess-indent.nvim" })
|
||||
|
||||
local ok, guess_indent = pcall(require, "guess-indent")
|
||||
if ok then
|
||||
guess_indent.setup()
|
||||
else
|
||||
print("plugin guess-indent missing")
|
||||
end
|
||||
51
nvim/.config/nvim/lua/plugins/init.lua
Normal file
51
nvim/.config/nvim/lua/plugins/init.lua
Normal file
@@ -0,0 +1,51 @@
|
||||
return {
|
||||
{
|
||||
'crusj/hierarchy-tree-go.nvim',
|
||||
dependencies = 'neovim/nvim-lspconfig',
|
||||
lazy = true,
|
||||
},
|
||||
|
||||
{
|
||||
'ggandor/leap.nvim',
|
||||
opts = {
|
||||
safe_labels = {},
|
||||
},
|
||||
dependencies = {
|
||||
"tpope/vim-repeat",
|
||||
},
|
||||
keys = {
|
||||
{ 'gs', '<Plug>(leap)', mode = { 'n', 'x', 'o' } },
|
||||
{ 'gS', '<Plug>(leap-from-window)', mode = { 'n', 'x', 'o' } },
|
||||
}
|
||||
},
|
||||
|
||||
{
|
||||
"folke/trouble.nvim",
|
||||
dependencies = { "nvim-tree/nvim-web-devicons" },
|
||||
},
|
||||
|
||||
{
|
||||
'stevearc/oil.nvim',
|
||||
dependencies = { "nvim-tree/nvim-web-devicons" },
|
||||
opts = {
|
||||
default_file_explorer = true,
|
||||
delete_to_trash = true,
|
||||
},
|
||||
keys = {
|
||||
{ "-", "<cmd>Oil<CR>", desc = "Open parent directory" },
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
'Wansmer/treesj',
|
||||
dependencies = { 'nvim-treesitter/nvim-treesitter' },
|
||||
opts = {
|
||||
use_default_keymaps = false,
|
||||
},
|
||||
keys = {
|
||||
{ '<leader>tg', function() require('treesj').toggle() end, desc = "[T]ree to[g]gle one-line" },
|
||||
{ '<leader>tj', function() require('treesj').join() end, desc = "[T]ree [J]oin one-line" },
|
||||
{ '<leader>ts', function() require('treesj').split() end, desc = "[T]ree [S]plit one-line" },
|
||||
},
|
||||
},
|
||||
}
|
||||
157
nvim/.config/nvim/lua/plugins/lsp.lua
Normal file
157
nvim/.config/nvim/lua/plugins/lsp.lua
Normal file
@@ -0,0 +1,157 @@
|
||||
return {
|
||||
{
|
||||
'neovim/nvim-lspconfig',
|
||||
dependencies = {
|
||||
-- Automatically install LSPs and related tools to stdpath for neovim
|
||||
'williamboman/mason.nvim',
|
||||
'williamboman/mason-lspconfig.nvim',
|
||||
'WhoIsSethDaniel/mason-tool-installer.nvim',
|
||||
'folke/neodev.nvim',
|
||||
|
||||
-- Useful status updates for LSP.
|
||||
{ 'j-hui/fidget.nvim', opts = {} },
|
||||
},
|
||||
config = function()
|
||||
vim.api.nvim_create_autocmd('LspAttach', {
|
||||
group = vim.api.nvim_create_augroup('my-lsp-attach', { clear = true }),
|
||||
callback = function(event)
|
||||
local map = function(keys, func, desc)
|
||||
vim.keymap.set('n', keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc })
|
||||
end
|
||||
|
||||
map('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition')
|
||||
map('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
|
||||
map('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
|
||||
map('<leader>D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition')
|
||||
map('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
|
||||
map('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
|
||||
map('<leader>rn', '<cmd>Lspsaga rename<CR>', '[R]e[n]ame')
|
||||
map('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
|
||||
map('K', '<cmd>Lspsaga hover_doc<CR>', 'Hover Documentation')
|
||||
map('<leader>K', vim.lsp.buf.signature_help, 'Signature Documentation')
|
||||
map('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
|
||||
|
||||
-- Highlight references under cursor (clear highlight when cursor moves).
|
||||
local client = vim.lsp.get_client_by_id(event.data.client_id)
|
||||
if client and client.server_capabilities.documentHighlightProvider then
|
||||
vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, {
|
||||
buffer = event.buf,
|
||||
callback = function()
|
||||
local clients = vim.lsp.get_clients({ bufnr = event.buf })
|
||||
for _, cl in ipairs(clients) do
|
||||
if cl.name == 'unocss' then
|
||||
return -- skip highlight if unocss is attached (workaround)
|
||||
end
|
||||
end
|
||||
vim.lsp.buf.document_highlight()
|
||||
end
|
||||
})
|
||||
|
||||
vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, {
|
||||
buffer = event.buf,
|
||||
callback = vim.lsp.buf.clear_references,
|
||||
})
|
||||
end
|
||||
end,
|
||||
})
|
||||
|
||||
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
||||
capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_capabilities())
|
||||
|
||||
local servers = {
|
||||
clangd = {},
|
||||
gopls = {},
|
||||
-- pyright = {},
|
||||
rust_analyzer = {},
|
||||
ts_ls = {},
|
||||
|
||||
lua_ls = {
|
||||
settings = {
|
||||
Lua = {
|
||||
runtime = { version = 'LuaJIT' },
|
||||
workspace = { checkThirdParty = false },
|
||||
telemetry = { enable = false },
|
||||
completion = {
|
||||
callSnippet = 'Replace',
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
html = {},
|
||||
htmx = {},
|
||||
unocss = {},
|
||||
}
|
||||
|
||||
require 'lspconfig'.html.setup {
|
||||
filetypes = { "html", "templ" },
|
||||
}
|
||||
|
||||
require 'lspconfig'.htmx.setup {
|
||||
filetypes = { "html", "templ" },
|
||||
}
|
||||
|
||||
require 'lspconfig'.unocss.setup {
|
||||
filetypes = { "html", "templ" },
|
||||
}
|
||||
|
||||
-- Setup neovim lua configuration
|
||||
require('neodev').setup()
|
||||
|
||||
require('mason').setup()
|
||||
|
||||
local ensure_installed = vim.tbl_keys(servers or {})
|
||||
vim.list_extend(ensure_installed, {
|
||||
'stylua', -- Used to format lua code
|
||||
})
|
||||
require('mason-tool-installer').setup { ensure_installed = ensure_installed }
|
||||
|
||||
require('mason-lspconfig').setup {
|
||||
handlers = {
|
||||
function(server_name)
|
||||
local server = servers[server_name] or {}
|
||||
-- This handles overriding only values explicitly passed
|
||||
-- by the server configuration above. Useful when disabling
|
||||
-- certain features of an LSP (for example, turning off formatting for tsserver)
|
||||
server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
|
||||
require('lspconfig')[server_name].setup(server)
|
||||
end,
|
||||
},
|
||||
}
|
||||
end,
|
||||
},
|
||||
{
|
||||
'nvimdev/lspsaga.nvim',
|
||||
dependencies = {
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
'nvim-tree/nvim-web-devicons',
|
||||
},
|
||||
opts = {
|
||||
lightbulb = { enable = false }
|
||||
},
|
||||
config = function(_, opts)
|
||||
require('lspsaga').setup(opts)
|
||||
vim.keymap.set('n', '<leader>la', '<cmd>Lspsaga code_action<CR>', { desc = "[L]spsaga code [A]ction" })
|
||||
vim.keymap.set('n', '<leader>lb', '<cmd>Lspsaga show_buf_diagnostics<CR>',
|
||||
{ desc = "[L]spsaga [B]uffer diagnostics" })
|
||||
vim.keymap.set('n', '<leader>lc', '<cmd>Lspsaga show_cursor_diagnostics<CR>',
|
||||
{ desc = "[L]spsaga [C]ursor diagnostics" })
|
||||
vim.keymap.set('n', '<leader>ld', '<cmd>Lspsaga goto_definition<CR>', { desc = "[L]spsaga goto [D]efinition" })
|
||||
vim.keymap.set('n', '<leader>lD', '<cmd>Lspsaga goto_type_definition<CR>',
|
||||
{ desc = "[L]spsaga goto type [D]efinition" })
|
||||
vim.keymap.set('n', '<leader>lf', '<cmd>Lspsaga finder<CR>', { desc = "[L]spsaga [F]inder" })
|
||||
vim.keymap.set('n', '<leader>lI', '<cmd>Lspsaga finder imp<CR>', { desc = "[L]spsaga finder [I]mplementations" })
|
||||
vim.keymap.set('n', '<leader>li', '<cmd>Lspsaga incoming_calls<CR>', { desc = "[L]spsaga [I]ncomping calls" })
|
||||
vim.keymap.set('n', '<leader>ll', '<cmd>Lspsaga show_line_diagnostics<CR>',
|
||||
{ desc = "[L]spsaga [L]ine diagnostics" })
|
||||
vim.keymap.set('n', '<leader>lo', '<cmd>Lspsaga outgoing_calls<CR>', { desc = "[L]spsaga [O]utgoing calls" })
|
||||
vim.keymap.set('n', '<leader>lO', '<cmd>Lspsaga outline<CR>', { desc = "[L]spsaga [O]utline" })
|
||||
vim.keymap.set('n', '<leader>lp', '<cmd>Lspsaga peek_definition<CR>', { desc = "[L]spsaga [P]eek definition" })
|
||||
vim.keymap.set('n', '<leader>lP', '<cmd>Lspsaga peek_type_definition<CR>',
|
||||
{ desc = "[L]spsaga [P]eek type definition" })
|
||||
vim.keymap.set('n', '<leader>lw', '<cmd>Lspsaga show_workspace_diagnostics<CR>',
|
||||
{ desc = "[L]spsaga [W]orkspace diagnostics" })
|
||||
vim.keymap.set({ 'n', 't' }, '<C-_>', '<cmd>Lspsaga term_toggle<CR>', { desc = "[L]spsaga [T]erm toggle" })
|
||||
end,
|
||||
},
|
||||
}
|
||||
@@ -1,48 +0,0 @@
|
||||
vim.api.nvim_create_autocmd("PackChanged", {
|
||||
group = vim.api.nvim_create_augroup("luasnip-update", { clear = true }),
|
||||
callback = function(ev)
|
||||
local name, kind = ev.data.spec.name, ev.data.kind
|
||||
if name == "luasnip" and (kind == "install" or kind == "update") then
|
||||
vim.system({ "make install_jsregexp" }, { cwd = ev.data.path }):wait()
|
||||
print("luasnip make done.")
|
||||
end
|
||||
end,
|
||||
})
|
||||
|
||||
vim.pack.add({ { src = "https://github.com/L3MON4D3/LuaSnip", version = vim.version.range("^2.0.0") } })
|
||||
local ok, ls = pcall(require, "luasnip")
|
||||
|
||||
if ok then
|
||||
vim.keymap.set({ "i" }, "<C-K>", function()
|
||||
ls.expand()
|
||||
end, { silent = true })
|
||||
vim.keymap.set({ "i", "s" }, "<C-L>", function(fallback)
|
||||
if ls.locally_jumpable() then
|
||||
ls.jump(1)
|
||||
else
|
||||
local key = vim.api.nvim_replace_termcodes("<C-L>", true, false, true)
|
||||
vim.api.nvim_feedkeys(key, "n", false)
|
||||
end
|
||||
end, { silent = true })
|
||||
vim.keymap.set({ "i", "s" }, "<C-J>", function()
|
||||
if ls.locally_jumpable() then
|
||||
ls.jump(-1)
|
||||
else
|
||||
local key = vim.api.nvim_replace_termcodes("<C-J>", true, false, true)
|
||||
vim.api.nvim_feedkeys(key, "n", false)
|
||||
end
|
||||
end, { silent = true })
|
||||
|
||||
vim.keymap.set({ "i", "s" }, "<C-E>", function()
|
||||
if ls.choice_active() then
|
||||
ls.change_choice(1)
|
||||
else
|
||||
local key = vim.api.nvim_replace_termcodes("<C-E>", true, false, true)
|
||||
vim.api.nvim_feedkeys(key, "n", false)
|
||||
end
|
||||
end, { silent = true })
|
||||
|
||||
require("luasnip.loaders.from_lua").load({ paths = vim.fs.joinpath(vim.fn.stdpath("config"), "lua", "snippets") })
|
||||
else
|
||||
print("plugin luasnip missing")
|
||||
end
|
||||
@@ -1,76 +0,0 @@
|
||||
vim.pack.add({ { src = "https://github.com/jake-stewart/multicursor.nvim", version = "1.0" } })
|
||||
|
||||
local ok, mc = pcall(require, "multicursor-nvim")
|
||||
if ok then
|
||||
mc.setup()
|
||||
|
||||
local set = vim.keymap.set
|
||||
|
||||
-- Add or skip cursor above/below the main cursor.
|
||||
set({ "n", "x" }, "<c-k>", function()
|
||||
mc.lineAddCursor(-1)
|
||||
end)
|
||||
set({ "n", "x" }, "<c-j>", function()
|
||||
mc.lineAddCursor(1)
|
||||
end)
|
||||
set({ "n", "x" }, "<leader><c-k>", function()
|
||||
mc.lineSkipCursor(-1)
|
||||
end)
|
||||
set({ "n", "x" }, "<leader><c-j>", function()
|
||||
mc.lineSkipCursor(1)
|
||||
end)
|
||||
|
||||
-- Add or skip adding a new cursor by matching word/selection
|
||||
set({ "n", "x" }, "<c-n>", function()
|
||||
mc.matchAddCursor(1)
|
||||
end)
|
||||
set({ "n", "x" }, "<leader><c-n>", function()
|
||||
mc.matchSkipCursor(1)
|
||||
end)
|
||||
set({ "n", "x" }, "<c-p>", function()
|
||||
mc.matchAddCursor(-1)
|
||||
end)
|
||||
set({ "n", "x" }, "<leader><c-p>", function()
|
||||
mc.matchSkipCursor(-1)
|
||||
end)
|
||||
|
||||
-- Add and remove cursors with control + left click.
|
||||
set("n", "<c-leftmouse>", mc.handleMouse)
|
||||
set("n", "<c-leftdrag>", mc.handleMouseDrag)
|
||||
set("n", "<c-leftrelease>", mc.handleMouseRelease)
|
||||
|
||||
-- Disable and enable cursors.
|
||||
set({ "n", "x" }, "<leader><c-q>", mc.toggleCursor)
|
||||
|
||||
-- Mappings defined in a keymap layer only apply when there are
|
||||
-- multiple cursors. This lets you have overlapping mappings.
|
||||
mc.addKeymapLayer(function(layerSet)
|
||||
-- Select a different cursor as the main one.
|
||||
layerSet({ "n", "x" }, "<left>", mc.prevCursor)
|
||||
layerSet({ "n", "x" }, "<right>", mc.nextCursor)
|
||||
|
||||
-- Delete the main cursor.
|
||||
layerSet({ "n", "x" }, "<leader>x", mc.deleteCursor)
|
||||
|
||||
-- Enable and clear cursors using escape.
|
||||
layerSet("n", "<esc>", function()
|
||||
if not mc.cursorsEnabled() then
|
||||
mc.enableCursors()
|
||||
else
|
||||
mc.clearCursors()
|
||||
end
|
||||
end)
|
||||
end)
|
||||
|
||||
-- Customize how cursors look.
|
||||
local hl = vim.api.nvim_set_hl
|
||||
hl(0, "MultiCursorCursor", { reverse = true })
|
||||
hl(0, "MultiCursorVisual", { link = "Visual" })
|
||||
hl(0, "MultiCursorSign", { link = "SignColumn" })
|
||||
hl(0, "MultiCursorMatchPreview", { link = "Search" })
|
||||
hl(0, "MultiCursorDisabledCursor", { reverse = true })
|
||||
hl(0, "MultiCursorDisabledVisual", { link = "Visual" })
|
||||
hl(0, "MultiCursorDisabledSign", { link = "SignColumn" })
|
||||
else
|
||||
print("plugin multicursor-nvim missing")
|
||||
end
|
||||
@@ -1,9 +0,0 @@
|
||||
vim.pack.add({ "https://github.com/chrisgrieser/nvim-various-textobjs" })
|
||||
|
||||
local ok, vto = pcall(require, "various-textobjs")
|
||||
if ok then
|
||||
vto.setup({ keymaps = { useDefaults = true, diabledDefaults = { 'r' } } })
|
||||
vim.keymap.set({ 'o', 'x' }, ' }', vto.restOfParagraph)
|
||||
else
|
||||
print("plugin nvim-various-textobjs missing")
|
||||
end
|
||||
@@ -1,10 +0,0 @@
|
||||
vim.pack.add({ "https://github.com/stevearc/oil.nvim" })
|
||||
|
||||
local ok, oil = pcall(require, "oil")
|
||||
if ok then
|
||||
oil.setup()
|
||||
else
|
||||
print("plugin oil missing")
|
||||
end
|
||||
|
||||
vim.keymap.set("n", "<leader>-", "<cmd>Oil<cr>", { desc = "Oil file manager" })
|
||||
17
nvim/.config/nvim/lua/plugins/persisted.lua
Normal file
17
nvim/.config/nvim/lua/plugins/persisted.lua
Normal file
@@ -0,0 +1,17 @@
|
||||
return {
|
||||
"olimorris/persisted.nvim",
|
||||
lazy = false, -- make sure the plugin is always loaded at startup
|
||||
opts = {
|
||||
autoload = true,
|
||||
ignored_dirs = {
|
||||
"~/.config",
|
||||
"~/tmp",
|
||||
"/tmp",
|
||||
{ "~", exact = true },
|
||||
{ "/", exact = true },
|
||||
},
|
||||
},
|
||||
keys = {
|
||||
{ "<leader>sp", "<cmd>:Telescope persisted<cr>", desc = "Search [P]ersisted" },
|
||||
},
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
vim.pack.add({ "https://github.com/sschleemilch/slimline.nvim" })
|
||||
|
||||
local ok, slimline = pcall(require, "slimline")
|
||||
if ok then
|
||||
slimline.setup()
|
||||
else
|
||||
print("plugin slimline missing")
|
||||
end
|
||||
@@ -1,98 +0,0 @@
|
||||
vim.pack.add({ "https://github.com/folke/snacks.nvim" })
|
||||
|
||||
local ok, snacks = pcall(require, "snacks")
|
||||
if ok then
|
||||
snacks.setup({
|
||||
picker = { enabled = false },
|
||||
})
|
||||
else
|
||||
print("plugin snacks missing")
|
||||
end
|
||||
|
||||
local set = vim.keymap.set
|
||||
|
||||
set("n", "<leader>ea", function()
|
||||
Snacks.explorer()
|
||||
end, { desc = "File Explorer" })
|
||||
|
||||
set("n", "<leader>gl", function()
|
||||
Snacks.picker.git_log_line()
|
||||
end, { desc = "Git Log Line" })
|
||||
|
||||
set({ "n", "v" }, "<leader>gx", function()
|
||||
Snacks.gitbrowse()
|
||||
end, { desc = "Git Browse" })
|
||||
|
||||
set("n", "<leader>xR", function()
|
||||
Snacks.picker.resume()
|
||||
end, { desc = "Resume" })
|
||||
|
||||
set("n", "<leader>n", function()
|
||||
Snacks.notifier.show_history()
|
||||
end, { desc = "Notification History" })
|
||||
|
||||
set("n", "<leader>N", function()
|
||||
Snacks.picker.notifications()
|
||||
end, { desc = "Notifications" })
|
||||
|
||||
set("n", "<leader>$", function()
|
||||
Snacks.rename.rename_file()
|
||||
end, { desc = "Rename File" })
|
||||
|
||||
set("n", "<leader>z", function()
|
||||
Snacks.zen.zoom()
|
||||
end, { desc = "Toggle Zoom" })
|
||||
|
||||
set("n", "<leader>.", function()
|
||||
Snacks.scratch()
|
||||
end, { desc = "Toggle Scratch Buffer" })
|
||||
|
||||
set("n", "<leader>x.", function()
|
||||
Snacks.scratch.select()
|
||||
end, { desc = "Select Scratch Buffer" })
|
||||
|
||||
-- Terminal
|
||||
|
||||
set({ "n", "t" }, "<c-/>", function()
|
||||
Snacks.terminal()
|
||||
end, { desc = "Toggle Terminal" })
|
||||
|
||||
set({ "n", "t" }, "<c-_>", function()
|
||||
Snacks.terminal()
|
||||
end, { desc = "which_key_ignore" })
|
||||
|
||||
vim.api.nvim_create_autocmd("VimEnter", {
|
||||
callback = function()
|
||||
-- Setup some globals for debugging (lazy-loaded)
|
||||
_G.dd = function(...)
|
||||
Snacks.debug.inspect(...)
|
||||
end
|
||||
_G.bt = function()
|
||||
Snacks.debug.backtrace()
|
||||
end
|
||||
|
||||
-- Override print to use snacks for `:=` command
|
||||
if vim.fn.has("nvim-0.11") == 1 then
|
||||
vim._print = function(_, ...)
|
||||
dd(...)
|
||||
end
|
||||
else
|
||||
vim.print = _G.dd
|
||||
end
|
||||
|
||||
-- Create some toggle mappings
|
||||
Snacks.toggle.option("spell", { name = "Spelling" }):map("<leader>us")
|
||||
Snacks.toggle.option("wrap", { name = "Wrap" }):map("<leader>uw")
|
||||
Snacks.toggle.option("relativenumber", { name = "Relative Number" }):map("<leader>uL")
|
||||
Snacks.toggle.diagnostics():map("<leader>ud")
|
||||
Snacks.toggle.line_number():map("<leader>ul")
|
||||
Snacks.toggle
|
||||
.option("conceallevel", { off = 0, on = vim.o.conceallevel > 0 and vim.o.conceallevel or 2 })
|
||||
:map("<leader>uc")
|
||||
Snacks.toggle.treesitter():map("<leader>uT")
|
||||
Snacks.toggle.option("background", { off = "light", on = "dark", name = "Dark Background" }):map("<leader>ub")
|
||||
Snacks.toggle.inlay_hints():map("<leader>uh")
|
||||
Snacks.toggle.indent():map("<leader>ug")
|
||||
Snacks.toggle.dim():map("<leader>uD")
|
||||
end,
|
||||
})
|
||||
17
nvim/.config/nvim/lua/plugins/sql.lua
Normal file
17
nvim/.config/nvim/lua/plugins/sql.lua
Normal file
@@ -0,0 +1,17 @@
|
||||
return {
|
||||
'kristijanhusak/vim-dadbod-ui',
|
||||
dependencies = {
|
||||
{ 'tpope/vim-dadbod', lazy = true },
|
||||
{ 'kristijanhusak/vim-dadbod-completion', ft = { 'sql', 'mysql', 'plsql' }, lazy = true },
|
||||
},
|
||||
cmd = {
|
||||
'DBUI',
|
||||
'DBUIToggle',
|
||||
'DBUIAddConnection',
|
||||
'DBUIFindBuffer',
|
||||
},
|
||||
init = function()
|
||||
-- Your DBUI configuration
|
||||
vim.g.db_ui_use_nerd_fonts = 1
|
||||
end,
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
vim.pack.add({
|
||||
{
|
||||
src = "https://github.com/kylechui/nvim-surround",
|
||||
version = vim.version.range("^4.0.0"),
|
||||
},
|
||||
})
|
||||
|
||||
local ok, surround = pcall(require, "nvim-surround")
|
||||
if ok then
|
||||
surround.setup()
|
||||
else
|
||||
print("plugin surround missing")
|
||||
end
|
||||
28
nvim/.config/nvim/lua/plugins/telescope-tabs.lua
Normal file
28
nvim/.config/nvim/lua/plugins/telescope-tabs.lua
Normal file
@@ -0,0 +1,28 @@
|
||||
local function get_tab_idx(tab_id)
|
||||
for i, tabnr in ipairs(vim.api.nvim_list_tabpages()) do
|
||||
if tabnr == tab_id then
|
||||
return i
|
||||
end
|
||||
end
|
||||
return -1
|
||||
end
|
||||
|
||||
return {
|
||||
'LukasPietzschmann/telescope-tabs',
|
||||
dependencies = { 'nvim-telescope/telescope.nvim' },
|
||||
lazy = true,
|
||||
config = function()
|
||||
require 'telescope-tabs'.setup {
|
||||
entry_formatter = function(tab_id, buffer_ids, file_names, file_paths, is_current)
|
||||
local cwd = vim.fn.getcwd(-1, get_tab_idx(tab_id))
|
||||
local entry_string = table.concat(file_names, ', ')
|
||||
return string.format('%d: %s %s%s', tab_id, cwd, entry_string, is_current and ' <' or '')
|
||||
end,
|
||||
entry_ordinal = function(tab_id, buffer_ids, file_names, file_paths, is_current)
|
||||
local cwd = vim.fn.getcwd(-1, get_tab_idx(tab_id))
|
||||
local entry_string = table.concat(file_names, ', ')
|
||||
return string.format('%s %s', cwd, entry_string)
|
||||
end,
|
||||
}
|
||||
end
|
||||
}
|
||||
102
nvim/.config/nvim/lua/plugins/telescope.lua
Normal file
102
nvim/.config/nvim/lua/plugins/telescope.lua
Normal file
@@ -0,0 +1,102 @@
|
||||
return {
|
||||
{ -- Fuzzy Finder (files, lsp, etc)
|
||||
'nvim-telescope/telescope.nvim',
|
||||
event = 'VimEnter',
|
||||
branch = '0.1.x',
|
||||
dependencies = {
|
||||
'nvim-lua/plenary.nvim',
|
||||
{ -- If encountering errors, see telescope-fzf-native README for install instructions
|
||||
'nvim-telescope/telescope-fzf-native.nvim',
|
||||
build = 'make',
|
||||
cond = function()
|
||||
return vim.fn.executable 'make' == 1
|
||||
end,
|
||||
},
|
||||
{ 'nvim-telescope/telescope-ui-select.nvim' },
|
||||
|
||||
|
||||
-- change directory with telescope from a list of directories
|
||||
{
|
||||
"SalOrak/whaler",
|
||||
opts = {
|
||||
directories = { "/home/lupan/src" },
|
||||
oneoff_directories = { "/home/lupan/dotfiles" },
|
||||
auto_file_explorer = false,
|
||||
auto_cwd = true,
|
||||
}
|
||||
},
|
||||
|
||||
-- Icons, requires Nerd font.
|
||||
{ 'nvim-tree/nvim-web-devicons' },
|
||||
|
||||
'davvid/telescope-git-grep.nvim',
|
||||
},
|
||||
config = function()
|
||||
local telescope = require 'telescope'
|
||||
-- To list available key bindings inside given telescope picker:
|
||||
-- - Insert mode: <c-/>
|
||||
-- - Normal mode: ?
|
||||
telescope.setup {
|
||||
extensions = {
|
||||
['ui-select'] = {
|
||||
require('telescope.themes').get_dropdown(),
|
||||
},
|
||||
whaler = {
|
||||
directories = { "/home/lupan/src" },
|
||||
oneoff_directories = { "/home/lupan/dotfiles" },
|
||||
auto_file_explorer = false,
|
||||
auto_cwd = true,
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
pcall(telescope.load_extension, 'fzf')
|
||||
pcall(telescope.load_extension, 'ui-select')
|
||||
pcall(telescope.load_extension, 'whaler')
|
||||
pcall(telescope.load_extension, 'git_grep')
|
||||
pcall(telescope.load_extension, 'persisted')
|
||||
|
||||
-- See `:help telescope.builtin`
|
||||
local builtin = require 'telescope.builtin'
|
||||
vim.keymap.set('n', '<leader>sh', builtin.help_tags, { desc = '[S]earch [H]elp' })
|
||||
vim.keymap.set('n', '<leader>sk', builtin.keymaps, { desc = '[S]earch [K]eymaps' })
|
||||
vim.keymap.set('n', '<leader>sf', builtin.find_files, { desc = '[S]earch [F]iles' })
|
||||
vim.keymap.set('n', '<leader>ss', builtin.builtin, { desc = '[S]earch [S]elect Telescope' })
|
||||
vim.keymap.set('n', '<leader>sw', builtin.grep_string, { desc = '[S]earch current [W]ord' })
|
||||
vim.keymap.set('n', '<leader>sg', builtin.live_grep, { desc = '[S]earch by [G]rep' })
|
||||
vim.keymap.set('n', '<leader>sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' })
|
||||
vim.keymap.set('n', '<leader>sr', builtin.resume, { desc = '[S]earch [R]esume' })
|
||||
vim.keymap.set('n', '<leader>s.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' })
|
||||
vim.keymap.set('n', '<leader><leader>', builtin.buffers, { desc = '[ ] Find existing buffers' })
|
||||
vim.keymap.set('n', '<leader>sF', function() builtin.find_files { hidden = true } end,
|
||||
{ desc = '[S]earch [F]iles (with hidden)' })
|
||||
vim.keymap.set('n', '<leader>sl', function() telescope.extensions.whaler.whaler() end,
|
||||
{ desc = '[S]earch with wha[L]er' })
|
||||
vim.keymap.set('n', '<leader>gf', builtin.git_files, { desc = '[G]it [F]iles' })
|
||||
vim.keymap.set('n', '<leader>gs', builtin.git_status, { desc = '[G]it [S]tatus' })
|
||||
vim.keymap.set('n', '<leader>gg', function() telescope.extensions.git_grep.live_grep() end,
|
||||
{ desc = '[G]it [g]rep' })
|
||||
vim.keymap.set('n', '<leader>gw', function() telescope.extensions.git_grep.grep() end,
|
||||
{ desc = '[G]it grep current [W]ord' })
|
||||
|
||||
vim.keymap.set('n', '<leader>/', function()
|
||||
builtin.current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {
|
||||
winblend = 10,
|
||||
previewer = false,
|
||||
})
|
||||
end, { desc = '[/] Fuzzily search in current buffer' })
|
||||
|
||||
vim.keymap.set('n', '<leader>s/', function()
|
||||
builtin.live_grep {
|
||||
grep_open_files = true,
|
||||
prompt_title = 'Live Grep in Open Files',
|
||||
}
|
||||
end, { desc = '[S]earch [/] in Open Files' })
|
||||
|
||||
vim.keymap.set('n', '<leader>sn', function()
|
||||
builtin.find_files { cwd = vim.fn.stdpath 'config' }
|
||||
end, { desc = '[S]earch [N]eovim files' })
|
||||
end,
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,148 +1,95 @@
|
||||
-- run ":TSUpdate" after plugin update
|
||||
-- If hooks need to run on install, run this before `vim.pack.add()`
|
||||
vim.api.nvim_create_autocmd("PackChanged", {
|
||||
group = vim.api.nvim_create_augroup("nvim-treesitter-update", { clear = true }),
|
||||
callback = function(ev)
|
||||
local name, kind = ev.data.spec.name, ev.data.kind
|
||||
if name == "nvim-treesitter" and kind == "update" then
|
||||
if not ev.data.active then
|
||||
vim.cmd.packadd("nvim-treesitter")
|
||||
end
|
||||
vim.cmd("TSUpdate")
|
||||
print("TSUpdate done.")
|
||||
end
|
||||
end,
|
||||
})
|
||||
return {
|
||||
|
||||
vim.pack.add({
|
||||
{ src = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects", version = "main" },
|
||||
{ src = "https://github.com/nvim-treesitter/nvim-treesitter", version = "main" },
|
||||
})
|
||||
local ok = pcall(require, "nvim-treesitter")
|
||||
if ok then
|
||||
vim.api.nvim_create_autocmd('FileType', {
|
||||
pattern = { 'odin', 'go' },
|
||||
callback = function() vim.treesitter.start() end,
|
||||
})
|
||||
else
|
||||
print("plugin nvim-treesitter.configs missing")
|
||||
end
|
||||
{ -- Highlight, edit, and navigate code
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
dependencies = {
|
||||
'nvim-treesitter/nvim-treesitter-textobjects',
|
||||
'nvim-orgmode/orgmode', -- as configured together
|
||||
'vrischmann/tree-sitter-templ',
|
||||
"nushell/tree-sitter-nu", -- additional parser
|
||||
},
|
||||
build = ':TSUpdate',
|
||||
config = function()
|
||||
-- See `:help nvim-treesitter`
|
||||
local org = require('orgmode')
|
||||
|
||||
local textobjects
|
||||
ok, textobjects = pcall(require, "nvim-treesitter-textobjects")
|
||||
if ok then
|
||||
textobjects.setup {
|
||||
move = {
|
||||
set_jumps = true,
|
||||
},
|
||||
select = {
|
||||
-- Automatically jump forward to textobj, similar to targets.vim
|
||||
lookahead = true,
|
||||
-- You can choose the select mode (default is charwise 'v')
|
||||
--
|
||||
-- Can also be a function which gets passed a table with the keys
|
||||
-- * query_string: eg '@function.inner'
|
||||
-- * method: eg 'v' or 'o'
|
||||
-- and should return the mode ('v', 'V', or '<c-v>') or a table
|
||||
-- mapping query_strings to modes.
|
||||
selection_modes = {
|
||||
['@parameter.outer'] = 'v', -- charwise
|
||||
['@function.outer'] = 'V', -- linewise
|
||||
-- ['@class.outer'] = '<c-v>', -- blockwise
|
||||
},
|
||||
-- If you set this to `true` (default is `false`) then any textobject is
|
||||
-- extended to include preceding or succeeding whitespace. Succeeding
|
||||
-- whitespace has priority in order to act similarly to eg the built-in
|
||||
-- `ap`.
|
||||
--
|
||||
-- Can also be a function which gets passed a table with the keys
|
||||
-- * query_string: eg '@function.inner'
|
||||
-- * selection_mode: eg 'v'
|
||||
-- and should return true of false
|
||||
include_surrounding_whitespace = false,
|
||||
},
|
||||
}
|
||||
local function key_select(key, object)
|
||||
vim.keymap.set({ "x", "o" }, key, function()
|
||||
require "nvim-treesitter-textobjects.select".select_textobject(object, "textobjects")
|
||||
end)
|
||||
end
|
||||
key_select("aa", "@parameter.outer")
|
||||
key_select("ia", "@parameter.inner")
|
||||
key_select("af", "@function.outer")
|
||||
key_select("if", "@function.inner")
|
||||
key_select("ac", "@class.outer")
|
||||
key_select("ic", "@class.inner")
|
||||
key_select("al", "@call.outer")
|
||||
key_select("il", "@call.inner")
|
||||
key_select("ao", "@loop.outer")
|
||||
key_select("io", "@loop.inner")
|
||||
key_select("ad", "@conditional.outer")
|
||||
key_select("id", "@conditional.inner")
|
||||
key_select("ar", "@return.outer")
|
||||
key_select("ir", "@return.inner")
|
||||
key_select("as", "@statement.outer")
|
||||
key_select("ag", "@assignment.outer")
|
||||
key_select("ig", "@assignment.inner")
|
||||
|
||||
vim.keymap.set({ "x", "o" }, "ax", function()
|
||||
require "nvim-treesitter-textobjects.select".select_textobject("@local.scope", "locals")
|
||||
end)
|
||||
vim.keymap.set("n", "<leader>cp", function()
|
||||
require("nvim-treesitter-textobjects.swap").swap_next "@parameter.inner"
|
||||
end)
|
||||
vim.keymap.set("n", "<leader>cP", function()
|
||||
require("nvim-treesitter-textobjects.swap").swap_previous "@parameter.inner"
|
||||
end)
|
||||
|
||||
vim.keymap.set({ "n", "x", "o" }, "]m", function()
|
||||
require("nvim-treesitter-textobjects.move").goto_next_start("@function.outer", "textobjects")
|
||||
end)
|
||||
vim.keymap.set({ "n", "x", "o" }, "]]", function()
|
||||
require("nvim-treesitter-textobjects.move").goto_next_start("@class.outer", "textobjects")
|
||||
end)
|
||||
-- You can also pass a list to group multiple queries.
|
||||
vim.keymap.set({ "n", "x", "o" }, "]o", function()
|
||||
require("nvim-treesitter-textobjects.move").goto_next_start({ "@loop.inner", "@loop.outer" },
|
||||
"textobjects")
|
||||
end)
|
||||
-- You can also use captures from other query groups like `locals.scm` or `folds.scm`
|
||||
vim.keymap.set({ "n", "x", "o" }, "]s", function()
|
||||
require("nvim-treesitter-textobjects.move").goto_next_start("@local.scope", "locals")
|
||||
end)
|
||||
vim.keymap.set({ "n", "x", "o" }, "]z", function()
|
||||
require("nvim-treesitter-textobjects.move").goto_next_start("@fold", "folds")
|
||||
end)
|
||||
|
||||
vim.keymap.set({ "n", "x", "o" }, "]M", function()
|
||||
require("nvim-treesitter-textobjects.move").goto_next_end("@function.outer", "textobjects")
|
||||
end)
|
||||
vim.keymap.set({ "n", "x", "o" }, "][", function()
|
||||
require("nvim-treesitter-textobjects.move").goto_next_end("@class.outer", "textobjects")
|
||||
end)
|
||||
|
||||
vim.keymap.set({ "n", "x", "o" }, "[m", function()
|
||||
require("nvim-treesitter-textobjects.move").goto_previous_start("@function.outer", "textobjects")
|
||||
end)
|
||||
vim.keymap.set({ "n", "x", "o" }, "[[", function()
|
||||
require("nvim-treesitter-textobjects.move").goto_previous_start("@class.outer", "textobjects")
|
||||
end)
|
||||
|
||||
vim.keymap.set({ "n", "x", "o" }, "[M", function()
|
||||
require("nvim-treesitter-textobjects.move").goto_previous_end("@function.outer", "textobjects")
|
||||
end)
|
||||
vim.keymap.set({ "n", "x", "o" }, "[]", function()
|
||||
require("nvim-treesitter-textobjects.move").goto_previous_end("@class.outer", "textobjects")
|
||||
end)
|
||||
|
||||
-- Go to either the start or the end, whichever is closer.
|
||||
-- Use if you want more granular movements
|
||||
vim.keymap.set({ "n", "x", "o" }, "]d", function()
|
||||
require("nvim-treesitter-textobjects.move").goto_next("@conditional.outer", "textobjects")
|
||||
end)
|
||||
vim.keymap.set({ "n", "x", "o" }, "[d", function()
|
||||
require("nvim-treesitter-textobjects.move").goto_previous("@conditional.outer", "textobjects")
|
||||
end)
|
||||
else
|
||||
print("plugin nvim-treesitter-textobjects missing")
|
||||
end
|
||||
---@diagnostic disable-next-line: missing-fields
|
||||
require('nvim-treesitter.configs').setup {
|
||||
ensure_installed = { 'c', 'cpp', 'go', 'haskell', 'lua', 'python', 'rust', 'tsx', 'templ', 'typescript', 'vimdoc', 'vim' },
|
||||
auto_install = false,
|
||||
highlight = {
|
||||
enable = true,
|
||||
additional_vim_regex_highlighting = { 'org' },
|
||||
},
|
||||
indent = { enable = true },
|
||||
incremental_selection = {
|
||||
enable = true,
|
||||
keymaps = {
|
||||
init_selection = '<c-space>',
|
||||
node_incremental = '<c-space>',
|
||||
scope_incremental = '<c-s>',
|
||||
node_decremental = '<C-p>',
|
||||
},
|
||||
},
|
||||
textobjects = {
|
||||
select = {
|
||||
enable = true,
|
||||
lookahead = true,
|
||||
keymaps = {
|
||||
['aa'] = '@parameter.outer',
|
||||
['ia'] = '@parameter.inner',
|
||||
['af'] = '@function.outer',
|
||||
['if'] = '@function.inner',
|
||||
['ac'] = '@class.outer',
|
||||
['ic'] = '@class.inner',
|
||||
['al'] = '@call.outer',
|
||||
['il'] = '@call.inner',
|
||||
['ao'] = '@loop.outer',
|
||||
['io'] = '@loop.inner',
|
||||
['ad'] = '@conditional.outer',
|
||||
['id'] = '@conditional.inner',
|
||||
['ar'] = '@return.outer',
|
||||
['ir'] = '@return.inner',
|
||||
['as'] = '@statement.outer',
|
||||
['ag'] = '@assignment.outer',
|
||||
['ig'] = '@assignment.inner',
|
||||
},
|
||||
},
|
||||
move = {
|
||||
enable = true,
|
||||
set_jumps = true,
|
||||
goto_next_start = {
|
||||
[']m'] = '@function.outer',
|
||||
[']]'] = '@class.outer',
|
||||
},
|
||||
goto_next_end = {
|
||||
[']M'] = '@function.outer',
|
||||
[']['] = '@class.outer',
|
||||
},
|
||||
goto_previous_start = {
|
||||
['[m'] = '@function.outer',
|
||||
['[['] = '@class.outer',
|
||||
},
|
||||
goto_previous_end = {
|
||||
['[M'] = '@function.outer',
|
||||
['[]'] = '@class.outer',
|
||||
},
|
||||
},
|
||||
swap = {
|
||||
enable = true,
|
||||
swap_next = {
|
||||
['<leader>a'] = '@parameter.inner',
|
||||
},
|
||||
swap_previous = {
|
||||
['<leader>A'] = '@parameter.inner',
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
org.setup({
|
||||
org_agenda_files = { '~/org/*.org' },
|
||||
org_default_notes_file = '~/org/capture.org',
|
||||
})
|
||||
end,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
vim.pack.add({ "https://github.com/folke/which-key.nvim" })
|
||||
|
||||
local ok, whichkey = pcall(require, "which-key")
|
||||
if ok then
|
||||
whichkey.setup({ preset = "helix", delay = 1000 })
|
||||
else
|
||||
print("plugin whichkey missing")
|
||||
end
|
||||
@@ -1,43 +0,0 @@
|
||||
return {
|
||||
s(
|
||||
"ife",
|
||||
fmt(
|
||||
[[
|
||||
if err != nil {
|
||||
<>
|
||||
}
|
||||
]],
|
||||
{
|
||||
i(0),
|
||||
},
|
||||
{ delimiters = "<>" }
|
||||
)
|
||||
),
|
||||
|
||||
s(
|
||||
"ifse",
|
||||
fmt(
|
||||
[[
|
||||
if <><>err = <>; err != nil {
|
||||
<>
|
||||
}
|
||||
]],
|
||||
{
|
||||
i(1),
|
||||
f(function(args)
|
||||
local a = args[1][1]
|
||||
if string.sub(a, -2) == ", " or a == "" then
|
||||
return ""
|
||||
elseif string.sub(a, -1) == "," then
|
||||
return " "
|
||||
else
|
||||
return ", "
|
||||
end
|
||||
end, { 1 }),
|
||||
i(2),
|
||||
i(0),
|
||||
},
|
||||
{ delimiters = "<>" }
|
||||
)
|
||||
),
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user