From b792e60b843c86360111a8622da212504ed48d96 Mon Sep 17 00:00:00 2001 From: Zackarias Montell Date: Mon, 3 Nov 2025 14:13:02 +0100 Subject: [PATCH 1/2] Changes from reinstalled machine --- .../LocalState/settings.json | 28 +++++++++++++------ AppData/Local/nvim/lazy-lock.json | 2 +- requirements.ps1 | 23 ++++----------- 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/AppData/Local/Packages/Microsoft.WindowsTerminal_8wekyb3d8bbwe/LocalState/settings.json b/AppData/Local/Packages/Microsoft.WindowsTerminal_8wekyb3d8bbwe/LocalState/settings.json index 7f8c105..a80327b 100644 --- a/AppData/Local/Packages/Microsoft.WindowsTerminal_8wekyb3d8bbwe/LocalState/settings.json +++ b/AppData/Local/Packages/Microsoft.WindowsTerminal_8wekyb3d8bbwe/LocalState/settings.json @@ -15,6 +15,10 @@ "command": "paste", "id": "User.paste" }, + { + "command": "find", + "id": "User.find" + }, { "command": { @@ -24,10 +28,6 @@ }, "id": "User.splitPane.A6751878" }, - { - "command": "find", - "id": "User.find" - }, { "command": { @@ -50,14 +50,14 @@ "id": "User.copy.644BA8F2", "keys": "ctrl+c" }, - { - "id": "User.find", - "keys": "ctrl+shift+f" - }, { "id": "User.paste", "keys": "ctrl+v" }, + { + "id": "User.find", + "keys": "ctrl+shift+f" + }, { "id": "User.splitPane.A6751878", "keys": "alt+shift+d" @@ -141,6 +141,18 @@ "hidden": true, "name": "Visual Studio Debug Console", "source": "VSDebugConsole" + }, + { + "guid": "{355e8afa-1c29-586b-8e45-29749ab7cd96}", + "hidden": false, + "name": "Developer Command Prompt for VS 2022", + "source": "Windows.Terminal.VisualStudio" + }, + { + "guid": "{deebd96f-cb5d-5aa4-b705-3e674eac8607}", + "hidden": false, + "name": "Developer PowerShell for VS 2022", + "source": "Windows.Terminal.VisualStudio" } ] }, diff --git a/AppData/Local/nvim/lazy-lock.json b/AppData/Local/nvim/lazy-lock.json index 7442621..b40d2eb 100644 --- a/AppData/Local/nvim/lazy-lock.json +++ b/AppData/Local/nvim/lazy-lock.json @@ -8,7 +8,7 @@ "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, "gitsigns.nvim": { "branch": "main", "commit": "ca8bf696be575efa925ef531c4efd897b5c3086b" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, - "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "lazy.nvim": { "branch": "main", "commit": "202d8e92b3a74ac88eb3a7f1e40fb59b4c2a6535" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "7f0bf635082bb9b7d2b37766054526a6ccafdb85" }, diff --git a/requirements.ps1 b/requirements.ps1 index 122b217..f674ae9 100644 --- a/requirements.ps1 +++ b/requirements.ps1 @@ -14,8 +14,7 @@ $packages = @( "Python.Python.3.13", # nvim "Python.Python.3.9", # project dependencies "JernejSimoncic.Wget", # nvim - "7zip.7zip", # nvim - "zig.zig" + "7zip.7zip" # nvim ) foreach ($package in $packages) { @@ -31,7 +30,7 @@ cd ~ npm install # mostly nvim deps ## Nvim requirements from choco, needs to be run as admin -Start-Process pwsh -Verb RunAs -ArgumentList "-Command", "choco install make unzip ripgrep" +Start-Process pwsh -Verb RunAs -ArgumentList "-Command", "choco install make unzip ripgrep zig" ## Nvim requirements from pip python -m pip install debugpy @@ -39,29 +38,17 @@ python -m pip install debugpy ## Git posh Install-Module posh-git -Scope CurrentUser -Force -Exit - # extras, make flag for these $packages = @( - "Schniz.fnm", # Fast node version manager - "wez.wezterm", # Teminal emulator - #"gnupg.gpg4win", - "microsoft.teams", - "putty.putty", - "microsoft.windowsterminal", - "mozilla.firefox", + "mozilla.firefox.developeredition", "Microsoft.VisualStudio.2022.Community", "JetBrains.Resharper", - "jandedobbeleer.ohmyposh", - #"IJHack.QtPass", "Microsoft.powertoys", - "google.chrome", - #"spotify.spotify", + "spotify.spotify", "microsoft.azuredatastudio", - #"mozilla.thunderbird", + "mozilla.thunderbird", "yubico.authenticator", - "microsoft.powershell", "Postman.Postman", "docker.dockerdesktop" ) From a252e9c33a7aaaa3f7111df503188ff7503cd613 Mon Sep 17 00:00:00 2001 From: Zackarias Montell Date: Tue, 4 Nov 2025 13:28:03 +0100 Subject: [PATCH 2/2] Adding mremoteng and dbee to vim --- AppData/Local/nvim/init.lua | 1 + AppData/Local/nvim/lazy-lock.json | 47 ++++++++++--------- .../Local/nvim/lua/kickstart/plugins/db.lua | 17 +++++++ requirements.ps1 | 2 + 4 files changed, 44 insertions(+), 23 deletions(-) create mode 100644 AppData/Local/nvim/lua/kickstart/plugins/db.lua diff --git a/AppData/Local/nvim/init.lua b/AppData/Local/nvim/init.lua index c0f3da2..d7dff1e 100644 --- a/AppData/Local/nvim/init.lua +++ b/AppData/Local/nvim/init.lua @@ -995,6 +995,7 @@ require('lazy').setup({ require 'kickstart.plugins.autopairs', require 'kickstart.plugins.neo-tree', require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps + require 'kickstart.plugins.db', -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` -- This is the easiest way to modularize your config. diff --git a/AppData/Local/nvim/lazy-lock.json b/AppData/Local/nvim/lazy-lock.json index b40d2eb..c75781f 100644 --- a/AppData/Local/nvim/lazy-lock.json +++ b/AppData/Local/nvim/lazy-lock.json @@ -1,43 +1,44 @@ { - "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, + "LuaSnip": { "branch": "master", "commit": "5a1e39223db9a0498024a77b8441169d260c8c25" }, "azure-functions.nvim": { "branch": "main", "commit": "6b368d5d5b1c7e205085a7e1b1c7eef3004a550c" }, - "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" }, - "catppuccin": { "branch": "main", "commit": "76a8d0515024cc55d8bd26fc13f1af88faef3ebf" }, - "conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" }, - "fidget.nvim": { "branch": "main", "commit": "dafd592c7bdbb6cd6d17d3c9a1a8abf3930138c1" }, + "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" }, + "catppuccin": { "branch": "main", "commit": "234fc048de931a0e42ebcad675bf6559d75e23df" }, + "conform.nvim": { "branch": "master", "commit": "26c02e1155a4980900bdccabca4516f4c712aae9" }, + "fidget.nvim": { "branch": "main", "commit": "e32b672d8fd343f9d6a76944fedb8c61d7d8111a" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "gitsigns.nvim": { "branch": "main", "commit": "ca8bf696be575efa925ef531c4efd897b5c3086b" }, + "gitsigns.nvim": { "branch": "main", "commit": "20ad4419564d6e22b189f6738116b38871082332" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "lazy.nvim": { "branch": "main", "commit": "202d8e92b3a74ac88eb3a7f1e40fb59b4c2a6535" }, - "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, + "lazydev.nvim": { "branch": "main", "commit": "371cd7434cbf95606f1969c2c744da31b77fcfa6" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "7f0bf635082bb9b7d2b37766054526a6ccafdb85" }, - "mason-nvim-dap.nvim": { "branch": "main", "commit": "86389a3dd687cfaa647b6f44731e492970034baa" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "d7b5feb6e769e995f7fcf44d92f49f811c51d10c" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "9a10e096703966335bd5c46c8c875d5b0690dade" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" }, - "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" }, - "mini.nvim": { "branch": "main", "commit": "4035ef97407a6661ae9ff913ff980e271a658502" }, - "neo-tree.nvim": { "branch": "main", "commit": "cea666ef965884414b1b71f6b39a537f9238bdb2" }, + "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" }, + "mini.nvim": { "branch": "main", "commit": "f545dcc3831ffcf1f15c708bbc63bac29fcef2d5" }, + "neo-tree.nvim": { "branch": "main", "commit": "8cdd6b1940f333c1dd085526a9c45b30fb2dbf50" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, - "nvim-dap": { "branch": "master", "commit": "a479e25ed5b5d331fb46ee4b9e160ff02ac64310" }, + "nvim-autopairs": { "branch": "master", "commit": "7a2c97cccd60abc559344042fefb1d5a85b3e33b" }, + "nvim-dap": { "branch": "master", "commit": "e97dc47e134ffb33da008658fecfae8f8547c528" }, "nvim-dap-cs": { "branch": "main", "commit": "16e5debe8cb7fb73c8799d20969ee00883586602" }, "nvim-dap-go": { "branch": "main", "commit": "b4421153ead5d726603b02743ea40cf26a51ed5f" }, - "nvim-dap-python": { "branch": "master", "commit": "261ce649d05bc455a29f9636dc03f8cdaa7e0e2c" }, + "nvim-dap-python": { "branch": "master", "commit": "64652d1ae1db80870d9aac7132d76e37acd86a26" }, "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" }, "nvim-dap-vscode-js": { "branch": "main", "commit": "03bd29672d7fab5e515fc8469b7d07cc5994bbf6" }, - "nvim-lint": { "branch": "master", "commit": "7ef127aaede2a4d5ad8df8321e2eb4e567f29594" }, - "nvim-lspconfig": { "branch": "master", "commit": "f0c6ccf43997a1c7e9ec4aea36ffbf2ddd9f15ef" }, + "nvim-dbee": { "branch": "master", "commit": "dda517694889a5d238d7aa407403984da9f80cc0" }, + "nvim-lint": { "branch": "master", "commit": "8c694e1a1ee2ac14df931679cd54e6b8d402c2c2" }, + "nvim-lspconfig": { "branch": "master", "commit": "2010fc6ec03e2da552b4886fceb2f7bc0fc2e9c0" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-web-devicons": { "branch": "master", "commit": "c2599a81ecabaae07c49ff9b45dcd032a8d90f1a" }, + "nvim-web-devicons": { "branch": "master", "commit": "8dcb311b0c92d460fac00eac706abd43d94d68af" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "roslyn.nvim": { "branch": "main", "commit": "8c949b1485aea6f56a7acc24c2362517e6002f2b" }, - "schemastore.nvim": { "branch": "main", "commit": "29e3e76967d32d434836d72380b4acea07bd0f50" }, + "roslyn.nvim": { "branch": "main", "commit": "7ba2dd0a5628c5ad3d8cc5a22e66ece3efc371bc" }, + "schemastore.nvim": { "branch": "main", "commit": "e5ca2c40986f415398dd5711625f0099b80b28b0" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, - "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, + "telescope.nvim": { "branch": "master", "commit": "84b9ba066d1860f7a586ce9cd732fd6c4f77d1d9" }, + "todo-comments.nvim": { "branch": "main", "commit": "411503d3bedeff88484de572f2509c248e499b38" }, "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, - "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } + "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" } } diff --git a/AppData/Local/nvim/lua/kickstart/plugins/db.lua b/AppData/Local/nvim/lua/kickstart/plugins/db.lua new file mode 100644 index 0000000..5dd257e --- /dev/null +++ b/AppData/Local/nvim/lua/kickstart/plugins/db.lua @@ -0,0 +1,17 @@ +return { + { + 'kndndrj/nvim-dbee', + dependencies = { + 'MunifTanjim/nui.nvim', + }, + build = function() + -- Install tries to automatically detect the install method. + -- if it fails, try calling it with one of these parameters: + -- "curl", "wget", "bitsadmin", "go" + require('dbee').install() + end, + config = function() + require('dbee').setup(--[[optional config]]) + end, + }, +} diff --git a/requirements.ps1 b/requirements.ps1 index f674ae9..ec0da8b 100644 --- a/requirements.ps1 +++ b/requirements.ps1 @@ -13,6 +13,7 @@ $packages = @( "chocolatey.chocolatey", # nvim "Python.Python.3.13", # nvim "Python.Python.3.9", # project dependencies + "Python.Python.3.10", # isort "JernejSimoncic.Wget", # nvim "7zip.7zip" # nvim ) @@ -41,6 +42,7 @@ Install-Module posh-git -Scope CurrentUser -Force # extras, make flag for these $packages = @( + "mRemoteNG.mRemoteNG", "mozilla.firefox.developeredition", "Microsoft.VisualStudio.2022.Community", "JetBrains.Resharper",