From 280469e8054af42fb9a05978b3fecaf70a7572b4 Mon Sep 17 00:00:00 2001 From: Ian Griffin Date: Thu, 17 Apr 2025 10:02:07 +0800 Subject: [PATCH] minor fixes, tab settings, and default progs --- after/ftplugin/html.lua | 2 +- after/ftplugin/markdown.lua | 2 +- lua/defs.lua | 6 +++--- lua/ui.lua | 3 +-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/after/ftplugin/html.lua b/after/ftplugin/html.lua index abd4d87..d410660 100644 --- a/after/ftplugin/html.lua +++ b/after/ftplugin/html.lua @@ -1 +1 @@ -require('conftool').set({'tabstop', 2},{'shiftwidth', 2}) +require('conftool').set({'tabstop', 4},{'shiftwidth', 4}) diff --git a/after/ftplugin/markdown.lua b/after/ftplugin/markdown.lua index fb5cb00..37dc4f8 100644 --- a/after/ftplugin/markdown.lua +++ b/after/ftplugin/markdown.lua @@ -1 +1 @@ -require('conftool').set({'tabstop', 5},{'shiftwidth', 5}) +require('conftool').set({'tabstop', 5},{'shiftwidth', 5}, {'expandtab', false}) diff --git a/lua/defs.lua b/lua/defs.lua index cf02255..eba4dda 100644 --- a/lua/defs.lua +++ b/lua/defs.lua @@ -1,7 +1,7 @@ return { template_dir = '~/templates', - external_term = 'xfce4-terminal', - external_filemgr = 'thunar', - external_pdfviewer = 'atril', + external_term = 'gterm', + external_filemgr = 'gfiles', + external_pdfviewer = 'gpdf', lsp_path = vim.env.HOME .. '/.local/share/lsp_servers' } diff --git a/lua/ui.lua b/lua/ui.lua index 353c4cd..30c4685 100644 --- a/lua/ui.lua +++ b/lua/ui.lua @@ -5,7 +5,7 @@ local ct = require 'conftool' -- vim.cmd('filetype plugin indent on') ct.set('autoindent', 'smartindent', 'cindent') -ct.set({'tabstop', 5}, {'shiftwidth', 5}) +ct.set({'tabstop', 4}, {'shiftwidth', 4}) -- -- Indent indicators @@ -19,7 +19,6 @@ vim.opt.list = true ct.set('ruler', 'showcmd', 'cursorline', 'title') -- ct.set('number') ct.set( - {'background', 'light'}, {'termguicolors', true}, {'signcolumn', 'number'}, {'conceallevel', 0},