From 25932e050143f98f429e1a4f29afefece50b6bdb Mon Sep 17 00:00:00 2001 From: andrzej Date: Thu, 4 Jul 2024 16:56:11 +0200 Subject: [PATCH] various changes --- nvim/.config/nvim/lazy-lock.json | 2 +- nvim/.config/nvim/lua/options/default.lua | 2 ++ nvim/.config/nvim/lua/plugins/matchup.lua | 6 ++++ .../snippets/typescriptreact/snippets.lua | 34 +++++++++++++++++++ scripts/scripts/tmux-dev-session.sh | 16 +++++++++ zsh/.zsh_aliases | 1 + 6 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 nvim/.config/nvim/lua/plugins/matchup.lua create mode 100644 nvim/.config/nvim/snippets/typescriptreact/snippets.lua create mode 100755 scripts/scripts/tmux-dev-session.sh diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 230698f..04c240f 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -51,8 +51,8 @@ "telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" }, "telescope.nvim": { "branch": "0.1.x", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" }, "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" }, - "ts-error-translator.nvim": { "branch": "main", "commit": "11ae55b28bde02663b5f983f59b0e3fd9c4e845b" }, "twilight.nvim": { "branch": "main", "commit": "8b7b50c0cb2dc781b2f4262a5ddd57571556d1e4" }, + "vim-matchup": { "branch": "master", "commit": "1535a769d5dca851fe7d41b0be95f7c7203a4bef" }, "vim-pencil": { "branch": "master", "commit": "6d70438a8886eaf933c38a7a43a61adb0a7815ed" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }, diff --git a/nvim/.config/nvim/lua/options/default.lua b/nvim/.config/nvim/lua/options/default.lua index cb8c123..ba7e60e 100644 --- a/nvim/.config/nvim/lua/options/default.lua +++ b/nvim/.config/nvim/lua/options/default.lua @@ -54,3 +54,5 @@ vim.opt.linebreak = true vim.opt.wrap = true vim.opt.tabstop = 2 +vim.opt.shiftwidth = 2 +vim.opt.softtabstop = 0 diff --git a/nvim/.config/nvim/lua/plugins/matchup.lua b/nvim/.config/nvim/lua/plugins/matchup.lua new file mode 100644 index 0000000..d6d2dfb --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/matchup.lua @@ -0,0 +1,6 @@ +return { + "andymass/vim-matchup", + config = function() + vim.g.matchup_matchparen_offscreen = { method = "popup" } + end, +} diff --git a/nvim/.config/nvim/snippets/typescriptreact/snippets.lua b/nvim/.config/nvim/snippets/typescriptreact/snippets.lua new file mode 100644 index 0000000..ce3203d --- /dev/null +++ b/nvim/.config/nvim/snippets/typescriptreact/snippets.lua @@ -0,0 +1,34 @@ +local ls = require("luasnip") +local s = ls.snippet +local sn = ls.snippet_node +local t = ls.text_node +local i = ls.insert_node +local f = ls.function_node +local c = ls.choice_node +local d = ls.dynamic_node +local r = ls.restore_node + +return { + s("export default function", { + t("export default function "), + i(1, "NAME"), + t("("), + i(2, ""), + t({ "){", "" }), + i(3, ""), + t({ "", "return", "(" }), + i(4, ""), + t({ "", ")" }), + t({ "", "}" }), + }), + s("export default async function", { + t("export default async function "), + i(1, "NAME"), + t("("), + i(2, ""), + t({ "){", "" }), + i(3, ""), + t({ "", "return(", "", "", ")" }), + t({ "", "}" }), + }), +} diff --git a/scripts/scripts/tmux-dev-session.sh b/scripts/scripts/tmux-dev-session.sh new file mode 100755 index 0000000..2d77f78 --- /dev/null +++ b/scripts/scripts/tmux-dev-session.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash + +SESSIONNAME=$PWD + +if tmux has-session -t "$SESSIONNAME" &> /dev/null + then + tmux new-session -s "$SESSIONNAME" -n script -d + tmux send-keys -t "$SESSIONNAME" "$HOME/bin/script" C-m +fi + +tmux attach -t "$SESSIONNAME" +# tmux attach-session -c "#{pane_current_path}" -y + +tmux split-window -v "npm run dev" +tmux split-window -h "npm run tailwind" +tmux split-window -h diff --git a/zsh/.zsh_aliases b/zsh/.zsh_aliases index 4c69f7b..32c5383 100644 --- a/zsh/.zsh_aliases +++ b/zsh/.zsh_aliases @@ -1,5 +1,6 @@ alias update="apt update && apt upgrade -y" alias tidal="/usr/bin/flatpak run --branch=stable --arch=x86_64 --command=com.mastermindzh.tidal-hifi com.mastermindzh.tidal-hifi &" +alias devsesh="$HOME/scripts/tmux-dev-session.sh" export SUDO_EDITOR="nvim"