From 726663247e398bd6f366d3e442ee624292f5dbc6 Mon Sep 17 00:00:00 2001 From: punkfairie <23287005+punkfairie@users.noreply.github.com> Date: Wed, 2 Oct 2024 20:12:04 -0700 Subject: [PATCH] Add .chezmoiscripts/20-pacman.sh Update .config/nvim/lua/config/autocmds.lua Update .config/packages/archgirlie Update .config/pacman/pacman.conf Update .config/picom/awesomewm Update tags --- .chezmoiscripts/run_once_after_20-pacman.sh | 4 ++++ dot_config/nvim/lua/config/autocmds.lua.tmpl | 20 ++++++++++++++++---- dot_config/packages/archgirlie | 2 ++ dot_config/pacman/pacman.conf.tmpl | 2 +- dot_config/picom/awesomewm | 4 ++-- tags | 14 -------------- 6 files changed, 25 insertions(+), 21 deletions(-) create mode 100644 .chezmoiscripts/run_once_after_20-pacman.sh diff --git a/.chezmoiscripts/run_once_after_20-pacman.sh b/.chezmoiscripts/run_once_after_20-pacman.sh new file mode 100644 index 0000000..cf3dee2 --- /dev/null +++ b/.chezmoiscripts/run_once_after_20-pacman.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +pacman-key --init +pacman-key --populate archlinux diff --git a/dot_config/nvim/lua/config/autocmds.lua.tmpl b/dot_config/nvim/lua/config/autocmds.lua.tmpl index 0f75f4d..c82a733 100644 --- a/dot_config/nvim/lua/config/autocmds.lua.tmpl +++ b/dot_config/nvim/lua/config/autocmds.lua.tmpl @@ -13,9 +13,20 @@ vim.api.nvim_create_autocmd("BufWinEnter", { end, }) -{{ if not .isServer -}} +vim.api.nvim_create_autocmd({ "BufWritePre" }, { + pattern = { "*" }, + callback = function() + local save_cursor = vim.fn.getpos(".") + pcall(function() + vim.cmd([[%s/\s\+$//e]]) + end) + vim.fn.setpos(".", save_cursor) + end, +}) + -- Define an autocmd group for the blade workaround -local augroup = vim.api.nvim_create_augroup("lsp_blade_workaround", { clear = true }) +local augroup = + vim.api.nvim_create_augroup("lsp_blade_workaround", { clear = true }) -- Autocommand to temporarily change 'blade' filetype to 'php' when opening for LSP server activation vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, { @@ -33,7 +44,9 @@ vim.api.nvim_create_autocmd("LspAttach", { vim.schedule(function() -- Check if the attached client is 'intelephense' for _, client in ipairs(vim.lsp.get_active_clients()) do - if client.name == "intelephense" and client.attached_buffers[args.buf] then + if + client.name == "intelephense" and client.attached_buffers[args.buf] + then vim.api.nvim_buf_set_option(args.buf, "filetype", "blade") -- update treesitter parser to blade vim.api.nvim_buf_set_option(args.buf, "syntax", "blade") @@ -43,4 +56,3 @@ vim.api.nvim_create_autocmd("LspAttach", { end) end, }) -{{ end -}} diff --git a/dot_config/packages/archgirlie b/dot_config/packages/archgirlie index 5bad83a..1f99313 100644 --- a/dot_config/packages/archgirlie +++ b/dot_config/packages/archgirlie @@ -1,3 +1,4 @@ + -> Avoid running yay as root/sudo. aic94xx-firmware alsa-utils amfora @@ -41,6 +42,7 @@ cowsay cpio ctags cuda +difftastic dnsmasq docker docker-compose diff --git a/dot_config/pacman/pacman.conf.tmpl b/dot_config/pacman/pacman.conf.tmpl index bf6e09f..67aff43 100644 --- a/dot_config/pacman/pacman.conf.tmpl +++ b/dot_config/pacman/pacman.conf.tmpl @@ -14,7 +14,7 @@ #CacheDir = /var/cache/pacman/pkg/ #LogFile = /var/log/pacman.log #GPGDir = /etc/pacman.d/gnupg/ -HookDir = /home/marley/.config/pacman/hooks/ +HookDir = {{ joinPath .chezmoi.homeDir ".config/pacman/hooks/" }} HoldPkg = pacman glibc #XferCommand = /usr/bin/curl -L -C - -f -o %o %u #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u diff --git a/dot_config/picom/awesomewm b/dot_config/picom/awesomewm index af9391e..7c7a2dc 100644 --- a/dot_config/picom/awesomewm +++ b/dot_config/picom/awesomewm @@ -167,7 +167,7 @@ active-opacity = 0.92; # Specify a list of conditions of windows that should always be considered focused. # focus-exclude = [] -focus-exclude = [ +focus-exclude = [ "class_g = 'awesome'", "class_g = 'Cairo-clock'", "class_g = 'Rofi'", @@ -320,7 +320,7 @@ detect-client-opacity = true; # as they essentially does sw-opti's job already, # unless you wish to specify a lower refresh rate than the actual value. # -# sw-opti = +# sw-opti = # Use EWMH '_NET_ACTIVE_WINDOW' to determine currently focused window, # rather than listening to 'FocusIn'/'FocusOut' event. Might have more accuracy, diff --git a/tags b/tags index 74104d2..a3e4411 100644 --- a/tags +++ b/tags @@ -1452,7 +1452,6 @@ 9 dot_config/polybar/pwidgets/system.ini /^ramp-capacity-9 = $/;" k section:module/battery 9 dot_config/polybar/shades/modules.ini /^ramp-capacity-9 = $/;" k section:module/battery Arch README.md /^### Arch$/;" S section:mar does dotfiles""First-Time Setup -Architecture dot_config/pacman/pacman.conf /^Architecture = auto$/;" k section:options Catppuccin-Macchiato-Standard-Pink-Dark dot_config/gtk-4.0/symlink_gtk-dark.css /^\/usr\/share\/themes\/Catppuccin-Macchiato-Standard-Pink-Dark\/gtk-4.0\/gtk-dark.css$/;" s Catppuccin-Macchiato-Standard-Pink-Dark dot_config/gtk-4.0/symlink_gtk.css /^\/usr\/share\/themes\/Catppuccin-Macchiato-Standard-Pink-Dark\/gtk-4.0\/gtk.css$/;" s EOF dot_config/polybar/blocks/scripts/executable_styles.sh /^ cat > $RFILE <<- EOF$/;" h @@ -1500,14 +1499,7 @@ GRUB README.md /^### GRUB$/;" S section:mar does dotfiles""Themes 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 IO2049F50104914 dot_config/openrazer/persistence.conf /^[IO2049F50104914]$/;" s -Include dot_config/pacman/pacman.conf /^Include = \/etc\/pacman.d\/chaotic-mirrorlist$/;" k section:chaotic-aur -Include dot_config/pacman/pacman.conf /^Include = \/etc\/pacman.d\/mirrorlist$/;" k section:core -Include dot_config/pacman/pacman.conf /^Include = \/etc\/pacman.d\/mirrorlist$/;" k section:extra -Include dot_config/pacman/pacman.conf /^Include = \/etc\/pacman.d\/mirrorlist$/;" k section:multilib -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 @@ -1519,7 +1511,6 @@ SDDM README.md /^### SDDM$/;" S section:mar does dotfiles""Themes Settings dot_config/gtk-3.0/settings.ini.src.ini /^[Settings]$/;" s Settings dot_config/gtk-4.0/settings.ini.src.ini /^[Settings]$/;" s 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 @@ -2891,7 +2882,6 @@ change_panel dot_config/polybar/panels/scripts/executable_styles.sh /^change_pan change_style dot_config/polybar/shapes/scripts/executable_style-switch.sh /^change_style() {$/;" f 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 charging dot_config/polybar/blocks/bars.ini /^format-charging = $/;" k section:module/battery_bar charging dot_config/polybar/blocks/bars.ini /^label-charging = %percentage%%$/;" k section:module/battery_bar charging dot_config/polybar/blocks/modules.ini /^format-charging = $/;" k section:module/battery @@ -3449,7 +3439,6 @@ copy_clipboard dot_config/copyq/copyq.conf /^copy_clipboard=false$/;" k section: 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 copy_shot dot_config/rofi/applets/bin/executable_screenshot.sh /^copy_shot () {$/;" f -core dot_config/pacman/pacman.conf /^[core]$/;" s countdown dot_config/rofi/applets/bin/executable_screenshot.sh /^countdown () {$/;" f cpu_brand dot_config/neofetch/config.conf /^cpu_brand="on"$/;" k cpu_cores dot_config/neofetch/config.conf /^cpu_cores="off"$/;" k @@ -4029,7 +4018,6 @@ exit dot_config/copyq/copyq.conf /^exit=ctrl+q$/;" k section:Shortcuts exit_command dot_config/awesome/lib/exit-screen.lua /^local exit_command = function()$/;" f expire_tab dot_config/copyq/copyq.conf /^expire_tab=0$/;" k section:Options export dot_config/copyq/copyq.conf /^export=ctrl+s$/;" k section:Shortcuts -extra dot_config/pacman/pacman.conf /^[extra]$/;" s f dot_config/nvim/lua/snippets/fish.lua /^local f = ls.function_node$/;" f f dot_config/nvim/lua/snippets/gitconfig.lua /^local f = ls.function_node$/;" f f dot_config/nvim/lua/snippets/lua.lua /^local f = ls.function_node$/;" f @@ -7843,7 +7831,6 @@ msg dot_config/polybar/panels/scripts/executable_powermenu.sh /^msg() {$/;" f msg dot_config/polybar/pwidgets/scripts/executable_powermenu.sh /^msg() {$/;" f msg dot_config/polybar/shades/scripts/executable_powermenu.sh /^msg() {$/;" f msg dot_config/polybar/shapes/scripts/executable_powermenu.sh /^msg() {$/;" f -multilib dot_config/pacman/pacman.conf /^[multilib]$/;" s music dot_config/awesome/ui/info-panel/music-player.lua /^local function music()$/;" f music_player dot_config/neofetch/config.conf /^music_player="auto"$/;" k mute dot_config/awesome/ui/popups/volume/init.lua /^volume.mute = function()$/;" f unknown:volume @@ -8173,7 +8160,6 @@ open dot_config/polybar/shades/user_modules.ini /^label-open = $/;" k section open dot_config/polybar/shapes/user_modules.ini /^label-open = " 﩯"$/;" k section:module/menu open dot_config/polybar/shapes/user_modules.ini /^label-open = "襤 "$/;" k section:module/powermenu open_windows_on_current_screen dot_config/copyq/copyq.conf /^open_windows_on_current_screen=true$/;" k section:Options -options dot_config/pacman/pacman.conf /^[options]$/;" s opts dot_config/nvim/lua/plugins/example.lua /^ opts = function()$/;" f opts dot_config/nvim/lua/plugins/example.lua /^ opts = function(_, opts)$/;" f opts dot_config/nvim/lua/plugins/nvim-cmp.lua /^ opts = function(_, opts)$/;" f