Compare commits

...

14 Commits

17 changed files with 278 additions and 95 deletions

View File

@ -3,7 +3,7 @@ profile Home {
output "DP-11" mode 1920x1200@59.95Hz position 0,0 transform normal scale 1.0
}
profile Kinemic {
output "eDP-1" mode 2256x1504@59.999Hz position 449,1440 transform normal scale 1.399999976158142
output "DP-3" mode 2560x1440@59.951Hz position 0,0 transform normal scale 1.0
profile Bell {
output "eDP-1" mode 2256x1504@59.999Hz position 2137,425 transform normal scale 1.399999976158142
output "DP-3" mode 1920x1080@59.951Hz position 0,0 transform normal scale 0.9
}

View File

@ -1,45 +1,46 @@
{
"LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
"alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" },
"auto-session": { "branch": "main", "commit": "9c3f977aafb56bd73ba0d082c4dcbdba5666faf3" },
"LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
"alpha-nvim": { "branch": "main", "commit": "a35468cd72645dbd52c0624ceead5f301c566dff" },
"auto-session": { "branch": "main", "commit": "fffb13dcbe8731b8650e5bf1caa749a485d20556" },
"cellular-automaton.nvim": { "branch": "main", "commit": "1606e9d5d04ff254023c3f3c62842d065708d6d3" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
"cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
"cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
"cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" },
"cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
"cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" },
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
"copilot.lua": { "branch": "master", "commit": "30321e33b03cb924fdcd6a806a0dc6fa0b0eafb9" },
"copilot.lua": { "branch": "master", "commit": "c1bb86abbed1a52a11ab3944ef00c8410520543d" },
"dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
"gruvbox.nvim": { "branch": "main", "commit": "15958f5ee43e144856cd2084ce6c571bfdb44504" },
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
"gruvbox.nvim": { "branch": "main", "commit": "00e38a379bab3389e187b3953566d67d494dfddd" },
"harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" },
"image.nvim": { "branch": "master", "commit": "6ffafab2e98b5bda46bf227055aa84b90add8cdc" },
"image.nvim": { "branch": "master", "commit": "4c51d6202628b3b51e368152c053c3fb5c5f76f2" },
"jupytext.nvim": { "branch": "main", "commit": "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b" },
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
"lsp-colors.nvim": { "branch": "main", "commit": "2bbe7541747fd339bdd8923fc45631a09bb4f1e5" },
"lsp-zero.nvim": { "branch": "v3.x", "commit": "ab2a3413646fedd77aa0eab4214a6473e62f6a64" },
"lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" },
"lsp-zero.nvim": { "branch": "v3.x", "commit": "77550f2f6cbf0959ef1583d845661af075f3442b" },
"lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" },
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
"markdown-toc.nvim": { "branch": "main", "commit": "049451fe7825f55e9b17ae1297a538278ffc557a" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
"mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
"markdown-toc.nvim": { "branch": "main", "commit": "5f51c86a416d7da6c0708d4ea354722fec7bb2b0" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "bb30c422329e86fcaa4e4920181f6715d634e516" },
"mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
"molten-nvim": { "branch": "main", "commit": "a286aa914d9a154bc359131aab788b5a077a5a99" },
"neoformat": { "branch": "master", "commit": "6a0dc851893c8bf9c932a69c4277e82b88120009" },
"neoformat": { "branch": "master", "commit": "9d2e28993e06e86b88c364b6176612b917468f3e" },
"noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
"nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" },
"nvim-cmp": { "branch": "main", "commit": "c27370703e798666486e3064b64d59eaf4bdc6d5" },
"nvim-dap": { "branch": "master", "commit": "8228cb00ab0850e483f8d58cc39cc580c05738d6" },
"nvim-dap-ui": { "branch": "master", "commit": "bc81f8d3440aede116f821114547a476b082b319" },
"nvim-lspconfig": { "branch": "master", "commit": "fd26f8626c03b424f7140d454031d1dcb8d23513" },
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
"nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
"nvim-dap": { "branch": "master", "commit": "2edd6375692d9ac1053d50acfe415c1eb2ba92d0" },
"nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" },
"nvim-lspconfig": { "branch": "master", "commit": "99d3a0f26bfe402f45257c1398287aef252cbe2d" },
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
"nvim-tree.lua": { "branch": "master", "commit": "c09ff35de503a41fa62465c6b4ae72d96e7a7ce4" },
"nvim-treesitter": { "branch": "master", "commit": "feab1f19f889fd6da9f80ced4717ae60d56f6519" },
"nvim-web-devicons": { "branch": "master", "commit": "ab4cfee554e501f497bce0856788d43cf2eb93d7" },
"otter.nvim": { "branch": "main", "commit": "e37053d2c6a17463e705483122eee04d41e3d4af" },
"overseer.nvim": { "branch": "master", "commit": "d95931e9e8cc4429819c8bbae395da00a6800d1e" },
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
"nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
"oil.nvim": { "branch": "master", "commit": "08c2bce8b00fd780fb7999dbffdf7cd174e896fb" },
"otter.nvim": { "branch": "main", "commit": "f3a401851c25c64220dcf2470252a1adc28308d5" },
"overseer.nvim": { "branch": "master", "commit": "72c68aab0358c92f451168b704c411c4a3e3410e" },
"pastify.nvim": { "branch": "main", "commit": "4a1d1e03c3ae725ee4af796deca8c7c169ef626e" },
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
"quarto-nvim": { "branch": "main", "commit": "93b1f5a1abc1b1da653f353947f62b294574759c" },
"quarto-nvim": { "branch": "main", "commit": "5325af3731ac9840b308791f08ad660958d76163" },
"session-lens": { "branch": "main", "commit": "eae46b472b3150f5ec0f977556e8085683d49eb0" },
"sqlite.nvim": { "branch": "master", "commit": "a8466c830a89794c2eafa41b41dd11fdf4a0d7ca" },
"telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
@ -47,11 +48,11 @@
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
"toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
"trouble.nvim": { "branch": "main", "commit": "3609bb9a82bbab1ef95cf2c27ce7e52267a7d40d" },
"undotree": { "branch": "master", "commit": "76c4e32d8f1aa493bb68d4a3fcd3c700395c303c" },
"vim-doge": { "branch": "master", "commit": "750d17dcd5a38a6afb51ddd07ee7d3e96bab7e9e" },
"vim-flog": { "branch": "master", "commit": "77c86cb5db8960d224f2a866120893e61d62f5e8" },
"undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" },
"vim-doge": { "branch": "master", "commit": "03a84072ef21b205237c77986c78914395d646c3" },
"vim-flog": { "branch": "master", "commit": "665b16ac8915f746bc43c9572b4581a5e9047216" },
"vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
"vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
"vimtex": { "branch": "master", "commit": "cf6b84775624582d7422715ee46b0a63b53cee38" },
"vimtex": { "branch": "master", "commit": "e10525a5aa65e2544f11e680dd81c77fba800248" },
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
}

View File

@ -1,5 +1,5 @@
return {
name = "Cargog Test",
name = "Cargo Test",
builder = function()
return {
cmd = {

View File

@ -176,17 +176,17 @@ return {
}
}
require('lspconfig').matlab_ls.setup({
settings = {
filetypes = {
"matlab"
},
matlab = {
installPath = "/opt/matlab/R2023a/"
}
},
single_file_support = true
})
-- require('lspconfig').matlab_ls.setup({
-- settings = {
-- filetypes = {
-- "matlab"
-- },
-- matlab = {
-- installPath = "/opt/matlab/R2023a/"
-- }
-- },
-- single_file_support = true
-- })
end
}
}

View File

@ -1,12 +1,13 @@
return {
"zbirenbaum/copilot.lua",
cmd = "Copilot",
event = "InsertEnter",
-- event = "InsertEnter",
opts = {
suggestion = {
enabled = true,
auto_trigger = true,
keymap = {
accept = "<C-l>",
accept = "<C-l>"
-- accept_word = false,
-- accept_line = false,
-- next = "<M-]>",

View File

@ -1,15 +1,27 @@
return {
{
"iamcco/markdown-preview.nvim",
cmd = {
"MarkdownPreviewToggle",
"MarkdownPreview",
"MarkdownPreviewStop"
},
ft = {
"markdown"
},
build = function() vim.fn["mkdp#util#install"]() end
}
-- Install markdown preview, use npx if available.
"iamcco/markdown-preview.nvim",
cmd = {
"MarkdownPreviewToggle",
"MarkdownPreview",
"MarkdownPreviewStop"
},
ft = {
"markdown"
},
build = function(plugin)
if vim.fn.executable "npx" then
vim.cmd("!cd " .. plugin.dir .. " && cd app && npx --yes yarn install")
else
vim.cmd [[Lazy load markdown-preview.nvim]]
vim.fn["mkdp#util#install"]()
end
end,
init = function()
if vim.fn.executable "npx" then
vim.g.mkdp_filetypes = {
"markdown"
}
end
end
}

View File

@ -6,23 +6,110 @@ return {
"BufNewFile"
},
init = function()
vim.cmd([[
let g:neoformat_enabled_python = ['autopep8']
let g:neoformat_enabled_cpp = ['clangformat']
let g:neoformat_enabled_c = ['clangformat']
let g:neoformat_enable_lua = ['luaformatter']
let g:neoformat_enabled_cmake = ['cmakeformat']
----------------
-- Formatters
----------------
let g:neoformat_markdown_mdformat = {
\ 'exe': 'mdformat',
\ 'args': ['--wrap=79', '--number'],
\ 'replace': 1,
\ }
let g:neoformat_enabled_markdown = ['mdformat']
vim.api.nvim_create_autocmd("FileType", {
pattern = "python",
callback = function()
vim.g.neoformat_python_autopep8 = {
exe = 'autopep8',
args = {'--max-line-length', '79', '--experimental'},
-- replace = 1
}
vim.g.neoformat_enabled_python = {
'autopep8'
}
end
})
let g:neoformat_enabled_latex = ['latexindent']
let g:latexindent_opt="-m -l -g=/dev/null"
]])
vim.api.nvim_create_autocmd("FileType", {
pattern = {
"cpp",
"c"
},
callback = function()
vim.g.neoformat_enabled_cpp = {
'clangformat'
}
vim.g.neoformat_enabled_c = {
'clangformat'
}
end
})
vim.api.nvim_create_autocmd("FileType", {
pattern = "lua",
callback = function()
vim.g.neoformat_enable_lua = {
'luaformatter'
}
end
})
vim.api.nvim_create_autocmd("FileType", {
pattern = "cmake",
callback = function()
vim.g.neoformat_enabled_cmake = {
'cmake-format'
}
end
})
-- Commented out rust formatter
-- vim.api.nvim_create_autocmd("FileType", {
-- pattern = "rust",
-- callback = function()
-- vim.g.neoformat_enabled_rust = {'rustfmt'}
-- end
-- })
vim.api.nvim_create_autocmd("FileType", {
pattern = "markdown",
callback = function()
vim.g.neoformat_markdown_mdformat = {
exe = 'mdformat',
args = {
'--wrap=79',
'--number'
},
replace = 1
}
vim.g.neoformat_enabled_markdown = {
'mdformat'
}
end
})
vim.api.nvim_create_autocmd("FileType", {
pattern = "tex",
callback = function()
vim.g.neoformat_tex_texfmt = {
exe = "tex-fmt",
args = {
"--stdin",
"--tabsize",
"4"
},
stdin = 1
}
vim.g.neoformat_enabled_tex = {
"texfmt"
}
end
})
----------------
-- Other
----------------
-- vim.cmd([[
-- augroup Neoformat
-- autocmd!
-- autocmd BufWritePre * undojoin | Neoformat
-- augroup END
-- ]])
vim.api.nvim_set_keymap('n', '<M-L>', '<cmd>Neoformat<cr>', {
noremap = true,

View File

@ -0,0 +1,13 @@
return {
'stevearc/oil.nvim',
opts = {},
dependencies = {
"nvim-tree/nvim-web-devicons"
},
init = function()
vim.keymap.set("n", "-", "<CMD>Oil<CR>", {
desc = "Open parent directory"
})
end,
lazy = false
}

View File

@ -11,19 +11,19 @@ return {
{
noremap = true,
mode = "x",
'<leader>p',
'<leader>v',
"<cmd>PastifyAfter<CR>"
},
{
noremap = true,
mode = "n",
'<leader>p',
'<leader>v',
"<cmd>PastifyAfter<CR>"
},
{
noremap = true,
mode = "n",
'<leader>P',
'<leader>V',
"<cmd>Pastify<CR>"
}
},

View File

@ -19,4 +19,6 @@ vim.keymap.set("n", "Q", "<nop>")
vim.keymap.set("n", "q:", "<nop>")
vim.cmd [[call nvim_create_user_command('W', 'w', {'nargs': 0})]]
vim.keymap.set("n", "QQ", ":q!<CR>")
-- vim.keymap.set("n", "<leader>cb", [[:up | %bd | e#<CR>]])

View File

@ -60,3 +60,5 @@ let &efm .= '%-Z%*\s--> %f:%l:%c,'
]]
end
})
vim.opt.exrc = true

View File

@ -13,7 +13,7 @@ local d = ls.dynamic_node
local fmt = require("luasnip.extras.fmt").fmt
local fmta = require("luasnip.extras.fmt").fmta
local rep = require("luasnip.extras").rep
local line_begin = require("luasnip.extras.expand_conditions").line_begin
local conds = require("luasnip.extras.expand_conditions")
---------------
-- Environments
@ -90,7 +90,7 @@ s({trig="notes"},
)
),
s({trig="beg"},
s({trig="beg", wordTrig=true, snippetType="autosnippet", condition=conds.line_begin},
fmta(
[[
\begin{<>}
@ -105,6 +105,46 @@ s({trig="beg"},
)
),
s({trig="item", wordTrig=true, snippetType="autosnippet",
condition = function(line_to_cursor, matched_trigger, captures)
return tex_utils.in_env("itemize") and conds.line_begin(line_to_cursor, matched_trigger, captures)
end},
fmta(
[[
\item <>
]],
{
i(0),
}
)
),
s({trig="item", wordTrig=true, snippetType="autosnippet", condition=conds.line_begin},
fmta(
[[
\begin{itemize}
\item <>
\end{itemize}
]],
{
i(0),
}
)
),
s({trig="frame", wordTrig=true, snippetType="autosnippet", condition=conds.line_begin},
fmta(
[[
\begin{frame}
\frametitle{<>}
\end{frame}
]],
{
i(0),
}
)
),
s({trig="sec"},
fmta(
[[

View File

@ -13,6 +13,7 @@ local d = ls.dynamic_node
local fmt = require("luasnip.extras.fmt").fmt
local fmta = require("luasnip.extras.fmt").fmta
local rep = require("luasnip.extras").rep
local conds = require("luasnip.extras.expand_conditions")
---------------
@ -56,7 +57,7 @@ end
return {
s({trig="ali", snippetType="autosnippet"},
s({trig="ali", wordTrig=true, snippetType="autosnippet", condition=conds.line_begin},
fmta(
[[
\begin{align*}
@ -113,6 +114,21 @@ s({trig="matp"},
{condition = tex_utils.in_mathzone}
),
s({trig="([^%a])array", regTrig=true, wordTrig=false, snippetType="autosnippet"},
fmta(
[[
<>\begin{array}{c}
<>
\end{array}
]],
{
f( function(_, snip) return snip.captures[1] end ),
i(0),
}
),
{condition = tex_utils.in_mathzone}
),
s({trig='([^%a])int', regTrig=true, wordTrig=false, snippetType="autosnippet"},
fmta(
[[<>\int_{<>}^{<>} <> d<> ]],
@ -228,13 +244,13 @@ s({trig="([^%a])tt", regTrig=true, wordTrig=false, snippetType="autosnippet"},
{condition = tex_utils.in_mathzone}
),
s({trig=".", snippetType="autosnippet"},
fmta(
[[\cdot ]],
{}
),
{condition = tex_utils.in_mathzone}
),
-- s({trig=".", snippetType="autosnippet"},
-- fmta(
-- [[\cdot ]],
-- {}
-- ),
-- {condition = tex_utils.in_mathzone}
-- ),
s({trig="$$", snippetType="autosnippet"},
fmta(

View File

@ -2,7 +2,7 @@ input "type:touchpad" {
tap enabled
natural_scroll enabled
scroll_factor 0.4
dwt disable
dwt enable
accel_profile "adaptive"
pointer_accel 0
drag enabled

View File

@ -1,7 +1,7 @@
set $ws1 "1: Dev"
set $ws2 "2: Firefox"
set $ws3 "3: Management"
set $ws4 "4"
set $ws4 "4: Mehscellaneous"
set $ws5 "5: Doc"
set $ws6 "6: 3D-Printing"
set $ws7 "7: Music"
@ -41,7 +41,12 @@ exec swaymsg 'workspace $ws2; exec firefox'
#
set $this_disp "eDP-1"
set $other_disp "DP-11"
set $other_disp "DP-3"
# set $this_disp "eDP-1"
# set $other_disp "DP-3"
# output edP-1 mode 1920x1080@120Hz
# output edP-1
workspace $ws1 output $other_disp $this_disp
workspace $ws2 output $this_disp

View File

@ -39,7 +39,7 @@ alias ....="cd ../../.."
export PATH=$PATH:/home/andreas/.local/bin
export EDITOR=nvim
alias get-idf='. $HOME/ext_sw/esp-idf/export.sh'
alias get-idf='. $HOME/ext-sw/esp-idf/export.sh'
alias c='cd ~/.dotfiles'
alias sc='cd ~/.config/sway && nvim'
@ -47,7 +47,7 @@ alias nc='cd ~/.config/nvim && nvim'
alias flog='nvim -c "Flog -all"'
alias bin='cd ~/.local/bin && nvim'
. "$HOME/.cargo/env"
export PATH=$PATH:"$HOME/.cargo/bin"
eval "$(zoxide init zsh)"
eval "$(thefuck --alias)"
@ -55,3 +55,7 @@ eval "$(thefuck --alias)"
. "/usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh"
bindkey '^l' autosuggest-accept
# . "$HOME/.cargo/env"
# export PYENV_ROOT="$HOME/.pyenv"
# [[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
# eval "$(pyenv init - zsh)"