commit ef4452298ee3e1dcc2f49059042e52349de75a3c
parent df8d6ca5134e999a510478443f1f8568ccee06b1
Author: Szymon Mikulicz <szymon.mikulicz@posteo.net>
Date: Thu, 26 Mar 2026 16:53:03 +0100
One more merge
Diffstat:
10 files changed, 124 insertions(+), 33 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
*~
sway/.config/sway/BG
+mlterm/.mlterm/msg.log
+mlterm/.mlterm/challenge
diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
@@ -27,10 +27,13 @@ if test -f "$XDG_RUNTIME_DIR/arista-ssh/agent.sock"
set -x SSH_AUTH_SOCK "$XDG_RUNTIME_DIR/arista-ssh/agent.sock"
end
+set PYTHONDIR (python3 --version | sed 's/Python \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/python\1.\2/')
set -x PERL5LIB "$HOME/.usr/local/lib/perl5/"
set -x XDG_DATA_DIRS $XDG_DATA_DIRS "$HOME/.usr/local/share"
-
-#direnv hook fish | source
+set -x PYTHONPATH "$HOME/.usr/local/lib/$PYTHONDIR/dist-packages"
+set -x EDITOR (which nvim)
+set -x VISUAL $EDITOR
+set -x SUDOEDIT $EDITOR
# pnpm
set -gx PNPM_HOME "/home/shyman/.local/share/pnpm"
diff --git a/foot/.config/foot/foot.ini b/foot/.config/foot/foot.ini
@@ -8,7 +8,7 @@
# title=foot
# locked-title=no
-font=CodeNewRoman Nerd Font:size=6
+font=Maple Mono NF:size=8
# font-bold=<bold variant of regular font>
# font-italic=<italic variant of regular font>
# font-bold-italic=<bold+italic variant of regular font>
diff --git a/mlterm/.mlterm/aafont b/mlterm/.mlterm/aafont
@@ -0,0 +1 @@
+DEFAULT=Maple Mono NF 20
diff --git a/mlterm/.mlterm/color b/mlterm/.mlterm/color
@@ -0,0 +1,17 @@
+black=#393552
+red=#eb6f92
+green=#3e8fb0
+yellow=#f6c177
+blue=#9ccfd8
+magenta=#c4a7e7
+cyan=#ea9a97
+white=#e0def4
+
+hl_black=#6e6a86
+hl_red=#eb6f92
+hl_green=#3e8fb0
+hl_yellow=#f6c177
+hl_blue=#9ccfd8
+hl_magenta=#c4a7e7
+hl_cyan=#ea9a97
+hl_white=#e0def4
diff --git a/mlterm/.mlterm/key b/mlterm/.mlterm/key
@@ -0,0 +1 @@
+BackSpace="\x7f"
diff --git a/mlterm/.mlterm/main b/mlterm/.mlterm/main
@@ -0,0 +1,18 @@
+use_multi_column_char = true
+use_ot_layout = true
+use_dynamic_comb = false
+use_combining = true
+use_anti_alias = true
+use_scrollbar = false
+depth=32
+vt_color_mode = true
+alpha=220
+termtype = xterm-256color
+borderless = true
+use_variable_column_width = true
+
+fg_color=#e0def4
+bg_color=#232136
+
+cursor_bg_color=#56526e
+cursor_fg_color=#e0def4
diff --git a/mlterm/.mlterm/vaafont b/mlterm/.mlterm/vaafont
@@ -0,0 +1 @@
+DEFAULT=Maple Mono NF 20
diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua
@@ -25,13 +25,13 @@ require('lazy').setup({
end
},
- {
- "rachartier/tiny-inline-diagnostic.nvim",
+ { "rachartier/tiny-inline-diagnostic.nvim",
event = "VeryLazy",
priority = 1000,
config = function()
require("tiny-inline-diagnostic").setup({
options = {
+ overwrite_events = {"DiagnosticChanged"},
multilines = {
enabled = true,
always_show = false,
@@ -44,7 +44,9 @@ require('lazy').setup({
{ 'mboughaba/i3config.vim', ft = {'i3config'}},
- { 'janet-lang/janet.vim', ft = {'janet'}},
+ { "aserowy/tmux.nvim",
+ config = function() return require("tmux").setup() end
+ },
{ "nvimdev/lspsaga.nvim",
config = function()
@@ -73,8 +75,7 @@ require('lazy').setup({
},
},
- {
- "folke/noice.nvim",
+ { "folke/noice.nvim",
event = "VeryLazy",
opts = {
lsp = {
@@ -108,6 +109,49 @@ require('lazy').setup({
}
},
+ { 'tac',
+ dependencies = { 'nvim-treesitter/nvim-treesitter' },
+ enabled = function()
+ return vim.fn.isdirectory('/src/ArEditorPlugins/nvim/plugins/tac.nvim') ~= 0
+ end,
+ dir = '/src/ArEditorPlugins/nvim/plugins/tac.nvim',
+ config = function()
+ require('tac').setup()
+ end
+ },
+
+ { 'stevearc/conform.nvim',
+ dependencies = { 'lewis6991/gitsigns.nvim' },
+ opts = {
+ formatters_by_ft = {
+ -- cpp = {"clang-format"},
+ -- python = {"yapf"},
+ },
+ format_on_save = {},
+ formatters = {
+ yapf = {
+ prepend_args = {"--style", "/home/szymon/.config/yapf/style"}
+ }
+ }
+ }
+ },
+
+ { "mfussenegger/nvim-lint",
+ event = 'VeryLazy',
+ priority = '500',
+ config = function()
+ require('lint').linters_by_ft = {
+ python = {'pylint'},
+ }
+
+ vim.api.nvim_create_autocmd({"TextChanged"}, {
+ callback = function()
+ require("lint").try_lint()
+ end
+ })
+ end
+ },
+
{ "ibhagwan/fzf-lua",
keys = {
{"<c-P>", "<cmd>FzfLua files<CR>"},
@@ -160,7 +204,13 @@ require('lazy').setup({
end
},
- {'akinsho/bufferline.nvim',
+ { 'mcauley-penney/visual-whitespace.nvim',
+ config = true,
+ event = "ModeChanged *:[vV\22]", -- optionally, lazy load on entering visual mode
+ opts = {},
+ },
+
+ { 'akinsho/bufferline.nvim',
dependencies = 'nvim-tree/nvim-web-devicons',
lazy = false,
config = function()
@@ -198,10 +248,7 @@ require('lazy').setup({
},
},
})
- end,
- keys = {
- { "<C-k>", "<cmd>NvimTreeToggle<CR>" }
- }
+ end
},
{ "lukas-reineke/indent-blankline.nvim",
@@ -212,6 +259,8 @@ require('lazy').setup({
'chaoren/vim-wordmotion',
+ 'janet-lang/janet.vim',
+
{ 'goolord/alpha-nvim',
dependencies = { 'nvim-tree/nvim-web-devicons' },
config = function ()
@@ -223,11 +272,19 @@ require('lazy').setup({
{ 'neovim/nvim-lspconfig',
config = function()
- if 1 == vim.fn.executable('clangd') then vim.lsp.enable('clangd') end
- if 1 == vim.fn.executable('pylsp') then vim.lsp.enable('pylsp') end
- if 1 == vim.fn.executable('zls') then vim.lsp.enable('zls') end
- if 1 == vim.fn.executable('bashls') then vim.lsp.enable('bashls') end
- if 1 == vim.fn.executable('beancount-language-server') then vim.lsp.enable('beancount') end
+ vim.lsp.config.artaclsp = {
+ cmd = { 'artaclsp' },
+ root_dir = '/src',
+ filetypes = { 'tac' },
+ }
+ lsp_enable = function(srvs)
+ for i,srv in ipairs(srvs) do
+ if 1 == vim.fn.executable(vim.lsp.config[srv].cmd[1]) then
+ vim.lsp.enable(srv)
+ end
+ end
+ end
+ lsp_enable({'clangd', 'pylsp', 'zls', 'bashls', 'artaclsp', 'beancount'})
end
},
@@ -274,17 +331,6 @@ require('lazy').setup({
enableAdditionalTextEdit = true,
}
})
- -- vim.keymap.set('i', '<Tab>', function()
- -- local col = vim.fn.col('.') - 1
- -- if vim.fn["pum#visible"]() then
- -- return vim.fn["pum#map#insert_relative"](1)
- -- elseif col <= 1 or vim.fn.getline('.'):sub(col, col):match('%s') then
- -- return "<TAB>"
- -- else
- -- return vim.fn["ddc#map#manual_complete"]()
- -- end
- -- end, {expr = true, silent = true})
-
vim.fn["ddc#enable"]()
end,
}
diff --git a/sway/.config/sway/config b/sway/.config/sway/config
@@ -7,7 +7,7 @@ font pango:Tamsyn 10
floating_modifier $mod
-bindsym $mod+Return exec foot
+bindsym $mod+Return exec $HOME/.usr/local/bin/mlterm-wl
bindsym $mod+Shift+q kill
@@ -119,6 +119,8 @@ bindsym XF86AudioStop exec --no-startup-id playerctl stop
bindsym XF86AudioNext exec --no-startup-id playerctl next
bindsym XF86AudioPrev exec --no-startup-id playerctl prev
+bindsym $mod+c exec $HOME/.usr/local/bin/mlterm-wl -g 100x30 -N com.sub.tui -e tmux new-session -A -s subtui SubTUI
+
# Screen brightness controls
bindsym XF86MonBrightnessDown exec brightnessctl s 10%-
bindsym XF86MonBrightnessUp exec brightnessctl s +10%
@@ -164,14 +166,14 @@ for_window [instance="mpv"] pixel 0
for_window [instance="^r_x11$"] floating enable
for_window [instance="^octave\-gui$"] floating enable
for_window [instance="^matplotlib$"] floating enable
-for_window [app_id="ymuse"] floating enable
+for_window [app_id="com.sub.tui"] floating enable
exec ~/.fehbg
exec mako
-exec wlsunset -l 50 -L 20
+exec wlsunset -l 50.049683 -L 19.944544
bar {
- font pango:DejaVu Sans Mono, FontAwesome 7
+ font pango:Powerline Symbols, DejaVu Sans Mono, FontAwesome 10
position top
status_command zsh -c "i3status-rs"
colors {
