Browse Source

Added conform shfmt config

master
chodak166 6 days ago
parent
commit
87a79aa7f7
  1. 10
      .bashrc
  2. 27
      .config/nvim/lazy-lock.json
  3. 10
      .config/nvim/lua/plugins/conform.lua
  4. 8
      .config/yazi/yazi.toml
  5. 4
      .dotfiles.d/init/arch/init-cargo-tools.sh
  6. 6
      .local/share/applications/mimeinfo.cache
  7. 8
      .local/share/applications/nvim.desktop
  8. 8
      .local/share/applications/yazi.desktop
  9. 5
      .tmux.conf
  10. 3
      .zshrc

10
.bashrc

@ -158,3 +158,13 @@ alias bat=batcat
[ -f "$HOME/.local/bin/env" ] && . "$HOME/.local/bin/env" [ -f "$HOME/.local/bin/env" ] && . "$HOME/.local/bin/env"
. "$HOME/.cargo/env" . "$HOME/.cargo/env"
# Sway / Wayland environment
export XDG_CURRENT_DESKTOP=sway
export XDG_SESSION_TYPE=wayland
export QT_QPA_PLATFORM=wayland
export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
export GDK_BACKEND=wayland
export MOZ_ENABLE_WAYLAND=1
export SDL_VIDEODRIVER=wayland
export _JAVA_AWT_WM_NONREPARENTING=1

27
.config/nvim/lazy-lock.json

@ -1,34 +1,33 @@
{ {
"LazyVim": { "branch": "main", "commit": "83d90f339defdb109a6ede333865a66ffc7ef6aa" }, "LazyVim": { "branch": "main", "commit": "c10948c50b18fae7f256433afdef09e432410480" },
"avante.nvim": { "branch": "main", "commit": "0e40cb0c0f13b87be8a2276a844428d60c466d78" }, "avante.nvim": { "branch": "main", "commit": "dee2402ed0b7c1d3710c0c8eed3d26aa055e118e" },
"blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" }, "blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" },
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
"catppuccin": { "branch": "main", "commit": "8edd468af4d63212b84d69b2ddb5ffc9023ef5eb" }, "catppuccin": { "branch": "main", "commit": "49a926655a2f5579e9c276470fc300baaa49e524" },
"clangd_extensions.nvim": { "branch": "main", "commit": "78c2ecd659d54972be17aa6ba2deac3c53223b80" },
"conform.nvim": { "branch": "master", "commit": "619363c30309d29ffa631e67c8183f2a72caa373" }, "conform.nvim": { "branch": "master", "commit": "619363c30309d29ffa631e67c8183f2a72caa373" },
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
"dotenv.nvim": { "branch": "main", "commit": "7d516e9293c6e3ac21830fb10a4e8674c02747c6" }, "dotenv.nvim": { "branch": "main", "commit": "7d516e9293c6e3ac21830fb10a4e8674c02747c6" },
"dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" }, "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
"flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" }, "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" },
"friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" }, "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
"gitsigns.nvim": { "branch": "main", "commit": "dd3f588bacbeb041be6facf1742e42097f62165d" }, "gitsigns.nvim": { "branch": "main", "commit": "25050e4ed39e628282831d4cbecb1850454ce915" },
"grug-far.nvim": { "branch": "main", "commit": "5506c2f59dc9ab2ed6c233585412b24d31d51521" }, "grug-far.nvim": { "branch": "main", "commit": "c995bbacf8229dc096ec1c3d60f8531059c86c1b" },
"hybrid-theme": { "branch": "main", "commit": "b131110fbe63481d7d263c71982206a70a04d236" }, "hybrid-theme": { "branch": "main", "commit": "b131110fbe63481d7d263c71982206a70a04d236" },
"indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" }, "indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" },
"just-runner.nvim": { "branch": "main", "commit": "f29d405aa828900df242600720a2b0e57261489f" }, "just-runner.nvim": { "branch": "main", "commit": "f29d405aa828900df242600720a2b0e57261489f" },
"lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
"lazydev.nvim": { "branch": "main", "commit": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d" }, "lazydev.nvim": { "branch": "main", "commit": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d" },
"lualine.nvim": { "branch": "master", "commit": "131a558e13f9f28b15cd235557150ccb23f89286" }, "lualine.nvim": { "branch": "master", "commit": "221ce6b2d999187044529f49da6554a92f740a96" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "7b01e2974a47d489bb92f47a41e4c0088ea8f86e" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "21c5b3ebeaa0412e28096bb0701434c51c1fbf76" },
"mason.nvim": { "branch": "main", "commit": "bb639d4bf385a4d89f478b83af4d770be05ab7eb" }, "mason.nvim": { "branch": "main", "commit": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d" },
"mini.ai": { "branch": "main", "commit": "4ce4c35e411ea329a15d4b15e9c89c2a3089e437" }, "mini.ai": { "branch": "main", "commit": "4511b3481707c1d021485475d34f2ed2a50bf47b" },
"mini.files": { "branch": "main", "commit": "423d6b5afb7a94e658950d470957f830d43dd41e" }, "mini.files": { "branch": "main", "commit": "02874bc653fbecf2bee2c65441d0ebd09110f011" },
"mini.icons": { "branch": "main", "commit": "520995f1d75da0e4cc901ee95080b1ff2bc46b94" }, "mini.icons": { "branch": "main", "commit": "ac38c983aed0a2bd32a65ca3e2348e12e58ca292" },
"mini.pairs": { "branch": "main", "commit": "30cf2f01c4aaa2033db67376b9924fa2442c05d6" }, "mini.pairs": { "branch": "main", "commit": "30cf2f01c4aaa2033db67376b9924fa2442c05d6" },
"noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" }, "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
"nvim-lint": { "branch": "master", "commit": "d48f3a76189d03b2239f6df1b2f7e3fa8353743b" }, "nvim-lint": { "branch": "master", "commit": "1ba49820a3c29ba6ab1b2dd441a63b3822c4e39b" },
"nvim-lspconfig": { "branch": "master", "commit": "9573948c38bfabeec353ae7dd7d3ffec4c506a6b" }, "nvim-lspconfig": { "branch": "master", "commit": "a683e0ddf0cf64c6cd689e18ffb480ade3c162b7" },
"nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" }, "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
"nvim-treesitter-textobjects": { "branch": "main", "commit": "851e865342e5a4cb1ae23d31caf6e991e1c99f1e" }, "nvim-treesitter-textobjects": { "branch": "main", "commit": "851e865342e5a4cb1ae23d31caf6e991e1c99f1e" },
"nvim-ts-autotag": { "branch": "main", "commit": "88c1453db4ba7dd24131086fe51fdf74e587d275" }, "nvim-ts-autotag": { "branch": "main", "commit": "88c1453db4ba7dd24131086fe51fdf74e587d275" },

10
.config/nvim/lua/plugins/conform.lua

@ -0,0 +1,10 @@
return {
"stevearc/conform.nvim",
opts = {
formatters = {
shfmt = {
args = { "-i", "2", "-ci", "-bn", "-sr" },
},
},
},
}

8
.config/yazi/yazi.toml

@ -10,10 +10,10 @@ url = "*/"
run = "git" run = "git"
group = "git" group = "git"
# [opener] [opener]
# edit = [ edit = [
# { run = 'nvim "$@"', desc = "Open in Neovim", block = true, for = "unix" }, { run = 'nvim "$@"', desc = "Open in Neovim", block = true, for = "unix" },
# ] ]
# [[plugin.prepend_previewers]] # [[plugin.prepend_previewers]]
# url = "*" # url = "*"

4
.dotfiles.d/init/arch/init-cargo-tools.sh

@ -6,7 +6,8 @@ sudo pacman -Syu --noconfirm
sudo pacman -S --noconfirm curl base-devel imagemagick glow sudo pacman -S --noconfirm curl base-devel imagemagick glow
echo "[2/4] Downloading and installing rustup (latest rustc/cargo)..." echo "[2/4] Downloading and installing rustup (latest rustc/cargo)..."
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y # curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
sudo pacman -S rustup
rustup default stable rustup default stable
@ -22,4 +23,3 @@ cargo install --force yazi-build
cargo install resvg cargo install resvg
echo "Done!" echo "Done!"

6
.local/share/applications/mimeinfo.cache

@ -0,0 +1,6 @@
[MIME Cache]
application/x-shellscript=nvim.desktop;
inode/directory=yazi.desktop;
text/html=nvim.desktop;
text/markdown=nvim.desktop;
text/plain=nvim.desktop;

8
.local/share/applications/nvim.desktop

@ -0,0 +1,8 @@
[Desktop Entry]
Type=Application
Name=Neovim
Exec=kitty nvim %F
Terminal=false
Icon=nvim
Categories=Utility;TextEditor;
MimeType=text/plain;text/markdown;text/html;application/x-shellscript;

8
.local/share/applications/yazi.desktop

@ -0,0 +1,8 @@
[Desktop Entry]
Type=Application
Name=Yazi
Exec=kitty yazi %f
Terminal=false
Icon=kitty
Categories=Utility;FileManager;
MimeType=inode/directory;

5
.tmux.conf

@ -2,6 +2,9 @@ set -g default-command /usr/bin/zsh
set -g default-terminal "tmux-256color" set -g default-terminal "tmux-256color"
run ~/.tmux.d/tmux-gruvbox/gruvbox-tpm.tmux
set -g @tmux-gruvbox 'dark' # or 'dark256', 'light', 'light256'
# disable mouse mode (to use selection mode from current terminal) # disable mouse mode (to use selection mode from current terminal)
set-option -g mouse off set-option -g mouse off
@ -26,7 +29,7 @@ bind-key -n Home send-key C-a
bind-key -n End send-key C-e bind-key -n End send-key C-e
# set status bar color # set status bar color
set -g status-bg "dark cyan" # set -g status-bg "dark cyan"
# window rename # window rename
set-option -g status-interval 5 set-option -g status-interval 5

3
.zshrc

@ -199,3 +199,6 @@ export SUDO_EDITOR=nvim
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
# opencode
export PATH=/home/chodak/.opencode/bin:$PATH

Loading…
Cancel
Save