From 4857157d2c6f5dd0663fae6c622c14f5b2891178 Mon Sep 17 00:00:00 2001 From: Zackarias Montell Date: Tue, 10 Jun 2025 16:39:00 +0200 Subject: [PATCH] leftovers --- .profile.ps1 | 3 +++ .wezterm.lua | 9 ++++++++- AppData/Local/nvim/init.lua | 30 +++++++++++++++--------------- AppData/Local/nvim/lazy-lock.json | 12 ++++++------ requirements.ps1 | 4 ++++ 5 files changed, 36 insertions(+), 22 deletions(-) diff --git a/.profile.ps1 b/.profile.ps1 index 1e55b37..14c22fd 100644 --- a/.profile.ps1 +++ b/.profile.ps1 @@ -1,5 +1,8 @@ oh-my-posh init pwsh --config "$HOME/.theme.omp.json" | Invoke-Expression +# git posh, seems to slow down things +# Import-Module posh-git + # setup fnm fnm env --use-on-cd --shell powershell | Out-String | Invoke-Expression diff --git a/.wezterm.lua b/.wezterm.lua index 0adcc37..b1748d2 100644 --- a/.wezterm.lua +++ b/.wezterm.lua @@ -1,6 +1,13 @@ local wezterm = require("wezterm") local act = wezterm.action -local default_prog = { "pwsh.exe", "-NoProfile", "-Command", "& { . ~/.profile.ps1; $host.EnterNestedPrompt() }" } +local default_prog = { + "pwsh.exe", + "-ExecutionPolicy", + "Bypass", + "-NoProfile", + "-Command", + "& { . ~/.profile.ps1; $host.EnterNestedPrompt() }", +} return { default_prog = default_prog, diff --git a/AppData/Local/nvim/init.lua b/AppData/Local/nvim/init.lua index c55913a..b8d107f 100644 --- a/AppData/Local/nvim/init.lua +++ b/AppData/Local/nvim/init.lua @@ -522,20 +522,20 @@ require('lazy').setup({ [vim.diagnostic.severity.HINT] = '󰌶 ', }, } or {}, - -- virtual_text = { - -- source = 'if_many', - -- spacing = 2, - -- format = function(diagnostic) - -- local diagnostic_message = { - -- [vim.diagnostic.severity.ERROR] = diagnostic.message, - -- [vim.diagnostic.severity.WARN] = diagnostic.message, - -- [vim.diagnostic.severity.INFO] = diagnostic.message, - -- [vim.diagnostic.severity.HINT] = diagnostic.message, - -- } - -- return diagnostic_message[diagnostic.severity] - -- end, - -- }, - virtual_lines = true, + virtual_text = { + source = 'if_many', + spacing = 2, + format = function(diagnostic) + local diagnostic_message = { + [vim.diagnostic.severity.ERROR] = diagnostic.message, + [vim.diagnostic.severity.WARN] = diagnostic.message, + [vim.diagnostic.severity.INFO] = diagnostic.message, + [vim.diagnostic.severity.HINT] = diagnostic.message, + } + return diagnostic_message[diagnostic.severity] + end, + }, + -- virtual_lines = true, } local servers = { @@ -597,7 +597,7 @@ require('lazy').setup({ pylsp = { plugins = { pycodestyle = { - ignore = { 'E501' }, -- ignore line length, let black formatter manage this, sometimes lines must be long. + ignore = { 'E501', 'E503' }, -- ignore line length, let black formatter manage this, sometimes lines must be long, ignore cr before binary operator }, }, }, diff --git a/AppData/Local/nvim/lazy-lock.json b/AppData/Local/nvim/lazy-lock.json index 639f048..dff6a19 100644 --- a/AppData/Local/nvim/lazy-lock.json +++ b/AppData/Local/nvim/lazy-lock.json @@ -2,12 +2,12 @@ "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, "blink-copilot": { "branch": "main", "commit": "bdc45bbbed2ec252b3a29f4adecf031e157b5573" }, "blink.cmp": { "branch": "main", "commit": "022521a8910a5543b0251b21c9e1a1e989745796" }, - "catppuccin": { "branch": "main", "commit": "8162a4bd9afb42837a655e404d1f937a87ba95e6" }, - "conform.nvim": { "branch": "master", "commit": "a4bb5d6c4ae6f32ab13114e62e70669fa67745b9" }, + "catppuccin": { "branch": "main", "commit": "1bf070129c0b6f77cc23f6a2212dcdc868308c52" }, + "conform.nvim": { "branch": "master", "commit": "2b2b30260203af3b93a7470ac6c8457ddd6e32d9" }, "copilot.lua": { "branch": "master", "commit": "0929c92097a49b6ae3565aab157fa2bce398d953" }, "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "gitsigns.nvim": { "branch": "main", "commit": "39e0d1cd44eafed5f30c372e377ab1cb1781ec9f" }, + "gitsigns.nvim": { "branch": "main", "commit": "e399f9748d7cfd8859747c8d6c4e9c8b4d50a1bd" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, @@ -15,8 +15,8 @@ "mason-lspconfig.nvim": { "branch": "main", "commit": "d39a75bbce4b8aad5d627191ea915179c77c100f" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "75d60a8f928decd8b38897f80849768b7c540a5b" }, - "mason.nvim": { "branch": "main", "commit": "1aceba8bc158b5aaf90649077cad06744bc23ac4" }, - "mini.nvim": { "branch": "main", "commit": "18889a4993a2c6de64eb07f91e7ad8666793441a" }, + "mason.nvim": { "branch": "main", "commit": "7c7318e8bae7e3536ef6b9e86b9e38e74f2e125e" }, + "mini.nvim": { "branch": "main", "commit": "009435c6c3653d54bc62997ca6b2e8513bc52cf4" }, "neo-tree.nvim": { "branch": "main", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" }, "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" }, @@ -29,7 +29,7 @@ "nvim-lspconfig": { "branch": "master", "commit": "ac1dfbe3b60e5e23a2cff90e3bd6a3bc88031a57" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, "nvim-treesitter": { "branch": "master", "commit": "066fd6505377e3fd4aa219e61ce94c2b8bdb0b79" }, - "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" }, + "nvim-web-devicons": { "branch": "master", "commit": "d360317f8f509b99229bb31d42269987696df6ff" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, diff --git a/requirements.ps1 b/requirements.ps1 index bf2318f..122b217 100644 --- a/requirements.ps1 +++ b/requirements.ps1 @@ -12,6 +12,7 @@ $packages = @( "microsoft.powershell", "chocolatey.chocolatey", # nvim "Python.Python.3.13", # nvim + "Python.Python.3.9", # project dependencies "JernejSimoncic.Wget", # nvim "7zip.7zip", # nvim "zig.zig" @@ -35,6 +36,9 @@ Start-Process pwsh -Verb RunAs -ArgumentList "-Command", "choco install make unz ## Nvim requirements from pip python -m pip install debugpy +## Git posh +Install-Module posh-git -Scope CurrentUser -Force + Exit # extras, make flag for these