From 4426bbe23e9e7c6c87445da1ac386daf895f92ba Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Mon, 13 Apr 2026 14:49:57 +0200 Subject: [PATCH] Update stuff --- flake.lock | 54 ++++++++++++++++----------------- modules/cli/home.nix | 5 +++- modules/cli/zsh/default.nix | 2 +- nvim/default.nix | 2 +- nvim/lua/plugins/lsp.lua | 60 +++++++++++++++++++++---------------- nvim/lua/settings.lua | 2 +- 6 files changed, 69 insertions(+), 56 deletions(-) diff --git a/flake.lock b/flake.lock index e904adc..98843d0 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ ] }, "locked": { - "lastModified": 1772408722, - "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "type": "github" }, "original": { @@ -44,11 +44,11 @@ ] }, "locked": { - "lastModified": 1775047159, - "narHash": "sha256-UWM4VZvfKaPwA9FMu7iZha5YAE8vsEtUazk+rFxmbTY=", + "lastModified": 1776184304, + "narHash": "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "1ce9e62690dfdd7e76bd266ccb9a887778410eb2", + "rev": "3c7524c68348ef79ce48308e0978611a050089b2", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1774915815, - "narHash": "sha256-LocQzkSjVS4G0AKMBiEIVdBKCNTMZXQFjQMWFId4Jpg=", + "lastModified": 1776211496, + "narHash": "sha256-2whL5MyvzUi10O5P80puwiaA1EbdS+i8c3gCc7ZSDmc=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "9001416dc5d0ca24c8e4b5a44bfe7cd6fbeb1dd1", + "rev": "05a9d064a2b7c5acd1cfdaaebdecc759b7211261", "type": "github" }, "original": { @@ -122,11 +122,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1774915197, - "narHash": "sha256-yor+eo8CVi7wBp7CjAMQnVoK+m197gsl7MvUzaqicns=", + "lastModified": 1776211157, + "narHash": "sha256-xirEVuJ3kM+PlXLfpq/yoZ7N+wc+q+f5aReKciy8N7M=", "owner": "neovim", "repo": "neovim", - "rev": "dbc4800dda2b0dc3290dc79955f857256e0694e2", + "rev": "e0eb967f8a68d942165c9a8f04920494a5abfc1c", "type": "github" }, "original": { @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1774762074, - "narHash": "sha256-89Mh4Eb/5stVJX6kGagVMijcU2FmfeD8Qv7UXc5d92o=", + "lastModified": 1775970782, + "narHash": "sha256-7jt9Vpm48Yy5yAWigYpde+HxtYEpEuyzIQJF4VYehhk=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "bc13aeaed568be76eab84df88ff39261bb52ff70", + "rev": "bedba5989b04614fc598af9633033b95a937933f", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1774933469, - "narHash": "sha256-OrnCQeUO2bqaWUl0lkDWyGWjKsOhtCyd7JSfTedQNUE=", + "lastModified": 1775490113, + "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f4c4c2c0c923d7811ac2a63ccc154767e4195337", + "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7", "type": "github" }, "original": { @@ -264,11 +264,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1774709303, - "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", + "lastModified": 1775710090, + "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685", + "rev": "4c1018dae018162ec878d42fec712642d214fdfa", "type": "github" }, "original": { @@ -316,11 +316,11 @@ "tmux": { "flake": false, "locked": { - "lastModified": 1775041268, - "narHash": "sha256-hu72yC6o8u5BOM0oyi9u/qawSukjFl9JAd0t1OVBe5s=", + "lastModified": 1776178868, + "narHash": "sha256-GCB7eQnVJpLKpK/+WPq1hCnxEeZRUmsUrqxXntnwqW4=", "owner": "tmux", "repo": "tmux", - "rev": "dc12da45736f03205de0841175e020a27d574290", + "rev": "638cecf43c23753a5a0283d22d488f84ccaf538e", "type": "github" }, "original": { @@ -336,11 +336,11 @@ ] }, "locked": { - "lastModified": 1774759885, - "narHash": "sha256-Y3D2GnZTO6BhGWeVcO6qUkiO5g0dDL2tmokLVWNC1WY=", + "lastModified": 1775710180, + "narHash": "sha256-sCokvdNvl8zIzsnjgG0TN5h3RUI7GJyWW9ErfmEj0rM=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "16e3f4cd221a030186a96015d82dcb3fb4afa4d6", + "rev": "2c138beb648d1cbbfae76695a8230ee04e4db25a", "type": "github" }, "original": { diff --git a/modules/cli/home.nix b/modules/cli/home.nix index 338bf4d..47096ec 100644 --- a/modules/cli/home.nix +++ b/modules/cli/home.nix @@ -13,8 +13,11 @@ programs.opencode = { enable = true; settings = { - theme = "catppuccin"; small_model = "github-copilot/gpt-5-mini"; + autoupdate = false; + }; + tui = { + theme = "catppuccin"; keybinds = { variant_cycle = "ctrl+n"; input_clear = "ctrl+u"; diff --git a/modules/cli/zsh/default.nix b/modules/cli/zsh/default.nix index a908678..6d9a78e 100644 --- a/modules/cli/zsh/default.nix +++ b/modules/cli/zsh/default.nix @@ -365,7 +365,7 @@ gh yq nmap # also for ncat - nodePackages.http-server + http-server nvim rename # this is perl-rename gfold diff --git a/nvim/default.nix b/nvim/default.nix index 5a14df2..3659d98 100644 --- a/nvim/default.nix +++ b/nvim/default.nix @@ -66,7 +66,7 @@ in postPatch = "rm -rf doc/"; }) SchemaStore-nvim - roslyn-nvim + # roslyn-nvim (conform-nvim.overrideAttrs { # clashes with oil postPatch = "rm doc/recipes.md"; diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua index ac7398a..199f67f 100644 --- a/nvim/lua/plugins/lsp.lua +++ b/nvim/lua/plugins/lsp.lua @@ -19,33 +19,43 @@ vim.lsp.enable({ "biome", "tailwindcss", "sqls", - "qmlls" - -- "roslyn_ls", we use roslyn.nvim plugin instead. + "qmlls", + "roslyn_ls", --we use roslyn.nvim plugin instead. }) +-- vim.api.nvim_create_autocmd("LspAttach", { +-- group = vim.api.nvim_create_augroup("lsp-setup", {}), +-- callback = function(ev) +-- local client = assert(vim.lsp.get_client_by_id(ev.data.client_id)) +-- if client:supports_method('textDocument/completion') then +-- vim.lsp.completion.enable(true, client.id, ev.buf) +-- end +-- end, +-- }) vim.lsp.on_type_formatting.enable() vim.lsp.document_color.enable(true, nil, { style = "virtual" }) -return { - -- see https://github.com/seblyng/roslyn.nvim/pull/178 - { - "roslyn.nvim", - ft = { "cs", "vb" }, - opts = { - broad_search = true, - }, - after = function(plug) - vim.lsp.config("roslyn", { - cmd = { - 'Microsoft.CodeAnalysis.LanguageServer', - '--logLevel', - 'Information', - '--extensionLogDirectory', - vim.fs.joinpath(vim.uv.os_tmpdir(), 'roslyn_ls/logs'), - '--stdio', - }, - }) - require("roslyn").setup(plug.opts) - end, - }, -} +return {} +-- return { +-- -- see https://github.com/seblyng/roslyn.nvim/pull/178 +-- { +-- "roslyn.nvim", +-- ft = { "cs", "vb" }, +-- opts = { +-- broad_search = true, +-- }, +-- after = function(plug) +-- vim.lsp.config("roslyn", { +-- cmd = { +-- 'Microsoft.CodeAnalysis.LanguageServer', +-- '--logLevel', +-- 'Information', +-- '--extensionLogDirectory', +-- vim.fs.joinpath(vim.uv.os_tmpdir(), 'roslyn_ls/logs'), +-- '--stdio', +-- }, +-- }) +-- require("roslyn").setup(plug.opts) +-- end, +-- }, +-- } diff --git a/nvim/lua/settings.lua b/nvim/lua/settings.lua index a114b63..0c75779 100644 --- a/nvim/lua/settings.lua +++ b/nvim/lua/settings.lua @@ -148,7 +148,7 @@ vim.keymap.set("n", "gD", function() vim.lsp.buf.declaration() end, { desc = "Go vim.keymap.set("n", "grs", function() vim.lsp.buf.type_definition() end, { desc = "Go to type definition" }) -- vim.keymap.set({ 'i' }, '', function() --- vim.lsp.completion.trigger() +-- vim.lsp.completion.get() -- end, { desc = "Trigger completion" })