diff options
| -rw-r--r-- | .config/mako/config | 2 | ||||
| -rw-r--r-- | .config/mako/config.bak | 23 | ||||
| -rw-r--r-- | .config/nvim/lua/lsp.lua | 8 | ||||
| -rw-r--r-- | .config/nvim/lua/lspconfig/prolog_lsp.lua | 21 | ||||
| -rw-r--r-- | .config/nvim/lua/plugin.lua | 2 | ||||
| -rw-r--r-- | .config/nvim/lua/treesitter.lua | 3 | ||||
| -rw-r--r-- | .config/nvim/lua/vimopt.lua | 7 | ||||
| -rw-r--r-- | .zshrc | 20 | ||||
| -rw-r--r-- | aur | 1 | ||||
| -rw-r--r-- | packages | 39 |
10 files changed, 89 insertions, 37 deletions
diff --git a/.config/mako/config b/.config/mako/config index 9c7a4eb..dfcc067 100644 --- a/.config/mako/config +++ b/.config/mako/config @@ -3,7 +3,7 @@ background-color=#14171d border-color=#4d4754 border-size=2 text-color=#c7c6c3 -border-radius=3 +border-radius=2 margin=5 padding=5,8 progress-color=#373c47 diff --git a/.config/mako/config.bak b/.config/mako/config.bak deleted file mode 100644 index 88da911..0000000 --- a/.config/mako/config.bak +++ /dev/null @@ -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 diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua index 6896146..c8c2512 100644 --- a/.config/nvim/lua/lsp.lua +++ b/.config/nvim/lua/lsp.lua @@ -1,6 +1,4 @@ -local lsp = require('lsp-zero') - -lsp.preset('recommended') +local lsp = require('lsp-zero').preset('recommended') require('mason').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) end) +require('lspconfig/prolog_lsp') + +lsp.configure('prolog_lsp', {force_setup = true}) lsp.setup() vim.diagnostic.config({ virtual_text = true }) + require("neodev").setup() require("nvim-surround").setup() require("toggleterm").setup() diff --git a/.config/nvim/lua/lspconfig/prolog_lsp.lua b/.config/nvim/lua/lspconfig/prolog_lsp.lua new file mode 100644 index 0000000..85ea353 --- /dev/null +++ b/.config/nvim/lua/lspconfig/prolog_lsp.lua @@ -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 + ]]; + } +} diff --git a/.config/nvim/lua/plugin.lua b/.config/nvim/lua/plugin.lua index 00bc00d..0aa0611 100644 --- a/.config/nvim/lua/plugin.lua +++ b/.config/nvim/lua/plugin.lua @@ -35,5 +35,7 @@ Plug('kylechui/nvim-surround') Plug('akinsho/toggleterm.nvim', {tag = '*'}) Plug('goolord/alpha-nvim') 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') diff --git a/.config/nvim/lua/treesitter.lua b/.config/nvim/lua/treesitter.lua index 268ec0e..b383d79 100644 --- a/.config/nvim/lua/treesitter.lua +++ b/.config/nvim/lua/treesitter.lua @@ -17,9 +17,8 @@ require('nvim-treesitter.configs').setup { ignore_install = { "javascript" }, highlight = { enable = true, - disable = { "c", "rust" }, 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)) if ok and stats and stats.size > max_filesize then return true diff --git a/.config/nvim/lua/vimopt.lua b/.config/nvim/lua/vimopt.lua index 16269d9..c415e31 100644 --- a/.config/nvim/lua/vimopt.lua +++ b/.config/nvim/lua/vimopt.lua @@ -12,3 +12,10 @@ set.number = true set.relativenumber = true set.rnu = true set.swapfile = false + +vim.filetype.add({ + pattern = { + ['.*%.pl'] = 'prolog', + ['.*%.prolog'] = 'prolog', + } +}) @@ -47,15 +47,16 @@ export LESS_TERMCAP_ue=$'\e[0m' export LESS_TERMCAP_us=$'\e[1;35m' export GROFF_NO_SGR=1 -# exit bad -[ $NOEXIT ] && alias exit="echo Exiting is disabled" +.reload() { + # 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 -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) +.reload # Enable zsh keybinds for home, end, and other movement keybinds bindkey "\e[1;5D" backward-word @@ -67,6 +68,9 @@ bindkey "\e[H" beginning-of-line bindkey "\e[F" end-of-line bindkey "\e\d" undo +zle -N reload .reload +bindkey "^R" reload + # GPG SETUP FOR SSH export GPG_TTY=$(tty) export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) @@ -7,4 +7,5 @@ pesterchum-git pfetch-rs swayfx ttf-twemoji-color +units wlogout @@ -1,3 +1,4 @@ +acpi alacritty alsa-tools alsa-utils @@ -15,6 +16,9 @@ cmake cups cups-pdf discord +docker +docker-compose +doxygen easyeffects efibootmgr element-desktop @@ -37,14 +41,17 @@ krita less lib32-libva-mesa-driver lib32-mesa-vdpau +libreoffice-fresh libva-mesa-driver libvirt linux linux-firmware linux-headers +lutris mako man-db man-pages +maven mesa-vdpau meson mpv @@ -55,11 +62,14 @@ networkmanager nodejs noto-fonts-cjk npm +obs-studio octave opendoas p7zip pacman-contrib +pandoc-cli pavucontrol +perl-image-exiftool pipewire-alsa pipewire-pulse python-pynvim @@ -70,6 +80,7 @@ ripgrep ruby rustup sassc +sbctl sl slurp sof-firmware @@ -78,6 +89,31 @@ steam swaybg swayidle 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 tlp tmux @@ -90,6 +126,9 @@ vulkan-tools waybar waylock wget +wine-staging +winetricks +wireguard-tools wl-clipboard wl-mirror wofi |