update mako, nvim add prolog
This commit is contained in:
parent
bfd55dc65e
commit
2e0f1541d6
10 changed files with 89 additions and 37 deletions
|
@ -3,7 +3,7 @@ background-color=#14171d
|
||||||
border-color=#4d4754
|
border-color=#4d4754
|
||||||
border-size=2
|
border-size=2
|
||||||
text-color=#c7c6c3
|
text-color=#c7c6c3
|
||||||
border-radius=3
|
border-radius=2
|
||||||
margin=5
|
margin=5
|
||||||
padding=5,8
|
padding=5,8
|
||||||
progress-color=#373c47
|
progress-color=#373c47
|
||||||
|
|
|
@ -1,23 +0,0 @@
|
||||||
font=Source Code Pro Medium 10
|
|
||||||
background-color=#272b33
|
|
||||||
border-size=2
|
|
||||||
margin=6
|
|
||||||
padding=5,8
|
|
||||||
progress-color=#373c47
|
|
||||||
layer=overlay
|
|
||||||
icons=1
|
|
||||||
|
|
||||||
[urgency=low]
|
|
||||||
text-color=#98c379
|
|
||||||
border-color=#98c379
|
|
||||||
default-timeout=10000
|
|
||||||
|
|
||||||
[urgency=normal]
|
|
||||||
text-color=#61afef
|
|
||||||
border-color=#61afef
|
|
||||||
default-timeout=10000
|
|
||||||
|
|
||||||
[urgency=critical]
|
|
||||||
text-color=#e06c75
|
|
||||||
border-color=#e06c75
|
|
||||||
default-timeout=0
|
|
|
@ -1,6 +1,4 @@
|
||||||
local lsp = require('lsp-zero')
|
local lsp = require('lsp-zero').preset('recommended')
|
||||||
|
|
||||||
lsp.preset('recommended')
|
|
||||||
|
|
||||||
require('mason').setup({})
|
require('mason').setup({})
|
||||||
require('mason-lspconfig').setup({
|
require('mason-lspconfig').setup({
|
||||||
|
@ -66,12 +64,16 @@ lsp.on_attach(function(client, bufnr)
|
||||||
keymap("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
|
keymap("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
require('lspconfig/prolog_lsp')
|
||||||
|
|
||||||
|
lsp.configure('prolog_lsp', {force_setup = true})
|
||||||
lsp.setup()
|
lsp.setup()
|
||||||
|
|
||||||
vim.diagnostic.config({
|
vim.diagnostic.config({
|
||||||
virtual_text = true
|
virtual_text = true
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
require("neodev").setup()
|
require("neodev").setup()
|
||||||
require("nvim-surround").setup()
|
require("nvim-surround").setup()
|
||||||
require("toggleterm").setup()
|
require("toggleterm").setup()
|
||||||
|
|
21
.config/nvim/lua/lspconfig/prolog_lsp.lua
Normal file
21
.config/nvim/lua/lspconfig/prolog_lsp.lua
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
local configs = require 'lspconfig.configs'
|
||||||
|
local util = require 'lspconfig/util'
|
||||||
|
|
||||||
|
configs.prolog_lsp = {
|
||||||
|
default_config = {
|
||||||
|
cmd = {"swipl",
|
||||||
|
"-g", "use_module(library(lsp_server)).",
|
||||||
|
"-g", "lsp_server:main",
|
||||||
|
"-t", "halt",
|
||||||
|
"--", "stdio"};
|
||||||
|
filetypes = {"prolog"};
|
||||||
|
root_dir = util.root_pattern("pack.pl");
|
||||||
|
};
|
||||||
|
docs = {
|
||||||
|
description = [[
|
||||||
|
https://github.com/jamesnvc/prolog_lsp
|
||||||
|
|
||||||
|
Prolog Language Server
|
||||||
|
]];
|
||||||
|
}
|
||||||
|
}
|
|
@ -35,5 +35,7 @@ Plug('kylechui/nvim-surround')
|
||||||
Plug('akinsho/toggleterm.nvim', {tag = '*'})
|
Plug('akinsho/toggleterm.nvim', {tag = '*'})
|
||||||
Plug('goolord/alpha-nvim')
|
Plug('goolord/alpha-nvim')
|
||||||
Plug('Darazaki/indent-o-matic')
|
Plug('Darazaki/indent-o-matic')
|
||||||
|
Plug('iamcco/markdown-preview.nvim', {["do"] = "cd app && npx --yes yarn install"})
|
||||||
|
Plug('skywind3000/asyncrun.vim')
|
||||||
|
|
||||||
vim.call('plug#end')
|
vim.call('plug#end')
|
||||||
|
|
|
@ -17,9 +17,8 @@ require('nvim-treesitter.configs').setup {
|
||||||
ignore_install = { "javascript" },
|
ignore_install = { "javascript" },
|
||||||
highlight = {
|
highlight = {
|
||||||
enable = true,
|
enable = true,
|
||||||
disable = { "c", "rust" },
|
|
||||||
disable = function(lang, buf)
|
disable = function(lang, buf)
|
||||||
local max_filesize = 100 * 1024 -- 100 KB
|
local max_filesize = 1000 * 1024 -- 1 MiB
|
||||||
local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
|
local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
|
||||||
if ok and stats and stats.size > max_filesize then
|
if ok and stats and stats.size > max_filesize then
|
||||||
return true
|
return true
|
||||||
|
|
|
@ -12,3 +12,10 @@ set.number = true
|
||||||
set.relativenumber = true
|
set.relativenumber = true
|
||||||
set.rnu = true
|
set.rnu = true
|
||||||
set.swapfile = false
|
set.swapfile = false
|
||||||
|
|
||||||
|
vim.filetype.add({
|
||||||
|
pattern = {
|
||||||
|
['.*%.pl'] = 'prolog',
|
||||||
|
['.*%.prolog'] = 'prolog',
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
20
.zshrc
20
.zshrc
|
@ -47,15 +47,16 @@ export LESS_TERMCAP_ue=$'\e[0m'
|
||||||
export LESS_TERMCAP_us=$'\e[1;35m'
|
export LESS_TERMCAP_us=$'\e[1;35m'
|
||||||
export GROFF_NO_SGR=1
|
export GROFF_NO_SGR=1
|
||||||
|
|
||||||
# exit bad
|
.reload() {
|
||||||
[ $NOEXIT ] && alias exit="echo Exiting is disabled"
|
# Enable zsh auto suggestions
|
||||||
|
autoload compinit && compinit
|
||||||
|
source $HOME/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
|
||||||
|
source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
|
||||||
|
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#696e8a"
|
||||||
|
ZSH_AUTOSUGGEST_STRATEGY=(completion history)
|
||||||
|
}
|
||||||
|
|
||||||
# Enable zsh auto suggestions
|
.reload
|
||||||
autoload compinit && compinit
|
|
||||||
source $HOME/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
|
|
||||||
source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
|
|
||||||
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#696e8a"
|
|
||||||
ZSH_AUTOSUGGEST_STRATEGY=(completion history)
|
|
||||||
|
|
||||||
# Enable zsh keybinds for home, end, and other movement keybinds
|
# Enable zsh keybinds for home, end, and other movement keybinds
|
||||||
bindkey "\e[1;5D" backward-word
|
bindkey "\e[1;5D" backward-word
|
||||||
|
@ -67,6 +68,9 @@ bindkey "\e[H" beginning-of-line
|
||||||
bindkey "\e[F" end-of-line
|
bindkey "\e[F" end-of-line
|
||||||
bindkey "\e\d" undo
|
bindkey "\e\d" undo
|
||||||
|
|
||||||
|
zle -N reload .reload
|
||||||
|
bindkey "^R" reload
|
||||||
|
|
||||||
# GPG SETUP FOR SSH
|
# GPG SETUP FOR SSH
|
||||||
export GPG_TTY=$(tty)
|
export GPG_TTY=$(tty)
|
||||||
export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
|
export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
|
||||||
|
|
1
aur
1
aur
|
@ -7,4 +7,5 @@ pesterchum-git
|
||||||
pfetch-rs
|
pfetch-rs
|
||||||
swayfx
|
swayfx
|
||||||
ttf-twemoji-color
|
ttf-twemoji-color
|
||||||
|
units
|
||||||
wlogout
|
wlogout
|
||||||
|
|
39
packages
39
packages
|
@ -1,3 +1,4 @@
|
||||||
|
acpi
|
||||||
alacritty
|
alacritty
|
||||||
alsa-tools
|
alsa-tools
|
||||||
alsa-utils
|
alsa-utils
|
||||||
|
@ -15,6 +16,9 @@ cmake
|
||||||
cups
|
cups
|
||||||
cups-pdf
|
cups-pdf
|
||||||
discord
|
discord
|
||||||
|
docker
|
||||||
|
docker-compose
|
||||||
|
doxygen
|
||||||
easyeffects
|
easyeffects
|
||||||
efibootmgr
|
efibootmgr
|
||||||
element-desktop
|
element-desktop
|
||||||
|
@ -37,14 +41,17 @@ krita
|
||||||
less
|
less
|
||||||
lib32-libva-mesa-driver
|
lib32-libva-mesa-driver
|
||||||
lib32-mesa-vdpau
|
lib32-mesa-vdpau
|
||||||
|
libreoffice-fresh
|
||||||
libva-mesa-driver
|
libva-mesa-driver
|
||||||
libvirt
|
libvirt
|
||||||
linux
|
linux
|
||||||
linux-firmware
|
linux-firmware
|
||||||
linux-headers
|
linux-headers
|
||||||
|
lutris
|
||||||
mako
|
mako
|
||||||
man-db
|
man-db
|
||||||
man-pages
|
man-pages
|
||||||
|
maven
|
||||||
mesa-vdpau
|
mesa-vdpau
|
||||||
meson
|
meson
|
||||||
mpv
|
mpv
|
||||||
|
@ -55,11 +62,14 @@ networkmanager
|
||||||
nodejs
|
nodejs
|
||||||
noto-fonts-cjk
|
noto-fonts-cjk
|
||||||
npm
|
npm
|
||||||
|
obs-studio
|
||||||
octave
|
octave
|
||||||
opendoas
|
opendoas
|
||||||
p7zip
|
p7zip
|
||||||
pacman-contrib
|
pacman-contrib
|
||||||
|
pandoc-cli
|
||||||
pavucontrol
|
pavucontrol
|
||||||
|
perl-image-exiftool
|
||||||
pipewire-alsa
|
pipewire-alsa
|
||||||
pipewire-pulse
|
pipewire-pulse
|
||||||
python-pynvim
|
python-pynvim
|
||||||
|
@ -70,6 +80,7 @@ ripgrep
|
||||||
ruby
|
ruby
|
||||||
rustup
|
rustup
|
||||||
sassc
|
sassc
|
||||||
|
sbctl
|
||||||
sl
|
sl
|
||||||
slurp
|
slurp
|
||||||
sof-firmware
|
sof-firmware
|
||||||
|
@ -78,6 +89,31 @@ steam
|
||||||
swaybg
|
swaybg
|
||||||
swayidle
|
swayidle
|
||||||
swaylock
|
swaylock
|
||||||
|
swi-prolog
|
||||||
|
tcpdump
|
||||||
|
texlive-basic
|
||||||
|
texlive-bibtexextra
|
||||||
|
texlive-binextra
|
||||||
|
texlive-context
|
||||||
|
texlive-fontsextra
|
||||||
|
texlive-fontsrecommended
|
||||||
|
texlive-fontutils
|
||||||
|
texlive-formatsextra
|
||||||
|
texlive-games
|
||||||
|
texlive-humanities
|
||||||
|
texlive-latex
|
||||||
|
texlive-latexextra
|
||||||
|
texlive-latexrecommended
|
||||||
|
texlive-luatex
|
||||||
|
texlive-mathscience
|
||||||
|
texlive-metapost
|
||||||
|
texlive-music
|
||||||
|
texlive-pictures
|
||||||
|
texlive-plaingeneric
|
||||||
|
texlive-pstricks
|
||||||
|
texlive-publishers
|
||||||
|
texlive-xetex
|
||||||
|
thunar
|
||||||
thunderbird
|
thunderbird
|
||||||
tlp
|
tlp
|
||||||
tmux
|
tmux
|
||||||
|
@ -90,6 +126,9 @@ vulkan-tools
|
||||||
waybar
|
waybar
|
||||||
waylock
|
waylock
|
||||||
wget
|
wget
|
||||||
|
wine-staging
|
||||||
|
winetricks
|
||||||
|
wireguard-tools
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
wl-mirror
|
wl-mirror
|
||||||
wofi
|
wofi
|
||||||
|
|
Loading…
Reference in a new issue