From 66fabe33e24d1bb20e47541867deed6c66e45946 Mon Sep 17 00:00:00 2001 From: Jedrzej Orbik Date: Tue, 1 Oct 2024 12:11:00 +0200 Subject: [PATCH] Run stow with --dotfiles, add --stow-only --- debian/.config/clangd | 1 - dotfiles_private | 2 +- macos/Library/Preferences/clangd | 1 - scripts/install.sh | 94 +++++++++++++------ scripts/uninstall.sh | 11 ++- common/.aliases => stow/common/dot-aliases | 0 .../common/dot-config}/nvim/init.lua | 0 .../common/dot-config}/nvim/lazy-lock.json | 14 +-- .../common/dot-config}/nvim/lua/common.lua | 0 .../nvim/lua/config_plugins/gitsigns.lua | 0 .../nvim/lua/config_plugins/lsp-zero.lua | 0 .../nvim/lua/config_plugins/telescope.lua | 0 .../nvim/lua/config_plugins/treesitter.lua | 0 .../common/dot-config}/nvim/lua/debugging.lua | 0 .../common/dot-config}/nvim/lua/ftplugin.lua | 0 .../common/dot-config}/nvim/lua/keymaps.lua | 0 .../template/user/populate_scripts.lua | 0 .../lua/overseer/template/user/run_script.lua | 0 .../template/user/run_script_with_args.lua | 0 .../common/dot-config}/nvim/lua/p.lua | 0 .../common/dot-config}/nvim/lua/plugins.lua | 0 .../common/dot-config}/nvim/lua/settings.lua | 0 .../dot-config}/nvim/plugin/filetypes.lua | 0 .../nvim/snippets/global.code-snippets | 0 .../dot-config}/nvim/snippets/markdown.json | 0 .../dot-config}/nvim/snippets/package.json | 0 .../dot-config}/nvim/snippets/python.json | 0 .../nvim/snippets/shellscript.json | 0 common/.p10k.zsh => stow/common/dot-p10k.zsh | 0 .../.tmux.conf => stow/common/dot-tmux.conf | 0 .../common/dot-wezterm.lua | 0 stow/debian/dot-config/clangd | 1 + {redundant => stow/linked}/clangd/config.yaml | 0 stow/macos/Library/Preferences/clangd | 1 + .../macos/dot-unison}/.gitignore | 0 .../macos/dot-unison}/default.prf | 0 36 files changed, 80 insertions(+), 45 deletions(-) delete mode 120000 debian/.config/clangd delete mode 120000 macos/Library/Preferences/clangd rename common/.aliases => stow/common/dot-aliases (100%) rename {common/.config => stow/common/dot-config}/nvim/init.lua (100%) rename {common/.config => stow/common/dot-config}/nvim/lazy-lock.json (93%) rename {common/.config => stow/common/dot-config}/nvim/lua/common.lua (100%) rename {common/.config => stow/common/dot-config}/nvim/lua/config_plugins/gitsigns.lua (100%) rename {common/.config => stow/common/dot-config}/nvim/lua/config_plugins/lsp-zero.lua (100%) rename {common/.config => stow/common/dot-config}/nvim/lua/config_plugins/telescope.lua (100%) rename {common/.config => stow/common/dot-config}/nvim/lua/config_plugins/treesitter.lua (100%) rename {common/.config => stow/common/dot-config}/nvim/lua/debugging.lua (100%) rename {common/.config => stow/common/dot-config}/nvim/lua/ftplugin.lua (100%) rename {common/.config => stow/common/dot-config}/nvim/lua/keymaps.lua (100%) rename {common/.config => stow/common/dot-config}/nvim/lua/overseer/template/user/populate_scripts.lua (100%) rename {common/.config => stow/common/dot-config}/nvim/lua/overseer/template/user/run_script.lua (100%) rename {common/.config => stow/common/dot-config}/nvim/lua/overseer/template/user/run_script_with_args.lua (100%) rename {common/.config => stow/common/dot-config}/nvim/lua/p.lua (100%) rename {common/.config => stow/common/dot-config}/nvim/lua/plugins.lua (100%) rename {common/.config => stow/common/dot-config}/nvim/lua/settings.lua (100%) rename {common/.config => stow/common/dot-config}/nvim/plugin/filetypes.lua (100%) rename {common/.config => stow/common/dot-config}/nvim/snippets/global.code-snippets (100%) rename {common/.config => stow/common/dot-config}/nvim/snippets/markdown.json (100%) rename {common/.config => stow/common/dot-config}/nvim/snippets/package.json (100%) rename {common/.config => stow/common/dot-config}/nvim/snippets/python.json (100%) rename {common/.config => stow/common/dot-config}/nvim/snippets/shellscript.json (100%) rename common/.p10k.zsh => stow/common/dot-p10k.zsh (100%) rename common/.tmux.conf => stow/common/dot-tmux.conf (100%) rename common/.wezterm.lua => stow/common/dot-wezterm.lua (100%) create mode 120000 stow/debian/dot-config/clangd rename {redundant => stow/linked}/clangd/config.yaml (100%) create mode 120000 stow/macos/Library/Preferences/clangd rename {macos/.unison => stow/macos/dot-unison}/.gitignore (100%) rename {macos/.unison => stow/macos/dot-unison}/default.prf (100%) diff --git a/debian/.config/clangd b/debian/.config/clangd deleted file mode 120000 index 8d4b595..0000000 --- a/debian/.config/clangd +++ /dev/null @@ -1 +0,0 @@ -../../redundant/clangd \ No newline at end of file diff --git a/dotfiles_private b/dotfiles_private index 7136f9f..3879dbc 160000 --- a/dotfiles_private +++ b/dotfiles_private @@ -1 +1 @@ -Subproject commit 7136f9f0e235f6b08c1db84aee116fe2d8f750fe +Subproject commit 3879dbc8eab96228e084c1341ce7db8fbc8002a1 diff --git a/macos/Library/Preferences/clangd b/macos/Library/Preferences/clangd deleted file mode 120000 index c2e4d21..0000000 --- a/macos/Library/Preferences/clangd +++ /dev/null @@ -1 +0,0 @@ -../../../redundant/clangd \ No newline at end of file diff --git a/scripts/install.sh b/scripts/install.sh index 6fb5450..9ad5b44 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -8,34 +8,50 @@ ROOT_DIR=$(dirname "$SCRIPT_DIR") # Initialize flags dev=false -copy=false install_only=false +stow_only=false + +function install_stow_debian { + if ! [ -x "$(command -v perl)" ]; then + sudo apt install perl -y + fi + current_dir=$(pwd) + + cd /tmp + wget https://mirror.fcix.net/gnu/stow/stow-latest.tar.gz + + tar -xzf stow-latest.tar.gz + + # Find the extracted directory (it should match "stow-X.Y.Z") + dir_name=$(tar -tzf stow-latest.tar.gz | head -1 | cut -f1 -d"/") + + # Change into the extracted directory + cd "$dir_name" + + ./configure && sudo make install + + # cleanup + cd /tmp + rm -rf "$dir_name" && rm "stow-latest.tar.gz" + cd "${current_dir}" +} # Loop through the arguments for arg in "$@"; do - if [ "$arg" == "--copy" ]; then - copy=true - elif [ "$arg" == "--dev" ]; then + if [ "$arg" == "--dev" ]; then dev=true elif [ "$arg" == "--optional" ]; then dev=true elif [ "$arg" == "--install-only" ]; then install_only=true + elif [ "$arg" == "--stow-only" ]; then + stow_only=true fi done -copy=false -if [[ $1 == "--copy" ]]; then - copy=true -fi - function add() { rm -r "$2" || true - if [[ $copy == true ]]; then - cp -r "$1" "$2" - else - ln -s "$1" "$2" - fi + ln -s "$1" "$2" } # snippets @@ -54,7 +70,16 @@ cd "$ROOT_DIR" if ! [ -x "$(command -v stow)" ]; then if [[ "$OSTYPE" == "linux-gnu"* ]]; then - sudo apt install stow -y + stow_version=$(stow --version | awk 'NR==1{print $NF}') + min_stow_version="2.4.0" + + # Compare versions + if [ "$(printf '%s\n' "$stow_version" "$min_stow_version" | sort -V | head -n1)" = "$stow_version" ] && [ "$stow_version" != "$min_stow_version" ]; then + echo "Your stow version ($stow_version) is lower than $min_stow_version." + echo "Installing from tarfile" + install_stow_debian + fi + elif [[ "$OSTYPE" == "darwin"* ]]; then if ! [ -x "$(command -v brew)" ]; then /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" @@ -65,7 +90,7 @@ if ! [ -x "$(command -v stow)" ]; then fi fi -# Stow platform-specific config +# Stow platform-specific prefix to run stow if [[ "$OSTYPE" == "linux-gnu"* ]]; then prefix="debian" elif [[ "$OSTYPE" == "darwin"* ]]; then @@ -76,21 +101,27 @@ else fi if [[ $install_only != true ]]; then + cd stow # Stow common config - stow -t ~ common - stow -t ~ "${prefix}" + stow --dotfiles -t ~ common + # Stow platform specific stuff + stow --dotfiles -t ~ "${prefix}" + + cd .. fi -# Platform-specific config install -if [[ "$OSTYPE" == "linux-gnu"* ]]; then - "${SCRIPT_DIR}/debian/install_min.sh" - if [[ $dev == true ]]; then - "${SCRIPT_DIR}/debian/install.sh" --optional +if [[ $stow_only != true ]]; then + # Platform-specific config install + if [[ "$OSTYPE" == "linux-gnu"* ]]; then + "${SCRIPT_DIR}/debian/install_min.sh" + if [[ $dev == true ]]; then + "${SCRIPT_DIR}/debian/install.sh" --optional + fi + elif [[ "$OSTYPE" == "darwin"* ]]; then + "${SCRIPT_DIR}/macos/install.sh" + else + echo "Unsupported OS" fi -elif [[ "$OSTYPE" == "darwin"* ]]; then - "${SCRIPT_DIR}/macos/install.sh" -else - echo "Unsupported OS" fi # Private submodule install @@ -98,11 +129,14 @@ SUBMODULE_PATH="dotfiles_private" # Check if the submodule is not empty if [[ -n "$(ls -A ${SUBMODULE_PATH})" ]]; then echo "Private submodule is available. Installing..." - install_only_arg="" + submodule_args=() if [[ $install_only == true ]]; then - install_only_arg="--install-only" + submodule_args+=("--install-only") + fi + if [[ $stow_only == true ]]; then + submodule_args+=("--stow-only") fi - "${SUBMODULE_PATH}/scripts/install.sh" $install_only_arg + "${SUBMODULE_PATH}/scripts/install.sh" "${submodule_args[@]}" else echo "Private submodule is not cloned. Skipping installation." fi diff --git a/scripts/uninstall.sh b/scripts/uninstall.sh index 2c30977..8838178 100755 --- a/scripts/uninstall.sh +++ b/scripts/uninstall.sh @@ -8,24 +8,25 @@ cd "$ROOT_DIR" # Private submodule uninstall SUBMODULE_PATH="dotfiles_private" -SUBMODULE_STATUS=$(git submodule status $SUBMODULE_PATH) || (git config --add safe.directory "${ROOT_DIR}" && SUBMODULE_STATUS=$(git submodule status $SUBMODULE_PATH)) # Check if the submodule is not empty -if [[ ! -z "$(ls -A ${SUBMODULE_PATH})" ]]; then +if [[ -n "$(ls -A ${SUBMODULE_PATH})" ]]; then echo "Private submodule is available. Uninstalling..." "${SUBMODULE_PATH}/scripts/uninstall.sh" else echo "Private submodule is not cloned. Skipping uninstallation." fi +cd stow + # Unstow platform-specific config if [[ "$OSTYPE" == "linux-gnu"* ]]; then - stow -D -t ~ debian + stow --dotfiles -D -t ~ debian elif [[ "$OSTYPE" == "darwin"* ]]; then - stow -D -t ~ macos + stow --dotfiles -D -t ~ macos else echo "Unsupported OS" fi # Unstow common -stow -D -t ~ common +stow --dotfiles -D -t ~ common diff --git a/common/.aliases b/stow/common/dot-aliases similarity index 100% rename from common/.aliases rename to stow/common/dot-aliases diff --git a/common/.config/nvim/init.lua b/stow/common/dot-config/nvim/init.lua similarity index 100% rename from common/.config/nvim/init.lua rename to stow/common/dot-config/nvim/init.lua diff --git a/common/.config/nvim/lazy-lock.json b/stow/common/dot-config/nvim/lazy-lock.json similarity index 93% rename from common/.config/nvim/lazy-lock.json rename to stow/common/dot-config/nvim/lazy-lock.json index 013d5a1..8fe50f4 100644 --- a/common/.config/nvim/lazy-lock.json +++ b/stow/common/dot-config/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "CopilotChat.nvim": { "branch": "canary", "commit": "2352cd3e7e980cd73594be05f96b2dc4c0dd4a74" }, + "CopilotChat.nvim": { "branch": "canary", "commit": "9333944fde3c65868818e245c73aa29eef826e9b" }, "LuaSnip": { "branch": "master", "commit": "e808bee352d1a6fcf902ca1a71cee76e60e24071" }, "Navigator.nvim": { "branch": "master", "commit": "91d86506ac2a039504d5205d32a1d4bc7aa57072" }, "aerial.nvim": { "branch": "master", "commit": "140f48fb068d21c02e753c63f7443649e55576f0" }, @@ -16,7 +16,7 @@ "copilot.lua": { "branch": "master", "commit": "1a237cf50372830a61d92b0adf00d3b23882e0e1" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dressing.nvim": { "branch": "master", "commit": "1b7921eecc65af1baf8ac1dc06f0794934cbcfb2" }, - "dropbar.nvim": { "branch": "master", "commit": "b7b0cd2670cfab298afc955f2531206218736766" }, + "dropbar.nvim": { "branch": "master", "commit": "a12869f34f8cd236dc708fb2815ccf1663000bf4" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, "friendly-snippets": { "branch": "main", "commit": "00ba9dd3df89509f95437b8d595553707c46d5ea" }, "fugitive-gitlab.vim": { "branch": "master", "commit": "838d3a110836f511be099002ce1a71493c042615" }, @@ -29,7 +29,7 @@ "incline.nvim": { "branch": "main", "commit": "16fc9c073e3ea4175b66ad94375df6d73fc114c0" }, "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" }, "kanagawa.nvim": { "branch": "master", "commit": "f491b0fe68fffbece7030181073dfe51f45cda81" }, - "last-color.nvim": { "branch": "main", "commit": "4086c5810bbe35b4184502f190e8d1ba910180cd" }, + "last-color.nvim": { "branch": "main", "commit": "95d3bb07409a8334ecc57336cc39673ecca02ae0" }, "lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" }, "lsp-zero.nvim": { "branch": "v4.x", "commit": "b8411704591ae8e1501f1b9b31c801c09927baac" }, "lsp_signature.nvim": { "branch": "master", "commit": "fc38521ea4d9ec8dbd4c2819ba8126cea743943b" }, @@ -39,7 +39,7 @@ "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "neoconf.nvim": { "branch": "main", "commit": "c5516054f2342e6fe4d3befd56249d02d5eeb380" }, + "neoconf.nvim": { "branch": "main", "commit": "944f30e58171cf909b6567ce206e9097745560d1" }, "neoscroll.nvim": { "branch": "master", "commit": "4e0428a41c6ec191df543fc95349f6e1c598e53f" }, "nvim-autopairs": { "branch": "master", "commit": "f158dcb865c36f72c92358f87787dab2c272eaf3" }, "nvim-bqf": { "branch": "main", "commit": "1b24dc6050c34e8cd377b6b4cd6abe40509e0187" }, @@ -53,12 +53,12 @@ "nvim-early-retirement": { "branch": "main", "commit": "2c36a5671b9d8f0d9e11b77c5a55de802bc45e34" }, "nvim-fundo": { "branch": "main", "commit": "ac9c9372c4bf677721e24f144ef29d3a05c2b589" }, "nvim-lint": { "branch": "master", "commit": "968a35d54b3a4c1ce66609cf80b14d4ae44fe77f" }, - "nvim-lspconfig": { "branch": "master", "commit": "dd329912c8d446240584a2dbcd3802af3a19105a" }, + "nvim-lspconfig": { "branch": "master", "commit": "a9bc587e9ae0cbcb3e90a2e9342f86b3b78c4408" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-scrollview": { "branch": "main", "commit": "401c0498689dcaa54b2e7483d823e33cdc051e72" }, "nvim-spectre": { "branch": "master", "commit": "ba7fb777edff6c1fbbeffd343e113af64c04e90a" }, "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, - "nvim-treesitter": { "branch": "master", "commit": "6511cd984ab4b21e28f83af488f38dc89c3b0586" }, + "nvim-treesitter": { "branch": "master", "commit": "679883ad31f1752cac92a4ca182cee8b2751d4f1" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "bf8d2ad35d1d1a687eae6c065c3d524f7ab61b23" }, "nvim-web-devicons": { "branch": "master", "commit": "26220156aafb198b2de6a4cf80c1b120a3768da0" }, "oil.nvim": { "branch": "master", "commit": "1360be5fda9c67338331abfcd80de2afbb395bcd" }, @@ -70,7 +70,7 @@ "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, "quicker.nvim": { "branch": "master", "commit": "183041a46d6c908eefb1c23ea02cce9c8f41256e" }, - "render-markdown.nvim": { "branch": "main", "commit": "67288febca78b7aac8fae9543ef8980237e27d2a" }, + "render-markdown.nvim": { "branch": "main", "commit": "629b5f7dc053b73cd753e4ceb830a45f86f9b3da" }, "spaceless.nvim": { "branch": "main", "commit": "8d46bc098dba18d4e19bce89bf19aab5007ef767" }, "stickybuf.nvim": { "branch": "master", "commit": "183b9569bef78f44b17c078214f7d731f19cbefe" }, "substitute.nvim": { "branch": "main", "commit": "17ffaeb5a1dc2dbef39cf0865d8a4b6000836714" }, diff --git a/common/.config/nvim/lua/common.lua b/stow/common/dot-config/nvim/lua/common.lua similarity index 100% rename from common/.config/nvim/lua/common.lua rename to stow/common/dot-config/nvim/lua/common.lua diff --git a/common/.config/nvim/lua/config_plugins/gitsigns.lua b/stow/common/dot-config/nvim/lua/config_plugins/gitsigns.lua similarity index 100% rename from common/.config/nvim/lua/config_plugins/gitsigns.lua rename to stow/common/dot-config/nvim/lua/config_plugins/gitsigns.lua diff --git a/common/.config/nvim/lua/config_plugins/lsp-zero.lua b/stow/common/dot-config/nvim/lua/config_plugins/lsp-zero.lua similarity index 100% rename from common/.config/nvim/lua/config_plugins/lsp-zero.lua rename to stow/common/dot-config/nvim/lua/config_plugins/lsp-zero.lua diff --git a/common/.config/nvim/lua/config_plugins/telescope.lua b/stow/common/dot-config/nvim/lua/config_plugins/telescope.lua similarity index 100% rename from common/.config/nvim/lua/config_plugins/telescope.lua rename to stow/common/dot-config/nvim/lua/config_plugins/telescope.lua diff --git a/common/.config/nvim/lua/config_plugins/treesitter.lua b/stow/common/dot-config/nvim/lua/config_plugins/treesitter.lua similarity index 100% rename from common/.config/nvim/lua/config_plugins/treesitter.lua rename to stow/common/dot-config/nvim/lua/config_plugins/treesitter.lua diff --git a/common/.config/nvim/lua/debugging.lua b/stow/common/dot-config/nvim/lua/debugging.lua similarity index 100% rename from common/.config/nvim/lua/debugging.lua rename to stow/common/dot-config/nvim/lua/debugging.lua diff --git a/common/.config/nvim/lua/ftplugin.lua b/stow/common/dot-config/nvim/lua/ftplugin.lua similarity index 100% rename from common/.config/nvim/lua/ftplugin.lua rename to stow/common/dot-config/nvim/lua/ftplugin.lua diff --git a/common/.config/nvim/lua/keymaps.lua b/stow/common/dot-config/nvim/lua/keymaps.lua similarity index 100% rename from common/.config/nvim/lua/keymaps.lua rename to stow/common/dot-config/nvim/lua/keymaps.lua diff --git a/common/.config/nvim/lua/overseer/template/user/populate_scripts.lua b/stow/common/dot-config/nvim/lua/overseer/template/user/populate_scripts.lua similarity index 100% rename from common/.config/nvim/lua/overseer/template/user/populate_scripts.lua rename to stow/common/dot-config/nvim/lua/overseer/template/user/populate_scripts.lua diff --git a/common/.config/nvim/lua/overseer/template/user/run_script.lua b/stow/common/dot-config/nvim/lua/overseer/template/user/run_script.lua similarity index 100% rename from common/.config/nvim/lua/overseer/template/user/run_script.lua rename to stow/common/dot-config/nvim/lua/overseer/template/user/run_script.lua diff --git a/common/.config/nvim/lua/overseer/template/user/run_script_with_args.lua b/stow/common/dot-config/nvim/lua/overseer/template/user/run_script_with_args.lua similarity index 100% rename from common/.config/nvim/lua/overseer/template/user/run_script_with_args.lua rename to stow/common/dot-config/nvim/lua/overseer/template/user/run_script_with_args.lua diff --git a/common/.config/nvim/lua/p.lua b/stow/common/dot-config/nvim/lua/p.lua similarity index 100% rename from common/.config/nvim/lua/p.lua rename to stow/common/dot-config/nvim/lua/p.lua diff --git a/common/.config/nvim/lua/plugins.lua b/stow/common/dot-config/nvim/lua/plugins.lua similarity index 100% rename from common/.config/nvim/lua/plugins.lua rename to stow/common/dot-config/nvim/lua/plugins.lua diff --git a/common/.config/nvim/lua/settings.lua b/stow/common/dot-config/nvim/lua/settings.lua similarity index 100% rename from common/.config/nvim/lua/settings.lua rename to stow/common/dot-config/nvim/lua/settings.lua diff --git a/common/.config/nvim/plugin/filetypes.lua b/stow/common/dot-config/nvim/plugin/filetypes.lua similarity index 100% rename from common/.config/nvim/plugin/filetypes.lua rename to stow/common/dot-config/nvim/plugin/filetypes.lua diff --git a/common/.config/nvim/snippets/global.code-snippets b/stow/common/dot-config/nvim/snippets/global.code-snippets similarity index 100% rename from common/.config/nvim/snippets/global.code-snippets rename to stow/common/dot-config/nvim/snippets/global.code-snippets diff --git a/common/.config/nvim/snippets/markdown.json b/stow/common/dot-config/nvim/snippets/markdown.json similarity index 100% rename from common/.config/nvim/snippets/markdown.json rename to stow/common/dot-config/nvim/snippets/markdown.json diff --git a/common/.config/nvim/snippets/package.json b/stow/common/dot-config/nvim/snippets/package.json similarity index 100% rename from common/.config/nvim/snippets/package.json rename to stow/common/dot-config/nvim/snippets/package.json diff --git a/common/.config/nvim/snippets/python.json b/stow/common/dot-config/nvim/snippets/python.json similarity index 100% rename from common/.config/nvim/snippets/python.json rename to stow/common/dot-config/nvim/snippets/python.json diff --git a/common/.config/nvim/snippets/shellscript.json b/stow/common/dot-config/nvim/snippets/shellscript.json similarity index 100% rename from common/.config/nvim/snippets/shellscript.json rename to stow/common/dot-config/nvim/snippets/shellscript.json diff --git a/common/.p10k.zsh b/stow/common/dot-p10k.zsh similarity index 100% rename from common/.p10k.zsh rename to stow/common/dot-p10k.zsh diff --git a/common/.tmux.conf b/stow/common/dot-tmux.conf similarity index 100% rename from common/.tmux.conf rename to stow/common/dot-tmux.conf diff --git a/common/.wezterm.lua b/stow/common/dot-wezterm.lua similarity index 100% rename from common/.wezterm.lua rename to stow/common/dot-wezterm.lua diff --git a/stow/debian/dot-config/clangd b/stow/debian/dot-config/clangd new file mode 120000 index 0000000..c8768da --- /dev/null +++ b/stow/debian/dot-config/clangd @@ -0,0 +1 @@ +../../linked/clangd \ No newline at end of file diff --git a/redundant/clangd/config.yaml b/stow/linked/clangd/config.yaml similarity index 100% rename from redundant/clangd/config.yaml rename to stow/linked/clangd/config.yaml diff --git a/stow/macos/Library/Preferences/clangd b/stow/macos/Library/Preferences/clangd new file mode 120000 index 0000000..7171edf --- /dev/null +++ b/stow/macos/Library/Preferences/clangd @@ -0,0 +1 @@ +../../../linked/clangd \ No newline at end of file diff --git a/macos/.unison/.gitignore b/stow/macos/dot-unison/.gitignore similarity index 100% rename from macos/.unison/.gitignore rename to stow/macos/dot-unison/.gitignore diff --git a/macos/.unison/default.prf b/stow/macos/dot-unison/default.prf similarity index 100% rename from macos/.unison/default.prf rename to stow/macos/dot-unison/default.prf