From 87a97f822add4ef67c032b863dab3bd5958760a6 Mon Sep 17 00:00:00 2001
From: Daniel Lundin <dln@arity.se>
Date: Tue, 1 Apr 2025 11:34:54 +0200
Subject: [PATCH 1/2] nix: update
---
flake.lock | 60 +++++++++++++++++++++++++++---------------------------
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/flake.lock b/flake.lock
index 2f375d2..85c2258 100644
--- a/flake.lock
+++ b/flake.lock
@@ -40,11 +40,11 @@
]
},
"locked": {
- "lastModified": 1741352980,
- "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
+ "lastModified": 1743550720,
+ "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
+ "rev": "c621e8422220273271f52058f618c94e405bb0f5",
"type": "github"
},
"original": {
@@ -148,11 +148,11 @@
]
},
"locked": {
- "lastModified": 1743360001,
- "narHash": "sha256-HtpS/ZdgWXw0y+aFdORcX5RuBGTyz3WskThspNR70SM=",
+ "lastModified": 1744008831,
+ "narHash": "sha256-g3mHJLB8ShKuMaBBZxiGuoftJ22f7Boegiw5xBUnS8E=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "b6fd653ef8fbeccfd4958650757e91767a65506d",
+ "rev": "f463902a3f03e15af658e48bcc60b39188ddf734",
"type": "github"
},
"original": {
@@ -172,11 +172,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
- "lastModified": 1743398899,
- "narHash": "sha256-gJeoWpWv14MnLoiERpVhHWSDzujvg9UM2BvR7BZe6AI=",
+ "lastModified": 1744003175,
+ "narHash": "sha256-b0b/qxiqf2G2/UrmcyP9aYr0Ni5NpdCY6GEF8KgnmCU=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
- "rev": "4be99133c03920579de8c3fe7c05ff1de60a7fbe",
+ "rev": "f7f5a474c38e3e41827b067f741e12ecbbe5cf18",
"type": "github"
},
"original": {
@@ -188,11 +188,11 @@
"neovim-src": {
"flake": false,
"locked": {
- "lastModified": 1743368881,
- "narHash": "sha256-CRORP8EaJ/Ajdx6WbUSjt9X4zNToyDLkzWz6VIthsaA=",
+ "lastModified": 1743931206,
+ "narHash": "sha256-Dl6kHmsN6AZBWEgEbQGpKYy+qvg+oPbBrK/CFQsWmZM=",
"owner": "neovim",
"repo": "neovim",
- "rev": "ee143aaf65a0e662c42c636aa4a959682858b3e7",
+ "rev": "2d11b981bfbb7816d88a69b43b758f3a3f515b96",
"type": "github"
},
"original": {
@@ -208,11 +208,11 @@
]
},
"locked": {
- "lastModified": 1743306489,
- "narHash": "sha256-LROaIjSLo347cwcHRfSpqzEOa2FoLSeJwU4dOrGm55E=",
+ "lastModified": 1743911143,
+ "narHash": "sha256-4j4JPwr0TXHH4ZyorXN5yIcmqIQr0WYacsuPA4ktONo=",
"owner": "nix-community",
"repo": "nix-index-database",
- "rev": "b3696bfb6c24aa61428839a99e8b40c53ac3a82d",
+ "rev": "a36f6a7148aec2c77d78e4466215cceb2f5f4bfb",
"type": "github"
},
"original": {
@@ -223,11 +223,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1743259260,
- "narHash": "sha256-ArWLUgRm1tKHiqlhnymyVqi5kLNCK5ghvm06mfCl4QY=",
+ "lastModified": 1743814133,
+ "narHash": "sha256-drDyYyUmjeYGiHmwB9eOPTQRjmrq3Yz26knwmMPLZFk=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "eb0e0f21f15c559d2ac7633dc81d079d1caf5f5f",
+ "rev": "250b695f41e0e2f5afbf15c6b12480de1fe0001b",
"type": "github"
},
"original": {
@@ -239,11 +239,11 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1743231893,
- "narHash": "sha256-tpJsHMUPEhEnzySoQxx7+kA+KUtgWqvlcUBqROYNNt0=",
+ "lastModified": 1743813633,
+ "narHash": "sha256-BgkBz4NpV6Kg8XF7cmHDHRVGZYnKbvG0Y4p+jElwxaM=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "c570c1f5304493cafe133b8d843c7c1c4a10d3a6",
+ "rev": "7819a0d29d1dd2bc331bec4b327f0776359b1fa6",
"type": "github"
},
"original": {
@@ -255,11 +255,11 @@
},
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1743259260,
- "narHash": "sha256-ArWLUgRm1tKHiqlhnymyVqi5kLNCK5ghvm06mfCl4QY=",
+ "lastModified": 1743938762,
+ "narHash": "sha256-UgFYn8sGv9B8PoFpUfCa43CjMZBl1x/ShQhRDHBFQdI=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "eb0e0f21f15c559d2ac7633dc81d079d1caf5f5f",
+ "rev": "74a40410369a1c35ee09b8a1abee6f4acbedc059",
"type": "github"
},
"original": {
@@ -271,11 +271,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1743315132,
- "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=",
+ "lastModified": 1743827369,
+ "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "52faf482a3889b7619003c0daec593a1912fddc1",
+ "rev": "42a1c966be226125b48c384171c44c651c236c22",
"type": "github"
},
"original": {
@@ -303,11 +303,11 @@
]
},
"locked": {
- "lastModified": 1743081648,
- "narHash": "sha256-WRAylyYptt6OX5eCEBWyTwOEqEtD6zt33rlUkr6u3cE=",
+ "lastModified": 1743748085,
+ "narHash": "sha256-uhjnlaVTWo5iD3LXics1rp9gaKgDRQj6660+gbUU3cE=",
"owner": "numtide",
"repo": "treefmt-nix",
- "rev": "29a3d7b768c70addce17af0869f6e2bd8f5be4b7",
+ "rev": "815e4121d6a5d504c0f96e5be2dd7f871e4fd99d",
"type": "github"
},
"original": {
From 98006874b86dca3e69e167de58d7474add82e685 Mon Sep 17 00:00:00 2001
From: Daniel Lundin <dln@arity.se>
Date: Mon, 7 Apr 2025 16:05:06 +0200
Subject: [PATCH 2/2] nvim: Nicer diagnostics
---
flake.lock | 42 +++++++++++++++++++--------------------
home/common/nvim/init.lua | 15 ++++++++++----
home/dln/desktop.nix | 1 +
3 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/flake.lock b/flake.lock
index 85c2258..b07d989 100644
--- a/flake.lock
+++ b/flake.lock
@@ -148,11 +148,11 @@
]
},
"locked": {
- "lastModified": 1744008831,
- "narHash": "sha256-g3mHJLB8ShKuMaBBZxiGuoftJ22f7Boegiw5xBUnS8E=",
+ "lastModified": 1744400600,
+ "narHash": "sha256-qYhUgA98mhq1QK13r9qVY+sG1ri6FBgyp+GApX6wS20=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "f463902a3f03e15af658e48bcc60b39188ddf734",
+ "rev": "b74b22bb6167e8dff083ec6988c98798bf8954d3",
"type": "github"
},
"original": {
@@ -172,11 +172,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
- "lastModified": 1744003175,
- "narHash": "sha256-b0b/qxiqf2G2/UrmcyP9aYr0Ni5NpdCY6GEF8KgnmCU=",
+ "lastModified": 1744447706,
+ "narHash": "sha256-8bkAMTy5A6IEEBrr8fGyBrpRNvHMBttsjmTS3IHO/3w=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
- "rev": "f7f5a474c38e3e41827b067f741e12ecbbe5cf18",
+ "rev": "8479d0e1c0b9274c25001432169c0056633bf63a",
"type": "github"
},
"original": {
@@ -188,11 +188,11 @@
"neovim-src": {
"flake": false,
"locked": {
- "lastModified": 1743931206,
- "narHash": "sha256-Dl6kHmsN6AZBWEgEbQGpKYy+qvg+oPbBrK/CFQsWmZM=",
+ "lastModified": 1744372015,
+ "narHash": "sha256-Aith8tgE4jRYDpFa9JqPsA4beTimLmqgwl6PLNlJHyU=",
"owner": "neovim",
"repo": "neovim",
- "rev": "2d11b981bfbb7816d88a69b43b758f3a3f515b96",
+ "rev": "4a706a70928231643e1a3f3fcf785de7aa930f8b",
"type": "github"
},
"original": {
@@ -223,11 +223,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1743814133,
- "narHash": "sha256-drDyYyUmjeYGiHmwB9eOPTQRjmrq3Yz26knwmMPLZFk=",
+ "lastModified": 1744316434,
+ "narHash": "sha256-lzFCg/1C39pyY2hMB2gcuHV79ozpOz/Vu15hdjiFOfI=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "250b695f41e0e2f5afbf15c6b12480de1fe0001b",
+ "rev": "d19cf9dfc633816a437204555afeb9e722386b76",
"type": "github"
},
"original": {
@@ -239,11 +239,11 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1743813633,
- "narHash": "sha256-BgkBz4NpV6Kg8XF7cmHDHRVGZYnKbvG0Y4p+jElwxaM=",
+ "lastModified": 1744309437,
+ "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "7819a0d29d1dd2bc331bec4b327f0776359b1fa6",
+ "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7",
"type": "github"
},
"original": {
@@ -255,11 +255,11 @@
},
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1743938762,
- "narHash": "sha256-UgFYn8sGv9B8PoFpUfCa43CjMZBl1x/ShQhRDHBFQdI=",
+ "lastModified": 1744347518,
+ "narHash": "sha256-4Y0ByuP4NEz2Zyso9Ozob8yR6kKuaunJ5OARv+tFLPI=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "74a40410369a1c35ee09b8a1abee6f4acbedc059",
+ "rev": "642c54c23609fefb5708b0e2be261446c59138f6",
"type": "github"
},
"original": {
@@ -271,11 +271,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1743827369,
- "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=",
+ "lastModified": 1744232761,
+ "narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "42a1c966be226125b48c384171c44c651c236c22",
+ "rev": "f675531bc7e6657c10a18b565cfebd8aa9e24c14",
"type": "github"
},
"original": {
diff --git a/home/common/nvim/init.lua b/home/common/nvim/init.lua
index cae84e0..2e21cbf 100644
--- a/home/common/nvim/init.lua
+++ b/home/common/nvim/init.lua
@@ -93,6 +93,7 @@ vim.opt.grepformat = vim.opt.grepformat ^ { "%f:%l:%c:%m" }
-- Diagnostics
vim.diagnostic.config {
+ float = { border = "rounded" },
severity_sort = true,
signs = {
linehl = {
@@ -114,11 +115,12 @@ vim.diagnostic.config {
[vim.diagnostic.severity.HINT] = "",
},
},
- virtual_lines = { current_line = true },
+ virtual_lines = false,
}
vim.keymap.set('n', '<Space>ud', function()
if vim.diagnostic.config().virtual_lines == true then
- vim.diagnostic.config({ virtual_lines = { current_line = true } })
+ -- vim.diagnostic.config({ virtual_lines = { current_line = true } })
+ vim.diagnostic.config({ virtual_lines = false })
else
vim.diagnostic.config({ virtual_lines = true })
end
@@ -176,8 +178,13 @@ end, opts("Format Buffer"))
vim.keymap.set('n', '<Leader><Leader>', "<cmd>Pick visit_paths cwd=''<cr>", opts("Visits"))
vim.keymap.set('n', '<Leader>b', "<cmd>Pick buffers<cr>", opts("Open buffer picker"))
vim.keymap.set('n', '<Leader>/', "<cmd>Pick grep_live_root<cr>", opts("Search workspace files"))
-vim.keymap.set('n', '<Leader>d', "<cmd>Pick diagnostic<cr>", opts("Open diagnostics picker"))
-vim.keymap.set("n", "<Leader>D", vim.diagnostic.setloclist, { desc = "Diagnostics to location list" })
+vim.keymap.set('n', '<Leader>d', vim.diagnostic.open_float, opts("Show diagnostics for line"))
+vim.keymap.set('n', '<m-d>', vim.diagnostic.open_float, opts("Show diagnostics for line"))
+vim.keymap.set('n', '<Leader>D', function()
+ local width = vim.o.columns - 8
+ MiniExtra.pickers.diagnostic({ scope = "current" }, { window = { config = { width = width } } })
+end, opts("Open diagnostics picker"))
+
vim.keymap.set("n", "<Leader>r", vim.lsp.buf.rename, opts("Rename Symbol"))
vim.keymap.set('n', '<Leader>F', "<cmd>Pick files<cr>", opts("Open file picker CWD"))
vim.keymap.set('n', '<Leader>f', "<cmd>Pick files_root<cr>", opts("Open file picker"))
diff --git a/home/dln/desktop.nix b/home/dln/desktop.nix
index 78177b4..e6f9326 100644
--- a/home/dln/desktop.nix
+++ b/home/dln/desktop.nix
@@ -16,6 +16,7 @@
pavucontrol
plexamp
signal-desktop
+ spotify
];
xdg.desktopEntries = {