diff --git a/.gitignore b/.gitignore index edb079a..3853240 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ copyq/copyq.lock copyq/copyq_geometry.* copyq/copyq_tab* nvim/lazy-lock.json +ncspot/*.cbor diff --git a/fish/config.fish b/fish/config.fish index 30d48af..ea8abd3 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -24,7 +24,7 @@ alias g+='bear -- g++ -Wextra -Werror -std=c++20' alias s="kitty +kitten ssh" alias zl='z "" ' alias jo='joshuto' -alias nv='neovide --novsync' +alias nv='neovide --novsync --nofork' # pwd based on the value of _ZO_RESOLVE_SYMLINKS. function __zoxide_pwd diff --git a/hypr_desktop/hyprland.conf b/hypr_desktop/hyprland.conf index b0eb54e..ca0786c 100644 --- a/hypr_desktop/hyprland.conf +++ b/hypr_desktop/hyprland.conf @@ -80,8 +80,8 @@ misc { vrr = 1 animate_manual_resizes=1 animate_mouse_windowdragging=0 - # enable_swallow=true - # swallow_regex=^(.*)(Alacritty)(.*)$ + enable_swallow=true + swallow_regex=^(.*)(kitty)(.*)$ } diff --git a/ncspot/userstate.cbor b/ncspot/userstate.cbor deleted file mode 100644 index 510f15a..0000000 Binary files a/ncspot/userstate.cbor and /dev/null differ diff --git a/nvim/ftdetect/typst.lua b/nvim/ftdetect/typst.lua new file mode 100644 index 0000000..120b3c4 --- /dev/null +++ b/nvim/ftdetect/typst.lua @@ -0,0 +1 @@ +vim.cmd [[ autocmd BufRead,BufNewFile *.typst set filetype=typst ]] diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua index 6ed76c7..f3911a5 100644 --- a/nvim/lua/plugins/lsp.lua +++ b/nvim/lua/plugins/lsp.lua @@ -4,8 +4,8 @@ return { lazy = true, event = { "BufReadPre", "BufNewFile" }, dependencies = { - { "folke/neoconf.nvim", cmd = "Neoconf", config = true }, - { "folke/neodev.nvim", opts = { experimental = { pathStrict = true } } }, + { "folke/neoconf.nvim", cmd = "Neoconf", config = true }, + { "folke/neodev.nvim", opts = { experimental = { pathStrict = true } } }, "mason.nvim", "williamboman/mason-lspconfig.nvim", "lvimuser/lsp-inlayhints.nvim", @@ -83,12 +83,25 @@ return { }, }, }, + typst_lsp = {}, ltex = { settings = { ltex = { checkFrequency = "save", }, }, + filetypes = { + "bib", + "gitcommit", + "markdown", + "org", + "plaintex", + "rst", + "rnoweb", + "tex", + "pandoc", + "typst", + }, }, texlab = {}, gopls = { diff --git a/nvim/snippets/typst.lua b/nvim/snippets/typst.lua new file mode 100644 index 0000000..782d924 --- /dev/null +++ b/nvim/snippets/typst.lua @@ -0,0 +1,47 @@ +local ls = require("luasnip") +-- some shorthands... +local s = ls.s +local i = ls.i +local t = ls.t +local d = ls.dynamic_node +local c = ls.choice_node +local f = ls.function_node +local sn = ls.snippet_node + +local fmt = require("luasnip.extras.fmt").fmt +local rep = require("luasnip.extras").rep + +local snippets, autosnippets = {}, {} +local group = vim.api.nvim_create_augroup("Tex Snippets", { clear = true }) +local file_pattern = "*.typst" +------------------------------------------------- boilerplate end +-- snippers go here: + +local colorSnippet = s( + "tx-", + fmt( + [[ #text({1})[{2}] ]], + { + i(1, "color"), + i(2, "text"), + } + ) +) +table.insert(snippets, colorSnippet) + +local imageSnippet = s( + "image-", + fmt( + [[ + #image("{1}", width: {2}%) + ]], + { + i(1, "image"), + i(2, "width"), + } + ) +) +table.insert(snippets, imageSnippet) + +------------------------------------------------- snippets end +return snippets, autosnippets