Changed colorscheme and updated tmux config +++
This commit is contained in:
@@ -15,7 +15,7 @@ after-login-command = []
|
||||
after-startup-command = ['exec-and-forget sketchybar']
|
||||
|
||||
# Intergration with sketchybar
|
||||
exec-on-workspace-change = ['/bin/zsh', '-c',
|
||||
exec-on-workspace-change = ['/bin/bash', '-c',
|
||||
'sketchybar --trigger aerospace_workspace_change FOCUSED_WORKSPACE=$AEROSPACE_FOCUSED_WORKSPACE'
|
||||
]
|
||||
|
||||
@@ -61,7 +61,7 @@ inner.horizontal = 10
|
||||
inner.vertical = 10
|
||||
outer.left = 10
|
||||
outer.bottom = 10
|
||||
outer.top = [{ monitor.dell = 40 }, { monitor.2 = 40 }, 10]
|
||||
outer.top = [{ monitor.dell = 40 }, { monitor.2 = 40 }, { monitor.3 = 40}, 10]
|
||||
outer.right = 10
|
||||
|
||||
# 'main' binding mode declaration
|
||||
@@ -146,6 +146,3 @@ ctrl-shift-d = ['join-with down', 'mode main']
|
||||
ctrl-shift-f = ['join-with up', 'mode main']
|
||||
ctrl-shift-g = ['join-with right', 'mode main']
|
||||
|
||||
#Assign workspace to monitor
|
||||
[workspace-to-monitor-force-assignment]
|
||||
'' = 2
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
|
||||
[env]
|
||||
TERM="xterm-256color"
|
||||
|
||||
[font]
|
||||
size = 13.0
|
||||
|
||||
[font.normal]
|
||||
family = "MesloLGL Nerd Font"
|
||||
style = "Regular"
|
||||
|
||||
[window]
|
||||
decorations = "Buttonless"
|
||||
opacity = 0.8
|
||||
blur = true
|
||||
|
||||
[general]
|
||||
import = [
|
||||
"~/.config/alacritty/themes/dracula.toml"
|
||||
]
|
||||
Submodule .config/alacritty/themes deleted from e1b08b5bc0
79
.config/kitty/current-theme.conf
Normal file
79
.config/kitty/current-theme.conf
Normal file
@@ -0,0 +1,79 @@
|
||||
# vim:ft=kitty
|
||||
|
||||
## name: Catppuccin Kitty Macchiato
|
||||
## author: Catppuccin Org
|
||||
## license: MIT
|
||||
## upstream: https://github.com/catppuccin/kitty/blob/main/themes/macchiato.conf
|
||||
## blurb: Soothing pastel theme for the high-spirited!
|
||||
|
||||
|
||||
|
||||
# The basic colors
|
||||
foreground #cad3f5
|
||||
background #24273a
|
||||
selection_foreground #24273a
|
||||
selection_background #f4dbd6
|
||||
|
||||
# Cursor colors
|
||||
cursor #f4dbd6
|
||||
cursor_text_color #24273a
|
||||
# URL underline color when hovering with mouse
|
||||
url_color #f4dbd6
|
||||
|
||||
# Kitty window border colors
|
||||
active_border_color #b7bdf8
|
||||
inactive_border_color #6e738d
|
||||
bell_border_color #eed49f
|
||||
|
||||
# OS Window titlebar colors
|
||||
wayland_titlebar_color system
|
||||
macos_titlebar_color system
|
||||
|
||||
# Tab bar colors
|
||||
active_tab_foreground #181926
|
||||
active_tab_background #c6a0f6
|
||||
inactive_tab_foreground #cad3f5
|
||||
inactive_tab_background #1e2030
|
||||
tab_bar_background #181926
|
||||
|
||||
# Colors for marks (marked text in the terminal)
|
||||
mark1_foreground #24273a
|
||||
mark1_background #b7bdf8
|
||||
mark2_foreground #24273a
|
||||
mark2_background #c6a0f6
|
||||
mark3_foreground #24273a
|
||||
mark3_background #7dc4e4
|
||||
|
||||
# The 16 terminal colors
|
||||
|
||||
# black
|
||||
color0 #494d64
|
||||
color8 #5b6078
|
||||
|
||||
# red
|
||||
color1 #ed8796
|
||||
color9 #ed8796
|
||||
|
||||
# green
|
||||
color2 #a6da95
|
||||
color10 #a6da95
|
||||
|
||||
# yellow
|
||||
color3 #eed49f
|
||||
color11 #eed49f
|
||||
|
||||
# blue
|
||||
color4 #8aadf4
|
||||
color12 #8aadf4
|
||||
|
||||
# magenta
|
||||
color5 #f5bde6
|
||||
color13 #f5bde6
|
||||
|
||||
# cyan
|
||||
color6 #8bd5ca
|
||||
color14 #8bd5ca
|
||||
|
||||
# white
|
||||
color7 #b8c0e0
|
||||
color15 #a5adcb
|
||||
18
.config/kitty/kitty.conf
Normal file
18
.config/kitty/kitty.conf
Normal file
@@ -0,0 +1,18 @@
|
||||
# BEGIN_KITTY_THEME
|
||||
# Dracula
|
||||
include current-theme.conf
|
||||
# END_KITTY_THEME
|
||||
|
||||
font_family MesloLGS Nerd Font Mono
|
||||
bold_font auto
|
||||
italic_font auto
|
||||
bold_italic_font auto
|
||||
|
||||
font_size 13.0
|
||||
|
||||
hide_window_decorations yes
|
||||
|
||||
background_opacity 1
|
||||
|
||||
|
||||
cursor_blink_interval 0
|
||||
@@ -1,54 +1,54 @@
|
||||
{
|
||||
"LuaSnip": { "branch": "master", "commit": "787dee55ca364cc9119787165418fe93b74c1842" },
|
||||
"alpha-nvim": { "branch": "main", "commit": "bf3c8bb8c02ed3d9644cc5bbc48e2bdc39349cd7" },
|
||||
"auto-session": { "branch": "main", "commit": "3cd531ce4d46fb156268ddedf5f3e6822ef26af7" },
|
||||
"bufferline.nvim": { "branch": "main", "commit": "5cc447cb2b463cb499c82eaeabbed4f5fa6a0a44" },
|
||||
"LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
|
||||
"alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" },
|
||||
"auto-session": { "branch": "main", "commit": "9c3f977aafb56bd73ba0d082c4dcbdba5666faf3" },
|
||||
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
|
||||
"catppuccin": { "branch": "main", "commit": "4bb938bbba41d306db18bf0eb0633a5f28fd7ba0" },
|
||||
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
|
||||
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
|
||||
"cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
|
||||
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
||||
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
|
||||
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
|
||||
"comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
|
||||
"conform.nvim": { "branch": "master", "commit": "278376b953bcab65e2ab9508b5575d1f9a2cbac1" },
|
||||
"csvview.nvim": { "branch": "main", "commit": "25d963b489b5b3c295bc2bb67861192368d0cb23" },
|
||||
"dracula.nvim": { "branch": "main", "commit": "94fa7885a06a67f0a8bfa03e064619d05d1ba496" },
|
||||
"conform.nvim": { "branch": "master", "commit": "a6f5bdb78caa305496357d17e962bbc4c0b392e2" },
|
||||
"csvview.nvim": { "branch": "main", "commit": "545da7939fd295c4c95e606173f5d00658d66abc" },
|
||||
"easytables.nvim": { "branch": "master", "commit": "ae57fdaad25a5f9ac2773ebdb8782c7bbc7d8932" },
|
||||
"follow-md-links.nvim": { "branch": "main", "commit": "41a6d74636b4209571680d40f20f59a0bf30bf57" },
|
||||
"friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "ee7634ab4f0a6606438fe13e16cbf2065589a5ed" },
|
||||
"indent-blankline.nvim": { "branch": "master", "commit": "e7a4442e055ec953311e77791546238d1eaae507" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" },
|
||||
"lspkind.nvim": { "branch": "master", "commit": "59c3f419af48a2ffb2320cea85e44e5a95f71664" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
|
||||
"follow-md-links.nvim": { "branch": "main", "commit": "ce8735a15dc3e5fc5bb052ec51b849c03e57df53" },
|
||||
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "4c40357994f386e72be92a46f41fc1664c84c87d" },
|
||||
"indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "e5e9bf48211a13d9ee6c1077c88327c49c1ab4a0" },
|
||||
"lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" },
|
||||
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
|
||||
"markdown-toc.nvim": { "branch": "main", "commit": "ce57af75962c93714f9d01880bf4e805f55485b9" },
|
||||
"markdown.nvim": { "branch": "main", "commit": "435b1ed56174d0f7334cc0fce9302084832453f6" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "7446f47b3dfb7df801f31a6f6783c2ad119a6935" },
|
||||
"mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" },
|
||||
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
|
||||
"markdown-toc.nvim": { "branch": "main", "commit": "049451fe7825f55e9b17ae1297a538278ffc557a" },
|
||||
"markdown.nvim": { "branch": "main", "commit": "57fa691b9e374c6539cc0340062dac8f42d4bd8b" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
|
||||
"mason-tool-installer.nvim": { "branch": "main", "commit": "374c78d3ebb5c53f43ea6bd906b6587b5e899b9e" },
|
||||
"mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
|
||||
"neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
|
||||
"noice.nvim": { "branch": "main", "commit": "df448c649ef6bc5a6a633a44f2ad0ed8d4442499" },
|
||||
"nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
|
||||
"noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
|
||||
"nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
|
||||
"nvim-FeMaco.lua": { "branch": "main", "commit": "96bbf843595dbe865838b3f2484b73557f34700c" },
|
||||
"nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" },
|
||||
"nvim-autopairs": { "branch": "master", "commit": "68f0e5c3dab23261a945272032ee6700af86227a" },
|
||||
"nvim-bufdel": { "branch": "main", "commit": "523d58e94e7212fff3e05c247b962dc8f93bcfde" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" },
|
||||
"nvim-lint": { "branch": "master", "commit": "16b21a7d04d06661f92f273a0744fd81fb19e09e" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "85afd4b936acd62b578c2e2d8e86541fb972c32e" },
|
||||
"nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
|
||||
"nvim-tree.lua": { "branch": "master", "commit": "8760d76c1d316aa46f141f3f2b80b853a2acc41e" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "f6c5a58e3bbbedd2a31d04e5aa6f9997df20e3df" },
|
||||
"nvim-treesitter-textobjects": { "branch": "master", "commit": "0d79d169fcd45a8da464727ac893044728f121d4" },
|
||||
"nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
|
||||
"telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" },
|
||||
"nvim-lint": { "branch": "master", "commit": "6e9dd545a1af204c4022a8fcd99727ea41ffdcc8" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "6b63bdf2399b9bedf93297d98419550523a9ad68" },
|
||||
"nvim-notify": { "branch": "master", "commit": "22f29093eae7785773ee9d543f8750348b1a195c" },
|
||||
"nvim-tree.lua": { "branch": "master", "commit": "6709463b2d18e77f7a946027917aa00d4aaed6f4" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "5774e7d3da4f681296a87fcd85d17779ad362a4f" },
|
||||
"nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" },
|
||||
"nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "1020869742ecb191f260818234517f4a1515cfe8" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
|
||||
"telescope-fzf-native.nvim": { "branch": "main", "commit": "2a5ceff981501cff8f46871d5402cd3378a8ab6a" },
|
||||
"telescope-live-grep-args.nvim": { "branch": "master", "commit": "649b662a8f476fd2c0289570764459e95ebaa3f3" },
|
||||
"telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
|
||||
"template.nvim": { "branch": "main", "commit": "59955db23613985e031d340756d5c01aebd583a3" },
|
||||
"todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
|
||||
"vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" },
|
||||
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
|
||||
"vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
|
||||
"vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
|
||||
"vim-tmux-navigator": { "branch": "master", "commit": "a9b52e7d36114d40350099f254b5f299a35df978" },
|
||||
"vimtex": { "branch": "master", "commit": "f59b2784e8e4a2cce741cc697b403428af4cf131" },
|
||||
"which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" }
|
||||
"vim-tmux-navigator": { "branch": "master", "commit": "d847ea942a5bb4d4fab6efebc9f30d787fd96e65" },
|
||||
"vimtex": { "branch": "master", "commit": "63ae2e94b0fabc6bdad0a685c1ef0a7e0705fe7b" },
|
||||
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
|
||||
}
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
return {
|
||||
"Mofiqul/dracula.nvim",
|
||||
"catppuccin/nvim",
|
||||
name = "catppuccin",
|
||||
priority = 1000,
|
||||
config = function()
|
||||
vim.cmd([[colorscheme dracula]])
|
||||
vim.cmd([[colorscheme catppuccin]])
|
||||
end,
|
||||
}
|
||||
|
||||
@@ -16,6 +16,14 @@ opt.wrap = false
|
||||
opt.ignorecase = true
|
||||
opt.smartcase = true
|
||||
|
||||
-- folding
|
||||
opt.foldmethod = "indent"
|
||||
opt.foldlevelstart = 0
|
||||
opt.foldlevel = 0
|
||||
|
||||
-- Disable folding in Telescope's result window.
|
||||
vim.api.nvim_create_autocmd("FileType", { pattern = "TelescopeResults", command = [[setlocal nofoldenable]] })
|
||||
|
||||
-- undo
|
||||
opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
|
||||
opt.undofile = true
|
||||
@@ -43,3 +51,7 @@ opt.splitright = true
|
||||
opt.splitbelow = true
|
||||
|
||||
opt.iskeyword:append("-")
|
||||
|
||||
vim.cmd([[autocmd BufEnter *.pdf execute "!zathura '%'" | bdelete %]])
|
||||
vim.cmd([[autocmd BufEnter *.jpg execute "!open '%'" | bdelete %]])
|
||||
vim.cmd([[autocmd BufEnter *.png execute "!open '%'" | bdelete %]])
|
||||
|
||||
@@ -3,7 +3,7 @@ return {
|
||||
event = { "BufReadPre", "BufNewFile" },
|
||||
config = function()
|
||||
local conform = require("conform")
|
||||
local wk = require("which-key")
|
||||
local wk = require("which-key")
|
||||
|
||||
conform.setup({
|
||||
formatters_by_ft = {
|
||||
@@ -11,11 +11,23 @@ return {
|
||||
python = { "black" },
|
||||
lua = { "stylua" },
|
||||
},
|
||||
format_on_save = {
|
||||
lsp_fallback = true,
|
||||
async = false,
|
||||
timeout_ms = 2500,
|
||||
},
|
||||
})
|
||||
|
||||
wk.add({
|
||||
{ "<leader>l" , group = "lsp", icon = ""},
|
||||
{"<leader>lf", function() conform.format({lsp_fallback = true, async = false, timeout_ms = 1000}) end, desc = "Format file", icon = ""},
|
||||
})
|
||||
wk.add({
|
||||
{ "<leader>l", group = "lsp", icon = "" },
|
||||
{
|
||||
"<leader>lf",
|
||||
function()
|
||||
conform.format({ lsp_fallback = true, async = false, timeout_ms = 1000 })
|
||||
end,
|
||||
desc = "Format file",
|
||||
icon = "",
|
||||
},
|
||||
})
|
||||
end,
|
||||
}
|
||||
|
||||
@@ -43,6 +43,18 @@ return {
|
||||
lspconfig["pyright"].setup({
|
||||
capabilities = capabilities,
|
||||
filetypes = { "python" },
|
||||
settings = {
|
||||
python = {
|
||||
pythonPath = vim.fn.exepath("python3.12"),
|
||||
},
|
||||
},
|
||||
})
|
||||
lspconfig["ltex"].setup({
|
||||
settings = {
|
||||
ltex = {
|
||||
language = "de-CH",
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
wk.add({
|
||||
|
||||
@@ -18,20 +18,20 @@ return {
|
||||
"clangd",
|
||||
"marksman",
|
||||
"texlab",
|
||||
"ltex",
|
||||
},
|
||||
})
|
||||
|
||||
mason_tool_installer.setup({
|
||||
ensure_installed = {
|
||||
"mypy",
|
||||
"ruff_lsp",
|
||||
"black",
|
||||
"clang-format",
|
||||
"stylua",
|
||||
"prettier",
|
||||
"vale",
|
||||
"pylint",
|
||||
"latexindent",
|
||||
"pylint",
|
||||
"latexindent",
|
||||
},
|
||||
})
|
||||
end,
|
||||
|
||||
@@ -6,7 +6,7 @@ return {
|
||||
|
||||
lualine.setup({
|
||||
options = {
|
||||
theme = "dracula-nvim",
|
||||
theme = "auto",
|
||||
},
|
||||
})
|
||||
end,
|
||||
|
||||
@@ -2,8 +2,7 @@ return {
|
||||
"iamcco/markdown-preview.nvim",
|
||||
cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" },
|
||||
ft = { "markdown" },
|
||||
build = "cd app && yarn install",
|
||||
init = function()
|
||||
vim.g.mkdp_filetypes = { "markdown" }
|
||||
build = function()
|
||||
vim.fn["mkdp#util#install"]()
|
||||
end,
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
return {
|
||||
"MeanderingProgrammer/markdown.nvim",
|
||||
event = { "BufReadPre", "BufNewFile" },
|
||||
event = { "BufReadPre", "BufNewFile" },
|
||||
dependencies = "nvim-treesitter/nvim-treesitter",
|
||||
config = function()
|
||||
local markdown = require("render-markdown")
|
||||
@@ -8,13 +8,13 @@ return {
|
||||
markdown.setup({
|
||||
checkbox = {
|
||||
custom = {
|
||||
inprogress = { raw = '[>]', rendered = ' ', highlight = 'RenderedMarkdownInProgress'},
|
||||
onhold = { raw = '[=]', rendered = ' ', highlight = 'RenderedMarkdownOnhold'},
|
||||
cancelled = { raw = '[_]', rendered = ' ', highlight = 'RenderedMarkdownCancelled'},
|
||||
important = { raw = '[!]', rendered = '', highlight = 'RenderedMarkdownImportant'},
|
||||
recurring = { raw = '[+]', rendered = ' ', highlight = 'RenderedMarkdownRecurring'},
|
||||
uncertain = { raw = '[?]', rendered = ' ', highlight = 'RenderedMarkdownUncertain'},
|
||||
},
|
||||
inprogress = { raw = "[>]", rendered = " ", highlight = "RenderedMarkdownInProgress" },
|
||||
onhold = { raw = "[=]", rendered = " ", highlight = "RenderedMarkdownOnhold" },
|
||||
cancelled = { raw = "[_]", rendered = " ", highlight = "RenderedMarkdownCancelled" },
|
||||
important = { raw = "[!]", rendered = "", highlight = "RenderedMarkdownImportant" },
|
||||
recurring = { raw = "[+]", rendered = " ", highlight = "RenderedMarkdownRecurring" },
|
||||
uncertain = { raw = "[?]", rendered = " ", highlight = "RenderedMarkdownUncertain" },
|
||||
},
|
||||
},
|
||||
})
|
||||
end,
|
||||
|
||||
@@ -21,6 +21,28 @@ end
|
||||
|
||||
-- Snippets --
|
||||
|
||||
local minipage = s(
|
||||
{ trig = "mp", desc = "Minipage Environment" },
|
||||
fmt(
|
||||
[[
|
||||
\begin{{minipage}}{{{}\linewidth}}
|
||||
{}
|
||||
\end{{minipage}}
|
||||
\begin{{minipage}}{{{}\linewidth}}
|
||||
{}
|
||||
\end{{minipage}} {}
|
||||
]],
|
||||
{
|
||||
i(1, "Size of Box 1"),
|
||||
i(2, "Contents of Box 1"),
|
||||
i(3, "Size of Box 2"),
|
||||
i(4, "Contents of Box 2"),
|
||||
i(0),
|
||||
}
|
||||
)
|
||||
)
|
||||
table.insert(autosnippets, minipage)
|
||||
|
||||
local item = s(
|
||||
{ trig = "-it", desc = "Itemize & Enumerate Item" },
|
||||
fmt(
|
||||
@@ -148,6 +170,166 @@ local figcap = s(
|
||||
)
|
||||
table.insert(autosnippets, figcap)
|
||||
|
||||
local sk = s(
|
||||
{ trig = "sk", regTrig = true, desc = "skalar product" },
|
||||
fmt(
|
||||
[[
|
||||
<{},{}> {}
|
||||
]],
|
||||
{
|
||||
i(1, "Vector 1"),
|
||||
i(2, "Vector 2"),
|
||||
i(3, ""),
|
||||
}
|
||||
),
|
||||
{
|
||||
condition = math,
|
||||
show_condition = math,
|
||||
}
|
||||
)
|
||||
table.insert(autosnippets, sk)
|
||||
|
||||
local thm = s(
|
||||
{ trig = "thm", regTrig = true, desc = "Theorem Block" },
|
||||
fmt(
|
||||
[[
|
||||
\thm{{{}}}{{
|
||||
{}
|
||||
}}
|
||||
{}
|
||||
]],
|
||||
{
|
||||
i(1, "Title of Theorem"),
|
||||
i(2, "Contents of Theorem"),
|
||||
i(3, ""),
|
||||
}
|
||||
)
|
||||
)
|
||||
table.insert(autosnippets, thm)
|
||||
|
||||
local pf = s(
|
||||
{ trig = "prf", regTrig = true, desc = "Proof Block" },
|
||||
fmt(
|
||||
[[
|
||||
\pf{{{}}}{{
|
||||
{}
|
||||
}}
|
||||
{}
|
||||
]],
|
||||
{
|
||||
i(1, "Title of proof"),
|
||||
i(2, "Contents of proof"),
|
||||
i(3, ""),
|
||||
}
|
||||
)
|
||||
)
|
||||
table.insert(autosnippets, pf)
|
||||
|
||||
local cor = s(
|
||||
{ trig = "cor", regTrig = true, desc = "Corollary Block" },
|
||||
fmt(
|
||||
[[
|
||||
\cor{{{}}}{{
|
||||
{}
|
||||
}}
|
||||
{}
|
||||
]],
|
||||
{
|
||||
i(1, "Title of corollary"),
|
||||
i(2, "Contents of corollary"),
|
||||
i(3, ""),
|
||||
}
|
||||
)
|
||||
)
|
||||
table.insert(autosnippets, cor)
|
||||
|
||||
local lenma = s(
|
||||
{ trig = "lenma", regTrig = true, desc = "Lenma Block" },
|
||||
fmt(
|
||||
[[
|
||||
\mlenma{{{}}}{{
|
||||
{}
|
||||
}}
|
||||
{}
|
||||
]],
|
||||
{
|
||||
i(1, "Title of lenma"),
|
||||
i(2, "Contents of lenma"),
|
||||
i(3, ""),
|
||||
}
|
||||
)
|
||||
)
|
||||
table.insert(autosnippets, lenma)
|
||||
|
||||
local dnf = s(
|
||||
{ trig = "dfn", regTrig = true, desc = "Definition Block" },
|
||||
fmt(
|
||||
[[
|
||||
\dfn{{{}}}{{
|
||||
{}
|
||||
}}
|
||||
{}
|
||||
]],
|
||||
{
|
||||
i(1, "Title of definition"),
|
||||
i(2, "Contents of definition"),
|
||||
i(3, ""),
|
||||
}
|
||||
)
|
||||
)
|
||||
table.insert(autosnippets, dnf)
|
||||
|
||||
local nt = s(
|
||||
{ trig = "nt", regTrig = true, desc = "Note Block" },
|
||||
fmt(
|
||||
[[
|
||||
\nt{{
|
||||
{}
|
||||
}}
|
||||
{}
|
||||
]],
|
||||
{
|
||||
i(1, "Contents of notes"),
|
||||
i(2, ""),
|
||||
}
|
||||
)
|
||||
)
|
||||
table.insert(autosnippets, nt)
|
||||
|
||||
local myexe = s(
|
||||
{ trig = "myexe", desc = "Exercise Block" },
|
||||
fmt(
|
||||
[[
|
||||
\exe{{{}}}{{
|
||||
{}
|
||||
}}{}
|
||||
]],
|
||||
{
|
||||
i(1, "Name of exercise"),
|
||||
i(2, "Contents of exercise"),
|
||||
i(0),
|
||||
}
|
||||
)
|
||||
)
|
||||
table.insert(autosnippets, myexe)
|
||||
|
||||
local myexa = s(
|
||||
{ trig = "myexa", desc = "Example Block" },
|
||||
fmt(
|
||||
[[
|
||||
\exa{{{}}}{{
|
||||
{}
|
||||
}}{}
|
||||
]],
|
||||
{
|
||||
i(1, "Name of example"),
|
||||
i(2, "Contents of example"),
|
||||
i(0),
|
||||
}
|
||||
)
|
||||
)
|
||||
table.insert(autosnippets, myexa)
|
||||
|
||||
-- Math --
|
||||
|
||||
local qed = s(
|
||||
@@ -339,10 +521,10 @@ local cube = s(
|
||||
table.insert(autosnippets, cube)
|
||||
|
||||
local superscript = s(
|
||||
{ trig = "tp", desc = "superscript" },
|
||||
{ trig = "-tp", regTrig = true, desc = "superscript" },
|
||||
fmt(
|
||||
[[
|
||||
^{}{}
|
||||
^{{{}}}{}
|
||||
]],
|
||||
{
|
||||
i(1),
|
||||
@@ -356,6 +538,52 @@ local superscript = s(
|
||||
)
|
||||
table.insert(autosnippets, superscript)
|
||||
|
||||
local subscript = s(
|
||||
{ trig = "(%a)(%d)", regTrig = true, desc = "subscript" },
|
||||
fmt(
|
||||
[[
|
||||
{}_{}{}
|
||||
]],
|
||||
{
|
||||
f(function(_, snip)
|
||||
return snip.captures[1]
|
||||
end),
|
||||
f(function(_, snip)
|
||||
return snip.captures[2]
|
||||
end),
|
||||
i(0),
|
||||
}
|
||||
),
|
||||
{
|
||||
condition = math,
|
||||
show_condition = math,
|
||||
}
|
||||
)
|
||||
table.insert(autosnippets, subscript)
|
||||
|
||||
local subcsript2 = s(
|
||||
{ trig = "(%a)_(%d%d)", regTrig = true, desc = "subscript 2" },
|
||||
fmt(
|
||||
[[
|
||||
{}_{{{}}}{}
|
||||
]],
|
||||
{
|
||||
f(function(_, snip)
|
||||
return snip.captures[1]
|
||||
end),
|
||||
f(function(_, snip)
|
||||
return snip.captures[2]
|
||||
end),
|
||||
i(0),
|
||||
}
|
||||
),
|
||||
{
|
||||
condition = math,
|
||||
show_condition = math,
|
||||
}
|
||||
)
|
||||
table.insert(autosnippets, subcsript2)
|
||||
|
||||
local frac = s(
|
||||
{ trig = "//", desc = "Fraction with no input" },
|
||||
fmt(
|
||||
@@ -1124,6 +1352,81 @@ local setbuilder = s(
|
||||
)
|
||||
table.insert(autosnippets, setbuilder)
|
||||
|
||||
local NN = s(
|
||||
{ trig = "NN", regTrig = true, desc = "Natural Number" },
|
||||
fmt(
|
||||
[[
|
||||
\mathbb{{N}}
|
||||
]],
|
||||
{}
|
||||
),
|
||||
{
|
||||
condition = math,
|
||||
show_condition = math,
|
||||
}
|
||||
)
|
||||
table.insert(autosnippets, NN)
|
||||
|
||||
local RN = s(
|
||||
{ trig = "RN", regTrig = true, desc = "Real Number" },
|
||||
fmt(
|
||||
[[
|
||||
\mathbb{{R}}
|
||||
]],
|
||||
{}
|
||||
),
|
||||
{
|
||||
condition = math,
|
||||
show_condition = math,
|
||||
}
|
||||
)
|
||||
table.insert(autosnippets, RN)
|
||||
|
||||
local QN = s(
|
||||
{ trig = "QN", regTrig = true, desc = "Rational Number" },
|
||||
fmt(
|
||||
[[
|
||||
\mathbb{{Q}}
|
||||
]],
|
||||
{}
|
||||
),
|
||||
{
|
||||
condition = math,
|
||||
show_condition = math,
|
||||
}
|
||||
)
|
||||
table.insert(autosnippets, QN)
|
||||
|
||||
local CN = s(
|
||||
{ trig = "CN", regTrig = true, desc = "Komplex Number" },
|
||||
fmt(
|
||||
[[
|
||||
\mathbb{{C}}
|
||||
]],
|
||||
{}
|
||||
),
|
||||
{
|
||||
condition = math,
|
||||
show_condition = math,
|
||||
}
|
||||
)
|
||||
table.insert(autosnippets, CN)
|
||||
|
||||
local polynomial = s(
|
||||
{ trig = "poly", desc = "Polynomial" },
|
||||
fmt(
|
||||
[[
|
||||
\wp
|
||||
]],
|
||||
{}
|
||||
),
|
||||
{
|
||||
condition = math,
|
||||
show_condition = math,
|
||||
}
|
||||
)
|
||||
table.insert(autosnippets, polynomial)
|
||||
|
||||
-- Greek Letters --
|
||||
|
||||
local degree = s(
|
||||
@@ -1307,7 +1610,7 @@ local Omega = s(
|
||||
table.insert(autosnippets, Omega)
|
||||
|
||||
local alpha = s(
|
||||
{ trig = "aloha", desc = "alpha" },
|
||||
{ trig = "alpha", desc = "alpha" },
|
||||
fmt(
|
||||
[[
|
||||
\alpha
|
||||
|
||||
@@ -1,74 +0,0 @@
|
||||
#:schema https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json
|
||||
|
||||
version = 2
|
||||
inal_space = true
|
||||
console_title_template = '{{ .Shell }} in {{ .Folder }}'
|
||||
|
||||
[[blocks]]
|
||||
type = 'prompt'
|
||||
alignment = 'left'
|
||||
newline = true
|
||||
|
||||
[[blocks.segments]]
|
||||
type = 'text'
|
||||
style = 'plain'
|
||||
foreground = 'p:white'
|
||||
template = "{{ .UserName }} in "
|
||||
|
||||
[[blocks.segments]]
|
||||
type = 'path'
|
||||
style = 'plain'
|
||||
background = 'transparent'
|
||||
foreground = 'p:purple'
|
||||
template = "{{ .Path }}"
|
||||
|
||||
[blocks.segments.properties]
|
||||
style = 'full'
|
||||
|
||||
[[blocks]]
|
||||
type = 'prompt'
|
||||
alignment = 'right'
|
||||
|
||||
[[blocks.segments]]
|
||||
type = 'git'
|
||||
style = 'plain'
|
||||
background = 'transparent'
|
||||
foreground = 'p:white'
|
||||
template = "{{ .UpstreamIcon }} {{ .HEAD }}<p:green>{{ if .Working.Added }} {{ .Working.String }}{{ end }}</><p:red>{{ if .Working.Deleted }} {{ .Working.String }}{{ end }}</><p:orange>{{ if .Working.Modified }} {{ .Working.String }}{{end}}</><p:yellow>{{ if .Staging.Changed }} {{ .Staging.String }}{{ end }}</>"
|
||||
|
||||
[blocks.segments.properties]
|
||||
branch_icon = ''
|
||||
fetch_status = true
|
||||
fetch_upstream_icon = true
|
||||
|
||||
[[blocks]]
|
||||
type = 'prompt'
|
||||
alignment = 'left'
|
||||
newline = true
|
||||
|
||||
[[blocks.segments]]
|
||||
type = 'text'
|
||||
style = 'plain'
|
||||
background = 'transparent'
|
||||
foreground_templates = [
|
||||
"{{if gt .Code 0}}p:red{{end}}",
|
||||
"{{if eq .Code 0}}p:magenta{{end}}",
|
||||
]
|
||||
template = ' '
|
||||
|
||||
[transient_prompt]
|
||||
background = 'transparent'
|
||||
foreground_templates = [
|
||||
"{{if gt .Code 0}}p:red{{end}}",
|
||||
"{{if eq .Code 0}}p:magenta{{end}}",
|
||||
]
|
||||
template = ' '
|
||||
|
||||
[palette]
|
||||
purple = "#9580ff"
|
||||
magenta = "#ff80bf"
|
||||
white = "#eeeeee"
|
||||
red = "#ff5555"
|
||||
green = "#8aff80"
|
||||
orange = "#ffca80"
|
||||
yellow = "#f1fa8c"
|
||||
@@ -5,7 +5,7 @@ export WHITE=0xffeeeeee
|
||||
# -- Dracula Scheme --
|
||||
export BAR_COLOR=0xff262626
|
||||
export ITEM_BG_COLOR=0xff4e4e4e
|
||||
export ACCENT_COLOR=0xffa582f0
|
||||
export ACCENT_COLOR=0xff8A8FA9
|
||||
|
||||
# -- Gray Scheme --
|
||||
# export BAR_COLOR=0xff101314
|
||||
|
||||
21
.config/starship/starship.toml
Normal file
21
.config/starship/starship.toml
Normal file
@@ -0,0 +1,21 @@
|
||||
# Get editor completions based on the config schema
|
||||
"$schema" = 'https://starship.rs/config-schema.json'
|
||||
# Minimal left prompt
|
||||
format = """$directory$character"""
|
||||
# Right prompt
|
||||
right_format = """$git_branch$git_commit$git_status$python$c"""
|
||||
|
||||
# Inserts a blank line between shell prompts
|
||||
add_newline = true
|
||||
|
||||
# Replace the '❯' symbol in the prompt with '➜'
|
||||
[character] # The name of the module we are configuring is 'character'
|
||||
success_symbol = '[❯ ](bold green)' # The 'success_symbol' segment is being set to '➜' with the color 'bold green'
|
||||
|
||||
# Git module
|
||||
[git_branch]
|
||||
format = '[$symbol$branch(:$remote_branch)]($style)'
|
||||
|
||||
# Disable the package module, hiding it from the prompt completely
|
||||
[package]
|
||||
disabled = false
|
||||
@@ -1,17 +0,0 @@
|
||||
#!/usr/bin/env zsh
|
||||
|
||||
selected=$(find ~/ -mindepth 2 -maxdepth 2 -type d | fzf)
|
||||
|
||||
selected_name=$(basename "$selected" | tr . _)
|
||||
|
||||
tmux has-session -t=$selected_name 2> /dev/null
|
||||
|
||||
if [[ $? -ne 0 ]]; then
|
||||
TMUX='' tmux new-session -d -s "$selected_name" -c "$selected"
|
||||
fi
|
||||
|
||||
if [[ -z "$TMUX" ]]; then
|
||||
tmux attach -t "$selected_name"
|
||||
else
|
||||
tmux switch-client -t "$selected_name"
|
||||
fi
|
||||
@@ -1,17 +0,0 @@
|
||||
#!/usr/bin/env zsh
|
||||
|
||||
selected=$(find ~/Projects/Private/ ~/Projects/Public/ -mindepth 1 -maxdepth 1 -type d | fzf)
|
||||
|
||||
selected_name=$(basename "$selected" | tr . _)
|
||||
|
||||
tmux has-session -t=$selected_name 2> /dev/null
|
||||
|
||||
if [[ $? -ne 0 ]]; then
|
||||
TMUX='' tmux new-session -d -s "$selected_name" -c "$selected"
|
||||
fi
|
||||
|
||||
if [[ -z "$TMUX" ]]; then
|
||||
tmux attach -t "$selected_name"
|
||||
else
|
||||
tmux switch-client -t "$selected_name"
|
||||
fi
|
||||
@@ -1,43 +1,105 @@
|
||||
######################
|
||||
# Tmux config #
|
||||
# Inspired by: #
|
||||
# - josean.dev #
|
||||
# - DevOps Toolbox #
|
||||
######################
|
||||
|
||||
# Use RGB Colors
|
||||
set -g default-terminal "screen-256color"
|
||||
|
||||
set -g base-index 1 # Start counting from 1
|
||||
set -g status-position top # Position status bar at top
|
||||
|
||||
set -g renumber-windows on # Whenever a window is closed, renumber them
|
||||
|
||||
# Change prefix
|
||||
set -g prefix C-a
|
||||
unbind C-b
|
||||
bind-key C-a send-prefix
|
||||
|
||||
######################
|
||||
# Change keybindings #
|
||||
######################
|
||||
|
||||
# Vertical window split
|
||||
unbind %
|
||||
bind - split-window -v
|
||||
|
||||
# Horizontal window split
|
||||
unbind '"'
|
||||
bind _ split-window -h
|
||||
|
||||
# Window resizing
|
||||
bind -r j resize-pane -D 5
|
||||
bind -r k resize-pane -U 5
|
||||
bind -r h resize-pane -L 5
|
||||
bind -r l resize-pane -R 5
|
||||
|
||||
bind -r m resize-pane -Z
|
||||
|
||||
# Vim keys
|
||||
set-window-option -g mode-keys vi
|
||||
|
||||
############
|
||||
# Vim Mode #
|
||||
############
|
||||
|
||||
bind-key -T copy-mode-vi 'v' send -X begin-selection
|
||||
bind-key -T copy-mode-vi 'y' send -X copy-selection
|
||||
|
||||
unbind -T copy-mode-vi MouseDragEnd1Pane
|
||||
|
||||
unbind r
|
||||
bind -r r source-file ~/.config/tmux/tmux.conf
|
||||
bind -r r source-file ~/.config/tmux/tmux.conf # Source config file
|
||||
|
||||
bind-key -r g run-shell -b "tmux neww ~/.config/tmux/tmux-sessionizer-git"
|
||||
bind-key -r f run-shell -b "tmux neww ~/.config/tmux/tmux-sessionizer-files"
|
||||
###########
|
||||
# Plugins #
|
||||
###########
|
||||
|
||||
set -g @plugin 'tmux-plugins/tpm'
|
||||
set -g @plugin 'christoomey/vim-tmux-navigator'
|
||||
set -g @plugin 'wfxr/tmux-power'
|
||||
set -g @plugin 'tmux-plugins/tpm' # Plugin Manager
|
||||
set -g @plugin 'christoomey/vim-tmux-navigator' # vim-like navigation
|
||||
set -g @plugin 'catppuccin/tmux' # Theme
|
||||
set -g @plugin 'tmux-plugins/tmux-resurrect'
|
||||
set -g @plugin 'tmux-plugins/tmux-continuum'
|
||||
set -g @plugin 'omerxx/tmux-sessionx'
|
||||
set -g @plugin 'sainnhe/tmux-fzf'
|
||||
|
||||
#############################################################
|
||||
# Catppuccin config #
|
||||
# See https://github.com/catppuccin/tmux for more resources #
|
||||
#############################################################
|
||||
|
||||
set -g @catppuccin_window_status_style "rounded"
|
||||
set -g @catppuccin_window_number_position "right"
|
||||
set -g @catppuccin_window_default_fill "number"
|
||||
set -g @catppuccin_window_text "#{window_name}"
|
||||
set -g @catppuccin_window_current_text "#{window_name}"
|
||||
set -g @catppuccin_window_current_fill "number"
|
||||
set -g @catppuccin_status_left_separator " "
|
||||
set -g @catppuccin_status_right_separator " "
|
||||
set -g @catppuccin_status_right_separator_inverse "no"
|
||||
set -g @catppuccin_status_fill "icon"
|
||||
set -g @catppuccin_status_connect_separator "no"
|
||||
set -g @catppuccin_flavor 'macchiato'
|
||||
set -g status-right-length 100
|
||||
set -g status-left-length 100
|
||||
set -g status-left "#{E:@catppuccin_status_session}"
|
||||
set -g status-right "#{E:@catppuccin_status_directory}"
|
||||
set -ag status-right "#{E:@catppuccin_status_date_time}"
|
||||
|
||||
####################
|
||||
# Resurrect config #
|
||||
####################
|
||||
|
||||
set -g @tmux_power_theme '#BD93F9'
|
||||
set -g @resurrect-capture-pane-contents 'on'
|
||||
set -g @continuum-restore 'on'
|
||||
|
||||
###################
|
||||
# Sessionx config #
|
||||
###################
|
||||
|
||||
unbind s
|
||||
set -g @sessionx-bind 's'
|
||||
|
||||
|
||||
run '~/.config/tmux/plugins/tpm/tpm'
|
||||
|
||||
@@ -41,4 +41,9 @@ set recolor-lightcolor "#282a36" # Background
|
||||
set recolor-darkcolor "#f8f8f2" # Foreground
|
||||
|
||||
set adjust-open width
|
||||
set recolor true
|
||||
|
||||
# Keymaps
|
||||
|
||||
map r recolor
|
||||
map f adjust_window best-fit
|
||||
map p goto
|
||||
|
||||
Reference in New Issue
Block a user