From d719d62c6c5530248f1dddab230ba2034df608e1 Mon Sep 17 00:00:00 2001 From: Beesquit Date: Mon, 13 Jul 2026 22:43:42 +0300 Subject: [PATCH] fix: fixed prettier config for neovim --- .bashrc | 1 + .config/nvim/lazy-lock.json | 14 +++++++------- .config/nvim/lua/plugins/conform.lua | 14 +++++++++----- config-scripts/install-config.sh | 8 +++----- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/.bashrc b/.bashrc index 612fffe..696fd3f 100644 --- a/.bashrc +++ b/.bashrc @@ -135,6 +135,7 @@ alias dcd='sudo docker compose down' alias dcu='sudo docker compose up' alias dcp='sudo docker compose pull' alias swagger-docs='sudo host-docs' +alias dockertmp='sudo docker run -it --rm alpine' # git aliases alias g='git' diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 3cec0f7..0196f81 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,6 +1,6 @@ { "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, - "catppuccin": { "branch": "main", "commit": "49a926655a2f5579e9c276470fc300baaa49e524" }, + "catppuccin": { "branch": "main", "commit": "05e8787020dcfdb937bf2ff23855ea2415b4e072" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, "conform.nvim": { "branch": "master", "commit": "619363c30309d29ffa631e67c8183f2a72caa373" }, @@ -13,19 +13,19 @@ "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "lualine.nvim": { "branch": "master", "commit": "221ce6b2d999187044529f49da6554a92f740a96" }, "multilayout.nvim": { "branch": "main", "commit": "105f22f6329f19a1824f58774d1899f2a69a5e77" }, - "neo-tree.nvim": { "branch": "main", "commit": "1b4c40051f2623d0a7dcf19d5b74b997b97b0a9a" }, + "neo-tree.nvim": { "branch": "main", "commit": "b01ee1769144c4491ea44bc329cb84040e9793be" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-autopairs": { "branch": "master", "commit": "7b9923abad60b903ece7c52940e1321d39eccc79" }, - "nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" }, - "nvim-dap": { "branch": "master", "commit": "531771530d4f82ad2d21e436e3cc052d68d7aebb" }, + "nvim-cmp": { "branch": "main", "commit": "2ffe79f1f021def8dd1fcd81deb16f1bb0d989f3" }, + "nvim-dap": { "branch": "master", "commit": "9e848e09a697ee95302a3ef2dd43fd6eb709e570" }, "nvim-dap-python": { "branch": "master", "commit": "1808458eba2b18f178f990e01376941a42c7f93b" }, "nvim-dap-ui": { "branch": "master", "commit": "1a66cabaa4a4da0be107d5eda6d57242f0fe7e49" }, - "nvim-lspconfig": { "branch": "master", "commit": "fef8b117ad5fb73943913f444f22065c4b834a60" }, + "nvim-lspconfig": { "branch": "master", "commit": "d5b6e3db4c17b0146f63a2fc47e2027a754b2cb1" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" }, - "nvim-web-devicons": { "branch": "master", "commit": "dfbfaa967a6f7ec50789bead7ef87e336c1fa63c" }, + "nvim-web-devicons": { "branch": "master", "commit": "09d1324e264c6950262dbe02a9bce2933a6800db" }, "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" }, - "telescope.nvim": { "branch": "master", "commit": "9377230aa5305d9e9aca4ed8dadf1070fb4aa9fc" }, + "telescope.nvim": { "branch": "master", "commit": "427b576c16792edad01a92b89721d923c19ad60f" }, "vim-fugitive": { "branch": "master", "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" }, "vim-suda": { "branch": "master", "commit": "c492741b4679b3cdd4d9e34138209784e061d916" }, "yanky.nvim": { "branch": "main", "commit": "020c22d0cfa60358569e49d1d7b91630f175aef0" } diff --git a/.config/nvim/lua/plugins/conform.lua b/.config/nvim/lua/plugins/conform.lua index 62304f7..b14dc16 100644 --- a/.config/nvim/lua/plugins/conform.lua +++ b/.config/nvim/lua/plugins/conform.lua @@ -29,7 +29,7 @@ return { json = { "prettierd", "prettier_f", stop_after_first = true }, jsonc = { "prettierd_f", "prettier_f", stop_after_first = true }, - markdown = { "prettierd", "prettier", stop_after_first = true }, + -- markdown = { "prettierd", "prettier", stop_after_first = true }, }, -- Custom formatters formatters = { @@ -51,19 +51,23 @@ return { }, prettierd = { - args = { "--tab-width", "2" }, + command = "prettierd", + args = { "$FILENAME", "--tab-width=2" }, + stdin = true, }, prettier = { - args = { "--tab-width", "2" }, + command = "prettier", + args = { "--stdin-filepath", "$FILENAME", "--tab-width", "2" }, + stdin = true, }, prettierd_f = { command = "prettierd", - args = { "--tab-width", "4" }, + args = { "$FILENAME", "--tab-width=4" }, stdin = true, }, prettier_f = { command = "prettier", - args = { "--tab-width", "4" }, + args = { "--stdin-filepath", "$FILENAME", "--tab-width", "4" }, stdin = true, }, }, diff --git a/config-scripts/install-config.sh b/config-scripts/install-config.sh index 89e8008..418ab9a 100755 --- a/config-scripts/install-config.sh +++ b/config-scripts/install-config.sh @@ -6,17 +6,15 @@ YELLOW='\033[0;33m' RED='\033[0;31m' NC='\033[0m' - # ---- Preparing for setup ---- # Testing for sudo access echo -e "${YELLOW}Preparing for setup. Please allow sudo....${NC}" if ! sudo -v; then - echo -e "${RED}Error: Failed to use sudo.${NC}" >&2 - exit 1 + echo -e "${RED}Error: Failed to use sudo.${NC}" >&2 + exit 1 fi echo - # ---- Initial setup ---- # Creating all the directories echo -e "${YELLOW}Creating all the directories....${NC}" @@ -84,12 +82,12 @@ sudo pacman -S --needed --noconfirm \ rofi waybar dunst awww hyprpicker hypridle hyprlock \ kitty yazi nwg-look grim slurp btop ncdu nmap exfat-utils abduco \ neovim vi vim tree-sitter-cli ripgrep fzf nano zip \ + shfmt stylua prettier ruff bash-language-server \ thunar thunar-shares-plugin thunar-archive-plugin thunar-volman gvfs \ gvfs-mtp gvfs-afc gvfs-nfs gvfs-smb gvfs-goa gvfs-wsdd gvfs-dnssd \ gvfs-gphoto2 fastfetch cowsay echo - # ---- Config setup ---- # This will delete all current dotfiles. Please be careful! # Cloning config from git