diff options
| -rw-r--r-- | nixos/nvim.nix | 2 | ||||
| -rw-r--r-- | nvim/init.lua | 66 | ||||
| -rw-r--r-- | nvim/nvim-pack-lock.json | 12 | ||||
| -rw-r--r-- | quickshell/BatteryInfo.qml | 2 | ||||
| -rw-r--r-- | quickshell/Procs.qml | 2 | ||||
| -rw-r--r-- | tmux/tmux.conf | 3 |
6 files changed, 85 insertions, 2 deletions
diff --git a/nixos/nvim.nix b/nixos/nvim.nix index c19c696..ae3c94c 100644 --- a/nixos/nvim.nix +++ b/nixos/nvim.nix @@ -9,6 +9,8 @@ xsel ripgrep tree-sitter + + luajitPackages.magick vscode-langservers-extracted ]; diff --git a/nvim/init.lua b/nvim/init.lua index d20a671..3bf6d12 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -24,6 +24,9 @@ vim.o.inccommand = 'split' vim.o.cursorline = true vim.o.scrolloff = 5 vim.o.confirm = true +vim.o.expandtab = true +vim.o.tabstop = 2 +vim.o.shiftwidth = 2 vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>') vim.diagnostic.config { @@ -145,6 +148,69 @@ vim.cmd.colorscheme 'gruvbox' vim.pack.add { gh 'folke/todo-comments.nvim' } require('todo-comments').setup { signs = false } +vim.pack.add { gh '3rd/image.nvim' } +require("image").setup({ + backend = "sixel", -- or "" or "" + processor = "magick_cli", -- or "magick_rock" + integrations = { + markdown = { + enabled = true, + clear_in_insert_mode = false, + download_remote_images = true, + only_render_image_at_cursor = true, + only_render_image_at_cursor_mode = "popup", -- or "inline" + floating_windows = false, -- if true, images will be rendered in floating markdown windows + filetypes = { "markdown", "vimwiki" }, -- markdown extensions (ie. quarto) can go here + }, + asciidoc = { + enabled = true, + clear_in_insert_mode = false, + download_remote_images = true, + only_render_image_at_cursor = true, + only_render_image_at_cursor_mode = "popup", + floating_windows = false, + filetypes = { "asciidoc", "adoc" }, + }, + neorg = { + enabled = true, + filetypes = { "norg" }, + }, + rst = { + enabled = true, + }, + typst = { + enabled = true, + filetypes = { "typst" }, + }, + html = { + enabled = false, + }, + css = { + enabled = false, + }, + }, + max_width = nil, + max_height = nil, + max_width_window_percentage = nil, + max_height_window_percentage = 50, + scale_factor = 1.0, + window_overlap_clear_enabled = false, -- toggles images when windows are overlapped + window_overlap_clear_ft_ignore = { "cmp_menu", "cmp_docs", "snacks_notif", "scrollview", "scrollview_sign" }, + editor_only_render_when_focused = false, -- auto show/hide images when the editor gains/looses focus + tmux_show_only_in_active_window = false, -- auto show/hide images in the correct Tmux window (needs visual-activity off) + hijack_file_patterns = { "*.png", "*.jpg", "*.jpeg", "*.gif", "*.webp", "*.avif" }, -- render image files as images when opened +}) + +vim.pack.add { gh 'ej-shafran/compile-mode.nvim' } +vim.g.compile_mode = {} +vim.keymap.set('n', '<leader>cp', "<cmd>:Compile<CR>", { desc = '[C]om[p]ile' }) +vim.keymap.set('n', '<leader>n', "<cmd>:NextError<CR>", { desc = '[N]ext Error' }) + +vim.keymap.set('t', '<Esc>', "<C-\\><C-n>", { desc = 'Escape terminal mode' }) + +vim.keymap.set('n', '<leader>z', "<C-w>_", { desc = '[Z]en Mode' }) +vim.keymap.set('n', '<leader><S-z>', "<C-w>=", { desc = 'Escape [Z]en Mode' }) + vim.pack.add { gh 'nvim-mini/mini.nvim' } if vim.g.have_nerd_font then diff --git a/nvim/nvim-pack-lock.json b/nvim/nvim-pack-lock.json index 07b5547..5451dc7 100644 --- a/nvim/nvim-pack-lock.json +++ b/nvim/nvim-pack-lock.json @@ -1,5 +1,9 @@ { "plugins": { + "compile-mode.nvim": { + "rev": "dd3e952076a33faba0a55b04b2b73945832c0527", + "src": "https://github.com/ej-shafran/compile-mode.nvim" + }, "conform.nvim": { "rev": "619363c30309d29ffa631e67c8183f2a72caa373", "src": "https://github.com/stevearc/conform.nvim" @@ -24,6 +28,14 @@ "rev": "84a4987ff36798c2fc1169cbaff67960aed9776f", "src": "https://github.com/NMAC427/guess-indent.nvim" }, + "hologram.nvim": { + "rev": "f5194f71ec1578d91b2e3119ff08e574e2eab542", + "src": "https://github.com/edluffy/hologram.nvim" + }, + "image.nvim": { + "rev": "88351f1f7d9dbae286e671ce3690a49660dd8a5c", + "src": "https://github.com/3rd/image.nvim" + }, "mini.nvim": { "rev": "bf8169f3e518be8de3f88073ace37d91f576cb04", "src": "https://github.com/nvim-mini/mini.nvim" diff --git a/quickshell/BatteryInfo.qml b/quickshell/BatteryInfo.qml index e879d94..72e4f3b 100644 --- a/quickshell/BatteryInfo.qml +++ b/quickshell/BatteryInfo.qml @@ -19,7 +19,7 @@ Rectangle { property var capacity: "" Timer { - interval: 0 + interval: 5000 running: true repeat: false onTriggered: { diff --git a/quickshell/Procs.qml b/quickshell/Procs.qml index f24bec6..6442bfb 100644 --- a/quickshell/Procs.qml +++ b/quickshell/Procs.qml @@ -4,7 +4,7 @@ import QtQuick Scope { Timer { - interval: 2000 + interval: 5000 running: true repeat: true onTriggered: { diff --git a/tmux/tmux.conf b/tmux/tmux.conf index 85aa047..35213d2 100644 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -6,6 +6,9 @@ set -g pane-base-index 1 set-window-option -g pane-base-index 1 set-window-option -g mode-keys vi set-option -g renumber-windows on +set -gq allow-passthrough on +set -g visual-activity off +set-option -g focus-events on unbind C-b set -g prefix C-Space |