diff options
| author | David T. Sadler <davidtsadler@googlemail.com> | 2026-08-24 12:28:57 +0100 |
|---|---|---|
| committer | David T. Sadler <davidtsadler@googlemail.com> | 2026-08-24 12:28:57 +0100 |
| commit | 734231af356955e1e6235cf61e2004676f8d94fd (patch) | |
| tree | b721a0eb0b89dadcfd493e936ee4292aa8723f76 | |
| parent | c551d811edb122310db51b969af8247c448bafbd (diff) | |
| parent | a97b1eff5c3192daa7b3d3c30c79a2bae302e62b (diff) | |
Merge branch 'main' into suliman
| -rw-r--r-- | README.md | 27 | ||||
| -rw-r--r-- | backups/adobe_account_backup_uuid_8228f98e-56c8-4480-81a1-0d0d53de3b10.zip | bin | 0 -> 11624 bytes | |||
| -rw-r--r-- | backups/adobe_uuid_8228f98e-56c8-4480-81a1-0d0d53de3b10.der | bin | 0 -> 608 bytes | |||
| -rw-r--r-- | bookmarks.txt | 1 | ||||
| -rwxr-xr-x | install.sh | 4 | ||||
| -rw-r--r-- | nvim/.config/nvim/nvim-pack-lock.json | 6 |
6 files changed, 35 insertions, 3 deletions
@@ -10,6 +10,33 @@ My custom configuration files. 2. Run the installation script: `./install.sh` +## Submodule Management + +### Sync Existing Submodules + +After running `git pull` on an existing setup or setting up a new machine, restore submodules to their exact pinned commits: + +```bash +git submodule update --init --recursive +``` + +### Update Submodules to Latest Upstream Releases + +To bump top-level submodules (like plugins) to their newest remote commits without breaking internal nested dependencies: + +```bash +# Fetch latest commits for top-level submodules +git submodule update --remote + +# Reset nested submodules to what top-level submodules expect +git submodule update --init --recursive + +# Commit updated submodule pointers +git add . +git commit -m "Update submodules to latest versions" +git push +``` + ## Neovim Keymaps <!-- BEGIN-NEOVIM-KEYMAPS --> diff --git a/backups/adobe_account_backup_uuid_8228f98e-56c8-4480-81a1-0d0d53de3b10.zip b/backups/adobe_account_backup_uuid_8228f98e-56c8-4480-81a1-0d0d53de3b10.zip Binary files differnew file mode 100644 index 0000000..a988385 --- /dev/null +++ b/backups/adobe_account_backup_uuid_8228f98e-56c8-4480-81a1-0d0d53de3b10.zip diff --git a/backups/adobe_uuid_8228f98e-56c8-4480-81a1-0d0d53de3b10.der b/backups/adobe_uuid_8228f98e-56c8-4480-81a1-0d0d53de3b10.der Binary files differnew file mode 100644 index 0000000..240c6d6 --- /dev/null +++ b/backups/adobe_uuid_8228f98e-56c8-4480-81a1-0d0d53de3b10.der diff --git a/bookmarks.txt b/bookmarks.txt index e3c865b..2c4e486 100644 --- a/bookmarks.txt +++ b/bookmarks.txt @@ -13,3 +13,4 @@ sadlersmtp|https://box.sadlersmtp.com/ HTTP Status Code|https://developer.mozilla.org/en-US/docs/Web/HTTP/Reference/Status Spotify Developers Documentation|https://developer.spotify.com/documentation/web-api Spotify Developers Dashboard|https://developer.spotify.com/dashboard +kobo|https://www.kobo.com/gb/en @@ -30,3 +30,7 @@ nix build git+https://git.ccnlc.eu/nydragon/calibre-plugins#acsm-calibre-plugin calibre-customize -a result nix build git+https://git.ccnlc.eu/nydragon/calibre-plugins#dedrm-plugin calibre-customize -a result + +curl --follow --output crosspoint_reader.zip https://github.com/crosspoint-reader/calibre-plugins/releases/download/v0.2.7/crosspoint_reader-v0.2.7.zip +calibre-customize -a crosspoint_reader.zip +rm -f crosspoint_reader.zip diff --git a/nvim/.config/nvim/nvim-pack-lock.json b/nvim/.config/nvim/nvim-pack-lock.json index 840a6d8..fa0ceee 100644 --- a/nvim/.config/nvim/nvim-pack-lock.json +++ b/nvim/.config/nvim/nvim-pack-lock.json @@ -15,7 +15,7 @@ }, "nord.nvim": { "rev": "80c1e5321505aeb22b7a9f23eb82f1e193c12470", - "src": "https://github.com/shaunsingh/nord.nvim.git" + "src": "https://github.com/shaunsingh/nord.nvim" }, "nvim-lint": { "rev": "606b823a57b027502a9ae00978ebf4f5d5158098", @@ -31,7 +31,7 @@ }, "vim-obsession": { "rev": "ed9dfc7c2cc917ace8b24f4f9f80a91e05614b63", - "src": "https://github.com/tpope/vim-obsession.git" + "src": "https://github.com/tpope/vim-obsession" } } -}
\ No newline at end of file +} |
