Xetibo/DashNix
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

pingpang

Browse source
This commit is contained in:
Fabio Lenherr 2023-04-06 09:03:27 +02:00
parent ff98e6fbf0
commit 3d1cc13c15
8 changed files with 235 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

185
eww_laptop/scripts/pop
View file

@ -1,134 +1,129 @@
#!/bin/bash #!/bin/bash
calendar() { calendar() {
LOCK_FILE="$HOME/.cache/eww-calendar.lock" LOCK_FILE="$HOME/.cache/eww-calendar.lock"
EWW_BIN="$HOME/.local/bin/eww" EWW_BIN="$HOME/.local/bin/eww"
run() { run() {
${EWW_BIN} -c $HOME/.config/eww open calendar ${EWW_BIN} -c $HOME/.config/eww open calendar
}
# Open widgets
if [[ ! -f "$LOCK_FILE" ]]; then
${EWW_BIN} -c $HOME/.config/eww close system music_win audio_ctl brightness
touch "$LOCK_FILE"
run && echo "ok good!"
else
${EWW_BIN} -c $HOME/.config/eww close calendar
rm "$LOCK_FILE" && echo "closed"
fi
} }
# Open widgets
if [[ ! -f "$LOCK_FILE" ]]; then
${EWW_BIN} -c $HOME/.config/eww close system music_win audio_ctl brightness
touch "$LOCK_FILE"
run && echo "ok good!"
else
${EWW_BIN} -c $HOME/.config/eww close calendar
rm "$LOCK_FILE" && echo "closed"
fi
}
system() { system() {
LOCK_FILE_MEM="$HOME/.cache/eww-system.lock" LOCK_FILE_MEM="$HOME/.cache/eww-system.lock"
EWW_BIN="$HOME/.local/bin/eww" EWW_BIN="$HOME/.local/bin/eww"
run() { run() {
${EWW_BIN} -c $HOME/.config/eww open system ${EWW_BIN} -c $HOME/.config/eww open system
}
# Open widgets
if [[ ! -f "$LOCK_FILE_MEM" ]]; then
${EWW_BIN} -c $HOME/.config/eww close calendar music_win audio_ctl brightness
touch "$LOCK_FILE_MEM"
run && echo "ok good!"
else
${EWW_BIN} -c $HOME/.config/eww close system
rm "$LOCK_FILE_MEM" && echo "closed"
fi
} }
# Open widgets
if [[ ! -f "$LOCK_FILE_MEM" ]]; then
${EWW_BIN} -c $HOME/.config/eww close calendar music_win audio_ctl brightness
touch "$LOCK_FILE_MEM"
run && echo "ok good!"
else
${EWW_BIN} -c $HOME/.config/eww close system
rm "$LOCK_FILE_MEM" && echo "closed"
fi
}
music() { music() {
LOCK_FILE_SONG="$HOME/.cache/eww-song.lock" LOCK_FILE_SONG="$HOME/.cache/eww-song.lock"
EWW_BIN="$HOME/.local/bin/eww" EWW_BIN="$HOME/.local/bin/eww"
run() { run() {
${EWW_BIN} -c $HOME/.config/eww open music_win ${EWW_BIN} -c $HOME/.config/eww open music_win
}
# Open widgets
if [[ ! -f "$LOCK_FILE_SONG" ]]; then
${EWW_BIN} -c $HOME/.config/eww close system calendar brightness
touch "$LOCK_FILE_SONG"
run && echo "ok good!"
else
${EWW_BIN} -c $HOME/.config/eww close music_win
rm "$LOCK_FILE_SONG" && echo "closed"
fi
} }
# Open widgets
if [[ ! -f "$LOCK_FILE_SONG" ]]; then
${EWW_BIN} -c $HOME/.config/eww close system calendar brightness
touch "$LOCK_FILE_SONG"
run && echo "ok good!"
else
${EWW_BIN} -c $HOME/.config/eww close music_win
rm "$LOCK_FILE_SONG" && echo "closed"
fi
}
audio() { audio() {
LOCK_FILE_AUDIO="$HOME/.cache/eww-audio.lock" LOCK_FILE_AUDIO="$HOME/.cache/eww-audio.lock"
EWW_BIN="$HOME/.local/bin/eww" EWW_BIN="$HOME/.local/bin/eww"
run() { run() {
${EWW_BIN} -c $HOME/.config/eww open audio_ctl ${EWW_BIN} -c $HOME/.config/eww open audio_ctl
} }
# Open widgets # Open widgets
if [[ ! -f "$LOCK_FILE_AUDIO" ]]; then if [[ ! -f "$LOCK_FILE_AUDIO" ]]; then
${EWW_BIN} -c $HOME/.config/eww close system calendar music brightness ${EWW_BIN} -c $HOME/.config/eww close system calendar music brightness
touch "$LOCK_FILE_AUDIO" touch "$LOCK_FILE_AUDIO"
run && echo "ok good!" run && echo "ok good!"
else else
${EWW_BIN} -c $HOME/.config/eww close audio_ctl ${EWW_BIN} -c $HOME/.config/eww close audio_ctl
rm "$LOCK_FILE_AUDIO" && echo "closed" rm "$LOCK_FILE_AUDIO" && echo "closed"
fi fi
} }
brightness() { brightness() {
LOCK_FILE_AUDIO="$HOME/.cache/eww-brightness.lock" LOCK_FILE_AUDIO="$HOME/.cache/eww-brightness.lock"
EWW_BIN="$HOME/.local/bin/eww" EWW_BIN="$HOME/.local/bin/eww"
run() { run() {
${EWW_BIN} -c $HOME/.config/eww open brightness_window ${EWW_BIN} -c $HOME/.config/eww open brightness_window
} }
# Open widgets # Open widgets
if [[ ! -f "$LOCK_FILE_AUDIO" ]]; then if [[ ! -f "$LOCK_FILE_AUDIO" ]]; then
${EWW_BIN} -c $HOME/.config/eww close system calendar music audio_ctl ${EWW_BIN} -c $HOME/.config/eww close system calendar music audio_ctl
touch "$LOCK_FILE_AUDIO" touch "$LOCK_FILE_AUDIO"
run && echo "ok good!" run && echo "ok good!"
else else
${EWW_BIN} -c $HOME/.config/eww close brightness_window ${EWW_BIN} -c $HOME/.config/eww close brightness_window
rm "$LOCK_FILE_AUDIO" && echo "closed" rm "$LOCK_FILE_AUDIO" && echo "closed"
fi fi
} }
hoverGet() { hoverGet() {
NAME="$1" NAME="$1"
EWW_BIN="$HOME/.local/bin/eww" EWW_BIN="$HOME/.local/bin/eww"
if [[ -f "$STORE" ]]; then if [[ -f "$STORE" ]]; then
rm "$STORE" rm "$STORE"
${EWW_BIN} -c $HOME/.config/eww close "$NAME" ${EWW_BIN} -c $HOME/.config/eww close "$NAME"
fi fi
} }
hoverCreate() { hoverCreate() {
if [[ ! -f "$STORE" ]]; then if [[ ! -f "$STORE" ]]; then
touch "$STORE" touch "$STORE"
else else
echo "failure!" echo "failure!"
fi fi
} }
STORE=true STORE=true
if [ "$1" = "calendar" ]; then if [ "$1" = "calendar" ]; then
calendar calendar
elif [ "$1" = "system" ]; then elif [ "$1" = "system" ]; then
system system
#elif [ "$1" = "music" ]; then #elif [ "$1" = "music" ]; then
#music #music
elif [ "$1" = "audio" ]; then elif [ "$1" = "audio" ]; then
audio audio
elif [ "$1" = "brightness" ]; then elif [ "$1" = "brightness" ]; then
brightness brightness
elif [ "$1" = "hoverGet" ]; then elif [ "$1" = "hoverGet" ]; then
hoverGet "$2" hoverGet "$2"
elif [ "$1" = "hoverCreate" ]; then elif [ "$1" = "hoverCreate" ]; then
hoverCreate hoverCreate
fi fi

34
eww_laptop/scripts/sascha_jpg.sh Normal file
View file

@ -0,0 +1,34 @@
#!/bin/sh
MONITOR=$(hyprctl monitors | grep "ID 1" | awk '{print ($2)}')
echo MONITOR
extend() {
hyprctl keyword wsbind 1,
hyprctl keyword wsbind 2,
hyprctl keyword wsbind 3,
hyprctl keyword wsbind 4,
hyprctl keyword wsbind 5,
hyprctl keyword wsbind 6,
hyprctl keyword wsbind 7,
hyprctl keyword wsbind 8,
hyprctl keyword wsbind 9,
hyprctl keyword wsbind 10,eDP-1
}
retract() {
hyprctl keyword wsbind 1,eDP-1
hyprctl keyword wsbind 2,eDP-1
hyprctl keyword wsbind 3,eDP-1
hyprctl keyword wsbind 4,eDP-1
hyprctl keyword wsbind 5,eDP-1
hyprctl keyword wsbind 6,eDP-1
hyprctl keyword wsbind 7,eDP-1
hyprctl keyword wsbind 8,eDP-1
hyprctl keyword wsbind 9,eDP-1
hyprctl keyword wsbind 10,eDP-1
}
if [ "$1" == "extend" ]; then
extend
elif [ "$1" == "retract" ]; then
retract
fi

2
gtk-3.0/bookmarks
View file

@ -1,5 +1,5 @@
file:///home/dashie/Pictures
file:///home/dashie/Documents file:///home/dashie/Documents
file:///home/dashie/Pictures
file:///home/dashie/Downloads file:///home/dashie/Downloads
file:///home/dashie/gits file:///home/dashie/gits
file:///home/dashie/gits/ost-4semester file:///home/dashie/gits/ost-4semester

1
hypr_laptop/hyprdock.toml Normal file
View file

@ -0,0 +1 @@
suspend_command = 'systemctl suspend'

34
hypr_laptop/hyprland.conf
View file

@ -5,7 +5,7 @@ exec-once=dbus-update-activation-environment --all
# #
monitor=eDP-1,1920x1080@144,0x0,1 monitor=eDP-1,1920x1080@144,0x0,1
monitor=,highrr,1920x0,1 monitor=,highres,1920x0,1
input { input {
kb_file=/home/dashie/.config/keymap.xkb #us with dead_diaeresis on shift + ' to get ä ö ü kb_file=/home/dashie/.config/keymap.xkb #us with dead_diaeresis on shift + ' to get ä ö ü
repeat_delay=200 repeat_delay=200
@ -78,7 +78,7 @@ misc {
# example window rules # example window rules
# for windows named/classed as abc and xyz # for windows named/classed as abc and xyz
windowrule=opacity 80,^(.*)(dunst)(.*)$ windowrule=opacity 80,^(.*)(dunst)(.*)$
windowrule=float,^(.*)(Calculator)(.*)$ windowrule=float,^(.*)(OxiCalc)(.*)$
windowrule=float,^(.*)(copyq)(.*)$ windowrule=float,^(.*)(copyq)(.*)$
windowrule=dimaround,^(.*)(onagre)(.*)$ windowrule=dimaround,^(.*)(onagre)(.*)$
windowrule=noborder,^(.*)(onagre)(.*)$ windowrule=noborder,^(.*)(onagre)(.*)$
@ -95,11 +95,13 @@ bind=SUPER,Q,killactive,
bind=SUPER,M,exit, bind=SUPER,M,exit,
bind=SUPER,E,exec,nautilus --new-window bind=SUPER,E,exec,nautilus --new-window
bind=SUPER,V,togglefloating, bind=SUPER,V,togglefloating,
bind=SUPER,R,exec,rofi -show drun -theme tokyonight # bind=SUPER,R,exec,rofi -show drun -theme tokyonight
bind=SUPERSHIFT,R,exec,rofi -show run -theme tokyonight # bind=SUPERSHIFT,R,exec,rofi -show run -theme tokyonight
bind=SUPER,R,exec,anyrun
bind=SUPER,C,togglesplit bind=SUPER,C,togglesplit
bind=SUPER,B,fullscreen bind=SUPER,B,fullscreen
bind=SUPER,G,exec,calculator --gui bind=SUPER,G,exec, oxicalc
bind=SUPERSHIFT,equal,exec, hyprdock --gui
bind=SUPERSHIFT,L,exec, playerctl --all-players -a pause & swaylock -c 000000 & systemctl suspend bind=SUPERSHIFT,L,exec, playerctl --all-players -a pause & swaylock -c 000000 & systemctl suspend
bind=,XF86AudioMute,exec, $HOME/.config/eww/scripts/toggle-mute bind=,XF86AudioMute,exec, $HOME/.config/eww/scripts/toggle-mute
bind=,XF86AudioLowerVolume,exec, $HOME/.config/eww/scripts/change-volume sink -5% bind=,XF86AudioLowerVolume,exec, $HOME/.config/eww/scripts/change-volume sink -5%
@ -114,8 +116,8 @@ bind=SUPERSHIFTALT,S,exec, grim -g "$(slurp)" $HOME/gits/ost-4semester/Screensho
bind=SUPER,D,exec, $HOME/.config/eww/scripts/cockpit_toggle bind=SUPER,D,exec, $HOME/.config/eww/scripts/cockpit_toggle
bind=,Print,exec, grim - | wl-copy bind=,Print,exec, grim - | wl-copy
bind=SUPER,A,exec,copyq toggle bind=SUPER,A,exec,copyq toggle
bind=SUPER,Y,exec, $HOME/.config/eww/scripts/monitor.sh extend bind=SUPERSHIFT,Y,exec, $HOME/.config/eww/scripts/monitor.sh extend
bind=SUPER,H,exec, $HOME/.config/eww/scripts/monitor.sh mirror bind=SUPERSHIFT,H,exec, $HOME/.config/eww/scripts/monitor.sh mirror
# bind=SUPERALT,H,pass,^(wlroots)$ # bind=SUPERALT,H,pass,^(wlroots)$
# bind=SUPERALT,left,pass,^(wlroots)$ # bind=SUPERALT,left,pass,^(wlroots)$
@ -123,10 +125,15 @@ bind=SUPER,H,exec, $HOME/.config/eww/scripts/monitor.sh mirror
# bind=SUPERALT,up,pass,^(wlroots)$ # bind=SUPERALT,up,pass,^(wlroots)$
# bind=SUPERALT,down,pass,^(wlroots)$ # bind=SUPERALT,down,pass,^(wlroots)$
bind=SUPER,bracketleft,movefocus,l bind=SUPER,J,movefocus,l
bind=SUPER,bracketright,movefocus,r bind=SUPER,semicolon,movefocus,r
bind=SUPER,semicolon,movefocus,u bind=SUPER,L,movefocus,u
bind=SUPER,apostrophe,movefocus,d bind=SUPER,K,movefocus,d
binde=SUPER,U,resizeactive,-20 0
binde=SUPER,P,resizeactive,20 0
binde=SUPER,O,resizeactive,0 -20
binde=SUPER,I,resizeactive,0 20
bind=SUPER,left,movewindow,l bind=SUPER,left,movewindow,l
bind=SUPER,right,movewindow,r bind=SUPER,right,movewindow,r
@ -174,11 +181,6 @@ bind=SUPER,mouse_up,workspace,e-1
bindm=SUPER,mouse:272,movewindow bindm=SUPER,mouse:272,movewindow
bindm=SUPER,mouse:273,resizewindow bindm=SUPER,mouse:273,resizewindow
binde=SUPER,O,resizeactive,-20 0
binde=SUPER,P,resizeactive,20 0
binde=SUPER,K,resizeactive,0 -20
binde=SUPER,L,resizeactive,0 20
#autostart programs #autostart programs
#exec=~/Documents/scripts/hyprstart.sh #exec=~/Documents/scripts/hyprstart.sh
#exec=hyprstart.sh #exec=hyprstart.sh

1
nvim/ftplugin/yuck.lua Normal file
View file

@ -0,0 +1 @@
-- require("yuck.vim").setup()

69
nvim/lazy-lock.json Normal file
View file

@ -0,0 +1,69 @@
{
"LazyVim": { "branch": "main", "commit": "8bb0c9ddd85780f1490ba29388449e9ef68a68ae" },
"LuaSnip": { "branch": "master", "commit": "436857749a905b48c1e8205b996639c28f006556" },
"alpha-nvim": { "branch": "main", "commit": "4e1c4dedf5983e84b3ed305228b2235c56c7023c" },
"bufferline.nvim": { "branch": "main", "commit": "3677aceb9a72630b0613e56516c8f7151b86f95c" },
"catppuccin": { "branch": "main", "commit": "9784b64e84fe2134cc866be3f33cb8194c0c3ede" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
"dressing.nvim": { "branch": "master", "commit": "5f44f829481640be0f96759c965ae22a3bcaf7ce" },
"editorconfig.nvim": { "branch": "master", "commit": "5b9e303e1d6f7abfe616ce4cc8d3fffc554790bf" },
"flit.nvim": { "branch": "main", "commit": "4c1739137acd3e7f03e2065a7be8a4dc41c7e461" },
"friendly-snippets": { "branch": "main", "commit": "2f5b8a41659a19bd602497a35da8d81f1e88f6d9" },
"gitsigns.nvim": { "branch": "main", "commit": "b1f9cf7c5c5639c006c937fc1819e09f358210fc" },
"harpoon": { "branch": "master", "commit": "f7040fd0c44e7a4010369136547de5604b9c22a1" },
"indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" },
"instant.nvim": { "branch": "master", "commit": "294b6d08143b3db8f9db7f606829270149e1a786" },
"lazy.nvim": { "branch": "main", "commit": "5b4444f0d7e556deba3f7ca949a2ba0e2c3369fb" },
"leap.nvim": { "branch": "main", "commit": "2ff8eac67bed41005ea2032728a0336c784de611" },
"lsp-inlayhints.nvim": { "branch": "main", "commit": "84ca3abe8aaecbb5b30ad89e4701d4a9c821b72c" },
"lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" },
"markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "a81503f0019942111fe464209237f8b4e85f4687" },
"mason-nvim-dap.nvim": { "branch": "main", "commit": "8c5d0212bb385ce363ac3a00aa2e16d88ac44ba7" },
"mason.nvim": { "branch": "main", "commit": "698cd0c4f10480991e665f31977650858d625af1" },
"mini.bufremove": { "branch": "main", "commit": "8d17f868e66ea3b143ab76f09f13f473d61450e2" },
"mini.comment": { "branch": "main", "commit": "8828ce512395ea86dffb1eabc9242a7a3dd1040d" },
"mini.indentscope": { "branch": "main", "commit": "7998edc970610c05598c7aea3d21ece8dd87ed52" },
"mini.pairs": { "branch": "main", "commit": "0256717c9364ad6b5384c37b4f96fb4f7cc74867" },
"mini.surround": { "branch": "main", "commit": "ab995ab83cdbee9141166d82e278dbebff4491de" },
"neo-tree.nvim": { "branch": "v2.x", "commit": "205184aa0e0f08e8a1249d9bb37b45bae85f01b9" },
"neoconf.nvim": { "branch": "main", "commit": "48178e12a8b722f36ca9f0e8ff0a5487b45de493" },
"neodev.nvim": { "branch": "main", "commit": "abdc346ff59c414698de551f876bcf3f223ed224" },
"noice.nvim": { "branch": "main", "commit": "e2a04d480a9fba6b698c01998582ea17aa213ba3" },
"nui.nvim": { "branch": "main", "commit": "0dc148c6ec06577fcf06cbab3b7dac96d48ba6be" },
"null-ls.nvim": { "branch": "main", "commit": "09e99259f4cdd929e7fb5487bf9d92426ccf7cc1" },
"nvim-cmp": { "branch": "main", "commit": "feed47fd1da7a1bad2c7dca456ea19c8a5a9823a" },
"nvim-dap": { "branch": "master", "commit": "73196075627a4f079c62b0dd4aff8ce0a1b7cf57" },
"nvim-dap-ui": { "branch": "master", "commit": "bdb94e3853d11b5ce98ec182e5a3719d5c0ef6fd" },
"nvim-dap-virtual-text": { "branch": "master", "commit": "8db23ea51203b5f00ad107a0cef7e0b2d7a0476c" },
"nvim-highlight-colors": { "branch": "main", "commit": "ce11467796389a4e5838c22384f94c624121796b" },
"nvim-jdtls": { "branch": "master", "commit": "9fcc9495b5d03f8d50e4af936fd0f905f045a6c2" },
"nvim-lspconfig": { "branch": "master", "commit": "4bb0f1845c5cc6465aecedc773fc2d619fcd8faf" },
"nvim-navic": { "branch": "master", "commit": "cdd24539bcf114a499827e9b32869fe74836efe7" },
"nvim-notify": { "branch": "master", "commit": "281e4d793c550c866bea3fb85d39de1f0188fb50" },
"nvim-spectre": { "branch": "master", "commit": "b71b64afe9fedbfdd25a8abec897ff4af3bd553a" },
"nvim-treesitter": { "branch": "master", "commit": "5b505f565816bc7e8c08605285ab78ecd7ca5945" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "5b2bcb9ca8315879181f468b37a897100d631005" },
"nvim-ts-context-commentstring": { "branch": "main", "commit": "729d83ecb990dc2b30272833c213cc6d49ed5214" },
"nvim-web-devicons": { "branch": "master", "commit": "4ee637e0b1873efe1e901380f232799fa0764879" },
"persistence.nvim": { "branch": "main", "commit": "adcf6913693a0434665d162ee45a186230496f8a" },
"plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" },
"tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "f044050da3ec6e1cdb31985beecec6810cc27f0b" },
"telescope-file-browser.nvim": { "branch": "master", "commit": "94fe37a1ea217dd2f90d91222bc1531521146ac3" },
"telescope-project.nvim": { "branch": "master", "commit": "8e8ee37b7210761502cdf2c3a82b5ba8fb5b2972" },
"telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" },
"telescope.nvim": { "branch": "master", "commit": "a3f17d3baf70df58b9d3544ea30abe52a7a832c2" },
"todo-comments.nvim": { "branch": "main", "commit": "6ccb0bebeb22dbe31940776a750db54b844ae653" },
"toggleterm.nvim": { "branch": "main", "commit": "c8e982ad2739eeb0b13d0fecb14820c9bf5e3da0" },
"tokyonight.nvim": { "branch": "main", "commit": "27203d70747094527d13575ed08f6a714e7a43f8" },
"trouble.nvim": { "branch": "main", "commit": "67337644e38144b444d026b0df2dc5fa0038930f" },
"vim-illuminate": { "branch": "master", "commit": "49062ab1dd8fec91833a69f0a1344223dd59d643" },
"vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" },
"vim-startuptime": { "branch": "master", "commit": "6580cf539c33a212f4f5542068a3b4dd2b3ad834" },
"vimtex": { "branch": "master", "commit": "c39907f3caad8157b5b5fb628e9d035a8aee7d76" },
"which-key.nvim": { "branch": "main", "commit": "fb027738340502b556c3f43051f113bcaa7e8e63" },
"yuck.vim": { "branch": "master", "commit": "9b5e0370f70cc30383e1dabd6c215475915fe5c3" }
}

25
nvim/lua/plugins/cmp.lua
View file

@ -3,7 +3,7 @@ return {
"L3MON4D3/LuaSnip", "L3MON4D3/LuaSnip",
build = (not jit.os:find("Windows")) build = (not jit.os:find("Windows"))
and "echo -e 'NOTE: jsregexp is optional, so not a big deal if it fails to build\n'; make install_jsregexp" and "echo -e 'NOTE: jsregexp is optional, so not a big deal if it fails to build\n'; make install_jsregexp"
or nil, or nil,
dependencies = { dependencies = {
"rafamadriz/friendly-snippets", "rafamadriz/friendly-snippets",
config = function() config = function()
@ -36,6 +36,7 @@ return {
opts = function() opts = function()
local cmp = require("cmp") local cmp = require("cmp")
local luasnip = require("luasnip") local luasnip = require("luasnip")
local compare = require('cmp.config.compare')
return { return {
preselect = cmp.PreselectMode.None, preselect = cmp.PreselectMode.None,
completion = { completion = {
@ -53,9 +54,9 @@ return {
["<C-e>"] = cmp.mapping.abort(), ["<C-e>"] = cmp.mapping.abort(),
["<CR>"] = cmp.mapping.confirm({ select = false }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. ["<CR>"] = cmp.mapping.confirm({ select = false }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
["<S-CR>"] = cmp.mapping.confirm({ ["<S-CR>"] = cmp.mapping.confirm({
behavior = cmp.ConfirmBehavior.Replace, behavior = cmp.ConfirmBehavior.Replace,
select = false, select = false,
}), -- Accept cur }), -- Accept cur
["<Tab>"] = cmp.mapping(function(fallback) ["<Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then if cmp.visible() then
cmp.select_next_item() cmp.select_next_item()
@ -96,6 +97,21 @@ return {
"s", "s",
}), }),
}, },
sorting = {
priority_weight = 2,
comparators = {
compare.offset,
compare.exact,
-- compare.scopes,
compare.kind,
compare.score,
compare.recently_used,
compare.locality,
-- compare.sort_text,
compare.length,
compare.order,
},
},
sources = cmp.config.sources({ sources = cmp.config.sources({
{ name = "nvim_lsp" }, { name = "nvim_lsp" },
{ name = "luasnip" }, { name = "luasnip" },
@ -103,6 +119,7 @@ return {
{ name = "path" }, { name = "path" },
}), }),
formatting = { formatting = {
preselect = cmp.PreselectMode.None,
format = function(entry, item) format = function(entry, item)
local icons = require("lazyvim.config").icons.kinds local icons = require("lazyvim.config").icons.kinds
if icons[item.kind] then if icons[item.kind] then