From 58a92fb669f7f9716af6ba48938d35420c4e0b97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= Date: Fri, 1 Mar 2024 09:27:15 +0100 Subject: [PATCH] update nixvim --- flake.lock | 115 +++++++++++++++++--------------------- flake.nix | 7 ++- home/packages/default.nix | 1 + home/programs/nixvim.nix | 93 +++++++++++++----------------- 4 files changed, 96 insertions(+), 120 deletions(-) diff --git a/flake.lock b/flake.lock index d76e988..74030ce 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1708472464, - "narHash": "sha256-dZzhUDumm6GlT3iokCycOQakWbH1IZANltu+gLdKtEY=", + "lastModified": 1708967105, + "narHash": "sha256-rUr9G1h9mkj/YAogNypZLOQtmtDawJKf4S4wXlEIFbA=", "owner": "Aylur", "repo": "ags", - "rev": "7465dcfa064c1aed1ca9c843f3a76c520c43a3d3", + "rev": "2e80d4e4f46f35d6529213c0a0e07f61b335cbe6", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1708451036, - "narHash": "sha256-tgZ38NummEdnXvxj4D0StHBzXgceAw8CptytHljH790=", + "lastModified": 1708806879, + "narHash": "sha256-MSbxtF3RThI8ANs/G4o1zIqF5/XlShHvwjl9Ws0QAbI=", "owner": "nix-community", "repo": "home-manager", - "rev": "517601b37c6d495274454f63c5a483c8e3ca6be1", + "rev": "4ee704cb13a5a7645436f400b9acc89a67b9c08a", "type": "github" }, "original": { @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1707919853, - "narHash": "sha256-qxmBGDzutuJ/tsX4gp+Mr7fjxOZBbeT9ixhS5o4iFOw=", + "lastModified": 1708558280, + "narHash": "sha256-w1ns8evB6N9VTrAojcdXLWenROtd77g3vyClrqeFdG8=", "owner": "nix-community", "repo": "home-manager", - "rev": "043ba285c6dc20f36441d48525402bcb9743c498", + "rev": "0b69d574162cfa6eb7919d5614a48d0185550891", "type": "github" }, "original": { @@ -202,11 +202,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1708543581, - "narHash": "sha256-wvhsh4J+Q9ED8oAWG+iz5uNOw70nagF+aeetlGpLkqs=", + "lastModified": 1708968051, + "narHash": "sha256-EkRf32ZKV2QAyDDaD98jc+EGxCQR5b+uGwpuNkH1Z+o=", "owner": "hyprwm", "repo": "hyprland", - "rev": "ea3fd13e24d7d3a74cf803bef3e6133b5d708d1b", + "rev": "f7a34534873bf499fc1a04a5fa25ada03c4ee415", "type": "github" }, "original": { @@ -245,36 +245,18 @@ "nixpkgs": [ "hyprland", "nixpkgs" - ] - }, - "locked": { - "lastModified": 1708005943, - "narHash": "sha256-9TT3xk++LI5/SPYgjYX34xZ4ebR93c1uerIq+SE/ues=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "aeb3e012adc7b3235335c540b214b82267c2b983", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlang_2": { - "inputs": { - "nixpkgs": [ + ], + "systems": [ "hyprland", - "xdph", - "nixpkgs" + "systems" ] }, "locked": { - "lastModified": 1704287638, - "narHash": "sha256-TuRXJGwtK440AXQNl5eiqmQqY4LZ/9+z/R7xC0ie3iA=", + "lastModified": 1708787654, + "narHash": "sha256-7ACgM3ZuAhPqurXHUvR2nWMRcnmzGGPjLK6q4DSTelI=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "6624f2bb66d4d27975766e81f77174adbe58ec97", + "rev": "0fce791ba2334aca183f2ed42399518947550d0d", "type": "github" }, "original": { @@ -291,11 +273,11 @@ ] }, "locked": { - "lastModified": 1707707289, - "narHash": "sha256-YuDt/eSTXMEHv8jS8BEZJgqCcG8Tr3cyqaZjJFXZHsw=", + "lastModified": 1708231718, + "narHash": "sha256-IZdieFWvhBkxoOFMDejqLUYqD94WN6k0YSpw0DFy+4g=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "44f50a5ecaab72a61d5fd8e5c5717bc4bf9c25dd", + "rev": "0e6857fa1d632637488666c08e7b02c08e3178f8", "type": "github" }, "original": { @@ -306,11 +288,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1705496572, - "narHash": "sha256-rPIe9G5EBLXdBdn9ilGc0nq082lzQd0xGGe092R/5QE=", + "lastModified": 1708475490, + "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19", + "rev": "0e74ca98a74bc7270d28838369593635a5db3260", "type": "github" }, "original": { @@ -322,11 +304,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1707546158, - "narHash": "sha256-nYYJTpzfPMDxI8mzhQsYjIUX+grorqjKEU9Np6Xwy/0=", + "lastModified": 1708807242, + "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0", + "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a", "type": "github" }, "original": { @@ -338,11 +320,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "lastModified": 1708807242, + "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a", "type": "github" }, "original": { @@ -364,11 +346,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1708506226, - "narHash": "sha256-iaC1I4KSI/d37nvoWdvRZZSt1ft5p+wmFPSPbun+VPI=", + "lastModified": 1708614940, + "narHash": "sha256-36muWApzetaV4WAEeqKsWxW4k2l0u3E841RI4sHPiz0=", "owner": "nix-community", "repo": "nixvim", - "rev": "f53be2242e31a6ea0d860e2674928a163857a47d", + "rev": "060a05138ca1a46fc0a0f79ef27f080cac57a59e", "type": "github" }, "original": { @@ -379,11 +361,11 @@ }, "nur": { "locked": { - "lastModified": 1708551955, - "narHash": "sha256-BI7+0KO4OfxzsEukk8Js1ce4ysJ4BS141ps07MNhO0s=", + "lastModified": 1708965861, + "narHash": "sha256-5r+S5cqd6dqQCkkuW8GNSWNcd82zpZAcA+XjTg6zCSc=", "owner": "nix-community", "repo": "NUR", - "rev": "0757452695e0d82544e47312e64b2f7a6211abde", + "rev": "053ea69d454c1f9a72f0b0250dc98f42e5a02ea1", "type": "github" }, "original": { @@ -407,11 +389,11 @@ ] }, "locked": { - "lastModified": 1707297608, - "narHash": "sha256-ADjo/5VySGlvtCW3qR+vdFF4xM9kJFlRDqcC9ZGI8EA=", + "lastModified": 1708018599, + "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "0db2e67ee49910adfa13010e7f012149660af7f0", + "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", "type": "github" }, "original": { @@ -465,18 +447,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1706359063, - "narHash": "sha256-5HUTG0p+nCJv3cn73AmFHRZdfRV5AD5N43g8xAePSKM=", + "lastModified": 1708558866, + "narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=", "owner": "wlroots", "repo": "wlroots", - "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", + "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", + "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", "type": "gitlab" } }, @@ -486,7 +468,10 @@ "hyprland", "hyprland-protocols" ], - "hyprlang": "hyprlang_2", + "hyprlang": [ + "hyprland", + "hyprlang" + ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -497,11 +482,11 @@ ] }, "locked": { - "lastModified": 1706521509, - "narHash": "sha256-AInZ50acOJ3wzUwGzNr1TmxGTMx+8j6oSTzz4E7Vbp8=", + "lastModified": 1708696469, + "narHash": "sha256-shh5wmpeYy3MmsBfkm4f76yPsBDGk6OLYRVG+ARy2F0=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "c06fd88b3da492b8f9067be021b9184f7012b5a8", + "rev": "1b713911c2f12b96c2574474686e4027ac4bf826", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b5f0ffa..67332ed 100644 --- a/flake.nix +++ b/flake.nix @@ -37,8 +37,11 @@ allowUnfree = true; allowUnsupportedSystem = true; experimental-features = "nix-command flakes"; - substituters = ["https://hyprland.cachix.org"]; - trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; + substituters = ["https://hyprland.cachix.org" "https://cuda-maintainers.cachix.org"]; + trusted-public-keys = [ + "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E=" + ]; }; overlays = [ nur.overlay diff --git a/home/packages/default.nix b/home/packages/default.nix index 4f854f3..dbae400 100644 --- a/home/packages/default.nix +++ b/home/packages/default.nix @@ -55,6 +55,7 @@ lpc21isp dfu-util cura + orca-slicer # gaming steam diff --git a/home/programs/nixvim.nix b/home/programs/nixvim.nix index e4b1974..cd62cae 100644 --- a/home/programs/nixvim.nix +++ b/home/programs/nixvim.nix @@ -434,7 +434,7 @@ in { ts-autotag.enable = true; leap.enable = true; harpoon = { - enable = false; + enable = true; enableTelescope = true; keymaps = { addFile = "hm"; @@ -473,61 +473,43 @@ in { nixvimInjections = true; }; - none-ls = { + conform-nvim = { enable = true; - sources = { - code_actions = { - eslint_d.enable = true; - shellcheck.enable = true; - }; - diagnostics = { - eslint_d = { - enable = true; - withArgs = '' - {only_local = "node_modules/.bin"} - ''; - }; - shellcheck.enable = true; - }; - formatting = { - alejandra.enable = true; - prettier = { - enable = true; - withArgs = '' - {extra_filetypes = {"svelte"}} - ''; - }; - rustfmt.enable = true; - shfmt.enable = true; - stylua.enable = true; - }; + formattersByFt = { + lua = ["stylua"]; + javascript = ["prettier"]; + markdown = ["prettier"]; + typescript = ["prettier"]; + json = ["prettier"]; + yaml = ["prettier"]; + html = ["prettier"]; + css = ["prettier"]; + scss = ["prettier"]; + less = ["prettier"]; + svelte = ["prettier"]; + rust = ["rustfmt"]; + bash = ["shfmt"]; + nix = ["alejandra"]; + }; + formatOnSave = { + timeoutMs = 500; + lspFallback = true; }; - sourcesItems = [{__raw = "require('null-ls').builtins.diagnostics.stylelint";}]; - onAttach = - /* - lua - */ - '' - function(client, bufnr) - if client.supports_method("textDocument/formatting") then - vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr }) - vim.api.nvim_create_autocmd("BufWritePre", { - group = augroup, - buffer = bufnr, - callback = function() - vim.lsp.buf.format({ - filter = function(client) - return client.name == "null-ls" - end, - bufnr = bufnr, - async = false, - }) - end, - }) - end - end - ''; }; + + lint = { + enable = true; + lintersByFt = { + javascript = ["eslint"]; + typescript = ["eslint"]; + css = ["stylelint"]; + scss = ["stylelint"]; + less = ["stylelint"]; + bash = ["shellcheck"]; + }; + autoCmd.event = "TextChanged"; + }; + lsp = { enable = true; keymaps = {diagnostic = {};}; @@ -626,6 +608,11 @@ in { }; experimental.ghost_text = true; }; + + which-key = { + enable = true; + }; + copilot-lua = { panel.enabled = false; suggestion.enabled = false;