From be3818d7194061a1ab6c0a47687d26021d8c64a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Fri, 17 Feb 2023 12:31:31 +0100 Subject: [PATCH 1/8] add neovim-nightly --- flake.lock | 63 ++++++++++++++++++++++++++++--- flake.nix | 2 + modules/programs/nvim/default.nix | 1 + overlays/default.nix | 2 + 4 files changed, 63 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index eb20aaa..f75a33e 100644 --- a/flake.lock +++ b/flake.lock @@ -210,6 +210,21 @@ } }, "flake-utils_5": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -419,6 +434,27 @@ "type": "github" } }, + "neovim": { + "inputs": { + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "dir": "contrib", + "lastModified": 1676603980, + "narHash": "sha256-EWHGiO/1dulYfzdUnxXqW6nu79T+soBC/YS0tZPtlQ0=", + "owner": "neovim", + "repo": "neovim", + "rev": "371a74e4e1685f21e83c70eb8f0bd05c2ce24e49", + "type": "github" + }, + "original": { + "dir": "contrib", + "owner": "neovim", + "repo": "neovim", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1673540789, @@ -532,6 +568,22 @@ } }, "nixpkgs_6": { + "locked": { + "lastModified": 1671983799, + "narHash": "sha256-Z2Ro6hFPZHkBqkVXY5/aBUzxi5xizQGvuHQ9+T5B/ks=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "fad51abd42ca17a60fc1d4cb9382e2d79ae31836", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { "locked": { "lastModified": 1675940568, "narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=", @@ -547,7 +599,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1671271357, "narHash": "sha256-xRJdLbWK4v2SewmSStYrcLa0YGJpleufl44A19XSW8k=", @@ -619,9 +671,9 @@ "pre-commit-hooks_3": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "gitignore": "gitignore_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { @@ -651,7 +703,8 @@ "hyprland": "hyprland", "hyprpaper": "hyprpaper", "master": "master", - "nixpkgs": "nixpkgs_6", + "neovim": "neovim", + "nixpkgs": "nixpkgs_7", "pre-commit-hooks": "pre-commit-hooks_3", "stable": "stable", "utils": "utils_2" @@ -690,7 +743,7 @@ }, "utils_2": { "inputs": { - "flake-utils": "flake-utils_5" + "flake-utils": "flake-utils_6" }, "locked": { "lastModified": 1657226504, diff --git a/flake.nix b/flake.nix index 945aaf5..efd2145 100644 --- a/flake.nix +++ b/flake.nix @@ -48,6 +48,8 @@ emacs.url = "git+ssh://git@gitea.moritzboeh.me/moritz/emacs.git?ref=main"; + neovim.url = "github:neovim/neovim?dir=contrib"; + # Hyprland hyprland.url = "github:hyprwm/Hyprland"; hyprpaper.url = "github:hyprwm/hyprpaper"; diff --git a/modules/programs/nvim/default.nix b/modules/programs/nvim/default.nix index 1c00cf5..553def7 100644 --- a/modules/programs/nvim/default.nix +++ b/modules/programs/nvim/default.nix @@ -20,6 +20,7 @@ in config = mkIf cfg.enable { home-manager.users.moritz.programs.neovim = { enable = true; + package = pkgs.neovim-nightly; vimAlias = true; vimdiffAlias = true; withNodeJs = true; diff --git a/overlays/default.nix b/overlays/default.nix index 071a899..4f6be2e 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,4 +1,6 @@ { inputs }: final: prev: { + neovim-nightly = inputs.neovim.packages.${prev.system}.default; + logseq-wayland = prev.symlinkJoin { name = "logseq-wayland"; paths = [ prev.logseq ]; From 5a4bea05d686020ca1d168e730e6e41a77b5ff37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Fri, 17 Feb 2023 12:38:02 +0100 Subject: [PATCH 2/8] fix catppuccin theme --- modules/programs/nvim/init.lua | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/modules/programs/nvim/init.lua b/modules/programs/nvim/init.lua index 1cb5fce..ea00f2c 100644 --- a/modules/programs/nvim/init.lua +++ b/modules/programs/nvim/init.lua @@ -33,11 +33,13 @@ vim.opt.updatetime = 300 vim.opt_local.spell = true vim.opt_local.spelllang = { "en", "de_20" } -- all English regions and new German spelling --- plugins require("catppuccin").setup({ - flavour = "macchiato", + compile_path = vim.fn.stdpath("cache") .. "/catppuccin", -- fix issue of writing to nix store + integrations = { + which_key = true, + }, }) -vim.cmd.colorscheme("catppuccin") +vim.cmd.colorscheme("catppuccin-macchiato") vim.o.timeout = true vim.o.timeoutlen = 300 @@ -63,20 +65,20 @@ require("noice").setup({ }) wk.register({ - f = { - name="find", - f = { "Telescope find_files", "find file" }, - g = { "Telescope live_grep", "live grep" }, - b = { "Telescope buffers", "find buffer" }, - }, + f = { + name = "find", + f = { "Telescope find_files", "find file" }, + g = { "Telescope live_grep", "live grep" }, + b = { "Telescope buffers", "find buffer" }, + }, }, { prefix = "" }) require("neogit").setup({ - disable_commit_confirmation = true, + disable_commit_confirmation = true, }) wk.register({ - g = { "Neogit", "git" } -}, { prefix = ""}) + g = { "Neogit", "git" }, +}, { prefix = "" }) require("nvim-treesitter.configs").setup({ sync_install = false, From d63cee0e9828a031941ed19f6ba4640ce43f1c7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Fri, 17 Feb 2023 12:38:44 +0100 Subject: [PATCH 3/8] add lsp --- modules/programs/nvim/default.nix | 10 +++ modules/programs/nvim/init.lua | 124 ++++++++++++++++++++++++++++++ 2 files changed, 134 insertions(+) diff --git a/modules/programs/nvim/default.nix b/modules/programs/nvim/default.nix index 553def7..5549f2b 100644 --- a/modules/programs/nvim/default.nix +++ b/modules/programs/nvim/default.nix @@ -26,17 +26,27 @@ in withNodeJs = true; withPython3 = true; extraLuaConfig = builtins.readFile ./init.lua; + extraPackages = with pkgs; [ + sumneko-lua-language-server + nil + ]; plugins = with pkgs.vimPlugins; [ catppuccin-nvim + cmp-nvim-lsp dashboard-nvim neogit noice-nvim nui-nvim # for noice-nvim + nvim-cmp + nvim-lspconfig nvim-treesitter.withAllGrammars nvim-web-devicons # for dashboard-nvim plenary-nvim # for telescope, neogit telescope-nvim which-key-nvim + cmp_luasnip + luasnip + lsp_lines-nvim ]; }; }; diff --git a/modules/programs/nvim/init.lua b/modules/programs/nvim/init.lua index ea00f2c..18cd345 100644 --- a/modules/programs/nvim/init.lua +++ b/modules/programs/nvim/init.lua @@ -88,3 +88,127 @@ require("nvim-treesitter.configs").setup({ additional_vim_regex_highlighting = true, }, }) + +local cmp = require("cmp") +local luasnip = require("luasnip") +cmp.setup({ + snippet = { + -- REQUIRED - you must specify a snippet engine + expand = function(args) + require("luasnip").lsp_expand(args.body) + end, + }, + mapping = cmp.mapping.preset.insert({ + [""] = cmp.mapping.scroll_docs(-4), + [""] = cmp.mapping.scroll_docs(4), + [""] = cmp.mapping.complete(), + [""] = cmp.mapping.abort(), + [""] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + else + fallback() + end + end, { "i", "s" }), + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, { "i", "s" }), + }), + sources = { + { name = "nvim_lsp" }, + { name = "luasnip" }, + { name = "buffer" }, + }, +}) + +-- The nvim-cmp almost supports LSP's capabilities so You should advertise it to LSP servers.. +local capabilities = require("cmp_nvim_lsp").default_capabilities() + +local lspconfig = require("lspconfig") +local on_attach_def = function(_, bufnr) + wk.register({ + K = { vim.lsp.buf.hover, "show info" }, + ["l"] = { + name = "lsp", + d = { vim.diagnostic.open_float, "open diagnostic window" }, + n = { vim.diagnostic.goto_next, "next error" }, + p = { vim.diagnostic.goto_prev, "prev error" }, + c = { vim.lsp.buf.code_action, "code action" }, + r = { vim.lsp.buf.rename, "rename" }, + f = { + function() + vim.lsp.buf.format({ async = true }) + end, + "format", + }, + }, + g = { + name = "goto", + r = { vim.lsp.buf.references, "references" }, + d = { vim.lsp.buf.definition, "definition" }, + D = { vim.lsp.buf.declaration, "declaration" }, + i = { vim.lsp.buf.implementation, "implementation" }, + t = { vim.lsp.buf.type_definition, "type defininition" }, + }, + }, { noremap = true, silent = true, buffer = bufnr }) +end + +local servers = { "nil_ls", "pylsp" } +for _, lsp in ipairs(servers) do + lspconfig[lsp].setup({ + on_attach = on_attach_def, + capabilities = capabilities, + flags = { + debounce_text_changes = 100, + }, + }) +end + +lspconfig.sumneko_lua.setup({ + on_attach = on_attach_def, + capabilities = capabilities, + settings = { + Lua = { + runtime = { + -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) + version = "LuaJIT", + }, + diagnostics = { + -- Get the language server to recognize the `vim` global + globals = { "vim" }, + }, + workspace = { + -- Make the server aware of Neovim runtime files + library = vim.api.nvim_get_runtime_file("", true), + checkThirdParty = false, + }, + -- Do not send telemetry data containing a randomized but unique identifier + telemetry = { + enable = false, + }, + }, + }, +}) + +local lsp_lines = require("lsp_lines") +lsp_lines.setup() +-- Disable virtual_text since it's redundant due to lsp_lines. +vim.diagnostic.config({ + virtual_text = false, +}) +wk.register({ + t = { + name = "toggle", + l = { lsp_lines.toggle, "lsp lines" }, + }, + { prefix = "" }, +}) From ec9cb2fb3edb5fd531dd9fd2b669740bf67fe366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Fri, 17 Feb 2023 12:39:03 +0100 Subject: [PATCH 4/8] use flake provided packages --- flake.nix | 2 -- overlays/default.nix | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index efd2145..8b09ac9 100644 --- a/flake.nix +++ b/flake.nix @@ -72,12 +72,10 @@ overlay = import ./overlays { inherit inputs; }; channels.nixpkgs.overlaysBuilder = channels: [ - inputs.agenix.overlays.default inputs.emacs.overlays.default inputs.howdy.overlays.default inputs.hypr-contrib.overlays.default inputs.hyprland.overlays.default - inputs.hyprpaper.overlays.default inputs.utils.overlay self.overlay ]; diff --git a/overlays/default.nix b/overlays/default.nix index 4f6be2e..9a7098b 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,4 +1,6 @@ { inputs }: final: prev: { + agenix = inputs.agenix.packages.${prev.system}.default; + hyprpaper = inputs.hyprpaper.packages.${prev.system}.default; neovim-nightly = inputs.neovim.packages.${prev.system}.default; logseq-wayland = prev.symlinkJoin { From fe6af3b8f2ad8e4e00acee9de81030a67849af36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Fri, 17 Feb 2023 12:59:51 +0100 Subject: [PATCH 5/8] tweak lua formatting options --- modules/programs/nvim/init.lua | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/programs/nvim/init.lua b/modules/programs/nvim/init.lua index 18cd345..200753e 100644 --- a/modules/programs/nvim/init.lua +++ b/modules/programs/nvim/init.lua @@ -195,6 +195,15 @@ lspconfig.sumneko_lua.setup({ telemetry = { enable = false, }, + format = { + enable = true, + -- Put format options here + -- NOTE: the value should be STRING!! + defaultConfig = { + indent_style = "space", + indent_size = "2", + }, + }, }, }, }) From b7c893aa0a80156771aea34884f02535746bb21e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Fri, 17 Feb 2023 13:00:23 +0100 Subject: [PATCH 6/8] add dashboard config --- modules/programs/nvim/init.lua | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/programs/nvim/init.lua b/modules/programs/nvim/init.lua index 200753e..4e20fbe 100644 --- a/modules/programs/nvim/init.lua +++ b/modules/programs/nvim/init.lua @@ -221,3 +221,13 @@ wk.register({ }, { prefix = "" }, }) + +require("dashboard").setup({ + theme = "hyper", + config = { + packages = { enable = true }, + week_header = { + enable = true, + }, + }, +}) From c9916f0366de0bcea4bc3e91a61e44f34e740e6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Fri, 17 Feb 2023 13:01:11 +0100 Subject: [PATCH 7/8] add nil overlay --- flake.lock | 87 +++++++++++++++++++++++++++++++++++++++++--- flake.nix | 2 + overlays/default.nix | 1 + 3 files changed, 85 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index f75a33e..7f6fef8 100644 --- a/flake.lock +++ b/flake.lock @@ -225,6 +225,21 @@ } }, "flake-utils_6": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_7": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -455,6 +470,26 @@ "type": "github" } }, + "nil": { + "inputs": { + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_7", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1676390054, + "narHash": "sha256-w0KvrM+9WIEYr0juDh4Vs39ed2IaT0T696fp9pZ7i1I=", + "owner": "oxalica", + "repo": "nil", + "rev": "944d5c335531778a1d7b54a97bf7fb5ec0c3e976", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "nil", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1673540789, @@ -584,6 +619,22 @@ } }, "nixpkgs_7": { + "locked": { + "lastModified": 1675309347, + "narHash": "sha256-D3CQ6HRDT2m3XJlrzb5jKq4vNFR5xFTEFKC7iSjlFpM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "006c3bd4dd2f5d1d2094047f307cbf9e2b73d9c5", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { "locked": { "lastModified": 1675940568, "narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=", @@ -599,7 +650,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1671271357, "narHash": "sha256-xRJdLbWK4v2SewmSStYrcLa0YGJpleufl44A19XSW8k=", @@ -671,9 +722,9 @@ "pre-commit-hooks_3": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "gitignore": "gitignore_2", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { @@ -704,12 +755,38 @@ "hyprpaper": "hyprpaper", "master": "master", "neovim": "neovim", - "nixpkgs": "nixpkgs_7", + "nil": "nil", + "nixpkgs": "nixpkgs_8", "pre-commit-hooks": "pre-commit-hooks_3", "stable": "stable", "utils": "utils_2" } }, + "rust-overlay": { + "inputs": { + "flake-utils": [ + "nil", + "flake-utils" + ], + "nixpkgs": [ + "nil", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1675391458, + "narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "stable": { "locked": { "lastModified": 1675918889, @@ -743,7 +820,7 @@ }, "utils_2": { "inputs": { - "flake-utils": "flake-utils_6" + "flake-utils": "flake-utils_7" }, "locked": { "lastModified": 1657226504, diff --git a/flake.nix b/flake.nix index 8b09ac9..9f6dffc 100644 --- a/flake.nix +++ b/flake.nix @@ -50,6 +50,8 @@ neovim.url = "github:neovim/neovim?dir=contrib"; + nil.url = "github:oxalica/nil"; + # Hyprland hyprland.url = "github:hyprwm/Hyprland"; hyprpaper.url = "github:hyprwm/hyprpaper"; diff --git a/overlays/default.nix b/overlays/default.nix index 9a7098b..7e5cdc1 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -2,6 +2,7 @@ agenix = inputs.agenix.packages.${prev.system}.default; hyprpaper = inputs.hyprpaper.packages.${prev.system}.default; neovim-nightly = inputs.neovim.packages.${prev.system}.default; + nil = inputs.nil.packages.${prev.system}.default; logseq-wayland = prev.symlinkJoin { name = "logseq-wayland"; From 0e73a701ecb5a68b570b5f18f6495b85a8eb9642 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Fri, 17 Feb 2023 13:03:41 +0100 Subject: [PATCH 8/8] flake: update inputs --- flake.lock | 62 +++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index 7f6fef8..2837f2c 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1675176355, - "narHash": "sha256-Qjxh5cmN56siY97mzmBLI1+cdjXSPqmfPVsKxBvHmwI=", + "lastModified": 1676599101, + "narHash": "sha256-CKS6UsOGhoNxGDBt9wyFiWHvtng/+BMAJ4G8ahhe1DE=", "owner": "ryantm", "repo": "agenix", - "rev": "b7ffcfe77f817d9ee992640ba1f270718d197f28", + "rev": "de657061b13cf329c57a1a9730a5049a971b40b3", "type": "github" }, "original": { @@ -84,11 +84,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1676057905, - "narHash": "sha256-9uGgDgMTwspDQlR2laeYa4qwf3BoU04sKpOR1h6/bvM=", + "lastModified": 1676394233, + "narHash": "sha256-RHO/MgRyFqgmIgogrL5LBmBhAt8hTpUJJ6Dww46GyZI=", "ref": "main", - "rev": "346600bd993ca400a493c9d9323a1caea267c650", - "revCount": 93, + "rev": "6fb9f917901160b2b212f420a8a8e4995c823626", + "revCount": 98, "type": "git", "url": "ssh://git@gitea.moritzboeh.me/moritz/emacs.git" }, @@ -321,11 +321,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1675935446, - "narHash": "sha256-WajulTn7QdwC7QuXRBavrANuIXE5z+08EdxdRw1qsNs=", + "lastModified": 1676367705, + "narHash": "sha256-un5UbRat9TwruyImtwUGcKF823rCEp4fQxnsaLFL7CM=", "owner": "nix-community", "repo": "home-manager", - "rev": "2dce7f1a55e785a22d61668516df62899278c9e4", + "rev": "da72e6fc6b7dc0c3f94edbd310aae7cd95c678b5", "type": "github" }, "original": { @@ -382,11 +382,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1676120405, - "narHash": "sha256-5DSaAh3ifx3tW7ZMF7GFy/Kw4uHs3ZUtt+cH9+YVOXY=", + "lastModified": 1676630258, + "narHash": "sha256-pc3aIr2LgmJFcTQwICpz3d4/u5/xHDI14qY/zEhGM3k=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "97e0f02621829d011e08506c7361236b07f3f2b4", + "rev": "be2e4d9dd1e58991a4f54078a331cbcbd8265c7f", "type": "github" }, "original": { @@ -421,11 +421,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1676033584, - "narHash": "sha256-MeF1nR09cUdkCd1KNjzxImwhqsP2cbn/0M6z87fNJAk=", + "lastModified": 1676406424, + "narHash": "sha256-G+JhFuaeB15MTU8DbJALm/Yf240FCQmrWZ8Y0UzyqRI=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "44a38bfedc009bcc05eed571e80a397a80075a9f", + "rev": "1d76f4db0d3b487b9a9562195815e181652aef7c", "type": "github" }, "original": { @@ -436,11 +436,11 @@ }, "master": { "locked": { - "lastModified": 1676126546, - "narHash": "sha256-LYDhE85B+MQMvIS3/SVnLSsKBC6aTeFrMRa6pN75mlg=", + "lastModified": 1676634984, + "narHash": "sha256-VlcjVkzFEYGOVMXvlpS9hREF40Zs3n3Gpw53nlo22CI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "aebc76376ca2da5ee4524326e6f83a3a18587d54", + "rev": "98042fc6d36ebb11a4defe4f2cee76aa6192257d", "type": "github" }, "original": { @@ -456,11 +456,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1676603980, - "narHash": "sha256-EWHGiO/1dulYfzdUnxXqW6nu79T+soBC/YS0tZPtlQ0=", + "lastModified": 1676634789, + "narHash": "sha256-ywC4XWyG6Qgs48ZYHU1BaxfPTlPS/Vt4Zgb5x0kYEWo=", "owner": "neovim", "repo": "neovim", - "rev": "371a74e4e1685f21e83c70eb8f0bd05c2ce24e49", + "rev": "f905ab04507fc5a86affeb5eaf8550c1795ac9b8", "type": "github" }, "original": { @@ -636,11 +636,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1675940568, - "narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=", + "lastModified": 1676549890, + "narHash": "sha256-sq/WcOEAl7gWrrfGkWdnyYazRyTf+enEim/o6LOQzI8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6ccc4a59c3f1b56d039d93da52696633e641bc71", + "rev": "8c66bd1b68f4708c90dcc97c6f7052a5a7b33257", "type": "github" }, "original": { @@ -728,11 +728,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1675688762, - "narHash": "sha256-oit/SxMk0B380ASuztBGQLe8TttO1GJiXF8aZY9AYEc=", + "lastModified": 1676513100, + "narHash": "sha256-MK39nQV86L2ag4TmcK5/+r1ULpzRLPbbfvWbPvIoYJE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "ab608394886fb04b8a5df3cb0bab2598400e3634", + "rev": "5f0cba88ac4d6dd8cad5c6f6f1540b3d6a21a798", "type": "github" }, "original": { @@ -789,11 +789,11 @@ }, "stable": { "locked": { - "lastModified": 1675918889, - "narHash": "sha256-hy7re4F9AEQqwZxubct7jBRos6md26bmxnCjxf5utJA=", + "lastModified": 1676546582, + "narHash": "sha256-MJ+PXNmUyxnMTFoss7G2lEcUY2cfYZM6RudBAL5aX1k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "49efda9011e8cdcd6c1aad30384cb1dc230c82fe", + "rev": "2fb7d749c084890192b2cd08ba264e5e4a14df1b", "type": "github" }, "original": {