chore: proper keymap documentation and more cleanup
This commit is contained in:
parent
6f9ecd5c96
commit
d46086ec26
16 changed files with 348 additions and 109 deletions
BIN
hypr/20220830_14h00m46s_grim.png
Normal file
BIN
hypr/20220830_14h00m46s_grim.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 38 KiB |
191
hypr/hyprland.conf
Normal file
191
hypr/hyprland.conf
Normal file
|
|
@ -0,0 +1,191 @@
|
|||
|
||||
#
|
||||
#fix the fucking portal
|
||||
exec-once=systemctl --user import-environment
|
||||
exec-once=dbus-update-activation-environment --all
|
||||
#
|
||||
#
|
||||
|
||||
monitor=DP-3,2560x1440@165,0x0,1
|
||||
monitor=DP-1,3440x1440@180,2560x0,1
|
||||
monitor=DP-2,1920x1200@60,6000x0,1
|
||||
monitor=DP-2,transform,1
|
||||
|
||||
monitor=,highrr,auto,1
|
||||
|
||||
workspace=DP-3,1
|
||||
workspace=DP-1,2
|
||||
workspace=DP-2,3
|
||||
|
||||
input {
|
||||
kb_file=/home/dashie/.config/keymap.xkb #us with dead_diaeresis on shift + ' to get ä ö ü
|
||||
kb_layout=
|
||||
kb_variant=
|
||||
kb_model=
|
||||
kb_options=
|
||||
kb_rules=
|
||||
repeat_delay=200
|
||||
natural_scroll=false
|
||||
follow_mouse=1
|
||||
force_no_accel=true
|
||||
|
||||
touchpad {
|
||||
natural_scroll=yes
|
||||
tap-to-click=yes
|
||||
}
|
||||
}
|
||||
|
||||
general {
|
||||
sensitivity=1.0 # for mouse cursor
|
||||
|
||||
gaps_in=5
|
||||
gaps_out=10
|
||||
border_size=3
|
||||
col.active_border=0xFFFF0000 0xFF00FF00 0xFF0000FF 45deg
|
||||
col.inactive_border=0x66333333
|
||||
|
||||
apply_sens_to_raw=0 # whether to apply the sensitivity to raw input (e.g. used by games where you aim using your mouse)
|
||||
|
||||
}
|
||||
|
||||
decoration {
|
||||
rounding=10
|
||||
blur=1
|
||||
blur_size=3 # minimum 1
|
||||
blur_passes=1 # minimum 1
|
||||
blur_new_optimizations=true
|
||||
}
|
||||
|
||||
animations {
|
||||
enabled=1
|
||||
animation=windowsMove,1,1,default
|
||||
animation=windows,1,7,default
|
||||
animation=border,1,10,default
|
||||
animation=fade,1,10,default
|
||||
animation=workspaces,1,6,default
|
||||
}
|
||||
|
||||
dwindle {
|
||||
preserve_split=true
|
||||
pseudotile=0 # enable pseudotiling on dwindle
|
||||
}
|
||||
|
||||
gestures {
|
||||
workspace_swipe=yes
|
||||
}
|
||||
|
||||
misc {
|
||||
no_vfr=false
|
||||
# animate_manual_resizes=true
|
||||
# enable_swallow=true
|
||||
# swallow_regex=^(.*)(Alacritty)(.*)$
|
||||
|
||||
}
|
||||
|
||||
#reserve place for bar
|
||||
#monitor=eDP-1,addreserved,45,0,0,0
|
||||
|
||||
# example window rules
|
||||
# for windows named/classed as abc and xyz
|
||||
windowrule=tile,^(.*)(Spotify)(.*)$
|
||||
windowrule=float,^(.*)(Steam)(.*)$
|
||||
windowrule=float,^(.*)(Calculator)(.*)$
|
||||
windowrule=float,^(.*)(winecfg.exe)(.*)$
|
||||
windowrule=float,^(.*)(speed.exe)(.*)$
|
||||
windowrule=center,^(.*)(gnome)(.*)$
|
||||
# windowrule=windowdance,^(.*)(ota)(.*)$
|
||||
windowrule=forceinput,^(.*)(ota)(.*)$
|
||||
windowrule=size 1200 800,^(org.gnome.NautilusPreviewer)$
|
||||
windowrule=center,^(.*)(swappy)(.*)$
|
||||
windowrule=opacity 80,^(.*)(dunst)(.*)$
|
||||
#windowrule=tile,xyz
|
||||
#windowrule=float,abc
|
||||
#windowrule=pseudo,abc
|
||||
#windowrule=monitor 0,xyz
|
||||
|
||||
# example binds
|
||||
bind=SUPER,S,exec,grim -g "$(slurp)" - | wl-copy
|
||||
bind=SUPERSHIFTALT,S,exec,grim -g "$(slurp)" $HOME/gits/ost-3semester/Screenshots/$(date +'%Y-%m-%d:%I:%M:%S.png')
|
||||
bind=SUPERSHIFT,S,exec,grim -g "$(slurp)" - | swappy -f -
|
||||
bind=SUPER,F,exec,firefox
|
||||
bind=SUPER,T,exec,alacritty
|
||||
bind=SUPER,Q,killactive,
|
||||
bind=SUPER,M,exit,
|
||||
bind=SUPER,E,exec,nautilus --new-window
|
||||
bind=SUPER,V,togglefloating,
|
||||
bind=SUPER,B,fullscreen,
|
||||
bind=SUPER,R,exec,wofi -I -m -t alacritty -s ~/.config/wofi/style.css --show drun
|
||||
bind=SUPERSHIFT,R,exec,wofi -I -m -t alacritty -s ~/.config/wofi/style.css --show run
|
||||
bind=SUPER,C,togglesplit
|
||||
bind=SUPER,G,exec,calculator --gui
|
||||
bind=SUPERSHIFT,L,exec, playerctl -a pause & swaylock -c 000000 & systemctl suspend
|
||||
bind=,XF86AudioMute,exec,pactl set-sink-mute @DEFAULT_SINK@ toggle
|
||||
bind=,XF86AudioLowerVolume,exec, $HOME/.config/eww/scripts/change-volume sink -5%
|
||||
bind=,XF86AudioRaiseVolume,exec, $HOME/.config/eww/scripts/change-volume sink +5%
|
||||
bind=,XF86AudioPlay,exec, playerctl play-pause
|
||||
bind=,XF86AudioNext,exec, playerctl next
|
||||
bind=,XF86AudioPrev,exec, playerctl previous
|
||||
bind=,XF86MonBrightnessDown,exec, $HOME/.config/eww/scripts/change-brightness brightness 10%-
|
||||
bind=,XF86MonBrightnessUp,exec, $HOME/.config/eww/scripts/change-brightness brightness +10%
|
||||
bind=SUPER,D,exec,$HOME/.config/eww/scripts/cockpit_toggle
|
||||
|
||||
binde=SUPER,bracketleft,movefocus,l
|
||||
binde=SUPER,bracketright,movefocus,r
|
||||
binde=SUPER,semicolon,movefocus,u
|
||||
binde=SUPER,apostrophe,movefocus,d
|
||||
|
||||
bind=SUPER,left,movewindow,l
|
||||
bind=SUPER,right,movewindow,r
|
||||
bind=SUPER,up,movewindow,u
|
||||
bind=SUPER,down,movewindow,d
|
||||
|
||||
bind=SUPER,1,workspace,1
|
||||
bind=SUPER,2,workspace,2
|
||||
bind=SUPER,3,workspace,3
|
||||
bind=SUPER,4,workspace,4
|
||||
bind=SUPER,5,workspace,5
|
||||
bind=SUPER,6,workspace,6
|
||||
bind=SUPER,7,workspace,7
|
||||
bind=SUPER,8,workspace,8
|
||||
bind=SUPER,9,workspace,9
|
||||
bind=SUPER,0,workspace,10
|
||||
|
||||
bind=SUPERSHIFT,1,movetoworkspace,1
|
||||
bind=SUPERSHIFT,2,movetoworkspace,2
|
||||
bind=SUPERSHIFT,3,movetoworkspace,3
|
||||
bind=SUPERSHIFT,4,movetoworkspace,4
|
||||
bind=SUPERSHIFT,5,movetoworkspace,5
|
||||
bind=SUPERSHIFT,6,movetoworkspace,6
|
||||
bind=SUPERSHIFT,7,movetoworkspace,7
|
||||
bind=SUPERSHIFT,8,movetoworkspace,8
|
||||
bind=SUPERSHIFT,9,movetoworkspace,9
|
||||
bind=SUPERSHIFT,0,movetoworkspace,10
|
||||
|
||||
bindm=SUPER,mouse:272,movewindow
|
||||
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
|
||||
|
||||
#binds for debug testing
|
||||
|
||||
bind=SUPERALT,H,pass,^(wlroots)$
|
||||
bind=SUPERALT,J,pass,^(wlroots)$
|
||||
|
||||
bind=SUPERALT,left,pass,^(wlroots)$
|
||||
bind=SUPERALT,right,pass,^(wlroots)$
|
||||
bind=SUPERALT,up,pass,^(wlroots)$
|
||||
bind=SUPERALT,down,pass,^(wlroots)$
|
||||
|
||||
|
||||
#autostart programs
|
||||
#exec=~/Documents/scripts/hyprstart.sh
|
||||
#exec=hyprstart.sh
|
||||
exec-once=hyprpaper
|
||||
exec-once=eww daemon
|
||||
exec-once=eww open bar
|
||||
exec-once=element-desktop
|
||||
exec-once=firefox
|
||||
exec-once=streamdeck -n
|
||||
66
hypr/hyprlandd.conf
Normal file
66
hypr/hyprlandd.conf
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
|
||||
#
|
||||
#fix the fucking portal
|
||||
#
|
||||
|
||||
monitor=,720x920@60,auto,1
|
||||
|
||||
input {
|
||||
repeat_delay=200
|
||||
natural_scroll=false
|
||||
follow_mouse=1
|
||||
force_no_accel=true
|
||||
|
||||
touchpad {
|
||||
natural_scroll=yes
|
||||
tap-to-click=yes
|
||||
}
|
||||
}
|
||||
|
||||
general {
|
||||
sensitivity=1.0 # for mouse cursor
|
||||
|
||||
gaps_in=5
|
||||
gaps_out=10
|
||||
border_size=3
|
||||
col.active_border=0x66ee1111
|
||||
col.inactive_border=0x66333333
|
||||
|
||||
apply_sens_to_raw=0 # whether to apply the sensitivity to raw input (e.g. used by games where you aim using your mouse)
|
||||
|
||||
}
|
||||
|
||||
decoration {
|
||||
rounding=10
|
||||
blur=1
|
||||
blur_size=3 # minimum 1
|
||||
blur_passes=1 # minimum 1
|
||||
blur_new_optimizations=true
|
||||
}
|
||||
|
||||
animations {
|
||||
enabled=0
|
||||
}
|
||||
|
||||
dwindle {
|
||||
preserve_split=true
|
||||
pseudotile=0 # enable pseudotiling on dwindle
|
||||
}
|
||||
|
||||
gestures {
|
||||
}
|
||||
|
||||
misc {
|
||||
|
||||
}
|
||||
|
||||
bind=SUPERALT,H,exec,alacritty
|
||||
|
||||
bind=SUPERALT,left,movewindow,l
|
||||
bind=SUPERALT,right,movewindow,r
|
||||
bind=SUPERALT,up,movewindow,u
|
||||
bind=SUPERALT,down,movewindow,d
|
||||
bind=SUPERALT,J,fullscreen
|
||||
|
||||
windowrule = nofullscreenrequest,^(.*)$
|
||||
|
||||
8
hypr/hyprpaper.conf
Normal file
8
hypr/hyprpaper.conf
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
|
||||
# wallpaper
|
||||
preload = /home/dashie/Pictures/backgrounds/Monitor1.jpg
|
||||
preload = /home/dashie/Pictures/backgrounds/Monitor2.jpg
|
||||
preload = /home/dashie/Pictures/backgrounds/Monitor3.jpg
|
||||
wallpaper = DP-2,/home/dashie/Pictures/backgrounds/Monitor1.jpg
|
||||
wallpaper = DP-1,/home/dashie/Pictures/backgrounds/Monitor2.jpg
|
||||
wallpaper = DP-3,/home/dashie/Pictures/backgrounds/Monitor3.jpg
|
||||
|
|
@ -9,7 +9,6 @@ require("settings.pairs")
|
|||
require("settings.indentline")
|
||||
require("settings.project")
|
||||
require("settings.dashboard")
|
||||
require("settings.haskell")
|
||||
require("settings.null-ls")
|
||||
require("settings.rainbow")
|
||||
require("settings.dap")
|
||||
|
|
|
|||
|
|
@ -26,6 +26,22 @@
|
|||
- fg: live ripgrep
|
||||
- fb: find buffers
|
||||
- fh: help for functions etc
|
||||
- fp: find projects
|
||||
|
||||
## toggletrouble
|
||||
- Ctrl + f: show errors and warnings
|
||||
|
||||
## cmp
|
||||
Note, these require the cmp list view to be open to do anything!
|
||||
- Ctrl + b: scroll docs up
|
||||
- Ctrl + f: scroll docs down
|
||||
- Ctrl + e: cancel cmp
|
||||
- Enter: write selected suggestion (does nothing if not selected)
|
||||
- Tab: scroll down through suggestion list
|
||||
- Shift + Tab: scroll up through suggestion list
|
||||
|
||||
## snippets
|
||||
These require you to be inside a snippet!
|
||||
- Ctrl + j: jump to next entry
|
||||
- Ctrl + k: jump to previous entry
|
||||
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ require("luasnip.loaders.from_lua").load({ paths = "~/.config/nvim/snippets" })
|
|||
|
||||
luasnip.config.set_config({
|
||||
history = true,
|
||||
delete_check_events = "TextChanged",
|
||||
updateevents = "TextChanged,TextChangedI",
|
||||
enable_autosnippets = true,
|
||||
ext_opts = {
|
||||
|
|
@ -26,9 +27,7 @@ luasnip.config.set_config({
|
|||
},
|
||||
})
|
||||
|
||||
--vim.cmd('let g:snipMate = {"snippet_version" : 1 }')
|
||||
require("luasnip/loaders/from_vscode").lazy_load()
|
||||
--require("luasnip.loaders.from_snipmate").lazy_load()
|
||||
|
||||
local check_backspace = function()
|
||||
local col = vim.fn.col(".") - 1
|
||||
|
|
@ -65,11 +64,6 @@ local kind_icons = {
|
|||
}
|
||||
-- find more here: https://www.nerdfonts.com/cheat-sheet
|
||||
|
||||
--local has_words_before = function()
|
||||
-- local line, col = unpack(vim.api.nvim_win_get_cursor(0))
|
||||
-- return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
|
||||
--end
|
||||
|
||||
cmp.setup({
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
|
|
@ -77,26 +71,13 @@ cmp.setup({
|
|||
end,
|
||||
},
|
||||
mapping = {
|
||||
["<C-k>"] = cmp.mapping.select_prev_item(),
|
||||
--["<C-j>"] = cmp.mapping.select_next_item(),
|
||||
["<C-b>"] = cmp.mapping(cmp.mapping.scroll_docs(-1), { "i", "c" }),
|
||||
["<C-f>"] = cmp.mapping(cmp.mapping.scroll_docs(1), { "i", "c" }),
|
||||
["<C-Space>"] = cmp.mapping(cmp.mapping.complete(), { "i", "c" }),
|
||||
["<C-y>"] = cmp.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `<C-y>` mapping.
|
||||
["<C-b>"] = cmp.mapping.scroll_docs(-1),
|
||||
["<C-f>"] = cmp.mapping.scroll_docs(1),
|
||||
["<C-e>"] = cmp.mapping({
|
||||
i = cmp.mapping.abort(),
|
||||
c = cmp.mapping.close(),
|
||||
}),
|
||||
-- mapping = cmp.mapping.preset.insert({
|
||||
-- ['<C-b>'] = cmp.mapping.scroll_docs(-4),
|
||||
-- ['<C-f>'] = cmp.mapping.scroll_docs(4),
|
||||
-- ['<C-Space>'] = cmp.mapping.complete(),
|
||||
-- ['<C-e>'] = cmp.mapping.abort(),
|
||||
-- ['<CR>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
|
||||
-- }),
|
||||
-- Accept currently selected item. If none selected, `select` first item.
|
||||
-- Set `select` to `false` to only confirm explicitly selected items.
|
||||
["<CR>"] = cmp.mapping.confirm({ select = true }),
|
||||
["<CR>"] = cmp.mapping.confirm({ select = false }),
|
||||
["<Tab>"] = cmp.mapping(function(fallback)
|
||||
if cmp.visible() then
|
||||
cmp.select_next_item()
|
||||
|
|
@ -104,13 +85,9 @@ cmp.setup({
|
|||
fallback()
|
||||
end
|
||||
end, { "i", "s" }),
|
||||
["<C-j>"] = cmp.mapping(function(fallback)
|
||||
if luasnip.expandable() then
|
||||
luasnip.expand()
|
||||
elseif luasnip.expand_or_jumpable() then
|
||||
luasnip.expand_or_jump()
|
||||
elseif check_backspace() then
|
||||
fallback()
|
||||
["<S-Tab>"] = cmp.mapping(function(fallback)
|
||||
if cmp.visible() then
|
||||
cmp.select_prev_item()
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
|
|
@ -118,8 +95,20 @@ cmp.setup({
|
|||
"i",
|
||||
"s",
|
||||
}),
|
||||
["<S-Tab>"] = cmp.mapping(function(fallback)
|
||||
if luasnip.jumpable(-1) then
|
||||
["<C-j>"] = cmp.mapping(function(fallback)
|
||||
if luasnip.expandable() then
|
||||
luasnip.expand()
|
||||
elseif luasnip.expand_or_jumpable() then
|
||||
luasnip.expand_or_jump()
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end, {
|
||||
"i",
|
||||
"s",
|
||||
}),
|
||||
["<C-k>"] = cmp.mapping(function(fallback)
|
||||
if luasnip.expand_or_jumpable(-1) then
|
||||
luasnip.jump(-1)
|
||||
else
|
||||
fallback()
|
||||
|
|
@ -129,12 +118,13 @@ cmp.setup({
|
|||
"s",
|
||||
}),
|
||||
},
|
||||
view = {
|
||||
{ entries = "native" },
|
||||
},
|
||||
formatting = {
|
||||
fields = { "kind", "abbr", "menu" },
|
||||
format = function(entry, vim_item)
|
||||
-- Kind icons
|
||||
vim_item.kind = string.format("%s", kind_icons[vim_item.kind])
|
||||
-- vim_item.kind = string.format('%s %s', kind_icons[vim_item.kind], vim_item.kind) -- This concatonates the icons with the name of the item kind
|
||||
vim_item.menu = ({
|
||||
nvim_lsp = "[LSP]",
|
||||
luasnip = "[Snippet]",
|
||||
|
|
@ -147,26 +137,8 @@ cmp.setup({
|
|||
sources = {
|
||||
{ name = "nvim_lsp" },
|
||||
{ name = "luasnip" },
|
||||
--{
|
||||
-- name = "buffer",
|
||||
-- option = {
|
||||
-- keyword_pattern = [[\k\+]],
|
||||
-- }
|
||||
--},
|
||||
{ name = "path" },
|
||||
-- {
|
||||
-- name = "spell",
|
||||
-- option = {
|
||||
-- keep_all_entries = false,
|
||||
-- enable_in_context = function()
|
||||
-- return true
|
||||
-- end,
|
||||
-- },
|
||||
-- },
|
||||
},
|
||||
confirm_opts = {
|
||||
behavior = cmp.ConfirmBehavior.Replace,
|
||||
select = false,
|
||||
{ name = "buffer" },
|
||||
},
|
||||
window = {
|
||||
documentation = {
|
||||
|
|
@ -174,7 +146,6 @@ cmp.setup({
|
|||
},
|
||||
},
|
||||
experimental = {
|
||||
ghost_text = false,
|
||||
native_menu = false,
|
||||
ghost_text = true,
|
||||
},
|
||||
})
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ dashboard.section.header.val = {
|
|||
dashboard.section.buttons.val = {
|
||||
dashboard.button("f", " Find file", ":Telescope find_files <CR>"),
|
||||
dashboard.button("e", " New file", ":ene <BAR> startinsert <CR>"),
|
||||
dashboard.button("p", " Find project", ":Telescope projects <CR>"),
|
||||
dashboard.button("p", " Find project", ":Telescope project <CR>"),
|
||||
dashboard.button("r", " Recently used files", ":Telescope oldfiles <CR>"),
|
||||
dashboard.button("t", " Find text", ":Telescope live_grep <CR>"),
|
||||
dashboard.button("c", " Configuration", ":e ~/.config/nvim/init.lua <CR>"),
|
||||
|
|
@ -23,12 +23,7 @@ dashboard.section.buttons.val = {
|
|||
}
|
||||
|
||||
local function footer()
|
||||
-- NOTE: requires the fortune-mod package to work
|
||||
-- local handle = io.popen("fortune")
|
||||
-- local fortune = handle:read("*a")
|
||||
-- handle:close()
|
||||
-- return fortune
|
||||
return "dashie@shitgaem.online"
|
||||
return "dashie@dashie.org"
|
||||
end
|
||||
|
||||
dashboard.section.footer.val = footer()
|
||||
|
|
@ -38,5 +33,4 @@ dashboard.section.header.opts.hl = "Include"
|
|||
dashboard.section.buttons.opts.hl = "Keyword"
|
||||
|
||||
dashboard.opts.opts.noautocmd = true
|
||||
-- vim.cmd([[autocmd User AlphaReady echo 'ready']])
|
||||
alpha.setup(dashboard.opts)
|
||||
|
|
|
|||
|
|
@ -25,12 +25,12 @@ vim.g.indent_blankline_context_patterns = {
|
|||
"class",
|
||||
"return",
|
||||
"function",
|
||||
"def",
|
||||
"def",
|
||||
"method",
|
||||
"^if",
|
||||
"^else",
|
||||
"^else if",
|
||||
"^elif",
|
||||
"^else",
|
||||
"^else if",
|
||||
"^elif",
|
||||
"^while",
|
||||
"jsx_element",
|
||||
"^for",
|
||||
|
|
|
|||
|
|
@ -26,24 +26,25 @@ keymap("n", "<F2>", ":BufferNext<CR>", opts)
|
|||
keymap("n", "<F4>", ":lua vim.lsp.buf.format { async = true }<CR>", opts)
|
||||
|
||||
-- telescope
|
||||
keymap("n", "ff", ':lua require("telescope.builtin").find_files()<CR>', {})
|
||||
keymap("n", "fg", ':lua require("telescope.builtin").live_grep()<CR>', {})
|
||||
keymap("n", "fb", ':lua require("telescope.builtin").buffers()<CR>', {})
|
||||
keymap("n", "fh", ':lua require("telescope.builtin").help_tags()<CR>', {})
|
||||
keymap("n", "ff", ":lua require('telescope.builtin').find_files()<CR>", {})
|
||||
keymap("n", "fg", ":lua require('telescope.builtin').live_grep()<CR>", {})
|
||||
keymap("n", "fb", ":lua require('telescope.builtin').buffers()<CR>", {})
|
||||
keymap("n", "fh", ":lua require('telescope.builtin').help_tags()<CR>", {})
|
||||
keymap("n", "fp", ":lua require'telescope'.extensions.project.project{}<CR>", { noremap = true, silent = true })
|
||||
|
||||
-- trouble
|
||||
keymap("n", "<C-f>", "<cmd>TroubleToggle<CR>", term_opts)
|
||||
require("trouble").setup {
|
||||
action_keys = {
|
||||
--remove the fucking stupid keymap amk
|
||||
open_tab = {}
|
||||
}
|
||||
}
|
||||
require("trouble").setup({
|
||||
action_keys = {
|
||||
--remove the fucking stupid keymap amk
|
||||
open_tab = {},
|
||||
},
|
||||
})
|
||||
|
||||
-- LSP
|
||||
local on_attach = function(client, bufnr)
|
||||
vim.api.nvim_buf_set_option(bufnr, "omnifunc", "v:lua.vim.lsp.omnifunc")
|
||||
local opts = { noremap = true, silent = true, buffer=bufnr }
|
||||
local opts = { noremap = true, silent = true, buffer = bufnr }
|
||||
keymap("n", "<leader>h", "<Cmd>lua vim.lsp.buf.declaration()<CR>", opts)
|
||||
keymap("n", "<leader>j", "<Cmd>lua vim.lsp.buf.definition()<CR>", opts)
|
||||
keymap("n", "<leader>k", "<Cmd>lua vim.lsp.buf.implementation()<CR>", opts)
|
||||
|
|
|
|||
|
|
@ -18,14 +18,14 @@ require("mason-lspconfig").setup({
|
|||
"cssls", -- css
|
||||
"html", -- html
|
||||
"clangd", -- cpp / c
|
||||
"tsserver", -- python
|
||||
"tsserver", -- javascript / typescript
|
||||
"sumneko_lua", -- lua
|
||||
"pyright", -- python
|
||||
"rust_analyzer", -- rust
|
||||
"cmake", -- cmake
|
||||
"bashls", -- shell
|
||||
"ansiblels", -- ansible
|
||||
"marksman",
|
||||
"marksman", -- markdown
|
||||
},
|
||||
automatic_installation = true,
|
||||
})
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ require("mason-null-ls").setup({
|
|||
"autopep8",
|
||||
"stylua",
|
||||
"rustfmt",
|
||||
"stylish-haskell",
|
||||
},
|
||||
})
|
||||
|
||||
|
|
@ -33,6 +32,5 @@ null_ls.setup({
|
|||
require("null-ls").builtins.formatting.autopep8,
|
||||
require("null-ls").builtins.formatting.stylua,
|
||||
require("null-ls").builtins.formatting.rustfmt,
|
||||
require("null-ls").builtins.formatting.stylish_haskell,
|
||||
},
|
||||
})
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ local options = {
|
|||
smartcase = true,
|
||||
showmode = true,
|
||||
termguicolors = true,
|
||||
-- winbar = "",
|
||||
ignorecase = true,
|
||||
showtabline = 2,
|
||||
timeoutlen = 200, -- time to wait for a mapped sequence to complete (in milliseconds)
|
||||
|
|
@ -18,7 +17,7 @@ local options = {
|
|||
expandtab = true, -- convert tabs to spaces
|
||||
shiftwidth = 2, -- the number of spaces inserted for each indentation
|
||||
tabstop = 2, -- insert 2 spaces for a tab
|
||||
scrolloff = 8, -- is one of my fav
|
||||
scrolloff = 8,
|
||||
sidescrolloff = 8,
|
||||
spell = true,
|
||||
syntax = "off",
|
||||
|
|
@ -26,8 +25,6 @@ local options = {
|
|||
mousemodel = "popup_setpos",
|
||||
}
|
||||
|
||||
--vim.opt.shortmess:append "c"
|
||||
|
||||
vim.g.mkdp_browser = '/usr/bin/firefox'
|
||||
vim.g.mkdp_auto_start = 1
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ Plug("numToStr/Comment.nvim") -- fast comments
|
|||
Plug("lukas-reineke/indent-blankline.nvim") -- indicators for indentation (needs config)
|
||||
Plug("lewis6991/impatient.nvim") -- speedup startup
|
||||
Plug("nvim-telescope/telescope.nvim") -- file/text search
|
||||
Plug("ahmedkhalf/project.nvim") -- project management -> switch projects
|
||||
Plug("goolord/alpha-nvim") -- dashboard
|
||||
Plug("lervag/vimtex") -- latex plugin
|
||||
Plug("weilbith/nvim-code-action-menu") -- code action menu
|
||||
|
|
@ -43,8 +42,9 @@ Plug("p00f/nvim-ts-rainbow") -- colors brackets
|
|||
Plug("nvim-telescope/telescope-ui-select.nvim") -- telescope ui
|
||||
Plug("nvim-telescope/telescope-file-browser.nvim") -- telescope file browser
|
||||
Plug("nvim-telescope/telescope-fzy-native.nvim") -- telescope fuzzy search
|
||||
Plug('nvim-telescope/telescope-project.nvim') -- telescope projects
|
||||
Plug 'folke/trouble.nvim' -- provides warning/error explanation tab
|
||||
Plug("iamcco/markdown-preview.nvim", { ["do"] = "cd app && yarn install" }) -- markdown preview
|
||||
|
||||
Plug("iamcco/markdown-preview.nvim", -- markdown preview
|
||||
{ ["do"] = "cd app && yarn install" })
|
||||
vim.call("plug#end")
|
||||
|
||||
|
|
|
|||
|
|
@ -1,22 +1,22 @@
|
|||
local status_ok, project = pcall(require, "project_nvim")
|
||||
if not status_ok then
|
||||
return
|
||||
end
|
||||
project.setup({
|
||||
active = true,
|
||||
on_config_done = nil,
|
||||
manual_mode = false,
|
||||
detection_methods = { "pattern" },
|
||||
patterns = { ".git", "_darcs", ".hg", ".bzr", ".svn", "Makefile", "package.json" },
|
||||
show_hidden = false,
|
||||
silent_chdir = true,
|
||||
ignore_lsp = {},
|
||||
datapath = vim.fn.stdpath("data"),
|
||||
})
|
||||
-- local status_ok, project = pcall(require, "project_nvim")
|
||||
-- if not status_ok then
|
||||
-- return
|
||||
-- end
|
||||
-- project.setup({
|
||||
-- active = true,
|
||||
-- on_config_done = nil,
|
||||
-- manual_mode = false,
|
||||
-- detection_methods = { "pattern" },
|
||||
-- patterns = { ".git", "_darcs", ".hg", ".bzr", ".svn", "Makefile", "package.json" },
|
||||
-- show_hidden = false,
|
||||
-- silent_chdir = true,
|
||||
-- ignore_lsp = {},
|
||||
-- datapath = vim.fn.stdpath("data"),
|
||||
-- })
|
||||
|
||||
local tele_status_ok, telescope = pcall(require, "telescope")
|
||||
if not tele_status_ok then
|
||||
return
|
||||
end
|
||||
|
||||
telescope.load_extension("projects")
|
||||
telescope.load_extension("project")
|
||||
|
|
|
|||
|
|
@ -52,7 +52,6 @@ local listSnippet = s(
|
|||
\item \textcolor{{{2}}}{{{6}}}
|
||||
\item \textcolor{{{3}}}{{{7}}}
|
||||
\item \textcolor{{{4}}}{{{8}}}
|
||||
\vspace{{-3mm}}
|
||||
\end{{itemize}}
|
||||
]],
|
||||
{
|
||||
|
|
@ -78,7 +77,6 @@ local enumerateSnippet = s(
|
|||
\item \textcolor{{{2}}}{{{6}}}
|
||||
\item \textcolor{{{3}}}{{{7}}}
|
||||
\item \textcolor{{{4}}}{{{8}}}
|
||||
\vspace{{-3mm}}
|
||||
\end{{enumerate}}
|
||||
]],
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue