Fixed conflits
This commit is contained in:
afonsofrancof
commit
b3fd3a48c4
3 changed files with 107 additions and 217 deletions
.config/nvim
|
|
@ -2,15 +2,120 @@ snippet templateHs "Start file with template"
|
|||
\documentclass{article}
|
||||
|
||||
%imports
|
||||
|
||||
%include polycode.fmt
|
||||
%format (cond (p) (f) (g)) = "\mcond{" p "}{" f "}{" g "}"
|
||||
%format (div (x)(y)) = x "\div " y
|
||||
%format succ = "\succ "
|
||||
%format ==> = "\Longrightarrow "
|
||||
%format map = "\map "
|
||||
%format length = "\length "
|
||||
%format fst = "\p1"
|
||||
%format p1 = "\p1"
|
||||
%format snd = "\p2"
|
||||
%format p2 = "\p2"
|
||||
%format Left = "i_1"
|
||||
%format Right = "i_2"
|
||||
%format i1 = "i_1"
|
||||
%format i2 = "i_2"
|
||||
%format >< = "\times"
|
||||
%format >|< = "\bowtie "
|
||||
%format |-> = "\mapsto"
|
||||
%format . = "\comp "
|
||||
%format .=?=. = "\mathbin{\stackrel{\mathrm{?}}{=}}"
|
||||
%format (kcomp (f)(g)) = f "\kcomp " g
|
||||
%format -|- = "+"
|
||||
%format conc = "\mathsf{conc}"
|
||||
%format summation = "{\sum}"
|
||||
%format (either (a) (b)) = "\alt{" a "}{" b "}"
|
||||
%format (frac (a) (b)) = "\frac{" a "}{" b "}"
|
||||
%format (uncurry f) = "\uncurry{" f "}"
|
||||
%format (const (f)) = "\underline{" f "}"
|
||||
%format TLTree = "\mathsf{TLTree}"
|
||||
%format (lcbr (x)(y)) = "\begin{lcbr}" x "\\" y "\end{lcbr}"
|
||||
%format (split (x) (y)) = "\conj{" x "}{" y "}"
|
||||
%format (for (f) (i)) = "\for{" f "}\ {" i "}"
|
||||
%format B_tree = "\mathsf{B}\mbox{-}\mathsf{tree} "
|
||||
\def\ana#1{\mathopen{[\!(}#1\mathclose{)\!]}}
|
||||
%format <$> = "\mathbin{\mathopen{\langle}\$\mathclose{\rangle}}"
|
||||
%format Either a b = a "+" b
|
||||
%format fmap = "\mathsf{fmap}"
|
||||
%format NA = "\textsc{na}"
|
||||
%format NB = "\textsc{nb}"
|
||||
%format inT = "\mathsf{in}"
|
||||
%format outT = "\mathsf{out}"
|
||||
%format outLTree = "\mathsf{out}"
|
||||
%format inLTree = "\mathsf{in}"
|
||||
%format inFTree = "\mathsf{in}"
|
||||
%format outFTree = "\mathsf{out}"
|
||||
%format Null = "1"
|
||||
%format (Prod (a) (b)) = a >< b
|
||||
%format fF = "\fun F "
|
||||
%format k1 = "k_1 "
|
||||
%format k2 = "k_2 "
|
||||
%format h1 = "h_1 "
|
||||
%format h2 = "h_2 "
|
||||
%format f1 = "f_1 "
|
||||
%format f2 = "f_2 "
|
||||
%format l1 = "l_1 "
|
||||
%format map1 = "map_1 "
|
||||
%format map2 = "map_2 "
|
||||
%format map3 = "map_3"
|
||||
%format l2 = "l_2 "
|
||||
%format Dist = "\fun{Dist}"
|
||||
%format IO = "\fun{IO}"
|
||||
%format LTree = "{\LTree}"
|
||||
%format FTree = "{\FTree}"
|
||||
%format inNat = "\mathsf{in}"
|
||||
%format (cata (f)) = "\cata{" f "}"
|
||||
%format (cataNat (g)) = "\cataNat{" g "}"
|
||||
%format (cataList (g)) = "\cataList{" g "}"
|
||||
%format (anaList (g)) = "\anaList{" g "}"
|
||||
%format Nat0 = "\N_0"
|
||||
%format Rational = "\Q "
|
||||
%format toRational = " to_\Q "
|
||||
%format fromRational = " from_\Q "
|
||||
%format muB = "\mu "
|
||||
%format (frac (n)(m)) = "\frac{" n "}{" m "}"
|
||||
%format (fac (n)) = "{" n "!}"
|
||||
%format (underbrace (t) (p)) = "\underbrace{" t "}_{" p "}"
|
||||
%format matrix = "matrix"
|
||||
%%format (bin (n) (k)) = "\Big(\vcenter{\xymatrix@R=1pt{" n "\\" k "}}\Big)"
|
||||
%format `ominus` = "\mathbin{\ominus}"
|
||||
%format % = "\mathbin{/}"
|
||||
%format <-> = "{\,\leftrightarrow\,}"
|
||||
%format <|> = "{\,\updownarrow\,}"
|
||||
%format `minusNat`= "\mathbin{-}"
|
||||
%format ==> = "\Rightarrow"
|
||||
%format .==>. = "\Rightarrow"
|
||||
%format .<==>. = "\Leftrightarrow"
|
||||
%format .==. = "\equiv"
|
||||
%format .<=. = "\leq"
|
||||
%format .&&&. = "\wedge"
|
||||
%format cdots = "\cdots "
|
||||
%format pi = "\pi "
|
||||
%format (curry (f)) = "\overline{" f "}"
|
||||
%format (cataLTree (x)) = "\llparenthesis\, " x "\,\rrparenthesis"
|
||||
%format (cataFTree (x)) = "\llparenthesis\, " x "\,\rrparenthesis"
|
||||
%format (anaLTree (x)) = "\mathopen{[\!(}" x "\mathclose{)\!]}"
|
||||
%format delta = "\Delta "
|
||||
%format (plus (f)(g)) = "{" f "}\plus{" g "}"
|
||||
%format ++ = "\mathbin{+\!\!\!+}"
|
||||
%format Integer = "\mathbb{Z}"
|
||||
\def\plus{\mathbin{\dagger}}
|
||||
\usepackage[all]{xy}
|
||||
\usepackage{mathtools}
|
||||
\usepackage[a4paper,left=3cm,right=2cm,top=2.5cm,bottom=2.5cm]{geometry}
|
||||
\usepackage{palatino}
|
||||
\usepackage[colorlinks=true,linkcolor=blue,citecolor=blue]{hyperref}
|
||||
\usepackage{graphicx}
|
||||
\usepackage{cp2122t}
|
||||
\usepackage{subcaption}
|
||||
\usepackage{adjustbox}
|
||||
\usepackage{color}
|
||||
|
||||
|
||||
\title{\Huge{Some Class}}
|
||||
\author{\huge{Afonso Franco}}
|
||||
\date{}
|
||||
|
||||
\begin{document}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,5 +2,4 @@
|
|||
vim.wo.number=true
|
||||
vim.wo.relativenumber= true
|
||||
|
||||
--vimtex
|
||||
|
||||
|
|
|
|||
|
|
@ -1,214 +0,0 @@
|
|||
-- Automatically generated packer.nvim plugin loader code
|
||||
|
||||
if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then
|
||||
vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"')
|
||||
return
|
||||
end
|
||||
|
||||
vim.api.nvim_command('packadd packer.nvim')
|
||||
|
||||
local no_errors, error_msg = pcall(function()
|
||||
|
||||
_G._packer = _G._packer or {}
|
||||
_G._packer.inside_compile = true
|
||||
|
||||
local time
|
||||
local profile_info
|
||||
local should_profile = false
|
||||
if should_profile then
|
||||
local hrtime = vim.loop.hrtime
|
||||
profile_info = {}
|
||||
time = function(chunk, start)
|
||||
if start then
|
||||
profile_info[chunk] = hrtime()
|
||||
else
|
||||
profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6
|
||||
end
|
||||
end
|
||||
else
|
||||
time = function(chunk, start) end
|
||||
end
|
||||
|
||||
local function save_profiles(threshold)
|
||||
local sorted_times = {}
|
||||
for chunk_name, time_taken in pairs(profile_info) do
|
||||
sorted_times[#sorted_times + 1] = {chunk_name, time_taken}
|
||||
end
|
||||
table.sort(sorted_times, function(a, b) return a[2] > b[2] end)
|
||||
local results = {}
|
||||
for i, elem in ipairs(sorted_times) do
|
||||
if not threshold or threshold and elem[2] > threshold then
|
||||
results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms'
|
||||
end
|
||||
end
|
||||
if threshold then
|
||||
table.insert(results, '(Only showing plugins that took longer than ' .. threshold .. ' ms ' .. 'to load)')
|
||||
end
|
||||
|
||||
_G._packer.profile_output = results
|
||||
end
|
||||
|
||||
time([[Luarocks path setup]], true)
|
||||
local package_path_str = "/home/afonso/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/afonso/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/afonso/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/afonso/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua"
|
||||
local install_cpath_pattern = "/home/afonso/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so"
|
||||
if not string.find(package.path, package_path_str, 1, true) then
|
||||
package.path = package.path .. ';' .. package_path_str
|
||||
end
|
||||
|
||||
if not string.find(package.cpath, install_cpath_pattern, 1, true) then
|
||||
package.cpath = package.cpath .. ';' .. install_cpath_pattern
|
||||
end
|
||||
|
||||
time([[Luarocks path setup]], false)
|
||||
time([[try_loadstring definition]], true)
|
||||
local function try_loadstring(s, component, name)
|
||||
local success, result = pcall(loadstring(s), name, _G.packer_plugins[name])
|
||||
if not success then
|
||||
vim.schedule(function()
|
||||
vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {})
|
||||
end)
|
||||
end
|
||||
return result
|
||||
end
|
||||
|
||||
time([[try_loadstring definition]], false)
|
||||
time([[Defining packer_plugins]], true)
|
||||
_G.packer_plugins = {
|
||||
["bufferline.nvim"] = {
|
||||
config = { "\27LJ\2\n<\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\15bufferline\frequire\0" },
|
||||
loaded = true,
|
||||
path = "/home/afonso/.local/share/nvim/site/pack/packer/start/bufferline.nvim",
|
||||
url = "https://github.com/akinsho/bufferline.nvim"
|
||||
},
|
||||
["coc.nvim"] = {
|
||||
config = { "\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21plugins.nvim-coc\frequire\0" },
|
||||
loaded = true,
|
||||
path = "/home/afonso/.local/share/nvim/site/pack/packer/start/coc.nvim",
|
||||
url = "https://github.com/neoclide/coc.nvim"
|
||||
},
|
||||
["feline.nvim"] = {
|
||||
loaded = true,
|
||||
path = "/home/afonso/.local/share/nvim/site/pack/packer/start/feline.nvim",
|
||||
url = "https://github.com/feline-nvim/feline.nvim"
|
||||
},
|
||||
["impatient.nvim"] = {
|
||||
loaded = true,
|
||||
path = "/home/afonso/.local/share/nvim/site/pack/packer/start/impatient.nvim",
|
||||
url = "https://github.com/lewis6991/impatient.nvim"
|
||||
},
|
||||
["leap.nvim"] = {
|
||||
config = { "\27LJ\2\nA\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\25add_default_mappings\tleap\frequire\0" },
|
||||
loaded = true,
|
||||
path = "/home/afonso/.local/share/nvim/site/pack/packer/start/leap.nvim",
|
||||
url = "https://github.com/ggandor/leap.nvim"
|
||||
},
|
||||
["mason.nvim"] = {
|
||||
config = { "\27LJ\2\n-\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\18plugins.mason\frequire\0" },
|
||||
loaded = true,
|
||||
path = "/home/afonso/.local/share/nvim/site/pack/packer/start/mason.nvim",
|
||||
url = "https://github.com/williamboman/mason.nvim"
|
||||
},
|
||||
["nvim-autopairs"] = {
|
||||
config = { "\27LJ\2\n@\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0" },
|
||||
loaded = true,
|
||||
path = "/home/afonso/.local/share/nvim/site/pack/packer/start/nvim-autopairs",
|
||||
url = "https://github.com/windwp/nvim-autopairs"
|
||||
},
|
||||
["nvim-lspconfig"] = {
|
||||
config = { "\27LJ\2\n1\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\22plugins.lspconfig\frequire\0" },
|
||||
loaded = true,
|
||||
path = "/home/afonso/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
|
||||
url = "https://github.com/neovim/nvim-lspconfig"
|
||||
},
|
||||
["nvim-tree.lua"] = {
|
||||
config = { "\27LJ\2\n7\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\14nvim-tree\frequire\0" },
|
||||
loaded = true,
|
||||
path = "/home/afonso/.local/share/nvim/site/pack/packer/start/nvim-tree.lua",
|
||||
url = "https://github.com/nvim-tree/nvim-tree.lua"
|
||||
},
|
||||
["nvim-treesitter"] = {
|
||||
config = { "\27LJ\2\n2\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\23plugins.treesitter\frequire\0" },
|
||||
loaded = true,
|
||||
path = "/home/afonso/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
|
||||
url = "https://github.com/nvim-treesitter/nvim-treesitter"
|
||||
},
|
||||
["nvim-web-devicons"] = {
|
||||
loaded = true,
|
||||
path = "/home/afonso/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
|
||||
url = "https://github.com/nvim-tree/nvim-web-devicons"
|
||||
},
|
||||
["onedark.vim"] = {
|
||||
loaded = true,
|
||||
path = "/home/afonso/.local/share/nvim/site/pack/packer/start/onedark.vim",
|
||||
url = "https://github.com/joshdick/onedark.vim"
|
||||
},
|
||||
["packer.nvim"] = {
|
||||
config = { 'require("plugins.packer")' },
|
||||
loaded = true,
|
||||
path = "/home/afonso/.local/share/nvim/site/pack/packer/start/packer.nvim",
|
||||
url = "https://github.com/wbthomason/packer.nvim"
|
||||
},
|
||||
vimtex = {
|
||||
config = { "\27LJ\2\n.\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\19plugins.vimtex\frequire\0" },
|
||||
loaded = true,
|
||||
path = "/home/afonso/.local/share/nvim/site/pack/packer/start/vimtex",
|
||||
url = "https://github.com/lervag/vimtex"
|
||||
}
|
||||
}
|
||||
|
||||
time([[Defining packer_plugins]], false)
|
||||
-- Config for: vimtex
|
||||
time([[Config for vimtex]], true)
|
||||
try_loadstring("\27LJ\2\n.\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\19plugins.vimtex\frequire\0", "config", "vimtex")
|
||||
time([[Config for vimtex]], false)
|
||||
-- Config for: nvim-treesitter
|
||||
time([[Config for nvim-treesitter]], true)
|
||||
try_loadstring("\27LJ\2\n2\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\23plugins.treesitter\frequire\0", "config", "nvim-treesitter")
|
||||
time([[Config for nvim-treesitter]], false)
|
||||
-- Config for: bufferline.nvim
|
||||
time([[Config for bufferline.nvim]], true)
|
||||
try_loadstring("\27LJ\2\n<\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\15bufferline\frequire\0", "config", "bufferline.nvim")
|
||||
time([[Config for bufferline.nvim]], false)
|
||||
-- Config for: mason.nvim
|
||||
time([[Config for mason.nvim]], true)
|
||||
try_loadstring("\27LJ\2\n-\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\18plugins.mason\frequire\0", "config", "mason.nvim")
|
||||
time([[Config for mason.nvim]], false)
|
||||
-- Config for: leap.nvim
|
||||
time([[Config for leap.nvim]], true)
|
||||
try_loadstring("\27LJ\2\nA\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\25add_default_mappings\tleap\frequire\0", "config", "leap.nvim")
|
||||
time([[Config for leap.nvim]], false)
|
||||
-- Config for: nvim-lspconfig
|
||||
time([[Config for nvim-lspconfig]], true)
|
||||
try_loadstring("\27LJ\2\n1\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\22plugins.lspconfig\frequire\0", "config", "nvim-lspconfig")
|
||||
time([[Config for nvim-lspconfig]], false)
|
||||
-- Config for: packer.nvim
|
||||
time([[Config for packer.nvim]], true)
|
||||
require("plugins.packer")
|
||||
time([[Config for packer.nvim]], false)
|
||||
-- Config for: nvim-autopairs
|
||||
time([[Config for nvim-autopairs]], true)
|
||||
try_loadstring("\27LJ\2\n@\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs")
|
||||
time([[Config for nvim-autopairs]], false)
|
||||
-- Config for: coc.nvim
|
||||
time([[Config for coc.nvim]], true)
|
||||
try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21plugins.nvim-coc\frequire\0", "config", "coc.nvim")
|
||||
time([[Config for coc.nvim]], false)
|
||||
-- Config for: nvim-tree.lua
|
||||
time([[Config for nvim-tree.lua]], true)
|
||||
try_loadstring("\27LJ\2\n7\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\14nvim-tree\frequire\0", "config", "nvim-tree.lua")
|
||||
time([[Config for nvim-tree.lua]], false)
|
||||
|
||||
_G._packer.inside_compile = false
|
||||
if _G._packer.needs_bufread == true then
|
||||
vim.cmd("doautocmd BufRead")
|
||||
end
|
||||
_G._packer.needs_bufread = false
|
||||
|
||||
if should_profile then save_profiles() end
|
||||
|
||||
end)
|
||||
|
||||
if not no_errors then
|
||||
error_msg = error_msg:gsub('"', '\\"')
|
||||
vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None')
|
||||
end
|
||||
Loading…
Add table
Reference in a new issue