From e8840b1495c2493dc487dee9d2c5c15b9e9efd7e Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Mon, 20 Nov 2023 21:59:18 +0100 Subject: [PATCH] Update deps --- flake.lock | 32 ++++++++--------- home/programs/nvim/default.nix | 11 ++++-- home/programs/nvim/plugins.nix | 62 ++++++++++++++++----------------- home/programs/nvim/plugins.yaml | 2 +- system/darwin/attic.nix | 13 +++++-- 5 files changed, 68 insertions(+), 52 deletions(-) diff --git a/flake.lock b/flake.lock index 07d5432..29cf4dc 100644 --- a/flake.lock +++ b/flake.lock @@ -244,11 +244,11 @@ ] }, "locked": { - "lastModified": 1700386809, - "narHash": "sha256-2IPxWo0Yplv+70EueZVLTwRAijax0tirYp5Jh0QV1A4=", + "lastModified": 1700419052, + "narHash": "sha256-U6a5f9ynbzcp8PMIHULbHPkbwp7YfPKOYmTcLqlalD4=", "owner": "nix-community", "repo": "home-manager", - "rev": "9a4725afa67db35cdf7be89f30527d745194cafa", + "rev": "993fb02d20760067b8ee19c713d94cee07037759", "type": "github" }, "original": { @@ -287,11 +287,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1700400332, - "narHash": "sha256-m3K6E1ajuMGKjDoXEy+w1S2V0IbdTnkU3BzK90B0Upk=", + "lastModified": 1700497181, + "narHash": "sha256-CllnAJDuP6SYf6qqfPSOqr803bTe6NP7U5Qq+opj/p8=", "owner": "neovim", "repo": "neovim", - "rev": "de28a0f84c577e264f37cd001b03d640db7d5ef9", + "rev": "ec79ff893d5906e1f0d90953cffa535ffae47823", "type": "github" }, "original": { @@ -312,11 +312,11 @@ ] }, "locked": { - "lastModified": 1700401644, - "narHash": "sha256-0agVFMWi5PAhJB5kWb/4Cb8pznv2YzaByZNtVlXlzdE=", + "lastModified": 1700506783, + "narHash": "sha256-kVJde7hviggGxNmc7WOooWY5fa6jkpDjv8HePUOiyoY=", "ref": "refs/heads/master", - "rev": "516a8fc4d27543b274e35d9d7037617a95292ea8", - "revCount": 589, + "rev": "18e21dfd5a49195757604ffe14175b9828ec69de", + "revCount": 590, "type": "git", "url": "https://git.kempkens.io/daniel/nix-overlay" }, @@ -363,11 +363,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1700375254, - "narHash": "sha256-S4AzIm/Eoz0bYpgEc27UbRvjVoc2+tt71gNQReSTsP4=", + "lastModified": 1700463343, + "narHash": "sha256-6HpM0MP3V6jYsnAklIkjw6Wa+L0Zgokq+OBduVBR3n4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0ace63bed8f561e4cc5b1c8fa5fee6be61fbcf8b", + "rev": "3fb937a1e9f4157f57011965b99fcb7f4139d9ad", "type": "github" }, "original": { @@ -379,11 +379,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700230496, - "narHash": "sha256-pl8PLUQLigZgFZrafIXs2djne5kboimK6MYsZN8Ywtg=", + "lastModified": 1700444282, + "narHash": "sha256-s/+tgT+Iz0LZO+nBvSms+xsMqvHt2LqYniG9r+CYyJc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a71323f68d4377d12c04a5410e214495ec598d4c", + "rev": "3f21a22b5aafefa1845dec6f4a378a8f53d8681c", "type": "github" }, "original": { diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix index a9047e6..6609a5f 100644 --- a/home/programs/nvim/default.nix +++ b/home/programs/nvim/default.nix @@ -224,8 +224,6 @@ in type = "fennel"; } - friendly-snippets - # cmp { plugin = nvim-cmp; @@ -269,6 +267,15 @@ in } # UI + { + plugin = oil-nvim; + config = /* fennel */ '' + (let [oil (require :oil)] + (oil.setup)) + ''; + type = "fennel"; + } + { plugin = heirline-nvim; config = builtins.readFile ../../config/nvim/plugins/heirline.fnl; diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index a76a1bb..58a44ec 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -29,23 +29,23 @@ in }; mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2023-11-19"; + version = "2023-11-20"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "92e2ae609f612f11f7e8e45d13614fcdff9f89b9"; - sha256 = "0fwg6k01njgybj1ca9iy92psi2slq227zlmp74z97fh1m9sn6b8l"; + rev = "05f4a49cd85a67b90328a1bcbae4d9ed2a0a417b"; + sha256 = "1m1z451p8bx5x9cal3a1yy3a28sjp7pmsisrfgsy2vckkxqf8m05"; fetchSubmodules = false; }; }; nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2023-11-19"; + version = "2023-11-20"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "e2f6e0e299e193d7e9c48634d355f7a6eb3020b4"; - sha256 = "06588a1ksahy51vszi7ri5i40yy2hxbp2zgrd1xnlc2xk0bxzbqh"; + rev = "cdbcca210cf3655aa9b31ebf2422763ecd85ee5c"; + sha256 = "18bxb2zg55ccjzj7q2kyv3bhyxagf3pm89zqhmwy45n0ng9vmn89"; fetchSubmodules = false; }; }; @@ -106,12 +106,12 @@ in }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2023-11-19"; + version = "2023-11-20"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "d87629647614b779fb2aad8f0042fe2864253ea6"; - sha256 = "04y1hygrpgkfb9y7ncbdrmqbzzvlr3f1xn3dgmyswl1cb602525b"; + rev = "1610b1aafb9b7b3a7b54c853ed45c6cb1a3d0df2"; + sha256 = "1n2c1ffgljf1ry3i6hk931q3m05f91786adfmqkxxbqf11phvj4s"; fetchSubmodules = false; }; }; @@ -132,8 +132,8 @@ in src = fetchFromGitHub { owner = "HiPhish"; repo = "rainbow-delimiters.nvim"; - rev = "072210357169394dff90d30ccfe0ac92530a9317"; - sha256 = "03ky9w9lvsb48lihx6lnmsj67w39hc79qhajr148zlldby7cw2v6"; + rev = "c6dce365e647162ae0031c1f814053beaf3dd843"; + sha256 = "07px1wk23p0sxvh7sv7gki0pp0mv0618kfgl7c6s5ylrpw6a11wq"; fetchSubmodules = false; }; }; @@ -208,12 +208,12 @@ in }; nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2023-11-19"; + version = "2023-11-20"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "6516abf5ac7d017480c8c8e08c0d24066bcb8d43"; - sha256 = "1vwjwqb5fsvf6bdj3c2wrja00jm3p4q2xhp7zg1na2nxsclswnqs"; + rev = "7fedba8b1f8d0080c775851c429b88fd2ed4c6f5"; + sha256 = "0l7lc35fixf7yhdr80f4b39rljyfvfj7alxl9kn6mc6qaffh8vg4"; fetchSubmodules = false; }; }; @@ -263,12 +263,12 @@ in }; nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2023-11-17"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "15fcab91e6a4e2a3e41dc55c5b3471f66c11ce39"; - sha256 = "1aqycpp4h274bhgx284fy632p89wx54cgjmqd1f0x1i2i94rvgap"; + rev = "3a7c15331a57ba40a56f00f29173700af853fa03"; + sha256 = "13h8s0cpgv2l6y1p54c9a4hncqh64zlrx07zy7k18xhqsz461c69"; fetchSubmodules = false; }; }; @@ -294,17 +294,6 @@ in fetchSubmodules = false; }; }; - friendly-snippets = buildVimPlugin { - pname = "friendly-snippets"; - version = "2023-10-01"; - src = fetchFromGitHub { - owner = "rafamadriz"; - repo = "friendly-snippets"; - rev = "43727c2ff84240e55d4069ec3e6158d74cb534b6"; - sha256 = "1sjk17gn919aa84dkjfagwwjsas9zfkbrk840bjf580k8m83d9m8"; - fetchSubmodules = false; - }; - }; nvim-cmp = buildVimPlugin { pname = "nvim-cmp"; version = "2023-11-06"; @@ -384,12 +373,12 @@ in }; conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2023-11-18"; + version = "2023-11-20"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "a36c68d2cd551e49883ddb2492c178d915567f58"; - sha256 = "1c9b4y41wf9kr4almhmqvg59nhslc6s5lgkpvv2mhchrqkm7zsba"; + rev = "2e5866a2c412a1237a9796a2d5a62d07fe084cc5"; + sha256 = "0j9hdc9a5jm1rvgv6hqrkmq7vqaxa8lb5lhk72zqwgvsf3lbq6g6"; fetchSubmodules = false; }; }; @@ -426,6 +415,17 @@ in fetchSubmodules = false; }; }; + oil-nvim = buildVimPlugin { + pname = "oil.nvim"; + version = "2023-11-20"; + src = fetchFromGitHub { + owner = "stevearc"; + repo = "oil.nvim"; + rev = "05cb8257cb9257144e63f41ccfe5a41ba3d1003c"; + sha256 = "0y2lfdx75d418jdypp1yg3sdmr88csb4z3p1dnxnggx4xk1yghrx"; + fetchSubmodules = false; + }; + }; heirline-nvim = buildVimPlugin { pname = "heirline.nvim"; version = "2023-09-03"; diff --git a/home/programs/nvim/plugins.yaml b/home/programs/nvim/plugins.yaml index 0f79e97..c1d36d4 100644 --- a/home/programs/nvim/plugins.yaml +++ b/home/programs/nvim/plugins.yaml @@ -35,7 +35,6 @@ - src: numtostr/comment.nvim # Snippets - src: L3MON4D3/LuaSnip -- src: rafamadriz/friendly-snippets # cmp - src: hrsh7th/nvim-cmp - src: hrsh7th/cmp-nvim-lsp @@ -52,6 +51,7 @@ # Textobjects - src: kylechui/nvim-surround # UI +- src: stevearc/oil.nvim - src: rebelot/heirline.nvim - src: lukas-reineke/indent-blankline.nvim - src: lukas-reineke/virt-column.nvim diff --git a/system/darwin/attic.nix b/system/darwin/attic.nix index 2ac317d..f10e66c 100644 --- a/system/darwin/attic.nix +++ b/system/darwin/attic.nix @@ -1,5 +1,14 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: +let + inherit (pkgs) stdenv; + + attic = pkgs.attic-client.overrideAttrs (_: _: { + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; + }); +in { - environment.systemPackages = [ pkgs.attic-client ]; + environment.systemPackages = [ attic ]; }