Compare commits
166 Commits
fa925a6a3d
...
master
Author | SHA1 | Date | |
---|---|---|---|
29608ff8c4 | |||
1513d23ec4 | |||
28de145180 | |||
17997c0550 | |||
d47467e161 | |||
8033f2e2a9 | |||
3fa1a018ee | |||
dd9de18aa7 | |||
6d8e00fabf | |||
b54ece050d | |||
437ca39309 | |||
1835f61e49 | |||
7caf112500 | |||
6b84ae6f3a | |||
d3b8e76787 | |||
24d031c214 | |||
bfa2c6313f | |||
cfb882fdc9 | |||
b6bc1de7af | |||
48664abc41 | |||
3fc6280267 | |||
ef95853433 | |||
3146aeee3e | |||
f685ebee2c | |||
5a40a5b3ab | |||
c06364cd27 | |||
f2f29762a4 | |||
7f850d115f | |||
fc88cb9801 | |||
75c39a5613 | |||
e90c2c7e4a | |||
24966cfc69 | |||
78ab1671ab | |||
d38ae42668 | |||
240d466e3d | |||
9e8f036f62 | |||
8a6ecfe7b9 | |||
8714b847a7 | |||
2c672e497c | |||
6d22ed0187 | |||
f5397295d3 | |||
2a14edd39c | |||
00a77bf58a | |||
9e9ccd0fde | |||
d72a4540b9 | |||
b0385dc277 | |||
f3f859d9a1 | |||
5b421c7999 | |||
cf729da8ef | |||
341499f9a7 | |||
10ba42cb1d | |||
154b1a11be | |||
ec9c92ab9f | |||
c321000834 | |||
06218e16d4 | |||
a7c29799b8 | |||
3035ab9acb | |||
e6216fb3cd | |||
24d4f9e638 | |||
ab1a7df7f4 | |||
4a666b8d21 | |||
3324aae2d6 | |||
10e03987be | |||
728b00c2ca | |||
30793b5a46 | |||
8fb8e43f59 | |||
1f040c70ab | |||
e03d46c3ab | |||
d9f7f0961f | |||
b73ebaf338 | |||
da18d28504 | |||
e50284111b | |||
faaf5807d5 | |||
7d4b8f4f7a | |||
98e69defac | |||
9062aeb17a | |||
e1610e3874 | |||
8c303ca0d1 | |||
b032608fd9 | |||
1dfb8e7e7b | |||
4d7bd1a487 | |||
ad79dc5bbf | |||
d522104407 | |||
01f6327e9e | |||
ad9aacbbcb | |||
7373c7b653 | |||
a1736b33e0 | |||
f10efa6808 | |||
3810c83e14 | |||
e08245989a | |||
492adae580 | |||
09ffb3b2d9 | |||
a8bf055a0b | |||
a22b7125a5 | |||
72f2a053c0 | |||
7111817d6f | |||
0c0a1a9f9c | |||
e1ba513fa6 | |||
1ce7cac540 | |||
ec7153193b | |||
a2a13c901a | |||
afc7829f1f | |||
bfe74b7499 | |||
fa84b139af | |||
557bb04d71 | |||
55e747eec2 | |||
d3b783cb55 | |||
f6e3c9acb4 | |||
c68109aa92 | |||
f87bdec4eb | |||
1d77cf6c1e | |||
85e31b13c1 | |||
ac26cef63a | |||
f72f18f5c7 | |||
ccf3dcc500 | |||
a987843e95 | |||
fef6cbc6bb | |||
118211652b | |||
c9ccef2f8a | |||
3c34d8942e | |||
7dbe42b087 | |||
60cd08c395 | |||
c47799a7e1 | |||
73bfbcc3a3 | |||
7dbf926206 | |||
4995ac177b | |||
56abd08940 | |||
d86e4ec4a3 | |||
b774bb44d9 | |||
b8cd095b8b | |||
021226fc80 | |||
a84dac1b3d | |||
7110966df9 | |||
9c1613f567 | |||
f3b5b49899 | |||
8068766afc | |||
d6a8dc4d1e | |||
b264e9d805 | |||
6181681134 | |||
7a4e0e7e61 | |||
4930040bef | |||
b1cfffafc7 | |||
3f1609b384 | |||
f410f907ef | |||
054068a205 | |||
cfec54cc6c | |||
253baf505e | |||
75c21332b8 | |||
113c96ede4 | |||
81a729d005 | |||
b18031ffc4 | |||
df7e4085a9 | |||
9a7ab0608e | |||
71355aa027 | |||
2cb9042040 | |||
48d8b50b5a | |||
0401ab01bf | |||
6a049c283f | |||
a667c5a237 | |||
ff6bb86881 | |||
38fe2f7481 | |||
7582ed78c3 | |||
e566a44c56 | |||
a46fd42e1e | |||
af53c0ce53 | |||
f1244ddfde |
31
README.md
31
README.md
@ -4,11 +4,40 @@ Lupan's config files
|
|||||||
Installation
|
Installation
|
||||||
------------
|
------------
|
||||||
|
|
||||||
|
Install Hyprland
|
||||||
|
----------------
|
||||||
|
|
||||||
To reproduce my environment clone this repo into `~/dotfiles` and check
|
To reproduce my environment clone this repo into `~/dotfiles` and check
|
||||||
that you have required programs in your `PATH` with
|
that you have required programs in your `PATH` with
|
||||||
|
|
||||||
```
|
```
|
||||||
$ sh check_dependencies.sh
|
$ sh check_dependencies.sh hypr
|
||||||
|
```
|
||||||
|
|
||||||
|
Install font `ttf-firacode-nerd` (https://github.com/ryanoasis/nerd-fonts/releases/download/v3.0.2/FiraCode.zip).
|
||||||
|
|
||||||
|
Install proper configurations with
|
||||||
|
|
||||||
|
```
|
||||||
|
$ stow shell hyprland alacritty xsession nvim yazi
|
||||||
|
```
|
||||||
|
|
||||||
|
Where `xsession` is just to install `lupan-set-theme` script, `nvim` and `yazi` may be skipped if you do not use them.
|
||||||
|
|
||||||
|
Change to `zsh` as your login shell with
|
||||||
|
|
||||||
|
```
|
||||||
|
$ chsh -s /usr/bin/zsh
|
||||||
|
```
|
||||||
|
|
||||||
|
Install DWM (old)
|
||||||
|
-----------------
|
||||||
|
|
||||||
|
To reproduce my environment clone this repo into `~/dotfiles` and check
|
||||||
|
that you have required programs in your `PATH` with
|
||||||
|
|
||||||
|
```
|
||||||
|
$ sh check_dependencies.sh dwm
|
||||||
```
|
```
|
||||||
|
|
||||||
Install font `ttf-firacode-nerd` (https://github.com/ryanoasis/nerd-fonts/releases/download/v3.0.2/FiraCode.zip).
|
Install font `ttf-firacode-nerd` (https://github.com/ryanoasis/nerd-fonts/releases/download/v3.0.2/FiraCode.zip).
|
||||||
|
17
alacritty/.config/alacritty/alacritty.toml
Normal file
17
alacritty/.config/alacritty/alacritty.toml
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
[colors]
|
||||||
|
draw_bold_text_with_bright_colors = false
|
||||||
|
|
||||||
|
[env]
|
||||||
|
TERM = "xterm-256color"
|
||||||
|
|
||||||
|
[font]
|
||||||
|
size = 10
|
||||||
|
|
||||||
|
[font.bold]
|
||||||
|
family = "Fira Code Nerd Font"
|
||||||
|
|
||||||
|
[font.normal]
|
||||||
|
family = "Fira Code Nerd Font"
|
||||||
|
|
||||||
|
[general]
|
||||||
|
import = ["~/.config/alacritty/dark.toml"]
|
@ -1,200 +0,0 @@
|
|||||||
# See: /usr/share/doc/alacritty/example/alacritty.yml
|
|
||||||
|
|
||||||
env:
|
|
||||||
TERM: xterm-256color
|
|
||||||
|
|
||||||
# From https://gist.github.com/sainnhe/6432f83181c4520ea87b5211fed27950
|
|
||||||
# Changed only to &dark and YAML &light labels
|
|
||||||
schemes:
|
|
||||||
dark: &dark
|
|
||||||
primary:
|
|
||||||
background: '#2c393c'
|
|
||||||
foreground: '#b1babd'
|
|
||||||
normal:
|
|
||||||
black: '#232e31'
|
|
||||||
red: '#d8aeb5'
|
|
||||||
green: '#9bc48e'
|
|
||||||
yellow: '#ceb58e'
|
|
||||||
blue: '#94c0ca'
|
|
||||||
magenta: '#ceaed6'
|
|
||||||
cyan: '#93c2bb'
|
|
||||||
white: '#9ea7aa'
|
|
||||||
bright:
|
|
||||||
black: '#597177'
|
|
||||||
red: '#dcb8be'
|
|
||||||
green: '#a2cd94'
|
|
||||||
yellow: '#d7bd95'
|
|
||||||
blue: '#9bc8d3'
|
|
||||||
magenta: '#d4b8da'
|
|
||||||
cyan: '#99cac4'
|
|
||||||
white: '#b9c3c5'
|
|
||||||
light: &light
|
|
||||||
primary:
|
|
||||||
background: '#e9f2f5'
|
|
||||||
foreground: '#6d797c'
|
|
||||||
normal:
|
|
||||||
black: '#1b1c1c'
|
|
||||||
red: '#d0426a'
|
|
||||||
green: '#52833e'
|
|
||||||
yellow: '#8e733f'
|
|
||||||
blue: '#44808b'
|
|
||||||
magenta: '#b14cc1'
|
|
||||||
cyan: '#42827a'
|
|
||||||
white: '#c2c7c9'
|
|
||||||
bright:
|
|
||||||
black: '#454748'
|
|
||||||
red: '#e34d76'
|
|
||||||
green: '#5b9146'
|
|
||||||
yellow: '#9d8046'
|
|
||||||
blue: '#4c8d99'
|
|
||||||
magenta: '#c455d5'
|
|
||||||
cyan: '#4a8f87'
|
|
||||||
white: '#eff1f1'
|
|
||||||
everforest_dark_hard: &everforest_dark_hard
|
|
||||||
primary:
|
|
||||||
background: '#272e33'
|
|
||||||
foreground: '#d3c6aa'
|
|
||||||
normal:
|
|
||||||
black: '#414b50'
|
|
||||||
red: '#e67e80'
|
|
||||||
green: '#a7c080'
|
|
||||||
yellow: '#dbbc7f'
|
|
||||||
blue: '#7fbbb3'
|
|
||||||
magenta: '#d699b6'
|
|
||||||
cyan: '#83c092'
|
|
||||||
white: '#d3c6aa'
|
|
||||||
bright:
|
|
||||||
black: '#475258'
|
|
||||||
red: '#e67e80'
|
|
||||||
green: '#a7c080'
|
|
||||||
yellow: '#dbbc7f'
|
|
||||||
blue: '#7fbbb3'
|
|
||||||
magenta: '#d699b6'
|
|
||||||
cyan: '#83c092'
|
|
||||||
white: '#d3c6aa'
|
|
||||||
everforest_dark_medium: &everforest_dark_medium
|
|
||||||
primary:
|
|
||||||
background: '#2d353b'
|
|
||||||
foreground: '#d3c6aa'
|
|
||||||
normal:
|
|
||||||
black: '#475258'
|
|
||||||
red: '#e67e80'
|
|
||||||
green: '#a7c080'
|
|
||||||
yellow: '#dbbc7f'
|
|
||||||
blue: '#7fbbb3'
|
|
||||||
magenta: '#d699b6'
|
|
||||||
cyan: '#83c092'
|
|
||||||
white: '#d3c6aa'
|
|
||||||
bright:
|
|
||||||
black: '#475258'
|
|
||||||
red: '#e67e80'
|
|
||||||
green: '#a7c080'
|
|
||||||
yellow: '#dbbc7f'
|
|
||||||
blue: '#7fbbb3'
|
|
||||||
magenta: '#d699b6'
|
|
||||||
cyan: '#83c092'
|
|
||||||
white: '#d3c6aa'
|
|
||||||
everforest_dark_soft: &everforest_dark_soft
|
|
||||||
primary:
|
|
||||||
background: '#333c43'
|
|
||||||
foreground: '#d3c6aa'
|
|
||||||
normal:
|
|
||||||
black: '#4d5960'
|
|
||||||
red: '#e67e80'
|
|
||||||
green: '#a7c080'
|
|
||||||
yellow: '#dbbc7f'
|
|
||||||
blue: '#7fbbb3'
|
|
||||||
magenta: '#d699b6'
|
|
||||||
cyan: '#83c092'
|
|
||||||
white: '#d3c6aa'
|
|
||||||
bright:
|
|
||||||
black: '#4d5960'
|
|
||||||
red: '#e67e80'
|
|
||||||
green: '#a7c080'
|
|
||||||
yellow: '#dbbc7f'
|
|
||||||
blue: '#7fbbb3'
|
|
||||||
magenta: '#d699b6'
|
|
||||||
cyan: '#83c092'
|
|
||||||
white: '#d3c6aa'
|
|
||||||
everforest_light_hard: &everforest_light_hard
|
|
||||||
primary:
|
|
||||||
background: '#fffbef'
|
|
||||||
foreground: '#5c6a72'
|
|
||||||
normal:
|
|
||||||
black: '#5c6a72'
|
|
||||||
red: '#f85552'
|
|
||||||
green: '#8da101'
|
|
||||||
yellow: '#dfa000'
|
|
||||||
blue: '#3a94c5'
|
|
||||||
magenta: '#df69ba'
|
|
||||||
cyan: '#35a77c'
|
|
||||||
white: '#e8e5d5'
|
|
||||||
bright:
|
|
||||||
black: '#5c6a72'
|
|
||||||
red: '#f85552'
|
|
||||||
green: '#8da101'
|
|
||||||
yellow: '#dfa000'
|
|
||||||
blue: '#3a94c5'
|
|
||||||
magenta: '#df69ba'
|
|
||||||
cyan: '#35a77c'
|
|
||||||
white: '#e8e5d5'
|
|
||||||
everforest_light_medium: &everforest_light_medium
|
|
||||||
primary:
|
|
||||||
background: '#fdf6e3'
|
|
||||||
foreground: '#5c6a72'
|
|
||||||
normal:
|
|
||||||
black: '#5c6a72'
|
|
||||||
red: '#f85552'
|
|
||||||
green: '#8da101'
|
|
||||||
yellow: '#dfa000'
|
|
||||||
blue: '#3a94c5'
|
|
||||||
magenta: '#df69ba'
|
|
||||||
cyan: '#35a77c'
|
|
||||||
white: '#e0dcc7'
|
|
||||||
bright:
|
|
||||||
black: '#5c6a72'
|
|
||||||
red: '#f85552'
|
|
||||||
green: '#8da101'
|
|
||||||
yellow: '#dfa000'
|
|
||||||
blue: '#3a94c5'
|
|
||||||
magenta: '#df69ba'
|
|
||||||
cyan: '#35a77c'
|
|
||||||
white: '#e0dcc7'
|
|
||||||
everforest_light_soft: &everforest_light_soft
|
|
||||||
primary:
|
|
||||||
background: '#f3ead3'
|
|
||||||
foreground: '#5c6a72'
|
|
||||||
normal:
|
|
||||||
black: '#5c6a72'
|
|
||||||
red: '#f85552'
|
|
||||||
green: '#8da101'
|
|
||||||
yellow: '#dfa000'
|
|
||||||
blue: '#3a94c5'
|
|
||||||
magenta: '#df69ba'
|
|
||||||
cyan: '#35a77c'
|
|
||||||
white: '#d8d3ba'
|
|
||||||
bright:
|
|
||||||
black: '#5c6a72'
|
|
||||||
red: '#f85552'
|
|
||||||
green: '#8da101'
|
|
||||||
yellow: '#dfa000'
|
|
||||||
blue: '#3a94c5'
|
|
||||||
magenta: '#df69ba'
|
|
||||||
cyan: '#35a77c'
|
|
||||||
white: '#d8d3ba'
|
|
||||||
|
|
||||||
draw_bold_text_with_bright_colors: false
|
|
||||||
|
|
||||||
colors: *dark
|
|
||||||
|
|
||||||
font:
|
|
||||||
size: 10.5
|
|
||||||
normal:
|
|
||||||
family: GoMono Nerd Font
|
|
||||||
bold:
|
|
||||||
family: GoMono Nerd Font
|
|
||||||
|
|
||||||
key_bindings:
|
|
||||||
- key: F6
|
|
||||||
mods: Control|Shift
|
|
||||||
command: { program: "/bin/sh", args: ["-c", "~/.config/alacritty/set_theme.sh --next"] }
|
|
71
alacritty/.config/alacritty/dark.toml
Normal file
71
alacritty/.config/alacritty/dark.toml
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
# Nightfox Alacritty Colors
|
||||||
|
## name: nightfox
|
||||||
|
## upstream: https://github.com/edeneast/nightfox.nvim/raw/main/extra/nightfox/alacritty.toml
|
||||||
|
|
||||||
|
[colors.primary]
|
||||||
|
background = "#2e3440" # changed
|
||||||
|
foreground = "#eceff4" # changed
|
||||||
|
dim_foreground = "#aeafb0"
|
||||||
|
bright_foreground = "#d6d6d7"
|
||||||
|
|
||||||
|
[colors.cursor]
|
||||||
|
text = "#cdcecf"
|
||||||
|
cursor = "#aeafb0"
|
||||||
|
|
||||||
|
[colors.vi_mode_cursor]
|
||||||
|
text = "#cdcecf"
|
||||||
|
cursor = "#63cdcf"
|
||||||
|
|
||||||
|
[colors.search.matches]
|
||||||
|
foreground = "#cdcecf"
|
||||||
|
background = "#3c5372"
|
||||||
|
|
||||||
|
[colors.search.focused_match]
|
||||||
|
foreground = "#cdcecf"
|
||||||
|
background = "#81b29a"
|
||||||
|
|
||||||
|
[colors.footer_bar]
|
||||||
|
foreground = "#cdcecf"
|
||||||
|
background = "#29394f"
|
||||||
|
|
||||||
|
[colors.hints.start]
|
||||||
|
foreground = "#cdcecf"
|
||||||
|
background = "#f4a261"
|
||||||
|
|
||||||
|
[colors.hints.end]
|
||||||
|
foreground = "#cdcecf"
|
||||||
|
background = "#29394f"
|
||||||
|
|
||||||
|
[colors.selection]
|
||||||
|
text = "#cdcecf"
|
||||||
|
background = "#2b3b51"
|
||||||
|
|
||||||
|
[colors.normal]
|
||||||
|
black = "#393b44"
|
||||||
|
red = "#c94f6d"
|
||||||
|
green = "#81b29a"
|
||||||
|
yellow = "#dbc074"
|
||||||
|
blue = "#719cd6"
|
||||||
|
magenta = "#9d79d6"
|
||||||
|
cyan = "#63cdcf"
|
||||||
|
white = "#dfdfe0"
|
||||||
|
|
||||||
|
[colors.bright]
|
||||||
|
black = "#575860"
|
||||||
|
red = "#d16983"
|
||||||
|
green = "#8ebaa4"
|
||||||
|
yellow = "#e0c989"
|
||||||
|
blue = "#86abdc"
|
||||||
|
magenta = "#baa1e2"
|
||||||
|
cyan = "#7ad5d6"
|
||||||
|
white = "#e4e4e5"
|
||||||
|
|
||||||
|
[colors.dim]
|
||||||
|
black = "#30323a"
|
||||||
|
red = "#ab435d"
|
||||||
|
green = "#6e9783"
|
||||||
|
yellow = "#baa363"
|
||||||
|
blue = "#6085b6"
|
||||||
|
magenta = "#8567b6"
|
||||||
|
cyan = "#54aeb0"
|
||||||
|
white = "#bebebe"
|
30
alacritty/.config/alacritty/light.toml
Normal file
30
alacritty/.config/alacritty/light.toml
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
# Colors (Alabaster)
|
||||||
|
# author tonsky
|
||||||
|
|
||||||
|
[colors.primary]
|
||||||
|
background = '#FFFFFF' # changed
|
||||||
|
foreground = '#434343'
|
||||||
|
|
||||||
|
[colors.cursor]
|
||||||
|
text = '#F7F7F7'
|
||||||
|
cursor = '#434343'
|
||||||
|
|
||||||
|
[colors.normal]
|
||||||
|
black = '#000000'
|
||||||
|
red = '#AA3731'
|
||||||
|
green = '#448C27'
|
||||||
|
yellow = '#CB9000'
|
||||||
|
blue = '#325CC0'
|
||||||
|
magenta = '#7A3E9D'
|
||||||
|
cyan = '#0083B2'
|
||||||
|
white = '#BBBBBB'
|
||||||
|
|
||||||
|
[colors.bright]
|
||||||
|
black = '#777777'
|
||||||
|
red = '#F05050'
|
||||||
|
green = '#60CB00'
|
||||||
|
yellow = '#FFBC5D'
|
||||||
|
blue = '#007ACC'
|
||||||
|
magenta = '#E64CE6'
|
||||||
|
cyan = '#00AACB'
|
||||||
|
white = '#FFFFFF'
|
@ -1,30 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
case "$1" in
|
|
||||||
lupan-dark|lupan-dark-blue|lupan-dark-gray|lupan-light|lupan-material-dark|lupan-material-light)
|
|
||||||
sed -i "s/^colors: [*].*/colors: *$1/" ~/.config/alacritty/alacritty.yml
|
|
||||||
;;
|
|
||||||
--next)
|
|
||||||
case $(grep colors: ~/.config/alacritty/alacritty.yml) in
|
|
||||||
'colors: *lupan-dark')
|
|
||||||
THEME=lupan-dark-blue
|
|
||||||
;;
|
|
||||||
'colors: *lupan-dark-blue')
|
|
||||||
THEME=lupan-dark-gray
|
|
||||||
;;
|
|
||||||
'colors: *lupan-dark-gray')
|
|
||||||
THEME=lupan-light
|
|
||||||
;;
|
|
||||||
'colors: *lupan-light')
|
|
||||||
THEME=lupan-material-dark
|
|
||||||
;;
|
|
||||||
'colors: *lupan-material-dark')
|
|
||||||
THEME=lupan-material-light
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
THEME=lupan-dark
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
sed -i "s/^colors: [*].*/colors: *$THEME/" ~/.config/alacritty/alacritty.yml
|
|
||||||
;;
|
|
||||||
esac
|
|
@ -51,7 +51,20 @@ end
|
|||||||
|
|
||||||
-- {{{ Variable definitions
|
-- {{{ Variable definitions
|
||||||
-- Themes define colours, icons, font and wallpapers.
|
-- Themes define colours, icons, font and wallpapers.
|
||||||
local theme = "theme_dark.lua"
|
|
||||||
|
local function read_theme()
|
||||||
|
local theme = "theme_dark.lua"
|
||||||
|
local f = io.open(os.getenv('HOME') .. '/.config/alacritty/alacritty.toml')
|
||||||
|
if f then
|
||||||
|
if string.find(f:read('*all'), 'light') then
|
||||||
|
theme = 'theme_light.lua'
|
||||||
|
end
|
||||||
|
f:close()
|
||||||
|
return theme
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
local theme = read_theme()
|
||||||
beautiful.init(gears.filesystem.get_configuration_dir() .. theme)
|
beautiful.init(gears.filesystem.get_configuration_dir() .. theme)
|
||||||
|
|
||||||
local function set_wallpaper(s)
|
local function set_wallpaper(s)
|
||||||
|
@ -1,51 +1,56 @@
|
|||||||
local themes_path = require("gears.filesystem").get_themes_dir()
|
local themes_path = require("gears.filesystem").get_themes_dir()
|
||||||
|
|
||||||
local xresources = require("beautiful.xresources")
|
local xresources = require("beautiful.xresources")
|
||||||
local dpi = xresources.apply_dpi
|
local dpi = xresources.apply_dpi
|
||||||
|
|
||||||
local theme = {}
|
local theme = {}
|
||||||
|
|
||||||
theme.font = "GoMono Nerd Font 10.5"
|
theme.font = "Fira Code Nerd Font 10"
|
||||||
theme.tasklist_disable_icon = true
|
theme.tasklist_disable_icon = true
|
||||||
theme.wibar_height = 40
|
theme.wibar_height = 40
|
||||||
|
|
||||||
theme.bg_normal = "#283538"
|
theme.bg_normal = "#293d38" -- hsl(165deg 20% 20%)
|
||||||
theme.bg_focus = "#495d62"
|
theme.bg_focus = "#478575" -- hsl(165deg 30% 40%)
|
||||||
theme.bg_urgent = "#d8aeb5"
|
theme.bg_urgent = "#5c3d45" -- hsl(345deg 20% 30%)
|
||||||
theme.bg_minimize = "#4e5c5f"
|
theme.bg_minimize = "#363e49" -- hsl(215deg 15% 25%)
|
||||||
theme.bg_systray = theme.bg_normal
|
theme.bg_systray = theme.bg_normal
|
||||||
theme.tasklist_bg_focus = "#354d52"
|
theme.tasklist_bg_focus = "#3d5c54" -- hsl(165deg 20% 30%)
|
||||||
|
|
||||||
theme.fg_normal = "#9ea7aa"
|
theme.fg_normal = "#a9d6ca" -- hsl(165deg 35% 75%)"
|
||||||
theme.fg_focus = "#b1babd"
|
theme.fg_focus = "#b1babd"
|
||||||
theme.fg_urgent = theme.bg_focus
|
theme.fg_urgent = theme.bg_focus
|
||||||
theme.fg_minimize = "#8a9294"
|
theme.fg_minimize = "#8a9294"
|
||||||
theme.taglist_fg_empty = "#798082"
|
theme.taglist_fg_empty = "#62847b" -- hsl(165deg 15% 45%)"
|
||||||
|
|
||||||
theme.useless_gap = dpi(1)
|
theme.useless_gap = dpi(1)
|
||||||
theme.border_width = dpi(2)
|
theme.border_width = dpi(2)
|
||||||
theme.border_normal = "#708090"
|
theme.border_normal = "#708090"
|
||||||
theme.border_focus = "#a0522d"
|
theme.border_focus = "#a0522d"
|
||||||
theme.border_marked = "#91231c"
|
theme.border_marked = "#91231c"
|
||||||
|
|
||||||
theme.bg_wallpaper = "#424a4c"
|
theme.bg_wallpaper = "#424a4c"
|
||||||
|
|
||||||
|
theme.hotkeys_font = theme.font
|
||||||
|
theme.hotkeys_description_font = theme.font
|
||||||
|
theme.hotkeys_bg = theme.bg_minimize
|
||||||
|
theme.hotkeys_modifiers_fg = theme.border_focus
|
||||||
|
|
||||||
-- You can use your own layout icons like this:
|
-- You can use your own layout icons like this:
|
||||||
theme.layout_fairh = themes_path .. "default/layouts/fairhw.png"
|
theme.layout_fairh = themes_path .. "default/layouts/fairhw.png"
|
||||||
theme.layout_fairv = themes_path .. "default/layouts/fairvw.png"
|
theme.layout_fairv = themes_path .. "default/layouts/fairvw.png"
|
||||||
theme.layout_floating = themes_path .. "default/layouts/floatingw.png"
|
theme.layout_floating = themes_path .. "default/layouts/floatingw.png"
|
||||||
theme.layout_magnifier = themes_path .. "default/layouts/magnifierw.png"
|
theme.layout_magnifier = themes_path .. "default/layouts/magnifierw.png"
|
||||||
theme.layout_max = themes_path .. "default/layouts/maxw.png"
|
theme.layout_max = themes_path .. "default/layouts/maxw.png"
|
||||||
theme.layout_fullscreen = themes_path .. "default/layouts/fullscreenw.png"
|
theme.layout_fullscreen = themes_path .. "default/layouts/fullscreenw.png"
|
||||||
theme.layout_tilebottom = themes_path .. "default/layouts/tilebottomw.png"
|
theme.layout_tilebottom = themes_path .. "default/layouts/tilebottomw.png"
|
||||||
theme.layout_tileleft = themes_path .. "default/layouts/tileleftw.png"
|
theme.layout_tileleft = themes_path .. "default/layouts/tileleftw.png"
|
||||||
theme.layout_tile = themes_path .. "default/layouts/tilew.png"
|
theme.layout_tile = themes_path .. "default/layouts/tilew.png"
|
||||||
theme.layout_tiletop = themes_path .. "default/layouts/tiletopw.png"
|
theme.layout_tiletop = themes_path .. "default/layouts/tiletopw.png"
|
||||||
theme.layout_spiral = themes_path .. "default/layouts/spiralw.png"
|
theme.layout_spiral = themes_path .. "default/layouts/spiralw.png"
|
||||||
theme.layout_dwindle = themes_path .. "default/layouts/dwindlew.png"
|
theme.layout_dwindle = themes_path .. "default/layouts/dwindlew.png"
|
||||||
theme.layout_cornernw = themes_path .. "default/layouts/cornernww.png"
|
theme.layout_cornernw = themes_path .. "default/layouts/cornernww.png"
|
||||||
theme.layout_cornerne = themes_path .. "default/layouts/cornernew.png"
|
theme.layout_cornerne = themes_path .. "default/layouts/cornernew.png"
|
||||||
theme.layout_cornersw = themes_path .. "default/layouts/cornersww.png"
|
theme.layout_cornersw = themes_path .. "default/layouts/cornersww.png"
|
||||||
theme.layout_cornerse = themes_path .. "default/layouts/cornersew.png"
|
theme.layout_cornerse = themes_path .. "default/layouts/cornersew.png"
|
||||||
|
|
||||||
return theme
|
return theme
|
||||||
|
@ -1,51 +1,56 @@
|
|||||||
local themes_path = require("gears.filesystem").get_themes_dir()
|
local themes_path = require("gears.filesystem").get_themes_dir()
|
||||||
|
|
||||||
local xresources = require("beautiful.xresources")
|
local xresources = require("beautiful.xresources")
|
||||||
local dpi = xresources.apply_dpi
|
local dpi = xresources.apply_dpi
|
||||||
|
|
||||||
local theme = {}
|
local theme = {}
|
||||||
|
|
||||||
theme.font = "GoMono Nerd Font 10.5"
|
theme.font = "Fira Code Nerd Font 10"
|
||||||
theme.tasklist_disable_icon = true
|
theme.tasklist_disable_icon = true
|
||||||
theme.wibar_height = 40
|
theme.wibar_height = 40
|
||||||
|
|
||||||
theme.bg_normal = "#283538"
|
theme.bg_normal = "#293d38" -- hsl(165deg 20% 20%)
|
||||||
theme.bg_focus = "#badde6"
|
theme.bg_focus = "#a9d6ca" -- hsl(165deg 35% 75%)
|
||||||
theme.bg_urgent = "#d0426a"
|
theme.bg_urgent = "#bc8f9b" -- hsl(345deg 25% 65%)
|
||||||
theme.bg_minimize = "#627b81"
|
theme.bg_minimize = "#62847b" -- hsl(165deg 15% 45%)
|
||||||
theme.bg_systray = theme.bg_normal
|
theme.bg_systray = theme.bg_normal
|
||||||
theme.tasklist_bg_focus = "#9cc2cb"
|
theme.tasklist_bg_focus = "#8fbcb1" -- hsl(165deg 25% 65%)
|
||||||
|
|
||||||
theme.fg_normal = "#616c6f"
|
theme.fg_normal = "#a9d6ca" -- hsl(165deg 35% 75%)"
|
||||||
theme.fg_focus = "#363d3e"
|
theme.fg_focus = "#363d3e"
|
||||||
theme.fg_urgent = "#e9f2f5"
|
theme.fg_urgent = "#e9f2f5"
|
||||||
theme.fg_minimize = "#4b5456"
|
theme.fg_minimize = "#4b5456"
|
||||||
theme.taglist_fg_empty = "#566063"
|
theme.taglist_fg_empty = "#62847b" -- hsl(165deg 15% 45%)"
|
||||||
|
|
||||||
theme.useless_gap = dpi(1)
|
theme.useless_gap = dpi(1)
|
||||||
theme.border_width = dpi(2)
|
theme.border_width = dpi(2)
|
||||||
theme.border_normal = "#bebebe"
|
theme.border_normal = "#bebebe"
|
||||||
theme.border_focus = "#ff7f50"
|
theme.border_focus = "#ff7f50"
|
||||||
theme.border_marked = "#91231c"
|
theme.border_marked = "#91231c"
|
||||||
|
|
||||||
theme.bg_wallpaper = "#b0bec2"
|
theme.bg_wallpaper = "#b0bec2"
|
||||||
|
|
||||||
|
theme.hotkeys_font = theme.font
|
||||||
|
theme.hotkeys_description_font = theme.font
|
||||||
|
theme.hotkeys_bg = theme.border_normal
|
||||||
|
theme.hotkeys_modifiers_fg = theme.bg_focus
|
||||||
|
|
||||||
-- You can use your own layout icons like this:
|
-- You can use your own layout icons like this:
|
||||||
theme.layout_fairh = themes_path .. "default/layouts/fairhw.png"
|
theme.layout_fairh = themes_path .. "default/layouts/fairhw.png"
|
||||||
theme.layout_fairv = themes_path .. "default/layouts/fairvw.png"
|
theme.layout_fairv = themes_path .. "default/layouts/fairvw.png"
|
||||||
theme.layout_floating = themes_path .. "default/layouts/floatingw.png"
|
theme.layout_floating = themes_path .. "default/layouts/floatingw.png"
|
||||||
theme.layout_magnifier = themes_path .. "default/layouts/magnifierw.png"
|
theme.layout_magnifier = themes_path .. "default/layouts/magnifierw.png"
|
||||||
theme.layout_max = themes_path .. "default/layouts/maxw.png"
|
theme.layout_max = themes_path .. "default/layouts/maxw.png"
|
||||||
theme.layout_fullscreen = themes_path .. "default/layouts/fullscreenw.png"
|
theme.layout_fullscreen = themes_path .. "default/layouts/fullscreenw.png"
|
||||||
theme.layout_tilebottom = themes_path .. "default/layouts/tilebottomw.png"
|
theme.layout_tilebottom = themes_path .. "default/layouts/tilebottomw.png"
|
||||||
theme.layout_tileleft = themes_path .. "default/layouts/tileleftw.png"
|
theme.layout_tileleft = themes_path .. "default/layouts/tileleftw.png"
|
||||||
theme.layout_tile = themes_path .. "default/layouts/tilew.png"
|
theme.layout_tile = themes_path .. "default/layouts/tilew.png"
|
||||||
theme.layout_tiletop = themes_path .. "default/layouts/tiletopw.png"
|
theme.layout_tiletop = themes_path .. "default/layouts/tiletopw.png"
|
||||||
theme.layout_spiral = themes_path .. "default/layouts/spiralw.png"
|
theme.layout_spiral = themes_path .. "default/layouts/spiralw.png"
|
||||||
theme.layout_dwindle = themes_path .. "default/layouts/dwindlew.png"
|
theme.layout_dwindle = themes_path .. "default/layouts/dwindlew.png"
|
||||||
theme.layout_cornernw = themes_path .. "default/layouts/cornernww.png"
|
theme.layout_cornernw = themes_path .. "default/layouts/cornernww.png"
|
||||||
theme.layout_cornerne = themes_path .. "default/layouts/cornernew.png"
|
theme.layout_cornerne = themes_path .. "default/layouts/cornernew.png"
|
||||||
theme.layout_cornersw = themes_path .. "default/layouts/cornersww.png"
|
theme.layout_cornersw = themes_path .. "default/layouts/cornersww.png"
|
||||||
theme.layout_cornerse = themes_path .. "default/layouts/cornersew.png"
|
theme.layout_cornerse = themes_path .. "default/layouts/cornersew.png"
|
||||||
|
|
||||||
return theme
|
return theme
|
||||||
|
@ -1,37 +1,53 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
|
REQUIRED="$1"
|
||||||
|
|
||||||
|
check_dependency() {
|
||||||
|
local CMD="$1"
|
||||||
|
shift
|
||||||
|
for REQ in "$@"; do
|
||||||
|
if [ "$REQ" = "$REQUIRED" ]; then
|
||||||
|
which "$CMD"
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
echo '# required:'
|
echo '# required:'
|
||||||
for CMD in \
|
|
||||||
zsh \
|
check_dependency zsh dwm hypr
|
||||||
git \
|
check_dependency git dwm hypr
|
||||||
cc \
|
check_dependency cc dwm
|
||||||
make \
|
check_dependency make dwm
|
||||||
setxkbmap \
|
check_dependency setxkbmap dwm
|
||||||
slock \
|
check_dependency slock dwm
|
||||||
systemctl \
|
check_dependency systemctl dwm hypr
|
||||||
xmodmap \
|
check_dependency xmodmap dwm
|
||||||
xrandr \
|
check_dependency xrandr dwm
|
||||||
xrdb \
|
check_dependency xrdb dwm
|
||||||
xset \
|
check_dependency xset dwm
|
||||||
xsetroot \
|
check_dependency xsetroot dwm
|
||||||
hsetroot \
|
check_dependency hsetroot dwm
|
||||||
xsettingsd \
|
check_dependency xsettingsd dwm
|
||||||
sed \
|
check_dependency sed dwm hypr
|
||||||
pkill \
|
check_dependency pkill dwm
|
||||||
dmenu \
|
check_dependency dmenu dwm
|
||||||
dmenu_run \
|
check_dependency dmenu_run dwm
|
||||||
xss-lock \
|
check_dependency xss-lock dwm
|
||||||
exa \
|
check_dependency exa dwm hypr
|
||||||
fzf \
|
check_dependency fzf dwm hypr
|
||||||
; do
|
check_dependency Hyprland hypr
|
||||||
which "$CMD"
|
check_dependency hyprctl hypr
|
||||||
done
|
check_dependency alacritty hypr
|
||||||
|
check_dependency swaylock hypr
|
||||||
|
check_dependency waybar hypr
|
||||||
|
check_dependency wofi hypr
|
||||||
|
|
||||||
echo -e '\n# optional:'
|
echo -e '\n# optional:'
|
||||||
for CMD in \
|
|
||||||
sx \
|
check_dependency sx dwm
|
||||||
picom \
|
check_dependency picom dwm
|
||||||
compton \
|
check_dependency compton dwm
|
||||||
xbacklight; do
|
check_dependency xbacklight dwm
|
||||||
which "$CMD"
|
check_dependency wl-copy hypr
|
||||||
done
|
check_dependency wl-paste hypr
|
||||||
|
4
foot/.config/foot/foot.ini
Normal file
4
foot/.config/foot/foot.ini
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
[main]
|
||||||
|
font = Fira Code Nerd Font:size=11
|
||||||
|
|
||||||
|
include = /usr/share/foot/themes/nord
|
4
hyprland/.config/hypr/five-rotated.conf
Normal file
4
hyprland/.config/hypr/five-rotated.conf
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
monitor=DP-1,highres,0x0,2,transform,1
|
||||||
|
monitor=HDMI-A-2,highres,1080x0,2
|
||||||
|
|
||||||
|
# vim: ft=hyprlang
|
4
hyprland/.config/hypr/five.conf
Normal file
4
hyprland/.config/hypr/five.conf
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
monitor=DP-1,highres,0x0,2
|
||||||
|
monitor=HDMI-A-2,highres,1920x0,2
|
||||||
|
|
||||||
|
# vim: ft=hyprlang
|
151
hyprland/.config/hypr/hyprland.conf
Normal file
151
hyprland/.config/hypr/hyprland.conf
Normal file
@ -0,0 +1,151 @@
|
|||||||
|
source = ~/.config/hypr/white.conf
|
||||||
|
|
||||||
|
input {
|
||||||
|
kb_layout = pl
|
||||||
|
kb_options = ctrl:nocaps
|
||||||
|
}
|
||||||
|
|
||||||
|
general {
|
||||||
|
gaps_in = 3
|
||||||
|
gaps_out = 4
|
||||||
|
layout = master
|
||||||
|
border_size = 3
|
||||||
|
col.inactive_border = 0xff5387ac
|
||||||
|
col.active_border = 0xffac7853
|
||||||
|
}
|
||||||
|
|
||||||
|
dwindle {
|
||||||
|
preserve_split = true
|
||||||
|
}
|
||||||
|
|
||||||
|
decoration {
|
||||||
|
rounding = 4
|
||||||
|
}
|
||||||
|
|
||||||
|
animations {
|
||||||
|
enabled = false
|
||||||
|
}
|
||||||
|
|
||||||
|
misc {
|
||||||
|
disable_hyprland_logo = true
|
||||||
|
disable_splash_rendering = true
|
||||||
|
disable_autoreload = true
|
||||||
|
background_color = 0xff808080
|
||||||
|
}
|
||||||
|
|
||||||
|
binds {
|
||||||
|
workspace_back_and_forth = true
|
||||||
|
}
|
||||||
|
|
||||||
|
$menu = wofi -S run
|
||||||
|
$terminal = alacritty || kitty
|
||||||
|
|
||||||
|
$mainMod = SUPER
|
||||||
|
|
||||||
|
bind = $mainMod, P, exec, $menu
|
||||||
|
bind = $mainMod SHIFT, Return, exec, $terminal
|
||||||
|
bind = $mainMod ALT, Return, exec, $terminal
|
||||||
|
bind = $mainMod, Return, layoutmsg,swapwithmaster master
|
||||||
|
bind = $mainMod CONTROL SHIFT, Q, exit
|
||||||
|
bind = $mainMod, Q, exec, hyprctl reload
|
||||||
|
bind = $mainMod CONTROL SHIFT, C, killactive
|
||||||
|
bind = $mainMod CONTROL SHIFT, L, exec, swaylock -c 263c59
|
||||||
|
bind = $mainMod ALT, O, exec, swaylock -c 263c59
|
||||||
|
bind = $mainMod CONTROL SHIFT, S, exec, swaylock -c 263c59
|
||||||
|
bind = $mainMod CONTROL SHIFT, S, exec, systemctl suspend
|
||||||
|
bind = $mainMod ALT, S, exec, swaylock -c 263c59
|
||||||
|
bind = $mainMod ALT, S, exec, systemctl suspend
|
||||||
|
bind = $mainMod CONTROL, Space, togglefloating
|
||||||
|
bind = $mainMod, D, exec, hyprctl keyword general:layout "dwindle"
|
||||||
|
bind = $mainMod, M, exec, hyprctl keyword general:layout "master"
|
||||||
|
bind = $mainMod, F, fullscreen, 0
|
||||||
|
bind = $mainMod SHIFT, F, fullscreen, 1
|
||||||
|
bind = $mainMod ALT, F, fullscreen, 1
|
||||||
|
bind = $mainMod, U, layoutmsg, togglesplit
|
||||||
|
bind = $mainMod, I, layoutmsg, cycleprev
|
||||||
|
bind = $mainMod, O, layoutmsg, cyclenext
|
||||||
|
bind = $mainMod, A, focuscurrentorlast
|
||||||
|
bind = $mainMod SHIFT, I, layoutmsg, swapprev
|
||||||
|
bind = $mainMod SHIFT, O, layoutmsg, swapnext
|
||||||
|
bind = $mainMod CONTROL, I, layoutmsg, removemaster
|
||||||
|
bind = $mainMod CONTROL, O, layoutmsg, addmaster
|
||||||
|
bind = $mainMod SHIFT, F6, exec, ~/bin/lupan-set-theme toggle
|
||||||
|
bind = $mainMod ALT, T, exec, ~/bin/lupan-set-theme toggle
|
||||||
|
|
||||||
|
bind = $mainMod, h, movefocus, l
|
||||||
|
bind = $mainMod, j, movefocus, d
|
||||||
|
bind = $mainMod, k, movefocus, u
|
||||||
|
bind = $mainMod, l, movefocus, r
|
||||||
|
|
||||||
|
bind = $mainMod SHIFT, h, swapwindow, l
|
||||||
|
bind = $mainMod SHIFT, j, swapwindow, d
|
||||||
|
bind = $mainMod SHIFT, k, swapwindow, u
|
||||||
|
bind = $mainMod SHIFT, l, swapwindow, r
|
||||||
|
|
||||||
|
bind = $mainMod ALT, h, swapwindow, l
|
||||||
|
bind = $mainMod ALT, j, swapwindow, d
|
||||||
|
bind = $mainMod ALT, k, swapwindow, u
|
||||||
|
bind = $mainMod ALT, l, swapwindow, r
|
||||||
|
|
||||||
|
bind = $mainMod CONTROL, h, layoutmsg, orientationleft
|
||||||
|
bind = $mainMod CONTROL, j, layoutmsg, orientationbottom
|
||||||
|
bind = $mainMod CONTROL, k, layoutmsg, orientationtop
|
||||||
|
bind = $mainMod CONTROL, l, layoutmsg, orientationright
|
||||||
|
|
||||||
|
# Switch workspaces with mainMod + [0-9]
|
||||||
|
bind = $mainMod, 1, workspace, 1
|
||||||
|
bind = $mainMod, 2, workspace, 2
|
||||||
|
bind = $mainMod, 3, workspace, 3
|
||||||
|
bind = $mainMod, 4, workspace, 4
|
||||||
|
bind = $mainMod, 5, workspace, 5
|
||||||
|
bind = $mainMod, 6, workspace, 6
|
||||||
|
bind = $mainMod, 7, workspace, 7
|
||||||
|
bind = $mainMod, 8, workspace, 8
|
||||||
|
bind = $mainMod, 9, workspace, 9
|
||||||
|
bind = $mainMod, 0, workspace, 10
|
||||||
|
|
||||||
|
# Move active window to a workspace with mainMod + SHIFT + [0-9]
|
||||||
|
bind = $mainMod SHIFT, 1, movetoworkspace, 1
|
||||||
|
bind = $mainMod SHIFT, 2, movetoworkspace, 2
|
||||||
|
bind = $mainMod SHIFT, 3, movetoworkspace, 3
|
||||||
|
bind = $mainMod SHIFT, 4, movetoworkspace, 4
|
||||||
|
bind = $mainMod SHIFT, 5, movetoworkspace, 5
|
||||||
|
bind = $mainMod SHIFT, 6, movetoworkspace, 6
|
||||||
|
bind = $mainMod SHIFT, 7, movetoworkspace, 7
|
||||||
|
bind = $mainMod SHIFT, 8, movetoworkspace, 8
|
||||||
|
bind = $mainMod SHIFT, 9, movetoworkspace, 9
|
||||||
|
bind = $mainMod SHIFT, 0, movetoworkspace, 10
|
||||||
|
|
||||||
|
bind = $mainMod ALT, 1, movetoworkspace, 1
|
||||||
|
bind = $mainMod ALT, 2, movetoworkspace, 2
|
||||||
|
bind = $mainMod ALT, 3, movetoworkspace, 3
|
||||||
|
bind = $mainMod ALT, 4, movetoworkspace, 4
|
||||||
|
bind = $mainMod ALT, 5, movetoworkspace, 5
|
||||||
|
bind = $mainMod ALT, 6, movetoworkspace, 6
|
||||||
|
bind = $mainMod ALT, 7, movetoworkspace, 7
|
||||||
|
bind = $mainMod ALT, 8, movetoworkspace, 8
|
||||||
|
bind = $mainMod ALT, 9, movetoworkspace, 9
|
||||||
|
bind = $mainMod ALT, 0, movetoworkspace, 10
|
||||||
|
|
||||||
|
bind = $mainMod, right, workspace, m+1
|
||||||
|
bind = $mainMod, left, workspace, m-1
|
||||||
|
|
||||||
|
# Switch workspaces on current monitor with mainMod + Control + [0-9]
|
||||||
|
bind = $mainMod CONTROL, 1, focusworkspaceoncurrentmonitor, 1
|
||||||
|
bind = $mainMod CONTROL, 2, focusworkspaceoncurrentmonitor, 2
|
||||||
|
bind = $mainMod CONTROL, 3, focusworkspaceoncurrentmonitor, 3
|
||||||
|
bind = $mainMod CONTROL, 4, focusworkspaceoncurrentmonitor, 4
|
||||||
|
bind = $mainMod CONTROL, 5, focusworkspaceoncurrentmonitor, 5
|
||||||
|
bind = $mainMod CONTROL, 6, focusworkspaceoncurrentmonitor, 6
|
||||||
|
bind = $mainMod CONTROL, 7, focusworkspaceoncurrentmonitor, 7
|
||||||
|
bind = $mainMod CONTROL, 8, focusworkspaceoncurrentmonitor, 8
|
||||||
|
bind = $mainMod CONTROL, 9, focusworkspaceoncurrentmonitor, 9
|
||||||
|
bind = $mainMod CONTROL, 0, focusworkspaceoncurrentmonitor, 10
|
||||||
|
|
||||||
|
bindm = $mainMod,mouse:272,movewindow
|
||||||
|
bindm = $mainMod,mouse:273,resizewindow
|
||||||
|
|
||||||
|
exec-once = waybar
|
||||||
|
exec-once = swayidle -w timeout 300 'swaylock -f -c 263c59' before-sleep 'swaylock -f -c 263c59'
|
||||||
|
|
||||||
|
# vim: ft=hyprlang
|
5
hyprland/.config/hypr/seven.conf
Normal file
5
hyprland/.config/hypr/seven.conf
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
monitor=eDP-1,prefered,0x0,1.5
|
||||||
|
monitor=DP-1,highres,1280x0,2
|
||||||
|
monitor=HDMI-A-1,highres,3200x0,2
|
||||||
|
|
||||||
|
# vim: ft=hyprlang
|
10
hyprland/.config/hypr/white.conf
Normal file
10
hyprland/.config/hypr/white.conf
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
env = LIBVA_DRIVER_NAME,nvidia
|
||||||
|
env = XDG_SESSION_TYPE,wayland
|
||||||
|
env = GBM_BACKEND,nvidia-drm
|
||||||
|
env = __GLX_VENDOR_LIBRARY_NAME,nvidia
|
||||||
|
env = WLR_NO_HARDWARE_CURSORS,1
|
||||||
|
|
||||||
|
monitor=DP-1,highres,0x0,2
|
||||||
|
monitor=DP-2,highres,1920x0,2
|
||||||
|
|
||||||
|
# vim: ft=hyprlang
|
13
hyprland/.config/waybar/config
Normal file
13
hyprland/.config/waybar/config
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
{
|
||||||
|
"layer": "top",
|
||||||
|
"position": "top",
|
||||||
|
"modules-left": [
|
||||||
|
"hyprland/workspaces",
|
||||||
|
"hyprland/window"
|
||||||
|
],
|
||||||
|
"modules-right": [
|
||||||
|
"tray",
|
||||||
|
"clock"
|
||||||
|
],
|
||||||
|
"reload_style_on_change": true,
|
||||||
|
}
|
12
hyprland/.config/waybar/dark.css
Normal file
12
hyprland/.config/waybar/dark.css
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
* {
|
||||||
|
background-color: #3f4947;
|
||||||
|
color: #9bafac;
|
||||||
|
}
|
||||||
|
|
||||||
|
#workspaces button.active {
|
||||||
|
border-bottom: 3px solid #9bafac;
|
||||||
|
}
|
||||||
|
|
||||||
|
#workspaces button.urgent {
|
||||||
|
border-bottom: 3px solid #a65959;
|
||||||
|
}
|
13
hyprland/.config/waybar/light.css
Normal file
13
hyprland/.config/waybar/light.css
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
* {
|
||||||
|
background-color: #dde4e3;
|
||||||
|
color: #2c3131;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#workspaces button.active {
|
||||||
|
border-bottom: 3px solid #2c3131;
|
||||||
|
}
|
||||||
|
|
||||||
|
#workspaces button.urgent {
|
||||||
|
border-bottom: 3px solid #9e412e;
|
||||||
|
}
|
25
hyprland/.config/waybar/style.css
Normal file
25
hyprland/.config/waybar/style.css
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
@import url("file:///home/lupan/.config/waybar/dark.css");
|
||||||
|
|
||||||
|
* {
|
||||||
|
font-family: Fira Code Nerd Font;
|
||||||
|
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;
|
||||||
|
}
|
32
kitty/.config/kitty/kitty.conf
Normal file
32
kitty/.config/kitty/kitty.conf
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
font_family FiraCode Nerd
|
||||||
|
font_size 11
|
||||||
|
|
||||||
|
cursor_blink_interval 0
|
||||||
|
|
||||||
|
tab_title_template "{fmt.fg.red}{bell_symbol}{activity_symbol}{fmt.fg.tab}{title} {index}"
|
||||||
|
|
||||||
|
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+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
|
||||||
|
map ctrl+alt+4 goto_tab 4
|
||||||
|
map ctrl+alt+5 goto_tab 5
|
||||||
|
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 10
|
||||||
|
|
||||||
|
# BEGIN_KITTY_THEME
|
||||||
|
# Afterglow
|
||||||
|
include current-theme.conf
|
||||||
|
# END_KITTY_THEME
|
@ -1,124 +0,0 @@
|
|||||||
-- [[ Configure LSP ]]
|
|
||||||
-- This function gets run when an LSP connects to a particular buffer.
|
|
||||||
local on_attach = function(_, bufnr)
|
|
||||||
local nmap = function(keys, func, desc)
|
|
||||||
if desc then
|
|
||||||
desc = 'LSP: ' .. desc
|
|
||||||
end
|
|
||||||
|
|
||||||
vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc })
|
|
||||||
end
|
|
||||||
|
|
||||||
nmap('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
|
|
||||||
nmap('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
|
|
||||||
|
|
||||||
nmap('gd', vim.lsp.buf.definition, '[G]oto [D]efinition')
|
|
||||||
nmap('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
|
|
||||||
nmap('gI', vim.lsp.buf.implementation, '[G]oto [I]mplementation')
|
|
||||||
nmap('<leader>D', vim.lsp.buf.type_definition, 'Type [D]efinition')
|
|
||||||
nmap('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
|
|
||||||
nmap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
|
|
||||||
|
|
||||||
-- See `:help K` for why this keymap
|
|
||||||
nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
|
|
||||||
nmap('<leader>K', vim.lsp.buf.signature_help, 'Signature Documentation')
|
|
||||||
|
|
||||||
-- Lesser used LSP functionality
|
|
||||||
nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
|
|
||||||
nmap('<leader>wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder')
|
|
||||||
nmap('<leader>wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder')
|
|
||||||
nmap('<leader>wl', function()
|
|
||||||
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
|
||||||
end, '[W]orkspace [L]ist Folders')
|
|
||||||
|
|
||||||
-- Create a command `:Format` local to the LSP buffer
|
|
||||||
vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_)
|
|
||||||
vim.lsp.buf.format()
|
|
||||||
end, { desc = 'Format current buffer with LSP' })
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Enable the following language servers. They will automatically be installed.
|
|
||||||
local servers = {
|
|
||||||
clangd = {},
|
|
||||||
gopls = {},
|
|
||||||
-- pyright = {},
|
|
||||||
rust_analyzer = {},
|
|
||||||
tsserver = {},
|
|
||||||
|
|
||||||
lua_ls = {
|
|
||||||
Lua = {
|
|
||||||
workspace = { checkThirdParty = false },
|
|
||||||
telemetry = { enable = false },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
-- Setup neovim lua configuration
|
|
||||||
require('neodev').setup()
|
|
||||||
|
|
||||||
-- nvim-cmp supports additional completion capabilities, so broadcast that to servers
|
|
||||||
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
|
||||||
capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
|
|
||||||
|
|
||||||
-- Ensure the servers above are installed
|
|
||||||
local mason_lspconfig = require 'mason-lspconfig'
|
|
||||||
|
|
||||||
mason_lspconfig.setup {
|
|
||||||
ensure_installed = vim.tbl_keys(servers),
|
|
||||||
}
|
|
||||||
|
|
||||||
mason_lspconfig.setup_handlers {
|
|
||||||
function(server_name)
|
|
||||||
require('lspconfig')[server_name].setup {
|
|
||||||
capabilities = capabilities,
|
|
||||||
on_attach = on_attach,
|
|
||||||
settings = servers[server_name],
|
|
||||||
}
|
|
||||||
end,
|
|
||||||
}
|
|
||||||
|
|
||||||
-- [[ Configure nvim-cmp ]]
|
|
||||||
-- See `:help cmp`
|
|
||||||
local cmp = require 'cmp'
|
|
||||||
local luasnip = require 'luasnip'
|
|
||||||
require('luasnip.loaders.from_vscode').lazy_load()
|
|
||||||
luasnip.config.setup {}
|
|
||||||
|
|
||||||
cmp.setup {
|
|
||||||
completion = { autocomplete = false },
|
|
||||||
snippet = {
|
|
||||||
expand = function(args)
|
|
||||||
luasnip.lsp_expand(args.body)
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
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-Space>'] = cmp.mapping.complete {},
|
|
||||||
['<Tab>'] = cmp.mapping(function(fallback)
|
|
||||||
if cmp.visible() then
|
|
||||||
cmp.select_next_item()
|
|
||||||
elseif luasnip.expand_or_locally_jumpable() then
|
|
||||||
luasnip.expand_or_jump()
|
|
||||||
else
|
|
||||||
fallback()
|
|
||||||
end
|
|
||||||
end, { 'i', 's' }),
|
|
||||||
['<S-Tab>'] = cmp.mapping(function(fallback)
|
|
||||||
if cmp.visible() then
|
|
||||||
cmp.select_prev_item()
|
|
||||||
elseif luasnip.locally_jumpable(-1) then
|
|
||||||
luasnip.jump(-1)
|
|
||||||
else
|
|
||||||
fallback()
|
|
||||||
end
|
|
||||||
end, { 'i', 's' }),
|
|
||||||
},
|
|
||||||
sources = {
|
|
||||||
{ name = 'nvim_lsp' },
|
|
||||||
{ name = 'luasnip' },
|
|
||||||
},
|
|
||||||
}
|
|
@ -1,8 +0,0 @@
|
|||||||
local ls = require "luasnip"
|
|
||||||
|
|
||||||
ls.config.set_config {
|
|
||||||
history = true,
|
|
||||||
updateevents = "TextChanged,TextChangedI",
|
|
||||||
}
|
|
||||||
|
|
||||||
require("luasnip.loaders.from_lua").load({ paths = "~/.config/nvim/snippets" })
|
|
@ -1,14 +0,0 @@
|
|||||||
local telescope = require 'telescope'
|
|
||||||
|
|
||||||
telescope.setup({
|
|
||||||
extensions = {
|
|
||||||
whaler = {
|
|
||||||
directories = { "/home/lupan/src" },
|
|
||||||
oneoff_directories = { "/home/lupan/dotfiles" },
|
|
||||||
auto_file_explorer = false,
|
|
||||||
auto_cwd = true,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
telescope.load_extension("whaler")
|
|
@ -1,80 +0,0 @@
|
|||||||
local org = require('orgmode')
|
|
||||||
org.setup_ts_grammar()
|
|
||||||
|
|
||||||
require('nvim-treesitter.configs').setup {
|
|
||||||
ensure_installed = { 'c', 'cpp', 'go', 'haskell', 'lua', 'org', 'python', 'rust', 'tsx', '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',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
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',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
local treesitter_parser_config = require "nvim-treesitter.parsers".get_parser_configs()
|
|
||||||
treesitter_parser_config.templ = {
|
|
||||||
install_info = {
|
|
||||||
url = "https://github.com/vrischmann/tree-sitter-templ.git",
|
|
||||||
files = { "src/parser.c", "src/scanner.c" },
|
|
||||||
branch = "master",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
vim.treesitter.language.register('templ', 'templ')
|
|
||||||
|
|
||||||
org.setup({
|
|
||||||
org_agenda_files = { '~/org/*.org' },
|
|
||||||
org_default_notes_file = '~/org/capture.org',
|
|
||||||
})
|
|
@ -1 +0,0 @@
|
|||||||
vim.keymap.set('n', '<leader>gg', ':Git grep ')
|
|
80
nvim/.config/nvim/lazy-lock.json
Normal file
80
nvim/.config/nvim/lazy-lock.json
Normal file
@ -0,0 +1,80 @@
|
|||||||
|
{
|
||||||
|
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
|
||||||
|
"LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
|
||||||
|
"better-escape.nvim": { "branch": "master", "commit": "199dcc2643dec5d8dbdab4ec672cf405224dcb3b" },
|
||||||
|
"blame.nvim": { "branch": "main", "commit": "39bb4cda9e658d053a43919b10ca52c0a4d738e1" },
|
||||||
|
"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" },
|
||||||
|
"fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
|
||||||
|
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
|
||||||
|
"gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" },
|
||||||
|
"global-note.nvim": { "branch": "main", "commit": "1e0d4bba425d971ed3ce40d182c574a25507115c" },
|
||||||
|
"go.nvim": { "branch": "master", "commit": "0d426e87227dd14584881ecc595c173121456111" },
|
||||||
|
"godoc.nvim": { "branch": "main", "commit": "356f79853dbb3b3e200064367603751895153c29" },
|
||||||
|
"guihua.lua": { "branch": "master", "commit": "d783191eaa75215beae0c80319fcce5e6b3beeda" },
|
||||||
|
"hardtime.nvim": { "branch": "main", "commit": "f87c86d1aa1e05dcf3c6ecd97fbfd237e2de0bf5" },
|
||||||
|
"hererocks": { "branch": "master", "commit": "c9c5444dea1e07e005484014a8231aa667be30b6" },
|
||||||
|
"hlsearch.nvim": { "branch": "main", "commit": "fdeb60b890d15d9194e8600042e5232ef8c29b0e" },
|
||||||
|
"incline.nvim": { "branch": "main", "commit": "27040695b3bbfcd3257669037bd008d1a892831d" },
|
||||||
|
"indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
|
||||||
|
"iswap.nvim": { "branch": "master", "commit": "e02cc91f2a8feb5c5a595767d208c54b6e3258ec" },
|
||||||
|
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
||||||
|
"leap.nvim": { "branch": "main", "commit": "346a16ef942635a8ca5ff92e603d07e7e8be6cbe" },
|
||||||
|
"lsp_signature.nvim": { "branch": "master", "commit": "b58cca003d1d3311213d6db0352f58d8e57bfff0" },
|
||||||
|
"lspsaga.nvim": { "branch": "main", "commit": "778d56ff9b387dacd14ae648ed5604394b486f51" },
|
||||||
|
"marks.nvim": { "branch": "master", "commit": "bb25ae3f65f504379e3d08c8a02560b76eaf91e8" },
|
||||||
|
"mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
|
||||||
|
"mason-tool-installer.nvim": { "branch": "main", "commit": "98767d37f8e5255a5111fc1e3163232d4dc07bda" },
|
||||||
|
"mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
|
||||||
|
"melange-nvim": { "branch": "master", "commit": "2db5407f2f6d6d6286f50f2f7365728d66f6f3ae" },
|
||||||
|
"mellifluous.nvim": { "branch": "v1", "commit": "1637e46585435ebda7963248e0e65422effad8d9" },
|
||||||
|
"mini.nvim": { "branch": "main", "commit": "0420076298c4457f200c2de468f65d080597a347" },
|
||||||
|
"nano-theme.nvim": { "branch": "main", "commit": "0b1158c4911f4bd9d5a1e2e7669ebff893435b64" },
|
||||||
|
"neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
|
||||||
|
"neogit": { "branch": "master", "commit": "6d1bd94f7fca92a50a892f494920696b5defa8c8" },
|
||||||
|
"nordic.nvim": { "branch": "main", "commit": "8627750ece357e9670f9e69853091f7fbb8d6523" },
|
||||||
|
"nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" },
|
||||||
|
"nvim-cmp": { "branch": "main", "commit": "1e1900b0769324a9675ef85b38f99cca29e203b3" },
|
||||||
|
"nvim-lspconfig": { "branch": "master", "commit": "0a1ac55d7d4ec2b2ed9616dfc5406791234d1d2b" },
|
||||||
|
"nvim-surround": { "branch": "main", "commit": "caf6f633d4d77a29b6e265b560c5a035d171a913" },
|
||||||
|
"nvim-treesitter": { "branch": "master", "commit": "aece1062335a9e856636f5da12d8a06c7615ce8a" },
|
||||||
|
"nvim-treesitter-textobjects": { "branch": "master", "commit": "9937e5e356e5b227ec56d83d0a9d0a0f6bc9cad4" },
|
||||||
|
"nvim-web-devicons": { "branch": "master", "commit": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c" },
|
||||||
|
"oil.nvim": { "branch": "master", "commit": "ab887d926c2665a708fbe9e6c4654042cc5f4c60" },
|
||||||
|
"onenord.nvim": { "branch": "main", "commit": "babdcc3da92f0c90703bb612a13a58e5f7669287" },
|
||||||
|
"orgmode": { "branch": "master", "commit": "145dce4d2f1bbaed5ff9e353822981b783627b32" },
|
||||||
|
"persisted.nvim": { "branch": "main", "commit": "b4b7a281307f8b52d47b0fd5b6798a453681d44e" },
|
||||||
|
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
|
||||||
|
"quicker.nvim": { "branch": "master", "commit": "1798be71cdcb15fb84fa8054148a56e17fd391dc" },
|
||||||
|
"rabbit.nvim": { "branch": "master", "commit": "3a4ce048b8ecc48811d061220d0e86111adda20d" },
|
||||||
|
"rest.nvim": { "branch": "main", "commit": "2ded89dbda1fd3c1430685ffadf2df8beb28336d" },
|
||||||
|
"slimline.nvim": { "branch": "main", "commit": "326514876f6e5c051a7a2bf1e926659a74500016" },
|
||||||
|
"sqlite.lua": { "branch": "master", "commit": "50092d60feb242602d7578398c6eb53b4a8ffe7b" },
|
||||||
|
"tardis.nvim": { "branch": "main", "commit": "a6ee00a217529490e79d349b1f1a9cf5831180d3" },
|
||||||
|
"telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
|
||||||
|
"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" },
|
||||||
|
"tmux.nvim": { "branch": "main", "commit": "2c1c3be0ef287073cef963f2aefa31a15c8b9cd8" },
|
||||||
|
"toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
|
||||||
|
"tree-sitter-nu": { "branch": "main", "commit": "d5c71a10b4d1b02e38967b05f8de70e847448dd1" },
|
||||||
|
"tree-sitter-templ": { "branch": "master", "commit": "7f7f06b3931ca00e8ddfbeab3fc08ad00d297fad" },
|
||||||
|
"treesj": { "branch": "main", "commit": "6c616638e3aa0087f2c267bb5990115b67105976" },
|
||||||
|
"treewalker.nvim": { "branch": "main", "commit": "43d3250007d2c5a2ed693c1edebf66d66af33407" },
|
||||||
|
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
|
||||||
|
"undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" },
|
||||||
|
"vim-ReplaceWithRegister": { "branch": "master", "commit": "b82bf59e5387b57d0125afb94fd7984061031136" },
|
||||||
|
"vim-dadbod": { "branch": "master", "commit": "9f0ca8bcef704659820a95c3bbd2c262583a66a1" },
|
||||||
|
"vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" },
|
||||||
|
"vim-dadbod-ui": { "branch": "master", "commit": "685e75b34ee0e12f92ec4507ea8bb7f1aaa936e5" },
|
||||||
|
"vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
|
||||||
|
"vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },
|
||||||
|
"whaler": { "branch": "main", "commit": "9e0b67e36250cb80e679563adcd4b7451eae26b2" },
|
||||||
|
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" },
|
||||||
|
"yankbank-nvim": { "branch": "main", "commit": "ded8f01bd6a7887310e14d463c8aa55eb79ec281" },
|
||||||
|
"zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" }
|
||||||
|
}
|
@ -1,13 +1,18 @@
|
|||||||
-- [[ Highlight on yank ]]
|
-- [[ Highlight on yank ]]
|
||||||
-- See `:help vim.highlight.on_yank()`
|
-- See `:help vim.highlight.on_yank()`
|
||||||
local highlight_group = vim.api.nvim_create_augroup('YankHighlight', { clear = true })
|
|
||||||
vim.api.nvim_create_autocmd('TextYankPost', {
|
vim.api.nvim_create_autocmd('TextYankPost', {
|
||||||
|
desc = 'Highlight when yanking (copying) text',
|
||||||
|
group = vim.api.nvim_create_augroup('YankHighlight', { clear = true }),
|
||||||
callback = function()
|
callback = function()
|
||||||
vim.highlight.on_yank()
|
vim.highlight.on_yank()
|
||||||
end,
|
end,
|
||||||
group = highlight_group,
|
|
||||||
pattern = '*',
|
|
||||||
})
|
})
|
||||||
|
|
||||||
vim.cmd('autocmd BufWritePre *.go :Format')
|
vim.api.nvim_create_autocmd('BufWritePre', {
|
||||||
vim.cmd('autocmd BufWritePre *.lua :Format')
|
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' },
|
||||||
|
})
|
||||||
|
@ -1,7 +1,13 @@
|
|||||||
-- See `:help vim.o`
|
-- See `:help vim.o`
|
||||||
|
|
||||||
|
-- Disable intro message
|
||||||
|
vim.opt.shortmess = vim.opt.shortmess + 'I'
|
||||||
|
|
||||||
|
vim.opt.showmode = false
|
||||||
|
|
||||||
-- Set highlight on search
|
-- Set highlight on search
|
||||||
vim.o.hlsearch = false
|
vim.o.hlsearch = true -- false
|
||||||
|
vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
|
||||||
|
|
||||||
-- Make line numbers default
|
-- Make line numbers default
|
||||||
vim.wo.number = true
|
vim.wo.number = true
|
||||||
@ -25,7 +31,7 @@ vim.wo.signcolumn = 'yes'
|
|||||||
|
|
||||||
-- Decrease update time
|
-- Decrease update time
|
||||||
vim.o.updatetime = 250
|
vim.o.updatetime = 250
|
||||||
vim.o.timeoutlen = 300
|
vim.o.timeout = false
|
||||||
|
|
||||||
-- Set completeopt to have a better completion experience
|
-- Set completeopt to have a better completion experience
|
||||||
vim.o.completeopt = 'menuone,noselect'
|
vim.o.completeopt = 'menuone,noselect'
|
||||||
@ -44,3 +50,7 @@ vim.o.expandtab = true
|
|||||||
vim.g.lightspeed_no_default_keymaps = true
|
vim.g.lightspeed_no_default_keymaps = true
|
||||||
|
|
||||||
vim.o.cursorline = true
|
vim.o.cursorline = true
|
||||||
|
|
||||||
|
vim.opt.foldcolumn = '1'
|
||||||
|
|
||||||
|
vim.opt.laststatus = 3
|
||||||
|
@ -10,33 +10,9 @@ key('v', '<Space>', '<Nop>', { silent = true })
|
|||||||
key('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
|
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', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
|
||||||
|
|
||||||
key("n", "<leader>dd", ":Explore<cr>", { desc = "[D]isplay [d]irectory" })
|
key("n", "<leader>ut", "<cmd>UndotreeToggle<CR>", { desc = "[U]undotree [t]oggle" })
|
||||||
key("n", "<leader>dv", ":Vexplore<cr>", { desc = "[D]isplay directory ([v]ertical split)" })
|
|
||||||
key("n", "<leader>dh", ":Sexplore<cr>", { desc = "[D]isplay [d]irectory ([h]orizontal split)" })
|
|
||||||
key("n", "<leader>dt", ":Lexplore 30<cr>", { desc = "[D]isplay directory [t]oggle" })
|
|
||||||
key("n", "<leader>ct", ":ColorizerToggle<cr>", { desc = "[C]olorizer [t]oggle" })
|
|
||||||
key("n", "<leader>ut", ":UndotreeToggle<cr>", { desc = "[U]undotree [t]oggle" })
|
|
||||||
|
|
||||||
-- telescope
|
-- tabs
|
||||||
|
|
||||||
key('n', '<leader><space>', '<cmd>Telescope buffers<cr>', { desc = '[ ] Find existing buffers' })
|
|
||||||
key('n', '<leader>?', '<cmd>Telescope oldfiles<cr>', { desc = '[?] Find recently opened buffers' })
|
|
||||||
key('n', '<leader>/', function()
|
|
||||||
require('telescope.builtin').current_buffer_fuzzy_find(require("telescope.themes").get_dropdown { previewer = false })
|
|
||||||
end, { desc = '[/] Find in current buffer' })
|
|
||||||
|
|
||||||
key('n', '<leader>gf', '<cmd>Telescope git_files<cr>', { desc = '[G]it [f]iles' })
|
|
||||||
key('n', '<leader>gs', '<cmd>Telescope git_status<cr>', { desc = '[G]it [s]tatus' })
|
|
||||||
key('n', '<leader>ff', '<cmd>Telescope find_files<cr>', { desc = '[F]ind [f]iles' })
|
|
||||||
key('n', '<leader>fg', '<cmd>Telescope live_grep<cr>', { desc = '[F]ind [g]rep' })
|
|
||||||
key('n', '<leader>fw', '<cmd>Telescope grep_string<cr>', { desc = '[F]ind [w]ord' })
|
|
||||||
key('n', '<leader>fh', '<cmd>Telescope help_tags<cr>', { desc = '[F]ind [h]elp (tags)' })
|
|
||||||
key('n', '<leader>fd', '<cmd>Telescope diagnostics<cr>', { desc = '[F]ind [d]iagnostics' })
|
|
||||||
key('n', '<leader>fk', '<cmd>Telescope keymaps<cr>', { desc = '[F]ind [k]eymaps' })
|
|
||||||
|
|
||||||
key('n', '<leader>fF', function()
|
|
||||||
require('telescope.builtin').find_files { hidden = true }
|
|
||||||
end, { desc = '[F]ind [F]iles (with hidden)' })
|
|
||||||
|
|
||||||
key('n', '<leader>td', function()
|
key('n', '<leader>td', function()
|
||||||
require('lupan.ui').tab_change_dir()
|
require('lupan.ui').tab_change_dir()
|
||||||
@ -55,29 +31,34 @@ key('n', '<leader>tt', function()
|
|||||||
end, { desc = '[T]ab [t]oggle previous' })
|
end, { desc = '[T]ab [t]oggle previous' })
|
||||||
|
|
||||||
for i = 1, 9, 1 do
|
for i = 1, 9, 1 do
|
||||||
key('n', '<leader>t' .. i, '<cmd>' .. i .. 'tabnext<cr>', { desc = '[T]ab nr [' .. i .. ']' })
|
key('n', '<leader>t' .. i, '<cmd>' .. i .. 'tabnext<CR>', { desc = '[T]ab nr [' .. i .. ']' })
|
||||||
end
|
end
|
||||||
|
|
||||||
key("n", "<leader>fl", '<cmd>Telescope whaler<cr>', { desc = '[F]ind with wha[l]er' })
|
-- translations
|
||||||
|
|
||||||
|
key('n', '<leader>tr', function()
|
||||||
|
require('lupan.ui').find_translation_key()
|
||||||
|
end, { desc = '[T][r]anlation key find' })
|
||||||
|
|
||||||
-- Diagnostic keymaps
|
-- Diagnostic keymaps
|
||||||
key('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous diagnostic message' })
|
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous [D]iagnostic message' })
|
||||||
key('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next diagnostic message' })
|
vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next [D]iagnostic message' })
|
||||||
key('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Open floating diagnostic message' })
|
vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Show diagnostic [E]rror messages' })
|
||||||
key('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostics list' })
|
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' })
|
||||||
|
|
||||||
key('n', '<leader>N', ':bn<cr>', { desc = '[N]ext buffer' })
|
key('n', '<leader>N', '<cmd>bn<CR>', { desc = '[N]ext buffer' })
|
||||||
key('n', '<leader>P', ':bp<cr>', { desc = '[P]revious buffer' })
|
key('n', '<leader>P', '<cmd>bp<CR>', { desc = '[P]revious buffer' })
|
||||||
|
|
||||||
key('n', '<leader>tc', ':tabnew<cr>', { desc = '[T]ab [c]reate' })
|
key('n', '<leader>tc', '<cmd>tabnew<CR>', { desc = '[T]ab [c]reate' })
|
||||||
key('n', '<leader>ts', ':tab split<cr>', { desc = '[T]ab [s]plit' })
|
key('n', '<leader>tx', '<cmd>tabclose<CR>', { desc = '[T]ab close' })
|
||||||
key('n', '<leader>tn', ':tabnext<cr>', { desc = '[T]ab [n]ext' })
|
key('n', '<leader>ts', '<cmd>tab split<CR>', { desc = '[T]ab [s]plit' })
|
||||||
key('n', '<leader>tp', ':tabprevious<cr>', { desc = '[T]ab [p]revious' })
|
key('n', '<leader>tn', '<cmd>tabnext<CR>', { desc = '[T]ab [n]ext' })
|
||||||
key('n', '<leader>tf', ':tabfirst<cr>', { desc = '[T]ab [f]irst' })
|
key('n', '<leader>tp', '<cmd>tabprevious<CR>', { desc = '[T]ab [p]revious' })
|
||||||
key('n', '<leader>tl', ':tablast<cr>', { desc = '[T]tab [l]ast' })
|
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', 'J', ":m '>+1<CR>gv=gv", { desc = "Move lines down" })
|
||||||
key('v', 'K', ":m '<-2<cr>gv=gv", { desc = "Move lines up" })
|
key('v', 'K', ":m '<-2<CR>gv=gv", { desc = "Move lines up" })
|
||||||
|
|
||||||
-- Change window
|
-- Change window
|
||||||
key('n', '<C-j>', '<C-w>j', opts)
|
key('n', '<C-j>', '<C-w>j', opts)
|
||||||
@ -98,8 +79,11 @@ key('n', 'g?', '<Plug>Lightspeed_S', { desc = "Lightspeed backward search" })
|
|||||||
|
|
||||||
-- Clipboard and quickfix
|
-- Clipboard and quickfix
|
||||||
key({ 'n', 'v' }, '<leader>y', '"+y', { desc = "Yank to clipboard" })
|
key({ 'n', 'v' }, '<leader>y', '"+y', { desc = "Yank to clipboard" })
|
||||||
key('n', '<leader>j', ':cn<CR>', { desc = "Quickfix next" })
|
key('n', '<leader>j', '<cmd>cn<CR>', { desc = "Quickfix next" })
|
||||||
key('n', '<leader>k', ':cp<CR>', { desc = "Quickfix previous" })
|
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
|
-- luasnip
|
||||||
|
|
||||||
@ -127,46 +111,6 @@ end, { silent = true })
|
|||||||
vim.keymap.set("n", "<leader>ss", "<cmd>source ~/.config/nvim/after/plugin/luasnip.lua<CR>",
|
vim.keymap.set("n", "<leader>ss", "<cmd>source ~/.config/nvim/after/plugin/luasnip.lua<CR>",
|
||||||
{ desc = "[S]nippets [s]ource" })
|
{ desc = "[S]nippets [s]ource" })
|
||||||
|
|
||||||
-- terminal
|
|
||||||
|
|
||||||
key('t', '<C-_>', '<C-\\><C-n>')
|
|
||||||
|
|
||||||
-- harpoon
|
|
||||||
|
|
||||||
key('n', '<leader>ha', function()
|
|
||||||
require("harpoon.mark").add_file()
|
|
||||||
end, { desc = '[H]arpoon [a]dd' })
|
|
||||||
|
|
||||||
key('n', '<leader>hm', function()
|
|
||||||
require("harpoon.ui").toggle_quick_menu()
|
|
||||||
end, { desc = '[H]arpoon toggle quick [m]enu' })
|
|
||||||
|
|
||||||
key('n', '<leader>hj', function()
|
|
||||||
require("harpoon.ui").nav_next()
|
|
||||||
end, { desc = '[H]arpoon next (j)' })
|
|
||||||
|
|
||||||
key('n', '<leader>hk', function()
|
|
||||||
require("harpoon.ui").nav_prev()
|
|
||||||
end, { desc = '[H]arpoon prev (k)' })
|
|
||||||
|
|
||||||
for i = 1, 9, 1 do
|
|
||||||
key('n', '<M-' .. i .. '>', function()
|
|
||||||
require("harpoon.ui").nav_file(i)
|
|
||||||
end, { desc = '[H]arpoon nav_file [' .. i .. ']' })
|
|
||||||
end
|
|
||||||
|
|
||||||
for i = 1, 9, 1 do
|
|
||||||
key('n', '<leader>T' .. i, function()
|
|
||||||
require("harpoon.term").gotoTerminal(i)
|
|
||||||
end, { desc = '[H]arpoon nav_file [' .. i .. ']' })
|
|
||||||
end
|
|
||||||
|
|
||||||
-- colors
|
-- colors
|
||||||
|
|
||||||
key('n', '<F6>', function()
|
key('n', '<F6>', function() require('lupan.utils').toggle_color_scheme() end, { desc = 'Toggle background' })
|
||||||
if vim.o.background == "dark" then
|
|
||||||
vim.o.background = "light"
|
|
||||||
else
|
|
||||||
vim.o.background = "dark"
|
|
||||||
end
|
|
||||||
end)
|
|
||||||
|
@ -41,4 +41,29 @@ function M.tab_change_dir_newtab()
|
|||||||
M.tab_change_dir({ action = tabnew_tcd, prompt_title = "Tab change directory (new tab)" })
|
M.tab_change_dir({ action = tabnew_tcd, prompt_title = "Tab change directory (new tab)" })
|
||||||
end
|
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
|
return M
|
||||||
|
53
nvim/.config/nvim/lua/lupan/utils.lua
Normal file
53
nvim/.config/nvim/lua/lupan/utils.lua
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
local M = {}
|
||||||
|
|
||||||
|
local filename = os.getenv('HOME') .. '/.config/alacritty/alacritty.toml'
|
||||||
|
|
||||||
|
local colorschemes = nil
|
||||||
|
|
||||||
|
function M.set_color_schemes(dark, light)
|
||||||
|
colorschemes = { dark = dark, light = light }
|
||||||
|
end
|
||||||
|
|
||||||
|
function M.terminalbg()
|
||||||
|
local ok, lines = pcall(io.lines, filename)
|
||||||
|
if ok then
|
||||||
|
for line in lines do
|
||||||
|
if string.find(line, 'light.toml') then
|
||||||
|
return "light"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
return "dark"
|
||||||
|
end
|
||||||
|
|
||||||
|
function M.update_color_scheme()
|
||||||
|
vim.o.background = M.terminalbg()
|
||||||
|
if colorschemes then
|
||||||
|
vim.cmd.colorscheme(colorschemes[vim.o.background])
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
function M.toggle_color_scheme()
|
||||||
|
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(filename, {}, vim.schedule_wrap(function(...)
|
||||||
|
M.update_color_scheme()
|
||||||
|
w:stop()
|
||||||
|
watch(fname)
|
||||||
|
end))
|
||||||
|
end
|
||||||
|
|
||||||
|
watch(filename)
|
||||||
|
|
||||||
|
return M
|
@ -1,38 +1,35 @@
|
|||||||
local function cwd()
|
|
||||||
return vim.fn.getcwd()
|
|
||||||
end
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
-- Colorscheme
|
{
|
||||||
|
"ramojus/mellifluous.nvim",
|
||||||
|
branch = "v1",
|
||||||
|
},
|
||||||
{
|
{
|
||||||
'rmehri01/onenord.nvim',
|
'rmehri01/onenord.nvim',
|
||||||
lazy = false,
|
|
||||||
priority = 1000,
|
|
||||||
config = function()
|
|
||||||
vim.cmd [[colorscheme onenord]]
|
|
||||||
end,
|
|
||||||
},
|
},
|
||||||
'neanias/everforest-nvim',
|
|
||||||
'bluz71/vim-nightfly-colors',
|
|
||||||
'bluz71/vim-moonfly-colors',
|
|
||||||
'Verf/deepwhite.nvim',
|
|
||||||
|
|
||||||
{
|
{
|
||||||
-- Statusline (see `:help lualine.txt`)
|
'AlexvZyl/nordic.nvim',
|
||||||
'nvim-lualine/lualine.nvim',
|
|
||||||
opts = {
|
|
||||||
options = {
|
|
||||||
icons_enabled = false,
|
|
||||||
theme = 'auto',
|
|
||||||
component_separators = '|',
|
|
||||||
section_separators = '',
|
|
||||||
},
|
|
||||||
sections = {
|
|
||||||
lualine_x = { cwd, 'encoding', 'fileformat', 'filetype' }
|
|
||||||
}
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"savq/melange-nvim",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'ronisbr/nano-theme.nvim',
|
||||||
|
config = function()
|
||||||
|
local nano = require('nano-theme.colors')
|
||||||
|
local nano_get = nano.get
|
||||||
|
function nano.get()
|
||||||
|
local t = nano_get()
|
||||||
|
local light = vim.o.background == 'light'
|
||||||
|
if not light then
|
||||||
|
t.nano_strong.fg = '#ECEFF4'
|
||||||
|
end
|
||||||
|
return t
|
||||||
|
end
|
||||||
|
|
||||||
|
require('lupan.utils').set_color_schemes('nano-theme', 'nano-theme')
|
||||||
|
require('lupan.utils').update_color_scheme()
|
||||||
|
end
|
||||||
|
},
|
||||||
{
|
{
|
||||||
-- Indentation guides (see `:help indent_blankline.txt`)
|
-- Indentation guides (see `:help indent_blankline.txt`)
|
||||||
'lukas-reineke/indent-blankline.nvim',
|
'lukas-reineke/indent-blankline.nvim',
|
||||||
@ -41,7 +38,15 @@ return {
|
|||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
'norcalli/nvim-colorizer.lua',
|
--- Create Color Code
|
||||||
cmd = 'ColorizerToggle'
|
'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" },
|
||||||
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
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,
|
||||||
|
}
|
12
nvim/.config/nvim/lua/plugins/bookmarks.lua
Normal file
12
nvim/.config/nvim/lua/plugins/bookmarks.lua
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
return {
|
||||||
|
{
|
||||||
|
"chentoast/marks.nvim",
|
||||||
|
event = "VeryLazy",
|
||||||
|
config = true,
|
||||||
|
keys = {
|
||||||
|
{ '<leader>ma', '<cmd>MarksListAll<CR>' },
|
||||||
|
{ '<leader>mb', '<cmd>MarksListBuf<CR>' },
|
||||||
|
{ '<leader>mg', '<cmd>MarksListGlobal<CR>' },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
51
nvim/.config/nvim/lua/plugins/convenience.lua
Normal file
51
nvim/.config/nvim/lua/plugins/convenience.lua
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
return {
|
||||||
|
{
|
||||||
|
'folke/which-key.nvim',
|
||||||
|
event = 'VimEnter',
|
||||||
|
opts = {
|
||||||
|
preset = 'helix',
|
||||||
|
delay = 1000,
|
||||||
|
},
|
||||||
|
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,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"folke/zen-mode.nvim",
|
||||||
|
opts = {
|
||||||
|
window = { width = 180 },
|
||||||
|
plugins = {
|
||||||
|
tmux = { enabled = true },
|
||||||
|
},
|
||||||
|
on_open = function()
|
||||||
|
vim.opt.laststatus = 1
|
||||||
|
require('incline').disable()
|
||||||
|
vim.system({ 'hyprctl', 'dispatch', 'fullscreen' })
|
||||||
|
vim.system({ 'awesome-client', 'client.focus.fullscreen = true' })
|
||||||
|
end,
|
||||||
|
on_close = function()
|
||||||
|
vim.opt.laststatus = 3
|
||||||
|
require('incline').enable()
|
||||||
|
vim.system({ 'hyprctl', 'dispatch', 'fullscreen' })
|
||||||
|
vim.system({ 'awesome-client', 'client.focus.fullscreen = false' })
|
||||||
|
end
|
||||||
|
},
|
||||||
|
keys = { { "<leader>z", "<cmd>ZenMode<CR>" } },
|
||||||
|
},
|
||||||
|
}
|
@ -8,21 +8,87 @@ return {
|
|||||||
-- Undo browsing
|
-- Undo browsing
|
||||||
'mbbill/undotree',
|
'mbbill/undotree',
|
||||||
|
|
||||||
|
|
||||||
-- Tabstops autodetected
|
-- Tabstops autodetected
|
||||||
'tpope/vim-sleuth',
|
'tpope/vim-sleuth',
|
||||||
|
|
||||||
{
|
{
|
||||||
"kylechui/nvim-surround",
|
"kylechui/nvim-surround",
|
||||||
version = "*", -- Use for stability; omit to use `main` branch for the latest features
|
version = "^3.0.0", -- Use for stability; omit to use `main` branch for the latest features
|
||||||
event = "VeryLazy",
|
event = "VeryLazy",
|
||||||
config = function()
|
config = true,
|
||||||
require("nvim-surround").setup({})
|
|
||||||
end
|
|
||||||
},
|
},
|
||||||
|
|
||||||
'ggandor/lightspeed.nvim',
|
{
|
||||||
|
'inkarkat/vim-ReplaceWithRegister',
|
||||||
|
keys = {
|
||||||
|
{ 'gp', '<Plug>ReplaceWithRegisterOperator' },
|
||||||
|
{ 'gpp', '<Plug>ReplaceWithRegisterLine' },
|
||||||
|
{ 'gp', '<Plug>ReplaceWithRegisterVisual', mode = 'x' },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
-- change directory with telescope from a list of dierectories
|
{
|
||||||
"SalOrak/whaler",
|
'ggandor/leap.nvim',
|
||||||
|
opts = {
|
||||||
|
safe_labels = {},
|
||||||
|
},
|
||||||
|
dependencies = {
|
||||||
|
"tpope/vim-repeat",
|
||||||
|
},
|
||||||
|
keys = {
|
||||||
|
{ '\\', '<Plug>(leap)', mode = { 'n', 'x', 'o' } },
|
||||||
|
{ 'gs', '<Plug>(leap-from-window)', mode = { 'n', 'x', 'o' } },
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
'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" },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
-- rehighlight search on n or N
|
||||||
|
{
|
||||||
|
'nvimdev/hlsearch.nvim',
|
||||||
|
event = 'BufRead',
|
||||||
|
config = true,
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
'mizlan/iswap.nvim',
|
||||||
|
event = 'VeryLazy',
|
||||||
|
keys = {
|
||||||
|
{ '<leader>cs', '<cmd>ISwapWith<CR>', desc = 'I[S]wap' },
|
||||||
|
{ '<leader>cS', '<cmd>ISwap<CR>', desc = 'I[S]wapWith' },
|
||||||
|
{ '<leader>cn', '<cmd>ISwapNodeWith<CR>', desc = 'ISwap[N]ode' },
|
||||||
|
{ '<leader>cN', '<cmd>ISwapNode<CR>', desc = 'ISwap[N]ode' },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
'aaronik/treewalker.nvim',
|
||||||
|
keys = {
|
||||||
|
{ '<leader>ch', '<cmd>Treewalker Left<CR>', desc = 'Tree Left' },
|
||||||
|
{ '<leader>cj', '<cmd>Treewalker Down<CR>', desc = 'Tree Down' },
|
||||||
|
{ '<leader>ck', '<cmd>Treewalker Up<CR>', desc = 'Tree Up' },
|
||||||
|
{ '<leader>cl', '<cmd>Treewalker Right<CR>', desc = 'Tree Right' },
|
||||||
|
{ '<leader>cJ', '<cmd>Treewalker SwapDown<CR>', desc = 'Tree Swap Down' },
|
||||||
|
{ '<leader>cK', '<cmd>Treewalker SwapUp<CR>', desc = 'Tree Swap Up' },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
'echasnovski/mini.nvim',
|
||||||
|
version = '*',
|
||||||
|
config = function()
|
||||||
|
require('mini.ai').setup()
|
||||||
|
end
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
13
nvim/.config/nvim/lua/plugins/file-explorer.lua
Normal file
13
nvim/.config/nvim/lua/plugins/file-explorer.lua
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
return {
|
||||||
|
{
|
||||||
|
'stevearc/oil.nvim',
|
||||||
|
dependencies = { "nvim-tree/nvim-web-devicons" },
|
||||||
|
opts = {
|
||||||
|
default_file_explorer = true,
|
||||||
|
delete_to_trash = true,
|
||||||
|
},
|
||||||
|
keys = {
|
||||||
|
{ "<leader>-", "<cmd>Oil<CR>", desc = "Open parent directory" },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
@ -1,6 +1,48 @@
|
|||||||
return {
|
return {
|
||||||
-- Git
|
-- Git
|
||||||
'tpope/vim-fugitive',
|
{
|
||||||
|
'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
|
-- Adds git releated signs to the gutter, as well as utilities for managing changes
|
||||||
|
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' },
|
||||||
|
}
|
24
nvim/.config/nvim/lua/plugins/godoc.lua
Normal file
24
nvim/.config/nvim/lua/plugins/godoc.lua
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
return {
|
||||||
|
{
|
||||||
|
'fredrikaverpil/godoc.nvim',
|
||||||
|
version = '*',
|
||||||
|
dependencies = {
|
||||||
|
{ 'nvim-telescope/telescope.nvim' },
|
||||||
|
{
|
||||||
|
'nvim-treesitter/nvim-treesitter',
|
||||||
|
opts = {
|
||||||
|
ensure_installed = { 'go' },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
event = 'VeryLazy',
|
||||||
|
cmd = 'GoDoc',
|
||||||
|
keys = {
|
||||||
|
{ '<leader>gd', '<cmd>GoDoc<CR>', desc = '[G]o[D]oc' },
|
||||||
|
},
|
||||||
|
build = 'go install github.com/lotusirous/gostdsym/stdsym@latest',
|
||||||
|
opts = {
|
||||||
|
picker = { type = 'telescope' },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
7
nvim/.config/nvim/lua/plugins/hardtime.lua
Normal file
7
nvim/.config/nvim/lua/plugins/hardtime.lua
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
return {
|
||||||
|
{
|
||||||
|
"m4xshen/hardtime.nvim",
|
||||||
|
dependencies = { "MunifTanjim/nui.nvim" },
|
||||||
|
opts = {}
|
||||||
|
},
|
||||||
|
}
|
16
nvim/.config/nvim/lua/plugins/http.lua
Normal file
16
nvim/.config/nvim/lua/plugins/http.lua
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
return {
|
||||||
|
{
|
||||||
|
"rest-nvim/rest.nvim",
|
||||||
|
dependencies = {
|
||||||
|
"nvim-treesitter/nvim-treesitter",
|
||||||
|
opts = function(_, opts)
|
||||||
|
opts.ensure_installed = opts.ensure_installed or {}
|
||||||
|
table.insert(opts.ensure_installed, "http")
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
ft = 'http',
|
||||||
|
keys = {
|
||||||
|
{ '<leader>S', '<cmd>Rest run<CR>', ft = 'http' },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
@ -1,75 +0,0 @@
|
|||||||
return {
|
|
||||||
-- Fuzzy finder
|
|
||||||
{
|
|
||||||
'nvim-telescope/telescope.nvim',
|
|
||||||
branch = '0.1.x',
|
|
||||||
dependencies = {
|
|
||||||
'nvim-lua/plenary.nvim' },
|
|
||||||
config = function()
|
|
||||||
pcall(require('telescope').load_extension, 'fzf')
|
|
||||||
end,
|
|
||||||
cmd = 'Telescope',
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
'nvim-treesitter/nvim-treesitter',
|
|
||||||
dependencies = {
|
|
||||||
'nvim-treesitter/nvim-treesitter-textobjects',
|
|
||||||
'nvim-orgmode/orgmode', -- as configured together
|
|
||||||
'vrischmann/tree-sitter-templ',
|
|
||||||
},
|
|
||||||
build =
|
|
||||||
':TSUpdate'
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
-- LSP Configuration & Plugins
|
|
||||||
'neovim/nvim-lspconfig',
|
|
||||||
dependencies = {
|
|
||||||
-- Automatically install LSPs to stdpath for neovim
|
|
||||||
{ 'williamboman/mason.nvim', config = true },
|
|
||||||
'williamboman/mason-lspconfig.nvim',
|
|
||||||
|
|
||||||
-- Useful status updates for LSP
|
|
||||||
{ 'j-hui/fidget.nvim', tag = 'legacy', opts = {} },
|
|
||||||
|
|
||||||
-- Additional lua configuration, makes nvim stuff amazing!
|
|
||||||
'folke/neodev.nvim',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
-- Autocompletion
|
|
||||||
'hrsh7th/nvim-cmp',
|
|
||||||
dependencies = {
|
|
||||||
-- Snippet Engine & its associated nvim-cmp source
|
|
||||||
'L3MON4D3/LuaSnip',
|
|
||||||
'saadparwaiz1/cmp_luasnip',
|
|
||||||
|
|
||||||
-- Adds LSP completion capabilities
|
|
||||||
'hrsh7th/cmp-nvim-lsp',
|
|
||||||
|
|
||||||
-- Adds a number of user-friendly snippets
|
|
||||||
'rafamadriz/friendly-snippets',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
|
|
||||||
-- Show pending keybinds
|
|
||||||
{ 'folke/which-key.nvim', opts = {} },
|
|
||||||
|
|
||||||
{
|
|
||||||
'akinsho/toggleterm.nvim',
|
|
||||||
keys = { '<C-_>', '<cmd>ToggleTerm<cr>', desc = 'Toggle term' },
|
|
||||||
version = "*",
|
|
||||||
opts = {
|
|
||||||
direction = "float",
|
|
||||||
open_mapping = [[<C-_>]],
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
'ThePrimeagen/harpoon',
|
|
||||||
dependencies = { 'nvim-lua/plenary.nvim' },
|
|
||||||
lazy = true,
|
|
||||||
}
|
|
||||||
}
|
|
25
nvim/.config/nvim/lua/plugins/line.lua
Normal file
25
nvim/.config/nvim/lua/plugins/line.lua
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
vim.opt.fillchars = {
|
||||||
|
stl = "─",
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
{
|
||||||
|
"sschleemilch/slimline.nvim",
|
||||||
|
opts = {
|
||||||
|
spaces = {
|
||||||
|
components = "─",
|
||||||
|
left = "─",
|
||||||
|
right = "─",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
'b0o/incline.nvim',
|
||||||
|
config = function()
|
||||||
|
require('incline').setup()
|
||||||
|
end,
|
||||||
|
-- Optional: Lazy load Incline
|
||||||
|
event = 'VeryLazy',
|
||||||
|
},
|
||||||
|
}
|
173
nvim/.config/nvim/lua/plugins/lsp.lua
Normal file
173
nvim/.config/nvim/lua/plugins/lsp.lua
Normal file
@ -0,0 +1,173 @@
|
|||||||
|
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,
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"folke/trouble.nvim",
|
||||||
|
dependencies = { "nvim-tree/nvim-web-devicons" },
|
||||||
|
opts = {},
|
||||||
|
cmd = 'Trouble'
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"ray-x/lsp_signature.nvim",
|
||||||
|
event = "InsertEnter",
|
||||||
|
opts = {
|
||||||
|
-- cfg options
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
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" },
|
||||||
|
},
|
||||||
|
}
|
7
nvim/.config/nvim/lua/plugins/quicker.lua
Normal file
7
nvim/.config/nvim/lua/plugins/quicker.lua
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
return {
|
||||||
|
'stevearc/quicker.nvim',
|
||||||
|
event = "FileType qf",
|
||||||
|
---@module "quicker"
|
||||||
|
---@type quicker.SetupOptions
|
||||||
|
opts = {},
|
||||||
|
}
|
36
nvim/.config/nvim/lua/plugins/rabbit.lua
Normal file
36
nvim/.config/nvim/lua/plugins/rabbit.lua
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
local function rabbit_select(n)
|
||||||
|
require('rabbit').Switch('harpoon').func.select(n)
|
||||||
|
end
|
||||||
|
|
||||||
|
return {
|
||||||
|
'VoxelPrismatic/rabbit.nvim',
|
||||||
|
event = 'VeryLazy',
|
||||||
|
opts = {
|
||||||
|
window = {
|
||||||
|
float = 'center',
|
||||||
|
plugin_name_position = 'title',
|
||||||
|
},
|
||||||
|
default_keys = {
|
||||||
|
open = { '-', '<leader>;' },
|
||||||
|
},
|
||||||
|
plugin_opts = {
|
||||||
|
history = { switch = ';' },
|
||||||
|
harpoon = { switch = 'f' },
|
||||||
|
},
|
||||||
|
colors = {
|
||||||
|
file = '#EBCB8B',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
keys = {
|
||||||
|
{ '<leader>1', function() rabbit_select(1) end },
|
||||||
|
{ '<leader>2', function() rabbit_select(2) end },
|
||||||
|
{ '<leader>3', function() rabbit_select(3) end },
|
||||||
|
{ '<leader>4', function() rabbit_select(4) end },
|
||||||
|
{ '<leader>5', function() rabbit_select(5) end },
|
||||||
|
{ '<leader>6', function() rabbit_select(6) end },
|
||||||
|
{ '<leader>7', function() rabbit_select(7) end },
|
||||||
|
{ '<leader>8', function() rabbit_select(8) end },
|
||||||
|
{ '<leader>9', function() rabbit_select(9) end },
|
||||||
|
{ '<leader>0', function() rabbit_select(10) 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,
|
||||||
|
}
|
5
nvim/.config/nvim/lua/plugins/tardis.lua
Normal file
5
nvim/.config/nvim/lua/plugins/tardis.lua
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
return {
|
||||||
|
'fredeeb/tardis.nvim',
|
||||||
|
dependencies = { 'nvim-lua/plenary.nvim' },
|
||||||
|
config = true,
|
||||||
|
}
|
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,
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
25
nvim/.config/nvim/lua/plugins/tmux.lua
Normal file
25
nvim/.config/nvim/lua/plugins/tmux.lua
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
return {
|
||||||
|
{
|
||||||
|
'aserowy/tmux.nvim',
|
||||||
|
opts = {
|
||||||
|
navigation = {
|
||||||
|
enable_default_keybindings = false,
|
||||||
|
},
|
||||||
|
resize = {
|
||||||
|
enable_default_keybindings = false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
keys = {
|
||||||
|
{ '<M-h>', [[<cmd>lua require("tmux").move_left()<cr>]] },
|
||||||
|
{ '<M-j>', [[<cmd>lua require("tmux").move_bottom()<cr>]] },
|
||||||
|
{ '<M-k>', [[<cmd>lua require("tmux").move_top()<cr>]] },
|
||||||
|
{ '<M-l>', [[<cmd>lua require("tmux").move_right()<cr>]] },
|
||||||
|
{ '<M-n>', [[<cmd>lua require("tmux").next_window()<cr>]] },
|
||||||
|
{ '<M-p>', [[<cmd>lua require("tmux").previous_window()<cr>]] },
|
||||||
|
{ '<M-H>', [[<cmd>lua require("tmux").resize_left()<cr>]] },
|
||||||
|
{ '<M-J>', [[<cmd>lua require("tmux").resize_bottom()<cr>]] },
|
||||||
|
{ '<M-K>', [[<cmd>lua require("tmux").resize_top()<cr>]] },
|
||||||
|
{ '<M-L>', [[<cmd>lua require("tmux").resize_right()<cr>]] },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
9
nvim/.config/nvim/lua/plugins/toggleterm.lua
Normal file
9
nvim/.config/nvim/lua/plugins/toggleterm.lua
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
return {
|
||||||
|
'akinsho/toggleterm.nvim',
|
||||||
|
version = '*',
|
||||||
|
config = true,
|
||||||
|
keys = {
|
||||||
|
{ '<F2>', '<cmd>ToggleTerm size=25<CR>', mode = { 'n', 'i', 't', }, },
|
||||||
|
{ '<C-w>', [[<C-\><C-n><C-w>]], mode = 't' },
|
||||||
|
}
|
||||||
|
}
|
95
nvim/.config/nvim/lua/plugins/treesitter.lua
Normal file
95
nvim/.config/nvim/lua/plugins/treesitter.lua
Normal file
@ -0,0 +1,95 @@
|
|||||||
|
return {
|
||||||
|
|
||||||
|
{ -- 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')
|
||||||
|
|
||||||
|
---@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,
|
||||||
|
}
|
||||||
|
}
|
12
nvim/.config/nvim/lua/plugins/yankbank.lua
Normal file
12
nvim/.config/nvim/lua/plugins/yankbank.lua
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
return {
|
||||||
|
"ptdewey/yankbank-nvim",
|
||||||
|
dependencies = "kkharji/sqlite.lua",
|
||||||
|
config = function()
|
||||||
|
require('yankbank').setup({
|
||||||
|
persist_type = "sqlite",
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
keys = {
|
||||||
|
{ "<leader>b", "<cmd>YankBank<CR>", desc = "Yank[B]ank" },
|
||||||
|
},
|
||||||
|
}
|
3
nvim/.config/nvim/snippets/go/snippets.lua
Normal file
3
nvim/.config/nvim/snippets/go/snippets.lua
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
return {
|
||||||
|
s("tr", { t "i18n.T(ctx, \"", i(1), t "\")" })
|
||||||
|
}
|
33
river/.config/river/bar
Executable file
33
river/.config/river/bar
Executable file
@ -0,0 +1,33 @@
|
|||||||
|
#!/usr/bin/env sh
|
||||||
|
|
||||||
|
FIFO="$XDG_RUNTIME_DIR/sandbar"
|
||||||
|
|
||||||
|
run() {
|
||||||
|
echo run
|
||||||
|
[ -e "$FIFO" ] && rm -f "$FIFO"
|
||||||
|
mkfifo "$FIFO"
|
||||||
|
|
||||||
|
"$HOME/.config/river/status" &
|
||||||
|
|
||||||
|
while cat "$FIFO"; do :; done | sandbar \
|
||||||
|
-font "FiraCode Nerd Font Ret:size=10" \
|
||||||
|
-active-fg-color "#000000" \
|
||||||
|
-active-bg-color "#e8c47d" \
|
||||||
|
-inactive-fg-color "#e8c47d" \
|
||||||
|
-inactive-bg-color "#000000" \
|
||||||
|
-urgent-fg-color "#000000" \
|
||||||
|
-urgent-bg-color "#cc241d" \
|
||||||
|
-title-fg-color "#000000" \
|
||||||
|
-title-bg-color "#e8c47d"
|
||||||
|
}
|
||||||
|
|
||||||
|
while true; do
|
||||||
|
run
|
||||||
|
CODE=$?
|
||||||
|
if [ $CODE -ne 139 && $CODE -ne 134 ]; then
|
||||||
|
echo exit because $CODE
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
echo sleep and continue
|
||||||
|
sleep 1
|
||||||
|
done
|
20
river/.config/river/init
Executable file
20
river/.config/river/init
Executable file
@ -0,0 +1,20 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
LOCK_COMMAND='swaylock -f -c 1f7693'
|
||||||
|
RANDR_COMMAND='${HOME}/.config/river/randr --on'
|
||||||
|
RANDR_OFF_COMMAND='${HOME}/.config/river/randr --off'
|
||||||
|
|
||||||
|
riverctl spawn "${RANDR_COMMAND}"
|
||||||
|
|
||||||
|
"${HOME}/.config/river/keymap"
|
||||||
|
|
||||||
|
# Set the default layout generator to be rivertile and start it.
|
||||||
|
# River will send the process group of the init executable SIGTERM on exit.
|
||||||
|
riverctl default-layout rivertile
|
||||||
|
rivertile -view-padding 1 -outer-padding 0 &
|
||||||
|
|
||||||
|
riverctl spawn "${HOME}/.config/river/bar"
|
||||||
|
|
||||||
|
riverctl spawn "swayidle -w timeout 300 '${LOCK_COMMAND}' \
|
||||||
|
timeout 330 '${RANDR_OFF_COMMAND}' resume '${RANDR_COMMAND}' \
|
||||||
|
before-sleep '${LOCK_COMMAND}' after-resume '${RANDR_COMMAND}'"
|
164
river/.config/river/keymap
Executable file
164
river/.config/river/keymap
Executable file
@ -0,0 +1,164 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
LOCK_COMMAND='swaylock -f -c 1f7693'
|
||||||
|
|
||||||
|
# Note: the "Super" modifier is also known as Logo, GUI, Windows, Mod4, etc.
|
||||||
|
|
||||||
|
# Super+Shift+Return to start an instance of foot (https://codeberg.org/dnkl/foot)
|
||||||
|
riverctl map normal Super+Shift Return spawn alacritty
|
||||||
|
riverctl map normal Super+Alt Return spawn alacritty
|
||||||
|
|
||||||
|
riverctl map normal Super P spawn "wofi -S run"
|
||||||
|
|
||||||
|
# Super+Q to close the focused view
|
||||||
|
riverctl map normal Super Q close
|
||||||
|
|
||||||
|
# Super+Shift+E to exit river
|
||||||
|
riverctl map normal Super+Shift E exit
|
||||||
|
|
||||||
|
# Super+J and Super+K to focus the next/previous view in the layout stack
|
||||||
|
riverctl map normal Super J focus-view next
|
||||||
|
riverctl map normal Super K focus-view previous
|
||||||
|
|
||||||
|
# Super+Shift+J and Super+Shift+K to swap the focused view with the next/previous
|
||||||
|
# view in the layout stack
|
||||||
|
riverctl map normal Super+Shift J swap next
|
||||||
|
riverctl map normal Super+Shift K swap previous
|
||||||
|
|
||||||
|
# Super+Period and Super+Comma to focus the next/previous output
|
||||||
|
riverctl map normal Super Period focus-output next
|
||||||
|
riverctl map normal Super Comma focus-output previous
|
||||||
|
|
||||||
|
# Super+Shift+{Period,Comma} to send the focused view to the next/previous output
|
||||||
|
riverctl map normal Super+Shift Period send-to-output next
|
||||||
|
riverctl map normal Super+Shift Comma send-to-output previous
|
||||||
|
|
||||||
|
# Super+Return to bump the focused view to the top of the layout stack
|
||||||
|
riverctl map normal Super Return zoom
|
||||||
|
|
||||||
|
# Super+H and Super+L to decrease/increase the main ratio of rivertile(1)
|
||||||
|
riverctl map normal Super H send-layout-cmd rivertile "main-ratio -0.05"
|
||||||
|
riverctl map normal Super L send-layout-cmd rivertile "main-ratio +0.05"
|
||||||
|
|
||||||
|
# Super+Shift+H and Super+Shift+L to increment/decrement the main count of rivertile(1)
|
||||||
|
riverctl map normal Super+Shift H send-layout-cmd rivertile "main-count +1"
|
||||||
|
riverctl map normal Super+Shift L send-layout-cmd rivertile "main-count -1"
|
||||||
|
|
||||||
|
# Super+Alt+{H,J,K,L} to move views
|
||||||
|
riverctl map normal Super+Alt H move left 100
|
||||||
|
riverctl map normal Super+Alt J move down 100
|
||||||
|
riverctl map normal Super+Alt K move up 100
|
||||||
|
riverctl map normal Super+Alt L move right 100
|
||||||
|
|
||||||
|
# Super+Alt+Control+{H,J,K,L} to snap views to screen edges
|
||||||
|
riverctl map normal Super+Alt+Control H snap left
|
||||||
|
riverctl map normal Super+Alt+Control J snap down
|
||||||
|
riverctl map normal Super+Alt+Control K snap up
|
||||||
|
riverctl map normal Super+Alt+Control L snap right
|
||||||
|
|
||||||
|
# Super+Alt+Shift+{H,J,K,L} to resize views
|
||||||
|
riverctl map normal Super+Alt+Shift H resize horizontal -100
|
||||||
|
riverctl map normal Super+Alt+Shift J resize vertical 100
|
||||||
|
riverctl map normal Super+Alt+Shift K resize vertical -100
|
||||||
|
riverctl map normal Super+Alt+Shift L resize horizontal 100
|
||||||
|
|
||||||
|
# Super + Left Mouse Button to move views
|
||||||
|
riverctl map-pointer normal Super BTN_LEFT move-view
|
||||||
|
|
||||||
|
# Super + Right Mouse Button to resize views
|
||||||
|
riverctl map-pointer normal Super BTN_RIGHT resize-view
|
||||||
|
|
||||||
|
# Super + Middle Mouse Button to toggle float
|
||||||
|
riverctl map-pointer normal Super BTN_MIDDLE toggle-float
|
||||||
|
|
||||||
|
for i in $(seq 1 9)
|
||||||
|
do
|
||||||
|
tags=$((1 << ($i - 1)))
|
||||||
|
|
||||||
|
# Super+[1-9] to focus tag [0-8]
|
||||||
|
riverctl map normal Super $i set-focused-tags $tags
|
||||||
|
|
||||||
|
# Super+Shift+[1-9] to tag focused view with tag [0-8]
|
||||||
|
riverctl map normal Super+Shift $i set-view-tags $tags
|
||||||
|
|
||||||
|
# Super+Control+[1-9] to toggle focus of tag [0-8]
|
||||||
|
riverctl map normal Super+Control $i toggle-focused-tags $tags
|
||||||
|
|
||||||
|
# Super+Shift+Control+[1-9] to toggle tag [0-8] of focused view
|
||||||
|
riverctl map normal Super+Shift+Control $i toggle-view-tags $tags
|
||||||
|
done
|
||||||
|
|
||||||
|
# Super+0 to focus all tags
|
||||||
|
# Super+Shift+0 to tag focused view with all tags
|
||||||
|
all_tags=$(((1 << 32) - 1))
|
||||||
|
riverctl map normal Super 0 set-focused-tags $all_tags
|
||||||
|
riverctl map normal Super+Shift 0 set-view-tags $all_tags
|
||||||
|
|
||||||
|
# Super+Space to toggle float
|
||||||
|
riverctl map normal Super Space toggle-float
|
||||||
|
|
||||||
|
# Super+F to toggle fullscreen
|
||||||
|
riverctl map normal Super F toggle-fullscreen
|
||||||
|
|
||||||
|
# Super+{Up,Right,Down,Left} to change layout orientation
|
||||||
|
riverctl map normal Super Up send-layout-cmd rivertile "main-location top"
|
||||||
|
riverctl map normal Super Right send-layout-cmd rivertile "main-location right"
|
||||||
|
riverctl map normal Super Down send-layout-cmd rivertile "main-location bottom"
|
||||||
|
riverctl map normal Super Left send-layout-cmd rivertile "main-location left"
|
||||||
|
|
||||||
|
# Declare a passthrough mode. This mode has only a single mapping to return to
|
||||||
|
# normal mode. This makes it useful for testing a nested wayland compositor
|
||||||
|
riverctl declare-mode passthrough
|
||||||
|
|
||||||
|
# Super+F11 to enter passthrough mode
|
||||||
|
riverctl map normal Super F11 enter-mode passthrough
|
||||||
|
|
||||||
|
# Super+F11 to return to normal mode
|
||||||
|
riverctl map passthrough Super F11 enter-mode normal
|
||||||
|
|
||||||
|
# Various media key mapping examples for both normal and locked mode which do
|
||||||
|
# not have a modifier
|
||||||
|
for mode in normal locked
|
||||||
|
do
|
||||||
|
# Eject the optical drive (well if you still have one that is)
|
||||||
|
riverctl map $mode None XF86Eject spawn 'eject -T'
|
||||||
|
|
||||||
|
# Control pulse audio volume with pamixer (https://github.com/cdemoulins/pamixer)
|
||||||
|
riverctl map $mode None XF86AudioRaiseVolume spawn 'pamixer -i 5'
|
||||||
|
riverctl map $mode None XF86AudioLowerVolume spawn 'pamixer -d 5'
|
||||||
|
riverctl map $mode None XF86AudioMute spawn 'pamixer --toggle-mute'
|
||||||
|
|
||||||
|
# Control MPRIS aware media players with playerctl (https://github.com/altdesktop/playerctl)
|
||||||
|
riverctl map $mode None XF86AudioMedia spawn 'playerctl play-pause'
|
||||||
|
riverctl map $mode None XF86AudioPlay spawn 'playerctl play-pause'
|
||||||
|
riverctl map $mode None XF86AudioPrev spawn 'playerctl previous'
|
||||||
|
riverctl map $mode None XF86AudioNext spawn 'playerctl next'
|
||||||
|
|
||||||
|
# Control screen backlight brightness with brightnessctl (https://github.com/Hummer12007/brightnessctl)
|
||||||
|
riverctl map $mode None XF86MonBrightnessUp spawn 'brightnessctl set +5%'
|
||||||
|
riverctl map $mode None XF86MonBrightnessDown spawn 'brightnessctl set 5%-'
|
||||||
|
done
|
||||||
|
|
||||||
|
riverctl map normal Super A focus-previous-tags
|
||||||
|
riverctl map normal Super+Control+Shift L spawn "${LOCK_COMMAND}"
|
||||||
|
riverctl map normal Super+Control+Shift S spawn "systemctl suspend"
|
||||||
|
|
||||||
|
riverctl map normal Super+Alt O spawn "${LOCK_COMMAND}"
|
||||||
|
riverctl map normal Super+Alt S spawn "systemctl suspend"
|
||||||
|
|
||||||
|
riverctl map normal Super+Alt T spawn "${HOME}/bin/lupan-set-theme toggle"
|
||||||
|
|
||||||
|
# Set background and border color
|
||||||
|
riverctl background-color 0x002b36
|
||||||
|
riverctl border-color-focused 0xac7853
|
||||||
|
riverctl border-color-unfocused 0x5387ac
|
||||||
|
|
||||||
|
riverctl keyboard-layout -options ctrl:nocaps pl
|
||||||
|
# Set keyboard repeat rate
|
||||||
|
riverctl set-repeat 50 300
|
||||||
|
|
||||||
|
# Make all views with an app-id that starts with "float" and title "foo" start floating.
|
||||||
|
riverctl rule-add -app-id 'float*' -title 'foo' float
|
||||||
|
|
||||||
|
# Make all views with app-id "bar" and any title use client-side decorations
|
||||||
|
riverctl rule-add -app-id "bar" csd
|
21
river/.config/river/randr
Executable file
21
river/.config/river/randr
Executable file
@ -0,0 +1,21 @@
|
|||||||
|
#!/usr/bin/env sh
|
||||||
|
|
||||||
|
repeat() {
|
||||||
|
for x in {0..10}; do
|
||||||
|
echo "$@"
|
||||||
|
"$@"
|
||||||
|
sleep 1
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
case "$1" in
|
||||||
|
--on)
|
||||||
|
repeat wlr-randr --output DP-1 --on --scale 2 --pos 0,0 &
|
||||||
|
repeat wlr-randr --output DP-2 --on --scale 2 --pos 1920,0 &
|
||||||
|
sleep 10
|
||||||
|
;;
|
||||||
|
--off)
|
||||||
|
wlr-randr --output DP-1 --off
|
||||||
|
wlr-randr --output DP-2 --off
|
||||||
|
;;
|
||||||
|
esac
|
52
river/.config/river/status
Executable file
52
river/.config/river/status
Executable file
@ -0,0 +1,52 @@
|
|||||||
|
#!/bin/env sh
|
||||||
|
|
||||||
|
cpu() {
|
||||||
|
cpu="$(grep -o "^[^ ]*" /proc/loadavg)"
|
||||||
|
}
|
||||||
|
|
||||||
|
memory() {
|
||||||
|
memory="$(free -h | sed -n "2s/\([^ ]* *\)\{2\}\([^ ]*\).*/\2/p")"
|
||||||
|
}
|
||||||
|
|
||||||
|
disk() {
|
||||||
|
disk="$(df -h | awk 'NR==2{print $4}')"
|
||||||
|
}
|
||||||
|
|
||||||
|
datetime() {
|
||||||
|
datetime="$(date "+%F %H:%M")"
|
||||||
|
}
|
||||||
|
|
||||||
|
bat() {
|
||||||
|
read -r bat_status </sys/class/power_supply/BAT0/status
|
||||||
|
read -r bat_capacity </sys/class/power_supply/BAT0/capacity
|
||||||
|
bat="$bat_status $bat_capacity%"
|
||||||
|
}
|
||||||
|
|
||||||
|
vol() {
|
||||||
|
vol="$([ "$(pamixer --get-mute)" = "false" ] && printf "%s%%" "$(pamixer --get-volume)" || printf '-')"
|
||||||
|
}
|
||||||
|
|
||||||
|
display() {
|
||||||
|
echo "all status [$memory $cpu $disk] [$bat] [$vol] [$datetime]" >"$FIFO"
|
||||||
|
}
|
||||||
|
|
||||||
|
printf "%s" "$$" > "$XDG_RUNTIME_DIR/status_pid"
|
||||||
|
FIFO="$XDG_RUNTIME_DIR/sandbar"
|
||||||
|
[ -e "$FIFO" ] || mkfifo "$FIFO"
|
||||||
|
sec=0
|
||||||
|
|
||||||
|
while true; do
|
||||||
|
sleep 1 &
|
||||||
|
wait && {
|
||||||
|
[ $((sec % 15)) -eq 0 ] && memory
|
||||||
|
[ $((sec % 15)) -eq 0 ] && cpu
|
||||||
|
[ $((sec % 15)) -eq 0 ] && disk
|
||||||
|
[ $((sec % 60)) -eq 0 ] && bat
|
||||||
|
[ $((sec % 5)) -eq 0 ] && vol
|
||||||
|
[ $((sec % 5)) -eq 0 ] && datetime
|
||||||
|
|
||||||
|
[ $((sec % 5)) -eq 0 ] && display
|
||||||
|
|
||||||
|
sec=$((sec + 1))
|
||||||
|
}
|
||||||
|
done
|
16
shell/.bashrc
Normal file
16
shell/.bashrc
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
#
|
||||||
|
# ~/.bashrc
|
||||||
|
#
|
||||||
|
|
||||||
|
# If not running interactively, don't do anything
|
||||||
|
[[ $- != *i* ]] && return
|
||||||
|
|
||||||
|
alias ls='ls --color=auto'
|
||||||
|
PS1='\e[34m\u@\h\e[0m \e[32m\W\e[0m \$ '
|
||||||
|
|
||||||
|
function before_command() { echo -ne '\e[2 q'; }
|
||||||
|
trap before_command DEBUG
|
||||||
|
|
||||||
|
if [[ -f /usr/share/bash-completion/bash_completion ]]; then
|
||||||
|
. /usr/share/bash-completion/bash_completion
|
||||||
|
fi
|
831
shell/.config/nushell/config.nu
Normal file
831
shell/.config/nushell/config.nu
Normal file
@ -0,0 +1,831 @@
|
|||||||
|
# Nushell Config File
|
||||||
|
#
|
||||||
|
# version = "0.89.0"
|
||||||
|
|
||||||
|
# For more information on defining custom themes, see
|
||||||
|
# https://www.nushell.sh/book/coloring_and_theming.html
|
||||||
|
# And here is the theme collection
|
||||||
|
# https://github.com/nushell/nu_scripts/tree/main/themes
|
||||||
|
let dark_theme = {
|
||||||
|
# color for nushell primitives
|
||||||
|
separator: white
|
||||||
|
leading_trailing_space_bg: { attr: n } # no fg, no bg, attr none effectively turns this off
|
||||||
|
header: green_bold
|
||||||
|
empty: blue
|
||||||
|
# Closures can be used to choose colors for specific values.
|
||||||
|
# The value (in this case, a bool) is piped into the closure.
|
||||||
|
# eg) {|| if $in { 'light_cyan' } else { 'light_gray' } }
|
||||||
|
bool: light_cyan
|
||||||
|
int: white
|
||||||
|
filesize: cyan
|
||||||
|
duration: white
|
||||||
|
date: purple
|
||||||
|
range: white
|
||||||
|
float: white
|
||||||
|
string: white
|
||||||
|
nothing: white
|
||||||
|
binary: white
|
||||||
|
cell-path: white
|
||||||
|
row_index: green_bold
|
||||||
|
record: white
|
||||||
|
list: white
|
||||||
|
block: white
|
||||||
|
hints: dark_gray
|
||||||
|
search_result: {bg: red fg: white}
|
||||||
|
shape_and: purple_bold
|
||||||
|
shape_binary: purple_bold
|
||||||
|
shape_block: blue_bold
|
||||||
|
shape_bool: light_cyan
|
||||||
|
shape_closure: green_bold
|
||||||
|
shape_custom: green
|
||||||
|
shape_datetime: cyan_bold
|
||||||
|
shape_directory: cyan
|
||||||
|
shape_external: cyan
|
||||||
|
shape_externalarg: green_bold
|
||||||
|
shape_external_resolved: light_yellow_bold
|
||||||
|
shape_filepath: cyan
|
||||||
|
shape_flag: blue_bold
|
||||||
|
shape_float: purple_bold
|
||||||
|
# shapes are used to change the cli syntax highlighting
|
||||||
|
shape_garbage: { fg: white bg: red attr: b}
|
||||||
|
shape_globpattern: cyan_bold
|
||||||
|
shape_int: purple_bold
|
||||||
|
shape_internalcall: cyan_bold
|
||||||
|
shape_keyword: cyan_bold
|
||||||
|
shape_list: cyan_bold
|
||||||
|
shape_literal: blue
|
||||||
|
shape_match_pattern: green
|
||||||
|
shape_matching_brackets: { attr: u }
|
||||||
|
shape_nothing: light_cyan
|
||||||
|
shape_operator: yellow
|
||||||
|
shape_or: purple_bold
|
||||||
|
shape_pipe: purple_bold
|
||||||
|
shape_range: yellow_bold
|
||||||
|
shape_record: cyan_bold
|
||||||
|
shape_redirection: purple_bold
|
||||||
|
shape_signature: green_bold
|
||||||
|
shape_string: green
|
||||||
|
shape_string_interpolation: cyan_bold
|
||||||
|
shape_table: blue_bold
|
||||||
|
shape_variable: purple
|
||||||
|
shape_vardecl: purple
|
||||||
|
}
|
||||||
|
|
||||||
|
let light_theme = {
|
||||||
|
# color for nushell primitives
|
||||||
|
separator: dark_gray
|
||||||
|
leading_trailing_space_bg: { attr: n } # no fg, no bg, attr none effectively turns this off
|
||||||
|
header: green_bold
|
||||||
|
empty: blue
|
||||||
|
# Closures can be used to choose colors for specific values.
|
||||||
|
# The value (in this case, a bool) is piped into the closure.
|
||||||
|
# eg) {|| if $in { 'dark_cyan' } else { 'dark_gray' } }
|
||||||
|
bool: dark_cyan
|
||||||
|
int: dark_gray
|
||||||
|
filesize: cyan_bold
|
||||||
|
duration: dark_gray
|
||||||
|
date: purple
|
||||||
|
range: dark_gray
|
||||||
|
float: dark_gray
|
||||||
|
string: dark_gray
|
||||||
|
nothing: dark_gray
|
||||||
|
binary: dark_gray
|
||||||
|
cell-path: dark_gray
|
||||||
|
row_index: green_bold
|
||||||
|
record: dark_gray
|
||||||
|
list: dark_gray
|
||||||
|
block: dark_gray
|
||||||
|
hints: dark_gray
|
||||||
|
search_result: {fg: white bg: red}
|
||||||
|
shape_and: purple_bold
|
||||||
|
shape_binary: purple_bold
|
||||||
|
shape_block: blue_bold
|
||||||
|
shape_bool: light_cyan
|
||||||
|
shape_closure: green_bold
|
||||||
|
shape_custom: green
|
||||||
|
shape_datetime: cyan_bold
|
||||||
|
shape_directory: cyan
|
||||||
|
shape_external: cyan
|
||||||
|
shape_externalarg: green_bold
|
||||||
|
shape_external_resolved: light_purple_bold
|
||||||
|
shape_filepath: cyan
|
||||||
|
shape_flag: blue_bold
|
||||||
|
shape_float: purple_bold
|
||||||
|
# shapes are used to change the cli syntax highlighting
|
||||||
|
shape_garbage: { fg: white bg: red attr: b}
|
||||||
|
shape_globpattern: cyan_bold
|
||||||
|
shape_int: purple_bold
|
||||||
|
shape_internalcall: cyan_bold
|
||||||
|
shape_keyword: cyan_bold
|
||||||
|
shape_list: cyan_bold
|
||||||
|
shape_literal: blue
|
||||||
|
shape_match_pattern: green
|
||||||
|
shape_matching_brackets: { attr: u }
|
||||||
|
shape_nothing: light_cyan
|
||||||
|
shape_operator: yellow
|
||||||
|
shape_or: purple_bold
|
||||||
|
shape_pipe: purple_bold
|
||||||
|
shape_range: yellow_bold
|
||||||
|
shape_record: cyan_bold
|
||||||
|
shape_redirection: purple_bold
|
||||||
|
shape_signature: green_bold
|
||||||
|
shape_string: green
|
||||||
|
shape_string_interpolation: cyan_bold
|
||||||
|
shape_table: blue_bold
|
||||||
|
shape_variable: purple
|
||||||
|
shape_vardecl: purple
|
||||||
|
}
|
||||||
|
|
||||||
|
# External completer example
|
||||||
|
let carapace_completer = if (which carapace | is-empty) {
|
||||||
|
null
|
||||||
|
} else {
|
||||||
|
{|spans| carapace $spans.0 nushell ...$spans | from json}
|
||||||
|
}
|
||||||
|
|
||||||
|
# The default config record. This is where much of your global configuration is setup.
|
||||||
|
$env.config = {
|
||||||
|
show_banner: false # true or false to enable or disable the welcome banner at startup
|
||||||
|
|
||||||
|
ls: {
|
||||||
|
use_ls_colors: true # use the LS_COLORS environment variable to colorize output
|
||||||
|
clickable_links: true # enable or disable clickable links. Your terminal has to support links.
|
||||||
|
}
|
||||||
|
|
||||||
|
rm: {
|
||||||
|
always_trash: false # always act as if -t was given. Can be overridden with -p
|
||||||
|
}
|
||||||
|
|
||||||
|
table: {
|
||||||
|
mode: rounded # basic, compact, compact_double, light, thin, with_love, rounded, reinforced, heavy, none, other
|
||||||
|
index_mode: always # "always" show indexes, "never" show indexes, "auto" = show indexes when a table has "index" column
|
||||||
|
show_empty: true # show 'empty list' and 'empty record' placeholders for command output
|
||||||
|
padding: { left: 1, right: 1 } # a left right padding of each column in a table
|
||||||
|
trim: {
|
||||||
|
methodology: wrapping # wrapping or truncating
|
||||||
|
wrapping_try_keep_words: true # A strategy used by the 'wrapping' methodology
|
||||||
|
truncating_suffix: "..." # A suffix used by the 'truncating' methodology
|
||||||
|
}
|
||||||
|
header_on_separator: false # show header text on separator/border line
|
||||||
|
# abbreviated_row_count: 10 # limit data rows from top and bottom after reaching a set point
|
||||||
|
}
|
||||||
|
|
||||||
|
error_style: "fancy" # "fancy" or "plain" for screen reader-friendly error messages
|
||||||
|
|
||||||
|
# datetime_format determines what a datetime rendered in the shell would look like.
|
||||||
|
# Behavior without this configuration point will be to "humanize" the datetime display,
|
||||||
|
# showing something like "a day ago."
|
||||||
|
datetime_format: {
|
||||||
|
# normal: '%a, %d %b %Y %H:%M:%S %z' # shows up in displays of variables or other datetime's outside of tables
|
||||||
|
# table: '%m/%d/%y %I:%M:%S%p' # generally shows up in tabular outputs such as ls. commenting this out will change it to the default human readable datetime format
|
||||||
|
}
|
||||||
|
|
||||||
|
explore: {
|
||||||
|
status_bar_background: {fg: "#1D1F21", bg: "#C4C9C6"},
|
||||||
|
command_bar_text: {fg: "#C4C9C6"},
|
||||||
|
highlight: {fg: "black", bg: "yellow"},
|
||||||
|
status: {
|
||||||
|
error: {fg: "white", bg: "red"},
|
||||||
|
warn: {}
|
||||||
|
info: {}
|
||||||
|
},
|
||||||
|
table: {
|
||||||
|
split_line: {fg: "#404040"},
|
||||||
|
selected_cell: {bg: light_blue},
|
||||||
|
selected_row: {},
|
||||||
|
selected_column: {},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
history: {
|
||||||
|
max_size: 100_000 # Session has to be reloaded for this to take effect
|
||||||
|
sync_on_enter: true # Enable to share history between multiple sessions, else you have to close the session to write history to file
|
||||||
|
file_format: "plaintext" # "sqlite" or "plaintext"
|
||||||
|
isolation: false # only available with sqlite file_format. true enables history isolation, false disables it. true will allow the history to be isolated to the current session using up/down arrows. false will allow the history to be shared across all sessions.
|
||||||
|
}
|
||||||
|
|
||||||
|
completions: {
|
||||||
|
case_sensitive: false # set to true to enable case-sensitive completions
|
||||||
|
quick: true # set this to false to prevent auto-selecting completions when only one remains
|
||||||
|
partial: true # set this to false to prevent partial filling of the prompt
|
||||||
|
algorithm: "prefix" # prefix or fuzzy
|
||||||
|
external: {
|
||||||
|
enable: true # set to false to prevent nushell looking into $env.PATH to find more suggestions, `false` recommended for WSL users as this look up may be very slow
|
||||||
|
max_results: 100 # setting it lower can improve completion performance at the cost of omitting some options
|
||||||
|
completer: $carapace_completer
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
filesize: {
|
||||||
|
metric: false # true => KB, MB, GB (ISO standard), false => KiB, MiB, GiB (Windows standard)
|
||||||
|
format: "auto" # b, kb, kib, mb, mib, gb, gib, tb, tib, pb, pib, eb, eib, auto
|
||||||
|
}
|
||||||
|
|
||||||
|
cursor_shape: {
|
||||||
|
emacs: line # block, underscore, line, blink_block, blink_underscore, blink_line, inherit to skip setting cursor shape (line is the default)
|
||||||
|
vi_insert: line # block, underscore, line, blink_block, blink_underscore, blink_line, inherit to skip setting cursor shape (block is the default)
|
||||||
|
vi_normal: block # block, underscore, line, blink_block, blink_underscore, blink_line, inherit to skip setting cursor shape (underscore is the default)
|
||||||
|
}
|
||||||
|
|
||||||
|
color_config: $dark_theme # if you want a more interesting theme, you can replace the empty record with `$dark_theme`, `$light_theme` or another custom record
|
||||||
|
use_grid_icons: true
|
||||||
|
footer_mode: "25" # always, never, number_of_rows, auto
|
||||||
|
float_precision: 2 # the precision for displaying floats in tables
|
||||||
|
buffer_editor: "" # command that will be used to edit the current line buffer with ctrl+o, if unset fallback to $env.EDITOR and $env.VISUAL
|
||||||
|
use_ansi_coloring: true
|
||||||
|
bracketed_paste: true # enable bracketed paste, currently useless on windows
|
||||||
|
edit_mode: vi # emacs, vi
|
||||||
|
shell_integration: false # enables terminal shell integration. Off by default, as some terminals have issues with this.
|
||||||
|
render_right_prompt_on_last_line: false # true or false to enable or disable right prompt to be rendered on last line of the prompt.
|
||||||
|
use_kitty_protocol: false # enables keyboard enhancement protocol implemented by kitty console, only if your terminal support this.
|
||||||
|
highlight_resolved_externals: false # true enables highlighting of external commands in the repl resolved by which.
|
||||||
|
|
||||||
|
hooks: {
|
||||||
|
pre_prompt: [{ null }] # run before the prompt is shown
|
||||||
|
pre_execution: [{ null }] # run before the repl input is run
|
||||||
|
env_change: {
|
||||||
|
PWD: [{|before, after| null }] # run if the PWD environment is different since the last repl input
|
||||||
|
}
|
||||||
|
display_output: "if (term size).columns >= 100 { table -e } else { table }" # run to display the output of a pipeline
|
||||||
|
command_not_found: { null } # return an error message when a command is not found
|
||||||
|
}
|
||||||
|
|
||||||
|
menus: [
|
||||||
|
# Configuration for default nushell menus
|
||||||
|
# Note the lack of source parameter
|
||||||
|
{
|
||||||
|
name: completion_menu
|
||||||
|
only_buffer_difference: false
|
||||||
|
marker: "| "
|
||||||
|
type: {
|
||||||
|
layout: columnar
|
||||||
|
columns: 4
|
||||||
|
col_width: 20 # Optional value. If missing all the screen width is used to calculate column width
|
||||||
|
col_padding: 2
|
||||||
|
}
|
||||||
|
style: {
|
||||||
|
text: green
|
||||||
|
selected_text: green_reverse
|
||||||
|
description_text: yellow
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: history_menu
|
||||||
|
only_buffer_difference: true
|
||||||
|
marker: "? "
|
||||||
|
type: {
|
||||||
|
layout: list
|
||||||
|
page_size: 10
|
||||||
|
}
|
||||||
|
style: {
|
||||||
|
text: green
|
||||||
|
selected_text: green_reverse
|
||||||
|
description_text: yellow
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: help_menu
|
||||||
|
only_buffer_difference: true
|
||||||
|
marker: "? "
|
||||||
|
type: {
|
||||||
|
layout: description
|
||||||
|
columns: 4
|
||||||
|
col_width: 20 # Optional value. If missing all the screen width is used to calculate column width
|
||||||
|
col_padding: 2
|
||||||
|
selection_rows: 4
|
||||||
|
description_rows: 10
|
||||||
|
}
|
||||||
|
style: {
|
||||||
|
text: green
|
||||||
|
selected_text: green_reverse
|
||||||
|
description_text: yellow
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
|
||||||
|
keybindings: [
|
||||||
|
{
|
||||||
|
name: completion_menu
|
||||||
|
modifier: none
|
||||||
|
keycode: tab
|
||||||
|
mode: [emacs vi_normal vi_insert]
|
||||||
|
event: {
|
||||||
|
until: [
|
||||||
|
{ send: menu name: completion_menu }
|
||||||
|
{ send: menunext }
|
||||||
|
{ edit: complete }
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: history_menu
|
||||||
|
modifier: control
|
||||||
|
keycode: char_r
|
||||||
|
mode: [emacs, vi_insert, vi_normal]
|
||||||
|
event: { send: menu name: history_menu }
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: help_menu
|
||||||
|
modifier: none
|
||||||
|
keycode: f1
|
||||||
|
mode: [emacs, vi_insert, vi_normal]
|
||||||
|
event: { send: menu name: help_menu }
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: completion_previous_menu
|
||||||
|
modifier: shift
|
||||||
|
keycode: backtab
|
||||||
|
mode: [emacs, vi_normal, vi_insert]
|
||||||
|
event: { send: menuprevious }
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: next_page_menu
|
||||||
|
modifier: control
|
||||||
|
keycode: char_x
|
||||||
|
mode: emacs
|
||||||
|
event: { send: menupagenext }
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: undo_or_previous_page_menu
|
||||||
|
modifier: control
|
||||||
|
keycode: char_z
|
||||||
|
mode: emacs
|
||||||
|
event: {
|
||||||
|
until: [
|
||||||
|
{ send: menupageprevious }
|
||||||
|
{ edit: undo }
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: escape
|
||||||
|
modifier: none
|
||||||
|
keycode: escape
|
||||||
|
mode: [emacs, vi_normal, vi_insert]
|
||||||
|
event: { send: esc } # NOTE: does not appear to work
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: cancel_command
|
||||||
|
modifier: control
|
||||||
|
keycode: char_c
|
||||||
|
mode: [emacs, vi_normal, vi_insert]
|
||||||
|
event: { send: ctrlc }
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: quit_shell
|
||||||
|
modifier: control
|
||||||
|
keycode: char_d
|
||||||
|
mode: [emacs, vi_normal, vi_insert]
|
||||||
|
event: { send: ctrld }
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: clear_screen
|
||||||
|
modifier: control
|
||||||
|
keycode: char_l
|
||||||
|
mode: [emacs, vi_normal, vi_insert]
|
||||||
|
event: { send: clearscreen }
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: search_history
|
||||||
|
modifier: control
|
||||||
|
keycode: char_q
|
||||||
|
mode: [emacs, vi_normal, vi_insert]
|
||||||
|
event: { send: searchhistory }
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: open_command_editor
|
||||||
|
modifier: control
|
||||||
|
keycode: char_o
|
||||||
|
mode: [emacs, vi_normal, vi_insert]
|
||||||
|
event: { send: openeditor }
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: move_up
|
||||||
|
modifier: none
|
||||||
|
keycode: up
|
||||||
|
mode: [emacs, vi_normal, vi_insert]
|
||||||
|
event: {
|
||||||
|
until: [
|
||||||
|
{send: menuup}
|
||||||
|
{send: up}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: move_down
|
||||||
|
modifier: none
|
||||||
|
keycode: down
|
||||||
|
mode: [emacs, vi_normal, vi_insert]
|
||||||
|
event: {
|
||||||
|
until: [
|
||||||
|
{send: menudown}
|
||||||
|
{send: down}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: move_left
|
||||||
|
modifier: none
|
||||||
|
keycode: left
|
||||||
|
mode: [emacs, vi_normal, vi_insert]
|
||||||
|
event: {
|
||||||
|
until: [
|
||||||
|
{send: menuleft}
|
||||||
|
{send: left}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: move_right_or_take_history_hint
|
||||||
|
modifier: none
|
||||||
|
keycode: right
|
||||||
|
mode: [emacs, vi_normal, vi_insert]
|
||||||
|
event: {
|
||||||
|
until: [
|
||||||
|
{send: historyhintcomplete}
|
||||||
|
{send: menuright}
|
||||||
|
{send: right}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: move_one_word_left
|
||||||
|
modifier: control
|
||||||
|
keycode: left
|
||||||
|
mode: [emacs, vi_normal, vi_insert]
|
||||||
|
event: {edit: movewordleft}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: move_one_word_right_or_take_history_hint
|
||||||
|
modifier: control
|
||||||
|
keycode: right
|
||||||
|
mode: [emacs, vi_normal, vi_insert]
|
||||||
|
event: {
|
||||||
|
until: [
|
||||||
|
{send: historyhintwordcomplete}
|
||||||
|
{edit: movewordright}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: move_to_line_start
|
||||||
|
modifier: none
|
||||||
|
keycode: home
|
||||||
|
mode: [emacs, vi_normal, vi_insert]
|
||||||
|
event: {edit: movetolinestart}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: move_to_line_start
|
||||||
|
modifier: control
|
||||||
|
keycode: char_a
|
||||||
|
mode: [emacs, vi_normal, vi_insert]
|
||||||
|
event: {edit: movetolinestart}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: move_to_line_end_or_take_history_hint
|
||||||
|
modifier: none
|
||||||
|
keycode: end
|
||||||
|
mode: [emacs, vi_normal, vi_insert]
|
||||||
|
event: {
|
||||||
|
until: [
|
||||||
|
{send: historyhintcomplete}
|
||||||
|
{edit: movetolineend}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: move_to_line_end_or_take_history_hint
|
||||||
|
modifier: control
|
||||||
|
keycode: char_e
|
||||||
|
mode: [emacs, vi_normal, vi_insert]
|
||||||
|
event: {
|
||||||
|
until: [
|
||||||
|
{send: historyhintcomplete}
|
||||||
|
{edit: movetolineend}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: move_to_line_start
|
||||||
|
modifier: control
|
||||||
|
keycode: home
|
||||||
|
mode: [emacs, vi_normal, vi_insert]
|
||||||
|
event: {edit: movetolinestart}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: move_to_line_end
|
||||||
|
modifier: control
|
||||||
|
keycode: end
|
||||||
|
mode: [emacs, vi_normal, vi_insert]
|
||||||
|
event: {edit: movetolineend}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: move_up
|
||||||
|
modifier: control
|
||||||
|
keycode: char_p
|
||||||
|
mode: [emacs, vi_normal, vi_insert]
|
||||||
|
event: {
|
||||||
|
until: [
|
||||||
|
{send: menuup}
|
||||||
|
{send: up}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: move_down
|
||||||
|
modifier: control
|
||||||
|
keycode: char_t
|
||||||
|
mode: [emacs, vi_normal, vi_insert]
|
||||||
|
event: {
|
||||||
|
until: [
|
||||||
|
{send: menudown}
|
||||||
|
{send: down}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: delete_one_character_backward
|
||||||
|
modifier: none
|
||||||
|
keycode: backspace
|
||||||
|
mode: [emacs, vi_insert]
|
||||||
|
event: {edit: backspace}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: delete_one_word_backward
|
||||||
|
modifier: control
|
||||||
|
keycode: backspace
|
||||||
|
mode: [emacs, vi_insert]
|
||||||
|
event: {edit: backspaceword}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: delete_one_character_forward
|
||||||
|
modifier: none
|
||||||
|
keycode: delete
|
||||||
|
mode: [emacs, vi_insert]
|
||||||
|
event: {edit: delete}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: delete_one_character_forward
|
||||||
|
modifier: control
|
||||||
|
keycode: delete
|
||||||
|
mode: [emacs, vi_insert]
|
||||||
|
event: {edit: delete}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: delete_one_character_forward
|
||||||
|
modifier: control
|
||||||
|
keycode: char_h
|
||||||
|
mode: [emacs, vi_insert]
|
||||||
|
event: {edit: backspace}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: delete_one_word_backward
|
||||||
|
modifier: control
|
||||||
|
keycode: char_w
|
||||||
|
mode: [emacs, vi_insert]
|
||||||
|
event: {edit: backspaceword}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: move_left
|
||||||
|
modifier: none
|
||||||
|
keycode: backspace
|
||||||
|
mode: vi_normal
|
||||||
|
event: {edit: moveleft}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: newline_or_run_command
|
||||||
|
modifier: none
|
||||||
|
keycode: enter
|
||||||
|
mode: emacs
|
||||||
|
event: {send: enter}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: move_left
|
||||||
|
modifier: control
|
||||||
|
keycode: char_b
|
||||||
|
mode: emacs
|
||||||
|
event: {
|
||||||
|
until: [
|
||||||
|
{send: menuleft}
|
||||||
|
{send: left}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: move_right_or_take_history_hint
|
||||||
|
modifier: control
|
||||||
|
keycode: char_f
|
||||||
|
mode: emacs
|
||||||
|
event: {
|
||||||
|
until: [
|
||||||
|
{send: historyhintcomplete}
|
||||||
|
{send: menuright}
|
||||||
|
{send: right}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: redo_change
|
||||||
|
modifier: control
|
||||||
|
keycode: char_g
|
||||||
|
mode: emacs
|
||||||
|
event: {edit: redo}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: undo_change
|
||||||
|
modifier: control
|
||||||
|
keycode: char_z
|
||||||
|
mode: emacs
|
||||||
|
event: {edit: undo}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: paste_before
|
||||||
|
modifier: control
|
||||||
|
keycode: char_y
|
||||||
|
mode: emacs
|
||||||
|
event: {edit: pastecutbufferbefore}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: cut_word_left
|
||||||
|
modifier: control
|
||||||
|
keycode: char_w
|
||||||
|
mode: emacs
|
||||||
|
event: {edit: cutwordleft}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: cut_line_to_end
|
||||||
|
modifier: control
|
||||||
|
keycode: char_k
|
||||||
|
mode: emacs
|
||||||
|
event: {edit: cuttoend}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: cut_line_from_start
|
||||||
|
modifier: control
|
||||||
|
keycode: char_u
|
||||||
|
mode: [emacs vi_insert]
|
||||||
|
event: {edit: cutfromstart}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: swap_graphemes
|
||||||
|
modifier: control
|
||||||
|
keycode: char_t
|
||||||
|
mode: emacs
|
||||||
|
event: {edit: swapgraphemes}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: move_one_word_left
|
||||||
|
modifier: alt
|
||||||
|
keycode: left
|
||||||
|
mode: emacs
|
||||||
|
event: {edit: movewordleft}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: move_one_word_right_or_take_history_hint
|
||||||
|
modifier: alt
|
||||||
|
keycode: right
|
||||||
|
mode: emacs
|
||||||
|
event: {
|
||||||
|
until: [
|
||||||
|
{send: historyhintwordcomplete}
|
||||||
|
{edit: movewordright}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: move_one_word_left
|
||||||
|
modifier: alt
|
||||||
|
keycode: char_b
|
||||||
|
mode: emacs
|
||||||
|
event: {edit: movewordleft}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: move_one_word_right_or_take_history_hint
|
||||||
|
modifier: alt
|
||||||
|
keycode: char_f
|
||||||
|
mode: emacs
|
||||||
|
event: {
|
||||||
|
until: [
|
||||||
|
{send: historyhintwordcomplete}
|
||||||
|
{edit: movewordright}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: delete_one_word_forward
|
||||||
|
modifier: alt
|
||||||
|
keycode: delete
|
||||||
|
mode: emacs
|
||||||
|
event: {edit: deleteword}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: delete_one_word_backward
|
||||||
|
modifier: alt
|
||||||
|
keycode: backspace
|
||||||
|
mode: emacs
|
||||||
|
event: {edit: backspaceword}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: delete_one_word_backward
|
||||||
|
modifier: alt
|
||||||
|
keycode: char_m
|
||||||
|
mode: emacs
|
||||||
|
event: {edit: backspaceword}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: cut_word_to_right
|
||||||
|
modifier: alt
|
||||||
|
keycode: char_d
|
||||||
|
mode: emacs
|
||||||
|
event: {edit: cutwordright}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: upper_case_word
|
||||||
|
modifier: alt
|
||||||
|
keycode: char_u
|
||||||
|
mode: emacs
|
||||||
|
event: {edit: uppercaseword}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: lower_case_word
|
||||||
|
modifier: alt
|
||||||
|
keycode: char_l
|
||||||
|
mode: emacs
|
||||||
|
event: {edit: lowercaseword}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: capitalize_char
|
||||||
|
modifier: alt
|
||||||
|
keycode: char_c
|
||||||
|
mode: emacs
|
||||||
|
event: {edit: capitalizechar}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: move_up
|
||||||
|
modifier: control
|
||||||
|
keycode: char_k
|
||||||
|
mode: [vi_normal, vi_insert]
|
||||||
|
event: {
|
||||||
|
until: [
|
||||||
|
{send: menuup}
|
||||||
|
{send: up}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: move_down
|
||||||
|
modifier: control
|
||||||
|
keycode: char_j
|
||||||
|
mode: [vi_normal, vi_insert]
|
||||||
|
event: {
|
||||||
|
until: [
|
||||||
|
{send: menudown}
|
||||||
|
{send: down}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: move_left
|
||||||
|
modifier: control
|
||||||
|
keycode: char_h
|
||||||
|
mode: [vi_normal, vi_insert]
|
||||||
|
event: {
|
||||||
|
until: [
|
||||||
|
{send: menuleft}
|
||||||
|
{send: left}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name: move_right_or_take_history_hint
|
||||||
|
modifier: control
|
||||||
|
keycode: char_l
|
||||||
|
mode: [vi_normal, vi_insert]
|
||||||
|
event: {
|
||||||
|
until: [
|
||||||
|
{send: historyhintcomplete}
|
||||||
|
{send: menuright}
|
||||||
|
{send: right}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
alias v = nvim
|
||||||
|
alias tl = tmux list-sessions
|
||||||
|
alias tn = tmux new -s
|
||||||
|
alias ta = tmux attach -t
|
||||||
|
alias nocaps = setxkbmap pl -option ctrl:nocaps
|
||||||
|
|
||||||
|
def gst [] {
|
||||||
|
git status -s | detect columns -n | rename status file
|
||||||
|
}
|
||||||
|
|
||||||
|
def glog [] {
|
||||||
|
git log --pretty=%h»¦«%aN»¦«%s»¦«%aD | lines | split column "»¦«" sha1 committer desc merged_at
|
||||||
|
}
|
||||||
|
|
||||||
|
def l [pattern? = '.'] {
|
||||||
|
ls $pattern | grid -c
|
||||||
|
}
|
109
shell/.config/nushell/env.nu
Normal file
109
shell/.config/nushell/env.nu
Normal file
@ -0,0 +1,109 @@
|
|||||||
|
# Nushell Environment Config File
|
||||||
|
#
|
||||||
|
# version = "0.89.0"
|
||||||
|
|
||||||
|
def create_left_prompt [] {
|
||||||
|
let home = $nu.home-path
|
||||||
|
|
||||||
|
# Perform tilde substitution on dir
|
||||||
|
# To determine if the prefix of the path matches the home dir, we split the current path into
|
||||||
|
# segments, and compare those with the segments of the home dir. In cases where the current dir
|
||||||
|
# is a parent of the home dir (e.g. `/home`, homedir is `/home/user`), this comparison will
|
||||||
|
# also evaluate to true. Inside the condition, we attempt to str replace `$home` with `~`.
|
||||||
|
# Inside the condition, either:
|
||||||
|
# 1. The home prefix will be replaced
|
||||||
|
# 2. The current dir is a parent of the home dir, so it will be uneffected by the str replace
|
||||||
|
let dir = (
|
||||||
|
if ($env.PWD | path split | zip ($home | path split) | all { $in.0 == $in.1 }) {
|
||||||
|
($env.PWD | str replace $home "~")
|
||||||
|
} else {
|
||||||
|
$env.PWD
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
let path_color = (if (is-admin) { ansi red_bold } else { ansi green_bold })
|
||||||
|
let separator_color = (if (is-admin) { ansi light_red_bold } else { ansi light_green_bold })
|
||||||
|
let path_segment = $"($path_color)($dir)"
|
||||||
|
|
||||||
|
let userhost = $'(ansi blue_bold)(id -un)@(hostname)(ansi reset)'
|
||||||
|
let base = $path_segment | str replace --all (char path_sep) $"($separator_color)(char path_sep)($path_color)"
|
||||||
|
let branch = do { git rev-parse --abbrev-ref HEAD } | complete
|
||||||
|
if $branch.exit_code == 0 {
|
||||||
|
$"($userhost) ($base) ($separator_color)\((ansi magenta)($branch.stdout | str trim)($separator_color)) "
|
||||||
|
} else {
|
||||||
|
$'($userhost) ($base) '
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def create_right_prompt [] {
|
||||||
|
# create a right prompt in magenta with green separators and am/pm underlined
|
||||||
|
let time_segment = ([
|
||||||
|
(ansi reset)
|
||||||
|
(ansi magenta)
|
||||||
|
(date now | format date '%x %X %p') # try to respect user's locale
|
||||||
|
] | str join | str replace --regex --all "([/:])" $"(ansi green)${1}(ansi magenta)" |
|
||||||
|
str replace --regex --all "([AP]M)" $"(ansi magenta_underline)${1}")
|
||||||
|
|
||||||
|
let last_exit_code = if ($env.LAST_EXIT_CODE != 0) {([
|
||||||
|
(ansi rb)
|
||||||
|
($env.LAST_EXIT_CODE)
|
||||||
|
] | str join)
|
||||||
|
} else { "" }
|
||||||
|
|
||||||
|
([$last_exit_code, (char space), $time_segment] | str join)
|
||||||
|
}
|
||||||
|
|
||||||
|
# Use nushell functions to define your right and left prompt
|
||||||
|
$env.PROMPT_COMMAND = {|| create_left_prompt }
|
||||||
|
# FIXME: This default is not implemented in rust code as of 2023-09-08.
|
||||||
|
$env.PROMPT_COMMAND_RIGHT = {|| create_right_prompt }
|
||||||
|
|
||||||
|
# The prompt indicators are environmental variables that represent
|
||||||
|
# the state of the prompt
|
||||||
|
$env.PROMPT_INDICATOR = {|| "> " }
|
||||||
|
$env.PROMPT_INDICATOR_VI_INSERT = {|| ": " }
|
||||||
|
$env.PROMPT_INDICATOR_VI_NORMAL = {|| "> " }
|
||||||
|
$env.PROMPT_MULTILINE_INDICATOR = {|| "::: " }
|
||||||
|
|
||||||
|
# If you want previously entered commands to have a different prompt from the usual one,
|
||||||
|
# you can uncomment one or more of the following lines.
|
||||||
|
# This can be useful if you have a 2-line prompt and it's taking up a lot of space
|
||||||
|
# because every command entered takes up 2 lines instead of 1. You can then uncomment
|
||||||
|
# the line below so that previously entered commands show with a single `🚀`.
|
||||||
|
# $env.TRANSIENT_PROMPT_COMMAND = {|| "🚀 " }
|
||||||
|
# $env.TRANSIENT_PROMPT_INDICATOR = {|| "" }
|
||||||
|
# $env.TRANSIENT_PROMPT_INDICATOR_VI_INSERT = {|| "" }
|
||||||
|
# $env.TRANSIENT_PROMPT_INDICATOR_VI_NORMAL = {|| "" }
|
||||||
|
# $env.TRANSIENT_PROMPT_MULTILINE_INDICATOR = {|| "" }
|
||||||
|
# $env.TRANSIENT_PROMPT_COMMAND_RIGHT = {|| "" }
|
||||||
|
|
||||||
|
# Specifies how environment variables are:
|
||||||
|
# - converted from a string to a value on Nushell startup (from_string)
|
||||||
|
# - converted from a value back to a string when running external commands (to_string)
|
||||||
|
# Note: The conversions happen *after* config.nu is loaded
|
||||||
|
$env.ENV_CONVERSIONS = {
|
||||||
|
"PATH": {
|
||||||
|
from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
|
||||||
|
to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
|
||||||
|
}
|
||||||
|
"Path": {
|
||||||
|
from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
|
||||||
|
to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# Directories to search for scripts when calling source or use
|
||||||
|
# The default for this is $nu.default-config-dir/scripts
|
||||||
|
$env.NU_LIB_DIRS = [
|
||||||
|
($nu.default-config-dir | path join 'scripts') # add <nushell-config-dir>/scripts
|
||||||
|
]
|
||||||
|
|
||||||
|
# Directories to search for plugin binaries when calling register
|
||||||
|
# The default for this is $nu.default-config-dir/plugins
|
||||||
|
$env.NU_PLUGIN_DIRS = [
|
||||||
|
($nu.default-config-dir | path join 'plugins') # add <nushell-config-dir>/plugins
|
||||||
|
]
|
||||||
|
|
||||||
|
# To add entries to PATH (on Windows you might use Path), you can use the following pattern:
|
||||||
|
# $env.PATH = ($env.PATH | split row (char esep) | prepend '/some/path')
|
||||||
|
|
@ -1,5 +1,9 @@
|
|||||||
alias v=nvim
|
alias v=nvim
|
||||||
alias ll='ls -l'
|
alias ll='ls -l'
|
||||||
|
alias ta='tmux attach -t'
|
||||||
|
alias tl='tmux list-sessions'
|
||||||
|
alias tn='tmux new -s'
|
||||||
|
alias fv='fzf --preview="bat --color=always --theme=Nord {}" --bind="enter:become(nvim {})"'
|
||||||
|
|
||||||
if which exa > /dev/null; then
|
if which exa > /dev/null; then
|
||||||
alias ls='exa --icons'
|
alias ls='exa --icons'
|
||||||
|
@ -3,3 +3,9 @@ set show-mode-in-prompt on
|
|||||||
set vi-ins-mode-string \1\e[6 q\2
|
set vi-ins-mode-string \1\e[6 q\2
|
||||||
set vi-cmd-mode-string \1\e[2 q\2
|
set vi-cmd-mode-string \1\e[2 q\2
|
||||||
|
|
||||||
|
set keymap vi-command
|
||||||
|
"k": history-substring-search-backward
|
||||||
|
"j": history-substring-search-forward
|
||||||
|
|
||||||
|
set keymap vi-insert
|
||||||
|
"\C-l": clear-screen
|
||||||
|
@ -27,5 +27,13 @@ done
|
|||||||
|
|
||||||
export PATH
|
export PATH
|
||||||
|
|
||||||
# start X at login
|
# start X or Hyprland at login
|
||||||
[[ -z "$DISPLAY" && "$XDG_VTNR" -eq 1 ]] && which /bin/sx > /dev/null && exec sx ~/.xsession
|
if [[ -z "$DISPLAY" && -z "$WAYLAND_DISPLAY" && "$XDG_VTNR" -eq 1 ]]; then
|
||||||
|
if which Hyprland > /dev/null && [ -d ~/.config/hypr ]; then
|
||||||
|
exec Hyprland
|
||||||
|
elif which river > /dev/null && [ -d ~/.config/river ]; then
|
||||||
|
exec river
|
||||||
|
elif which /usr/bin/sx > /dev/null; then
|
||||||
|
exec /usr/bin/sx ~/.xsession
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
@ -1,6 +1 @@
|
|||||||
# start X at login on first console or otherwise source ~/.profile
|
source ~/.profile
|
||||||
if [[ -z "$DISPLAY" && "$XDG_VTNR" -eq 1 ]] && which /bin/sx > /dev/null; then
|
|
||||||
exec sx ~/.xsession
|
|
||||||
else
|
|
||||||
source ~/.profile
|
|
||||||
fi
|
|
||||||
|
54
shell/.zshrc
54
shell/.zshrc
@ -2,11 +2,13 @@
|
|||||||
# % cd ~/.local/share
|
# % cd ~/.local/share
|
||||||
# % git clone https://github.com/zap-zsh/zap.git --branch=release-v1
|
# % git clone https://github.com/zap-zsh/zap.git --branch=release-v1
|
||||||
|
|
||||||
export FZF_DEFAULT_OPTS='--color=bw,hl:green,hl+:green'
|
export FZF_DEFAULT_OPTS='--color=bg+:#808080'
|
||||||
zstyle ':fzf-tab:*' fzf-flags $FZF_DEFAULT_OPTS
|
zstyle ':fzf-tab:*' fzf-flags $FZF_DEFAULT_OPTS
|
||||||
|
|
||||||
|
export BAT_THEME=ansi
|
||||||
|
|
||||||
[ -f "${XDG_DATA_HOME:-$HOME/.local/share}/zap/zap.zsh" ] && source "${XDG_DATA_HOME:-$HOME/.local/share}/zap/zap.zsh"
|
[ -f "${XDG_DATA_HOME:-$HOME/.local/share}/zap/zap.zsh" ] && source "${XDG_DATA_HOME:-$HOME/.local/share}/zap/zap.zsh"
|
||||||
plug "zap-zsh/vim"
|
plug "jeffreytse/zsh-vi-mode"
|
||||||
|
|
||||||
autoload -Uz compinit
|
autoload -Uz compinit
|
||||||
compinit
|
compinit
|
||||||
@ -15,19 +17,43 @@ plug "Aloxaf/fzf-tab"
|
|||||||
plug "zap-zsh/fzf"
|
plug "zap-zsh/fzf"
|
||||||
plug "zsh-users/zsh-autosuggestions"
|
plug "zsh-users/zsh-autosuggestions"
|
||||||
plug "zsh-users/zsh-syntax-highlighting"
|
plug "zsh-users/zsh-syntax-highlighting"
|
||||||
|
plug "MichaelAquilina/zsh-you-should-use"
|
||||||
|
plug "zsh-users/zsh-history-substring-search"
|
||||||
|
|
||||||
|
if which zoxide > /dev/null; then
|
||||||
|
eval "$(zoxide init zsh)"
|
||||||
|
else
|
||||||
|
plug "agkozak/zsh-z"
|
||||||
|
ZSHZ_ECHO=1
|
||||||
|
setopt autocd
|
||||||
|
fi
|
||||||
|
|
||||||
|
ZVM_VI_INSERT_ESCAPE_BINDKEY=jj
|
||||||
|
ZSH_HIGHLIGHT_STYLES[comment]=fg=blue
|
||||||
|
HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND=bg=magenta,fg=black,bold
|
||||||
|
HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND=bg=red,fg=black,bold
|
||||||
|
|
||||||
|
bindkey '^[[A' history-substring-search-up
|
||||||
|
bindkey '^[[B' history-substring-search-down
|
||||||
|
bindkey -M vicmd 'k' history-substring-search-up
|
||||||
|
bindkey -M vicmd 'j' history-substring-search-down
|
||||||
|
|
||||||
# Prompt.
|
# Prompt.
|
||||||
|
|
||||||
autoload -Uz vcs_info
|
if which starship > /dev/null; then
|
||||||
precmd () { vcs_info }
|
eval "$(starship init zsh)"
|
||||||
setopt prompt_subst
|
else
|
||||||
zstyle ':vcs_info:git:*' check-for-changes true
|
autoload -Uz vcs_info
|
||||||
zstyle ':vcs_info:git:*' formats '%F{green}%r%f/%F{yellow}%S%f %F{magenta}(%b)%u%c%f '
|
precmd () { vcs_info }
|
||||||
zstyle ':vcs_info:git:*' actionformats '%F{green}%r%f/%F{yellow}%S%f %F{magenta}(%b|%a)%u%c%f '
|
setopt prompt_subst
|
||||||
zstyle ':vcs_info:*' nvcsformats '%F{green}%~%f%b '
|
zstyle ':vcs_info:git:*' check-for-changes true
|
||||||
zstyle ':vcs_info:*' enable git
|
zstyle ':vcs_info:git:*' formats '%F{green}%r%f/%F{yellow}%S%f %F{magenta}(%b)%u%c%f '
|
||||||
PS1='%B%F{blue}%n@%m%f ${vcs_info_msg_0_}%B%#%f%b '
|
zstyle ':vcs_info:git:*' actionformats '%F{green}%r%f/%F{yellow}%S%f %F{magenta}(%b|%a)%u%c%f '
|
||||||
RPROMPT='%(?..%B%F{red}%?%f%b)'
|
zstyle ':vcs_info:*' nvcsformats '%F{green}%~%f%b '
|
||||||
|
zstyle ':vcs_info:*' enable git
|
||||||
|
PS1='%B%F{blue}%n@%m%f ${vcs_info_msg_0_}%B%#%f%b '
|
||||||
|
RPROMPT='%(?..%B%F{red}%?%f%b)'
|
||||||
|
fi
|
||||||
|
|
||||||
# History.
|
# History.
|
||||||
|
|
||||||
@ -46,10 +72,12 @@ setopt share_history
|
|||||||
|
|
||||||
# Convenience.
|
# Convenience.
|
||||||
|
|
||||||
setopt autocd
|
|
||||||
bindkey -M vicmd '^[h' run-help
|
bindkey -M vicmd '^[h' run-help
|
||||||
bindkey -M viins '^[h' run-help
|
bindkey -M viins '^[h' run-help
|
||||||
|
|
||||||
|
setopt glob_complete
|
||||||
|
setopt interactive_comments
|
||||||
|
|
||||||
# Aliases.
|
# Aliases.
|
||||||
|
|
||||||
for f in ~/.config/shellconfig/*.sh(N) ~/.config/shellconfig/*.zsh(N); do source "$f"; done
|
for f in ~/.config/shellconfig/*.sh(N) ~/.config/shellconfig/*.zsh(N); do source "$f"; done
|
||||||
|
@ -1,27 +1,40 @@
|
|||||||
set -g status-bg colour0
|
set -g status-bg colour0
|
||||||
set -g status-fg colour7
|
set -g status-fg colour7
|
||||||
|
|
||||||
bind-key C-j select-pane -D
|
set -sg escape-time 0
|
||||||
bind-key C-k select-pane -U
|
|
||||||
bind-key C-h select-pane -L
|
|
||||||
bind-key C-l select-pane -R
|
|
||||||
|
|
||||||
bind-key j switch-client -n
|
bind-key -n M-1 select-window -t 1
|
||||||
bind-key k switch-client -p
|
bind-key -n M-2 select-window -t 2
|
||||||
bind-key h previous-window
|
bind-key -n M-3 select-window -t 3
|
||||||
bind-key l next-window
|
bind-key -n M-4 select-window -t 4
|
||||||
bind-key t last-window
|
bind-key -n M-5 select-window -t 5
|
||||||
|
bind-key -n M-6 select-window -t 6
|
||||||
|
bind-key -n M-7 select-window -t 7
|
||||||
|
bind-key -n M-8 select-window -t 8
|
||||||
|
bind-key -n M-9 select-window -t 9
|
||||||
|
bind-key -n M-0 select-window -t 10
|
||||||
|
|
||||||
|
bind-key -n M-! swap-window -t 1
|
||||||
|
bind-key -n M-@ swap-window -t 2
|
||||||
|
bind-key -n M-# swap-window -t 3
|
||||||
|
bind-key -n M-$ swap-window -t 4
|
||||||
|
bind-key -n M-% swap-window -t 5
|
||||||
|
bind-key -n M-^ swap-window -t 6
|
||||||
|
bind-key -n M-& swap-window -t 7
|
||||||
|
bind-key -n M-* swap-window -t 8
|
||||||
|
bind-key -n M-( swap-window -t 9
|
||||||
|
bind-key -n M-) swap-window -t 10
|
||||||
|
|
||||||
|
bind-key S new-session
|
||||||
bind-key T switch-client -l
|
bind-key T switch-client -l
|
||||||
|
|
||||||
bind -n S-Left previous-window
|
bind-key Right resize-pane -R 8
|
||||||
bind -n S-Right next-window
|
bind-key Left resize-pane -L 8
|
||||||
bind -n C-S-Left swap-window -t -1
|
bind-key Up resize-pane -U 4
|
||||||
bind -n C-S-Right swap-window -t 1
|
bind-key Down resize-pane -D 4
|
||||||
bind -n S-Up switch-client -p
|
|
||||||
bind -n S-Down switch-client -n
|
|
||||||
|
|
||||||
set -g default-terminal "screen-256color"
|
set -g default-terminal "screen-256color"
|
||||||
set -as terminal-features ",xterm-256color:RGB"
|
set -as terminal-features ",*:RGB"
|
||||||
|
|
||||||
set -g base-index 1
|
set -g base-index 1
|
||||||
setw -g base-index 1
|
setw -g base-index 1
|
||||||
@ -30,9 +43,43 @@ set -g set-titles on
|
|||||||
set -g set-titles-string "#H [#S]"
|
set -g set-titles-string "#H [#S]"
|
||||||
|
|
||||||
set -g status-justify centre
|
set -g status-justify centre
|
||||||
set -g status-left "#[bg=green]#[fg=black] #H #[bg=default]#[fg=default] #S"
|
set -g status-left " #[fg=green]#[bg=green]#[fg=black] #H #[bg=default]#[fg=green]#[fg=default] #S"
|
||||||
set -g status-left-length 50
|
set -g status-left-length 50
|
||||||
set -g status-right "#[bg=green]#[fg=black] %H:%M "
|
set -g status-right "#[fg=green]#[bg=green]#[fg=black] %H:%M #[bg=default]#[fg=green] "
|
||||||
|
set-window-option -g window-status-current-format '#[fg=green]#[bg=green]#[fg=black] #I:#W#F #[fg=green]#[bg=black]'
|
||||||
|
|
||||||
set-window-option -g window-status-current-style bg=green
|
is_vim="ps -o state= -o comm= -t '#{pane_tty}' | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?\.?(view|n?vim?x?)(-wrapped)?(diff)?$'"
|
||||||
set-window-option -ga window-status-current-style fg=black
|
|
||||||
|
bind-key -n 'M-h' if-shell "$is_vim" 'send-keys M-h' 'select-pane -L'
|
||||||
|
bind-key -n 'M-j' if-shell "$is_vim" 'send-keys M-j' 'select-pane -D'
|
||||||
|
bind-key -n 'M-k' if-shell "$is_vim" 'send-keys M-k' 'select-pane -U'
|
||||||
|
bind-key -n 'M-l' if-shell "$is_vim" 'send-keys M-l' 'select-pane -R'
|
||||||
|
bind-key -n 'M-n' if-shell "$is_vim" 'send-keys M-n' 'select-window -n'
|
||||||
|
bind-key -n 'M-p' if-shell "$is_vim" 'send-keys M-p' 'select-window -p'
|
||||||
|
|
||||||
|
bind-key -T copy-mode-vi 'M-h' select-pane -L
|
||||||
|
bind-key -T copy-mode-vi 'M-j' select-pane -D
|
||||||
|
bind-key -T copy-mode-vi 'M-k' select-pane -U
|
||||||
|
bind-key -T copy-mode-vi 'M-l' select-pane -R
|
||||||
|
bind-key -T copy-mode-vi 'M-n' select-window -n
|
||||||
|
bind-key -T copy-mode-vi 'M-p' select-window -p
|
||||||
|
|
||||||
|
bind -n 'M-H' if-shell "$is_vim" 'send-keys M-H' 'resize-pane -L 1'
|
||||||
|
bind -n 'M-J' if-shell "$is_vim" 'send-keys M-J' 'resize-pane -D 1'
|
||||||
|
bind -n 'M-K' if-shell "$is_vim" 'send-keys M-K' 'resize-pane -U 1'
|
||||||
|
bind -n 'M-L' if-shell "$is_vim" 'send-keys M-L' 'resize-pane -R 1'
|
||||||
|
|
||||||
|
bind-key -T copy-mode-vi M-H resize-pane -L 1
|
||||||
|
bind-key -T copy-mode-vi M-J resize-pane -D 1
|
||||||
|
bind-key -T copy-mode-vi M-K resize-pane -U 1
|
||||||
|
bind-key -T copy-mode-vi M-L resize-pane -R 1
|
||||||
|
|
||||||
|
bind -n 'C-M-h' if-shell "$is_vim" 'send-keys C-M-h' 'swap-pane -s "{left-of}"'
|
||||||
|
bind -n 'C-M-j' if-shell "$is_vim" 'send-keys C-M-j' 'swap-pane -s "{down-of}"'
|
||||||
|
bind -n 'C-M-k' if-shell "$is_vim" 'send-keys C-M-k' 'swap-pane -s "{up-of}"'
|
||||||
|
bind -n 'C-M-l' if-shell "$is_vim" 'send-keys C-M-l' 'swap-pane -s "{right-of}"'
|
||||||
|
|
||||||
|
bind-key -T copy-mode-vi C-M-h swap-pane -s "{left-of}"
|
||||||
|
bind-key -T copy-mode-vi C-M-j swap-pane -s "{down-of}"
|
||||||
|
bind-key -T copy-mode-vi C-M-k swap-pane -s "{up-of}"
|
||||||
|
bind-key -T copy-mode-vi C-M-l swap-pane -s "{right-of}"
|
||||||
|
@ -7,6 +7,7 @@ fi
|
|||||||
xset b off
|
xset b off
|
||||||
xrandr --auto
|
xrandr --auto
|
||||||
xrandr --output HDMI1 --right-of DP1
|
xrandr --output HDMI1 --right-of DP1
|
||||||
|
xrandr --output DP-0 --left-of DP-2
|
||||||
xrdb -merge ~/.Xresources
|
xrdb -merge ~/.Xresources
|
||||||
setxkbmap pl -option ctrl:nocaps
|
setxkbmap pl -option ctrl:nocaps
|
||||||
|
|
||||||
|
@ -23,9 +23,24 @@ fi
|
|||||||
if [ -f ~/.config/alacritty/alacritty.yml ]; then
|
if [ -f ~/.config/alacritty/alacritty.yml ]; then
|
||||||
sed -i "s/^colors: [*].*/colors: *$THEME/" ~/.config/alacritty/alacritty.yml
|
sed -i "s/^colors: [*].*/colors: *$THEME/" ~/.config/alacritty/alacritty.yml
|
||||||
fi
|
fi
|
||||||
|
if [ -f ~/.config/alacritty/alacritty.toml ]; then
|
||||||
|
sed -i "s#^import =.*#import = [\"~/.config/alacritty/$THEME.toml\"]#" ~/.config/alacritty/alacritty.toml
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$THEME" = dark ]; then
|
||||||
|
kitten themes --reload-in=all Afterglow
|
||||||
|
elif [ "$THEME" = light ]; then
|
||||||
|
kitten themes --reload-in=all One Half Light
|
||||||
|
fi
|
||||||
|
|
||||||
# GTK
|
# GTK
|
||||||
if [ -f ~/.config/xsettingsd/xsettingsd.conf ]; then
|
if [ -f ~/.config/xsettingsd/xsettingsd.conf ]; then
|
||||||
sed -i -E "s#(Net/ThemeName) .*#\\1 \"${GTK_THEME}\"#" ~/.config/xsettingsd/xsettingsd.conf
|
sed -i -E "s#(Net/ThemeName) .*#\\1 \"${GTK_THEME}\"#" ~/.config/xsettingsd/xsettingsd.conf
|
||||||
pkill -HUP -x xsettingsd
|
pkill -HUP -x xsettingsd
|
||||||
|
gsettings set org.gnome.desktop.interface gtk-theme "${GTK_THEME}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# waybar
|
||||||
|
if [ -f ~/.config/waybar/style.css ]; then
|
||||||
|
sed -i -E "s#file:///.*/(light|dark)[.]css#file://$HOME/.config/waybar/$THEME.css#" ~/.config/waybar/style.css
|
||||||
fi
|
fi
|
||||||
|
17
yazi/.config/yazi/yazi.toml
Normal file
17
yazi/.config/yazi/yazi.toml
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
[opener]
|
||||||
|
imv = [
|
||||||
|
{ run = 'imv "$@"', orphan = true },
|
||||||
|
]
|
||||||
|
zathura = [
|
||||||
|
{ run = 'zathura "$@"', orphan = true },
|
||||||
|
]
|
||||||
|
nvim_cd = [
|
||||||
|
{ run = 'nvim -c "cd $@"', block = true }
|
||||||
|
]
|
||||||
|
|
||||||
|
[open]
|
||||||
|
prepend_rules = [
|
||||||
|
{ mime = "image/*", use = "imv" },
|
||||||
|
{ mime = "application/pdf", use = "zathura" },
|
||||||
|
{ mime = "inode/directory", use = "nvim_cd" }
|
||||||
|
]
|
Reference in New Issue
Block a user