From 1f9c3a255bc40dedc1c25e2a9f3e10e7525836cf Mon Sep 17 00:00:00 2001 From: aleidk Date: Wed, 29 May 2024 08:29:57 -0400 Subject: [PATCH] minor updates for new installation --- .gitignore | 1 + .../run_once_setup_gtk_theme.sh.tmpl | 10 ++------- chezmoi/dot_config/kitty/kitty.conf | 2 +- .../nvim/lua/aleidk/plugins/bufferline.lua | 21 ++++++++++++------- .../nvim/lua/aleidk/plugins/formatter.lua | 1 + .../nvim/lua/aleidk/plugins/lsp.lua | 3 ++- .../dot_config/nvim/original_lazy-lock.json | 2 +- chezmoi/dot_config/tmux/tmux.conf | 2 +- 8 files changed, 22 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 1f4cbbb..218484e 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ result config/ncspot/userstate.cbor config/zsh/zprofile.local config/spicetify/CustomApps/* +chezmoi/dot_config/zsh/aliases/work.zsh diff --git a/chezmoi/.chezmoiscripts/run_once_setup_gtk_theme.sh.tmpl b/chezmoi/.chezmoiscripts/run_once_setup_gtk_theme.sh.tmpl index de0810c..b138e5f 100644 --- a/chezmoi/.chezmoiscripts/run_once_setup_gtk_theme.sh.tmpl +++ b/chezmoi/.chezmoiscripts/run_once_setup_gtk_theme.sh.tmpl @@ -11,15 +11,9 @@ tmp_dir="$(mktemp -d)" cd "$tmp_dir" -git clone --recurse-submodules git@github.com:catppuccin/gtk.git -cd gtk -python -m venv venv +curl -LsS "https://raw.githubusercontent.com/catppuccin/gtk/main/install.py" -o install.py -source venv/bin/activate - -pip install -r requirements.txt - -python install.py macchiato --link -a teal -d ~/.themes --tweaks normal +python3 install.py macchiato teal rm -rf "$tmp_dir" {{ end }} diff --git a/chezmoi/dot_config/kitty/kitty.conf b/chezmoi/dot_config/kitty/kitty.conf index 248820d..a40a1bf 100644 --- a/chezmoi/dot_config/kitty/kitty.conf +++ b/chezmoi/dot_config/kitty/kitty.conf @@ -1122,7 +1122,7 @@ confirm_os_window_close 0 #: The foreground and background colors. -background_opacity 0.8 +# background_opacity 0.8 #: The opacity of the background. A number between zero and one, where #: one is opaque and zero is fully transparent. This will only work if diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/bufferline.lua b/chezmoi/dot_config/nvim/lua/aleidk/plugins/bufferline.lua index e863744..369f4bf 100644 --- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/bufferline.lua +++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/bufferline.lua @@ -2,14 +2,14 @@ return { "akinsho/bufferline.nvim", event = "VeryLazy", keys = { - { "bp", "BufferLineTogglePin", desc = "Toggle pin" }, + { "bp", "BufferLineTogglePin", desc = "Toggle pin" }, { "bP", "BufferLineGroupClose ungrouped", desc = "Close non-pinned buffers" }, - { "bO", "BufferLineCloseOthers", desc = "Close non focused buffers" }, - { "bA", "bufdo bd", desc = "Close all buffers" }, - { "bh", "BufferLineMovePrev", desc = "Move buffer to right" }, - { "bl", "BufferLineMoveNext", desc = "Move buffer to left" }, - { "", "BufferLineCyclePrev", desc = "Prev buffer" }, - { "", "BufferLineCycleNext", desc = "Next buffer" }, + { "bO", "BufferLineCloseOthers", desc = "Close non focused buffers" }, + { "bA", "bufdo bd", desc = "Close all buffers" }, + { "bh", "BufferLineMovePrev", desc = "Move buffer to right" }, + { "bl", "BufferLineMoveNext", desc = "Move buffer to left" }, + { "", "BufferLineCyclePrev", desc = "Prev buffer" }, + { "", "BufferLineCycleNext", desc = "Next buffer" }, }, dependencies = { { @@ -39,7 +39,7 @@ return { diagnostics_indicator = function(_, _, diag) local icons = require("aleidk.constants").icons.diagnostics local ret = (diag.error and icons.Error .. diag.error .. " " or "") - .. (diag.warning and icons.Warn .. diag.warning or "") + .. (diag.warning and icons.Warn .. diag.warning or "") return vim.trim(ret) end, -- return false to exluce buffers @@ -51,6 +51,11 @@ return { return false end + -- disable for dadbod query buffers + if string.find(vim.fn.bufname(buf_number), "db_ui") then + return false + end + return true end, offsets = { diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/formatter.lua b/chezmoi/dot_config/nvim/lua/aleidk/plugins/formatter.lua index f3d4bce..b5899dc 100644 --- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/formatter.lua +++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/formatter.lua @@ -20,6 +20,7 @@ return { lua = { "stylua" }, markdown = { "markdownlint" }, nim = { "nimpretty" }, + php = { "pint" }, python = { "blue" }, scss = { { "prettierd", "prettier" } }, sh = { "shfmt" }, diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/lsp.lua b/chezmoi/dot_config/nvim/lua/aleidk/plugins/lsp.lua index 04605e5..9439369 100644 --- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/lsp.lua +++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/lsp.lua @@ -7,7 +7,7 @@ return { { "williamboman/mason.nvim" }, "williamboman/mason-lspconfig.nvim", -- Additional lua configuration, makes nvim stuff amazing! - { "folke/neodev.nvim", opts = {} }, + { "folke/neodev.nvim", opts = {} }, }, config = function() @@ -59,6 +59,7 @@ return { emmet_ls = {}, html = {}, pyright = {}, + phpactor = {}, rust_analyzer = { settings = { ["rust-analyzer"] = { diff --git a/chezmoi/dot_config/nvim/original_lazy-lock.json b/chezmoi/dot_config/nvim/original_lazy-lock.json index 5230885..36f2d05 100644 --- a/chezmoi/dot_config/nvim/original_lazy-lock.json +++ b/chezmoi/dot_config/nvim/original_lazy-lock.json @@ -23,7 +23,7 @@ "gitsigns.nvim": { "branch": "main", "commit": "5a9a6ac29a7805c4783cda21b80a1e361964b3f2" }, "grapple.nvim": { "branch": "main", "commit": "8648afb68bbee59b06c6a66436d6a6083daa569b" }, "indent-blankline.nvim": { "branch": "master", "commit": "046e2cf04e08ece927bacbfb87c5b35c0b636546" }, - "lazy.nvim": { "branch": "main", "commit": "16603c6917435d8446f7357cb61095138a417085" }, + "lazy.nvim": { "branch": "main", "commit": "8f19915175395680808de529e4220da8dafc0759" }, "lazygit.nvim": { "branch": "main", "commit": "de35012036d43bca03628d40d083f7c02a4cda3f" }, "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "9453e3d6cd2ca45d96e20f343e8f1b927364b630" }, diff --git a/chezmoi/dot_config/tmux/tmux.conf b/chezmoi/dot_config/tmux/tmux.conf index e731eae..e3e9a49 100644 --- a/chezmoi/dot_config/tmux/tmux.conf +++ b/chezmoi/dot_config/tmux/tmux.conf @@ -110,7 +110,7 @@ TMUX_FZF_OPTIONS="-p -w 80% -h 60% -m" # Tmux Management -bind-key "f" run-shell "fzf-tmux-sessions" +bind-key "f" run-shell "~/.local/share/chezmoi/scripts/fzf-tmux-sessions" bind-key "F" run-shell -b "$HOME/.config/tmux/plugins/tmux-fzf/scripts/session.sh switch" # bind-key "F" run-shell -b "$HOME/.config/tmux/plugins/tmux-fzf/scripts/window.sh switch"