From 71cedb1ca14316c6f4abce371d0ff35eea1a1d8f Mon Sep 17 00:00:00 2001 From: punkfairie <23287005+punkfairie@users.noreply.github.com> Date: Mon, 10 Jun 2024 17:48:49 -0700 Subject: [PATCH] Update .config/nvim/lua/config/lazy.lua Update .config/nvim/lua/plugins/conform.lua Update .config/nvim/lua/plugins/mason.lua Update .config/nvim/lua/plugins/nvim-lint.lua Update .config/nvim/lua/plugins/nvim-lspconfig.lua Update .config/nvim/lua/plugins/nvim-treesitter.lua Remove .config/nvim/lua/plugins/refactoring.lua Update tags --- dot_config/nvim/lua/config/lazy.lua.tmpl | 25 +- dot_config/nvim/lua/plugins/conform.lua.tmpl | 1 - dot_config/nvim/lua/plugins/mason.lua.tmpl | 2 - dot_config/nvim/lua/plugins/nvim-lint.lua | 1 - .../nvim/lua/plugins/nvim-lspconfig.lua.tmpl | 13 - .../nvim/lua/plugins/nvim-treesitter.lua.tmpl | 10 - dot_config/nvim/lua/plugins/refactoring.lua | 10 - tags | 236 ++++++++++++++++++ 8 files changed, 254 insertions(+), 44 deletions(-) delete mode 100644 dot_config/nvim/lua/plugins/refactoring.lua diff --git a/dot_config/nvim/lua/config/lazy.lua.tmpl b/dot_config/nvim/lua/config/lazy.lua.tmpl index 5f7c8a9..f229e42 100644 --- a/dot_config/nvim/lua/config/lazy.lua.tmpl +++ b/dot_config/nvim/lua/config/lazy.lua.tmpl @@ -17,30 +17,41 @@ require("lazy").setup({ { import = "lazyvim.plugins.extras.coding.yanky" }, -- editor - {{ if ne .chezmoi.hostname "marleycentre" -}} + {{ if not .isServer -}} { import = "lazyvim.plugins.extras.editor.aerial" }, {{ end -}} { import = "lazyvim.plugins.extras.editor.leap" }, { import = "lazyvim.plugins.extras.editor.navic" }, + {{ if not .isServer -}} + { import = "lazyvim.plugins.extras.editor.refactoring" }, + {{ end - }} + { import = "lazyvim.plugins.extras.editor.trouble-v3" }, -- formatting { import = "lazyvim.plugins.extras.formatting.prettier" }, -- lang - {{ if ne .chezmoi.hostname "marleycentre" -}} + {{ if not .isServer -}} { import = "lazyvim.plugins.extras.lang.go" }, {{ end -}} + { import = "lazyvim.plugins.extras.lang.git" }, { import = "lazyvim.plugins.extras.lang.json" }, { import = "lazyvim.plugins.extras.lang.markdown" }, { import = "lazyvim.plugins.extras.lang.python" }, { import = "lazyvim.plugins.extras.lang.ruby" }, - {{ if ne .chezmoi.hostname "marleycentre" -}} + { import = "lazyvim.plugins.extras.lang.sql" }, + {{ if not .isServer -}} + { import = "lazyvim.plugins.extras.lang.tailwind" }, + {{ end -}} + { import = "lazyvim.plugins.extras.lang.toml" }, + {{ if not .isServer -}} { import = "lazyvim.plugins.extras.lang.typescript" }, + { import = "lazyvim.plugins.extras.lang.vue" }, {{ end -}} { import = "lazyvim.plugins.extras.lang.yaml" }, -- linting - {{ if ne .chezmoi.hostname "marleycentre" -}} + {{ if not .isServer -}} { import = "lazyvim.plugins.extras.linting.eslint" }, {{ end -}} @@ -48,19 +59,19 @@ require("lazy").setup({ { import = "lazyvim.plugins.extras.lsp.none-ls" }, -- test - {{ if ne .chezmoi.hostname "marleycentre" -}} + {{ if not .isServer -}} { import = "lazyvim.plugins.extras.test.core" }, {{ end -}} -- ui - {{ if ne .chezmoi.hostname "marleycentre" -}} + {{ if not .isServer -}} { import = "lazyvim.plugins.extras.ui.mini-animate" }, {{ end -}} -- util { import = "lazyvim.plugins.extras.util.dot" }, { import = "lazyvim.plugins.extras.util.mini-hipatterns" }, - {{ if ne .chezmoi.hostname "marleycentre" -}} + {{ if not .isServer -}} { import = "lazyvim.plugins.extras.util.project" }, {{ end -}} diff --git a/dot_config/nvim/lua/plugins/conform.lua.tmpl b/dot_config/nvim/lua/plugins/conform.lua.tmpl index 5b803dc..ff8d0e1 100644 --- a/dot_config/nvim/lua/plugins/conform.lua.tmpl +++ b/dot_config/nvim/lua/plugins/conform.lua.tmpl @@ -13,7 +13,6 @@ return { {{ end -}} -- data/conf - sql = { "prettier" }, json = { "prettier" }, toml = { "taplo" }, yaml = { "prettier" }, diff --git a/dot_config/nvim/lua/plugins/mason.lua.tmpl b/dot_config/nvim/lua/plugins/mason.lua.tmpl index 6f8488b..2621819 100644 --- a/dot_config/nvim/lua/plugins/mason.lua.tmpl +++ b/dot_config/nvim/lua/plugins/mason.lua.tmpl @@ -8,7 +8,6 @@ return { -- data/conf "yamllint", - "sqlfluff", {{ if not .isServer -}} -- php @@ -18,7 +17,6 @@ return { {{ end -}} -- shell - "shellcheck", "shfmt", }, }, diff --git a/dot_config/nvim/lua/plugins/nvim-lint.lua b/dot_config/nvim/lua/plugins/nvim-lint.lua index 334d35d..ca4928b 100644 --- a/dot_config/nvim/lua/plugins/nvim-lint.lua +++ b/dot_config/nvim/lua/plugins/nvim-lint.lua @@ -3,7 +3,6 @@ return { "mfussenegger/nvim-lint", opts = { linters_by_ft = { - sql = { "sqlfluff" }, yaml = { "yamllint" }, bash = { "shellcheck" }, sh = { "shellcheck" }, diff --git a/dot_config/nvim/lua/plugins/nvim-lspconfig.lua.tmpl b/dot_config/nvim/lua/plugins/nvim-lspconfig.lua.tmpl index 0ef56fa..2ff3b01 100644 --- a/dot_config/nvim/lua/plugins/nvim-lspconfig.lua.tmpl +++ b/dot_config/nvim/lua/plugins/nvim-lspconfig.lua.tmpl @@ -5,9 +5,7 @@ return { opts = { servers = { -- data/conf - {{ if not .isServer -}} sqlls = {}, - {{ end -}} taplo = {}, -- web @@ -18,16 +16,6 @@ return { cssls = {}, {{ if not .isServer -}} denols = {}, - volar = { - filetypes = { - "typescript", - "javascript", - "javascriptreact", - "typescriptreact", - "vue", - "json", - }, - }, stylelint_lsp = { settings = { stylelintplus = { @@ -84,7 +72,6 @@ return { {{ end -}} -- shell - bashls = {}, pkgbuild_language_server = { mason = false }, }, }, diff --git a/dot_config/nvim/lua/plugins/nvim-treesitter.lua.tmpl b/dot_config/nvim/lua/plugins/nvim-treesitter.lua.tmpl index 8f16f33..b454ebf 100644 --- a/dot_config/nvim/lua/plugins/nvim-treesitter.lua.tmpl +++ b/dot_config/nvim/lua/plugins/nvim-treesitter.lua.tmpl @@ -8,11 +8,6 @@ return { -- git "diff", - "git_config", - "git_rebase", - "gitattributes", - "gitcommit", - "gitignore", -- data/conf "ini", @@ -25,15 +20,10 @@ return { "scss", "javascript", "jsdoc", - "vue", -- php "php_only", "phpdoc", - - -- shell - "bash", - "fish", }, }, diff --git a/dot_config/nvim/lua/plugins/refactoring.lua b/dot_config/nvim/lua/plugins/refactoring.lua deleted file mode 100644 index 153ee7d..0000000 --- a/dot_config/nvim/lua/plugins/refactoring.lua +++ /dev/null @@ -1,10 +0,0 @@ -return { - { - "ThePrimeagen/refactoring.nvim", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-treesitter/nvim-treesitter", - }, - config = true, - }, -} diff --git a/tags b/tags index e820d79..0fbff94 100644 --- a/tags +++ b/tags @@ -108,7 +108,9 @@ Catppuccin-Macchiato-Standard-Pink-Dark dot_config/gtk-4.0/symlink_gtk.css /^\/u First-Time Setup README.md /^## First-Time Setup$/;" s chapter:mar does dotfiles GPG makes me want to toss the computer out the window README.md /^### GPG makes me want to toss the computer out the window$/;" S section:mar does dotfiles""First-Time Setup GRUB README.md /^### GRUB$/;" S section:mar does dotfiles""Themes +GUIEffects dot_config/Trolltech.conf /^GUIEffects=none$/;" k section:qt General README.md /^### General$/;" S section:mar does dotfiles""First-Time Setup +General dot_config/copyq/copyq.conf /^[General]$/;" s General dot_config/openrazer/razer.conf /^[General]$/;" s HoldPkg dot_config/pacman/pacman.conf /^HoldPkg = pacman glibc$/;" k section:options HookDir dot_config/pacman/pacman.conf /^HookDir = \/home\/marley\/.config\/pacman\/hooks\/$/;" k section:options @@ -120,19 +122,34 @@ Include dot_config/pacman/pacman.conf /^Include = \/etc\/pacman.d\/mirrorlist$/; LocalFileSigLevel dot_config/pacman/pacman.conf /^LocalFileSigLevel = Optional$/;" k section:options Notif_center_remove_notif dot_config/awesome/ui/notif-panel/init.lua /^Notif_center_remove_notif = function(box)$/;" f Notif_center_reset_notifs_container dot_config/awesome/ui/notif-panel/init.lua /^Notif_center_reset_notifs_container = function()$/;" f +Options dot_config/copyq/copyq.conf /^[Options]$/;" s PM2038H11502057 dot_config/openrazer/persistence.conf /^[PM2038H11502057]$/;" s +Plugins dot_config/copyq/copyq.conf /^[Plugins]$/;" s Remember dot_config/awesome/lib/savefloats.lua /^function Remember(c)$/;" f Restore dot_config/awesome/lib/savefloats.lua /^function Restore(c)$/;" f SDDM README.md /^### SDDM$/;" S section:mar does dotfiles""Themes +Shortcuts dot_config/copyq/copyq.conf /^[Shortcuts]$/;" s SigLevel dot_config/pacman/pacman.conf /^SigLevel = Required DatabaseOptional$/;" k section:options Startup dot_config/openrazer/razer.conf /^[Startup]$/;" s TTY README.md /^### TTY$/;" S section:mar does dotfiles""Themes +Tabs dot_config/copyq/copyq.conf /^[Tabs]$/;" s +Theme dot_config/copyq/copyq.conf /^[Theme]$/;" s Themes README.md /^## Themes$/;" s chapter:mar does dotfiles [""] dot_config/nvim/lua/plugins/nvim-cmp.lua /^ [""] = function(fallback)$/;" f [""] dot_config/nvim/lua/plugins/example.lua /^ [""] = cmp.mapping(function(fallback)$/;" f [""] dot_config/nvim/lua/plugins/example.lua /^ [""] = cmp.mapping(function(fallback)$/;" f _get_widget_geometry dot_config/awesome/helpers/ui.lua /^local function _get_widget_geometry(_hierarchy, widget)$/;" f abort dot_config/awesome/lib/animation/init.lua /^function animation:abort()$/;" f unknown:animation +about dot_config/copyq/copyq.conf /^about=shift+f1$/;" k section:Shortcuts +activate_closes dot_config/copyq/copyq.conf /^activate_closes=true$/;" k section:Options +activate_focuses dot_config/copyq/copyq.conf /^activate_focuses=true$/;" k section:Options +activate_item_with_single_click dot_config/copyq/copyq.conf /^activate_item_with_single_click=false$/;" k section:Options +activate_pastes dot_config/copyq/copyq.conf /^activate_pastes=true$/;" k section:Options +active dot_config/Trolltech.conf /^Palette\\active=#cad3f5, #363a4f, #3e4263, #31344e, #0f1017, #1a1c29, #cad3f5, #ffffff, #cad3f5,/;" k section:qt +activeBackground dot_config/Trolltech.conf /^KWinPalette\\activeBackground=#24273a$/;" k section:qt +activeBlend dot_config/Trolltech.conf /^KWinPalette\\activeBlend=#cad3f5$/;" k section:qt +activeForeground dot_config/Trolltech.conf /^KWinPalette\\activeForeground=#cad3f5$/;" k section:qt +activeTitleBtnBg dot_config/Trolltech.conf /^KWinPalette\\activeTitleBtnBg=#1e2030$/;" k section:qt add_hover_cursor dot_config/awesome/helpers/ui.lua /^function ui.add_hover_cursor(w, hover_cursor)$/;" f unknown:ui alsamixer dot_config/mopidy/mopidy.conf /^[alsamixer]$/;" s alt-speed-down dot_config/transmission/settings.json /^ "alt-speed-down": 50,$/;" n @@ -142,6 +159,9 @@ alt-speed-time-day dot_config/transmission/settings.json /^ "alt-speed-time-d alt-speed-time-enabled dot_config/transmission/settings.json /^ "alt-speed-time-enabled": false,$/;" b alt-speed-time-end dot_config/transmission/settings.json /^ "alt-speed-time-end": 1020,$/;" n alt-speed-up dot_config/transmission/settings.json /^ "alt-speed-up": 50,$/;" n +alt_bg dot_config/copyq/copyq.conf /^alt_bg=bg-#101a1a$/;" k section:Theme +alt_item_css dot_config/copyq/copyq.conf /^alt_item_css="\\n ;border: 0px solid transparent\\n ;border-radius: 5px\\n "$/;" k section:Theme +always_on_top dot_config/copyq/copyq.conf /^always_on_top=false$/;" k section:Options animations dot_config/picom.conf /^animations: false;$/;" k announce-ip dot_config/transmission/settings.json /^ "announce-ip": "",$/;" s announce-ip-enabled dot_config/transmission/settings.json /^ "announce-ip-enabled": false,$/;" b @@ -158,6 +178,8 @@ ascii_distro dot_config/neofetch/config.conf /^ascii_distro="auto"$/;" k audio dot_config/mopidy/mopidy.conf /^[audio]$/;" s aurrpcurl dot_config/yay/config.json /^ "aurrpcurl": "https:\/\/aur.archlinux.org\/rpc?",$/;" s aururl dot_config/yay/config.json /^ "aururl": "https:\/\/aur.archlinux.org",$/;" s +autocompletion dot_config/copyq/copyq.conf /^autocompletion=true$/;" k section:Options +autostart dot_config/copyq/copyq.conf /^autostart=false$/;" k section:Options backend dot_config/hyfetch.json /^ "backend": "neofetch",$/;" s backend dot_config/picom.conf /^backend = "glx";$/;" k background_color dot_config/neofetch/config.conf /^background_color=$/;" k @@ -178,6 +200,7 @@ battery_display dot_config/neofetch/config.conf /^battery_display="off"$/;" k battery_notifier dot_config/openrazer/razer.conf /^battery_notifier = True$/;" k section:Startup battery_notifier_freq dot_config/openrazer/razer.conf /^battery_notifier_freq = 600$/;" k section:Startup battery_notifier_percent dot_config/openrazer/razer.conf /^battery_notifier_percent = 33$/;" k section:Startup +bg dot_config/copyq/copyq.conf /^bg=#ffffff$/;" k section:Theme bind-address-ipv4 dot_config/transmission/settings.json /^ "bind-address-ipv4": "0.0.0.0",$/;" s bind-address-ipv6 dot_config/transmission/settings.json /^ "bind-address-ipv6": "::",$/;" s block_height dot_config/neofetch/config.conf /^block_height=1$/;" k @@ -205,13 +228,21 @@ callback dot_config/awesome/ui/top-panel/widgets/clock.lua /^ callback = functio callback dot_config/awesome/ui/top-panel/widgets/date.lua /^ callback = function()$/;" f catimg_size dot_config/neofetch/config.conf /^catimg_size="2"$/;" k cc dot_config/awesome/themes/catppuccin/assets/volume.svg /^ inkscape:version="0.92.4 5da689c313, 2019-01-14">$/;" n uri:http://creativecommons.org/ns# +change_clipboard_owner_delay_ms dot_config/copyq/copyq.conf /^change_clipboard_owner_delay_ms=150$/;" k section:Options +change_tab_icon dot_config/copyq/copyq.conf /^change_tab_icon=ctrl+shift+t$/;" k section:Shortcuts changed dot_config/awesome/ui/popups/layout/init.lua /^function layout_popup.changed()$/;" f unknown:layout_popup chaotic-aur dot_config/pacman/pacman.conf /^[chaotic-aur]$/;" s checkNewParams dot_config/awesome/lib/animation/tween.lua /^local function checkNewParams(_, _, subject, target, easing)$/;" f checkSubjectAndTargetRecursively dot_config/awesome/lib/animation/tween.lua /^local function checkSubjectAndTargetRecursively(subject, target, path)$/;" f +check_clipboard dot_config/copyq/copyq.conf /^check_clipboard=true$/;" k section:Options +check_selection dot_config/copyq/copyq.conf /^check_selection=false$/;" k section:Options clamping dot_config/picom.conf /^animation-clamping = false$/;" k cleanAfter dot_config/yay/config.json /^ "cleanAfter": false,$/;" b cleanmenu dot_config/yay/config.json /^ "cleanmenu": false,$/;" b +clipboard_notification_lines dot_config/copyq/copyq.conf /^clipboard_notification_lines=0$/;" k section:Options +clipboard_tab dot_config/copyq/copyq.conf /^clipboard_tab=&clipboard$/;" k section:Options +close_on_unfocus dot_config/copyq/copyq.conf /^close_on_unfocus=false$/;" k section:Options +close_on_unfocus_delay_ms dot_config/copyq/copyq.conf /^close_on_unfocus_delay_ms=500$/;" k section:Options codepoint_to_utf8 dot_config/awesome/lib/json.lua /^local function codepoint_to_utf8(n)$/;" f col_offset dot_config/neofetch/config.conf /^col_offset=49$/;" k color_align dot_config/hyfetch.json /^ "color_align": {$/;" o @@ -219,13 +250,20 @@ color_blocks dot_config/neofetch/config.conf /^color_blocks="on"$/;" k colorize_text dot_config/awesome/helpers/ui.lua /^function ui.colorize_text(text, color)$/;" f unknown:ui colors dot_config/neofetch/config.conf /^colors=(distro)$/;" k combinedupgrade dot_config/yay/config.json /^ "combinedupgrade": true,$/;" b +command_history_size dot_config/copyq/copyq.conf /^command_history_size=100$/;" k section:Options +commands dot_config/copyq/copyq.conf /^commands=f6$/;" k section:Shortcuts compact-view dot_config/transmission/settings.json /^ "compact-view": false,$/;" b completionrefreshtime dot_config/yay/config.json /^ "completionrefreshtime": 7,$/;" n cond dot_config/nvim/lua/plugins/beacon.lua /^ cond = function()$/;" f config dot_config/nvim/lua/plugins/example.lua /^ config = function()$/;" f config dot_config/nvim/lua/plugins/luasnip.lua /^ config = function(_, opts)$/;" f config dot_config/nvim/lua/plugins/nvim-emmet.lua /^ config = function()$/;" f +confirm_exit dot_config/copyq/copyq.conf /^confirm_exit=true$/;" k section:Options +contrast dot_config/Trolltech.conf /^KDE\\contrast=7$/;" k section:qt copyTables dot_config/awesome/lib/animation/tween.lua /^local function copyTables(destination, keysTable, valuesTable)$/;" f +copy_clipboard dot_config/copyq/copyq.conf /^copy_clipboard=false$/;" k section:Options +copy_selected_items dot_config/copyq/copyq.conf /^copy_selected_items=ctrl+c$/;" k section:Shortcuts +copy_selection dot_config/copyq/copyq.conf /^copy_selection=false$/;" k section:Options core dot_config/mopidy/mopidy.conf /^[core]$/;" s core dot_config/pacman/pacman.conf /^[core]$/;" s corners dot_config/picom.conf /^detect-rounded-corners = true;$/;" k @@ -242,6 +280,12 @@ create_notif dot_config/awesome/ui/notif-panel/init.lua /^local create_notif = f create_set dot_config/awesome/lib/json.lua /^local function create_set(...)$/;" f crop_mode dot_config/neofetch/config.conf /^crop_mode="normal"$/;" k crop_offset dot_config/neofetch/config.conf /^crop_offset="center"$/;" k +css dot_config/copyq/copyq.conf /^css=ClipboardBrowser::selected:item{outline:0px}$/;" k section:Theme +css_template_items dot_config/copyq/copyq.conf /^css_template_items=items$/;" k section:Theme +css_template_main_window dot_config/copyq/copyq.conf /^css_template_main_window=main_window$/;" k section:Theme +css_template_menu dot_config/copyq/copyq.conf /^css_template_menu=menu$/;" k section:Theme +css_template_notification dot_config/copyq/copyq.conf /^css_template_notification=notification$/;" k section:Theme +cur_item_css dot_config/copyq/copyq.conf /^cur_item_css="\\n ;border: 0.1em solid ${sel_bg}"$/;" k section:Theme current-color-scheme dot_config/awesome/ui/info-panel/weather/icons/weather-clouds-night.svg /^