From 300ae4a691a1dea37ca3a18f00b2d784cbc59939 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Wed, 26 Oct 2022 16:10:57 +0200 Subject: [PATCH] Update deps --- flake.lock | 30 +++++----- home/config/nvim/plugins/telescope.fnl | 7 ++- home/programs/nvim/default.nix | 2 +- home/programs/nvim/plugins.nix | 76 +++++++++++------------- home/programs/nvim/plugins.yaml | 11 +--- patches/darwin/ventura-fontrestore.patch | 51 ---------------- system/flakes/Styx.nix | 4 +- 7 files changed, 61 insertions(+), 120 deletions(-) delete mode 100644 patches/darwin/ventura-fontrestore.patch diff --git a/flake.lock b/flake.lock index e657270..f5604da 100644 --- a/flake.lock +++ b/flake.lock @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1666614183, - "narHash": "sha256-R5+bCtUquwSfQmRBbCYc6FT6xtCaAebh0KE187e8458=", + "lastModified": 1666776005, + "narHash": "sha256-HwSMF19PpczfqNHKcFsA6cF4PVbG00uUSdbq6q3jB5o=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "0f90e1c34caedd0bf765ebe47b92dd1ceffafcc8", + "rev": "f6648ca0698d1611d7eadfa72b122252b833f86c", "type": "github" }, "original": { @@ -102,11 +102,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1666596900, - "narHash": "sha256-GlJohATL4oqniHmyHqDUKo/lECNN/BULDleEJ0Q2ap4=", + "lastModified": 1666766306, + "narHash": "sha256-ttI5NiFPTBSDlHIHn4fiE0KUk890OTAgPbFKi7YpF6Y=", "owner": "neovim", "repo": "neovim", - "rev": "29fe3348ba126a334d7e6f06a66f14ec3110d02f", + "rev": "c00844aee4d9b607073ff123dfe2e872c9b84954", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1666600129, - "narHash": "sha256-DD9ve1v7Dy6vxYbGnmrNAD2cNBuNFm8smaOGbRW/MWc=", + "lastModified": 1666772293, + "narHash": "sha256-bgTIZmIgGoK/fesiH8gnvi7hKralzRwOrxl5dfb9dlo=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "877513fb7d17c5f62889556c3f5ff742b6221d20", + "rev": "d63dbcb723e31773ee7523498c8bc46170603a69", "type": "github" }, "original": { @@ -145,11 +145,11 @@ ] }, "locked": { - "lastModified": 1666601049, - "narHash": "sha256-/uf+Ma6R3j1Ghsp+jP83fz3NQXnK9bszaZrRyuK9NOo=", + "lastModified": 1666773053, + "narHash": "sha256-uo3ypM3bRpweZRo976GomlWKTcj+YzyuuUGIAZfC7gw=", "owner": "nifoc", "repo": "nix-overlay", - "rev": "7ce298ad6dd4f5194adaffc5125d54a629883b42", + "rev": "211f970da992d86094794ba3f0597fd290fdf898", "type": "github" }, "original": { @@ -160,11 +160,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1666659249, - "narHash": "sha256-Qbyj7ya2ZTL5Vt5ONMUwgq/shNSqZVbxDInQbmDO5iw=", + "lastModified": 1666753130, + "narHash": "sha256-Wff1dGPFSneXJLI2c0kkdWTgxnQ416KE6X4KnFkgPYQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d4f8e53720b554b6dac71c7ec62b3b51158905f9", + "rev": "f540aeda6f677354f1e7144ab04352f61aaa0118", "type": "github" }, "original": { diff --git a/home/config/nvim/plugins/telescope.fnl b/home/config/nvim/plugins/telescope.fnl index 74ca220..98af05a 100644 --- a/home/config/nvim/plugins/telescope.fnl +++ b/home/config/nvim/plugins/telescope.fnl @@ -24,7 +24,12 @@ :--column :--smart-case :--trim]} - :extensions {:ui-select [(themes.get_dropdown {})]}}) + :extensions {:ui-select [(themes.get_dropdown {})] + :fzf {:fuzzy true + :override_generic_sorter true + :override_file_sorter true + :case_mode :smart_case}}}) + (telescope.load_extension :fzf) (telescope.load_extension :ui-select) (telescope.load_extension :toggleterm) (telescope.load_extension :yank_history) diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix index 5d2a329..246c240 100644 --- a/home/programs/nvim/default.nix +++ b/home/programs/nvim/default.nix @@ -152,7 +152,7 @@ in type = "fennel"; } - telescope-zf-native-nvim + telescope-fzf-native-nvim { plugin = project-nvim; diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index 992d9df..f69509d 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -47,12 +47,12 @@ rec { }; nvim-osc52 = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-osc52"; - version = "2022-09-29"; + version = "2022-10-25"; src = pkgs.fetchFromGitHub { owner = "ojroques"; repo = "nvim-osc52"; - rev = "87069dc586d835b70360d4771de53adb9b4aaff7"; - sha256 = "03mmfb5cyh7pm1kbl5ws1ch7r47qbj4dqiyh5dwf3c70a38ry194"; + rev = "75b9b86807448db9ade7715a86171d31da6348ff"; + sha256 = "0vsnsp2ab0ma0pb53lr6pyp8330f0axcnbkzr9cfckv45fqvd5b2"; fetchSubmodules = false; }; }; @@ -113,12 +113,12 @@ rec { }; nvim-treesitter = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-10-25"; + version = "2022-10-26"; src = pkgs.fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "0eff7beaf8cf7e631a7e8edc0d363e0b0a8f6f1d"; - sha256 = "0n6cljmljhzdbw8pfkppnkaxzim80d956py34gcm7rapm1h0zj4i"; + rev = "2f5be4585ef18ac720810c08f678b4d55e2d5658"; + sha256 = "060iq0ckn9ssiwbnw6hicw5cg6jahck5vbkbi35gxlgg3s5gy7mx"; fetchSubmodules = false; }; passthru.withPlugins = @@ -157,31 +157,27 @@ rec { }; telescope-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-10-24"; + version = "2022-10-25"; src = pkgs.fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "5c7db4055d89f9057d562f4f8b9d03189c9f9786"; - sha256 = "1mc80m83jfnjwnaxnsl3d96xm03wycal58xwm19fcgs8nsdn3010"; + rev = "9cf465894a61b840f6ab9e757223d21b8005cff9"; + sha256 = "1kxq72ps7dqjbfpdm091kqzr5jz4gy8ahbfbasm2j52ri7ypbnkn"; fetchSubmodules = false; }; }; - telescope-zf-native-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { - pname = "telescope-zf-native.nvim"; - version = "2022-10-05"; + telescope-fzf-native-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { + pname = "telescope-fzf-native.nvim"; + version = "2022-09-06"; src = pkgs.fetchFromGitHub { - owner = "natecraddock"; - repo = "telescope-zf-native.nvim"; - rev = "0a8408059c6d443a33595cc021677163ed81d2c5"; - sha256 = "1yipix2v6rxj249p80c36y3rc9k1wrlv509nd38ip2p3r6ifwz4n"; - fetchSubmodules = true; + owner = "nvim-telescope"; + repo = "telescope-fzf-native.nvim"; + rev = "65c0ee3d4bb9cb696e262bca1ea5e9af3938fc90"; + sha256 = "0nyvhlalrgg6n793lp3yrxgszv5j0ln9sjbh45pxxg0wn15jxm45"; + fetchSubmodules = false; }; - nativeBuildInputs = with pkgs; [ just zig ]; buildPhase = '' - just clean - XDG_CACHE_HOME=./xdg_cache just build - mv lib/libzf.so lib/libzf-osx-arm64.so - rm -rf ./xdg_cache + make ''; }; project-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { @@ -230,12 +226,12 @@ rec { }; nvim-lspconfig = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-10-25"; + version = "2022-10-26"; src = pkgs.fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "a035031fd6f6bcb5b433fe0f32d755ba7485406d"; - sha256 = "1g7gwbwjdwk6x4crkc66331fmi27lbns49hvjmvyvn9b4rq0c1fn"; + rev = "2315a397fd5057e3a74a09a240f606af28447ebf"; + sha256 = "1rqy3lcxy8lxi041g7s5j0nvmbch6s43r6agnwspqm1ag1i7pin0"; fetchSubmodules = false; }; }; @@ -252,12 +248,12 @@ rec { }; nvim-navic = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-navic"; - version = "2022-09-30"; + version = "2022-10-25"; src = pkgs.fetchFromGitHub { owner = "SmiteshP"; repo = "nvim-navic"; - rev = "132b273773768b36e9ecab2138b82234a9faf5ed"; - sha256 = "1qs02qkjzq0lczc4sdds0p2rrr1klnmw7n7n3hy6i4sr6gycfg1v"; + rev = "9f7f0b797096ee852106c4fd47b6b13d0ebb364e"; + sha256 = "1zqbs170ppmjh3njsg24z5ic965ga0plrbjam88qys1ap0gdph2v"; fetchSubmodules = false; }; }; @@ -274,12 +270,12 @@ rec { }; nvim-lint = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-10-16"; + version = "2022-10-26"; src = pkgs.fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "2ad83cad2aba5ac6071d75a32f0792e9e8af1ec5"; - sha256 = "0am81inrd6hn3a58afp0mrqsz9v31nxm93dzq0mc4086qfnhvlqg"; + rev = "844bb7828557052da765b9b0fa5ab0574eb7187a"; + sha256 = "13aczdfdxx7r0sambfhh8awa2azskxlyaks6vsy2jhii8698vhw9"; fetchSubmodules = false; }; }; @@ -307,12 +303,12 @@ rec { }; friendly-snippets = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2022-10-22"; + version = "2022-10-26"; src = pkgs.fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "b838c362477a4af8a0251518a6865e518f4ed6eb"; - sha256 = "166p9hqfx9rhj9g199adb0nmqjx1kq0y5xdpq784jslyfaj3xngv"; + rev = "bb318c455e4e8946d64c79753f5bb07f7c27d711"; + sha256 = "1fixlb14s38d5wy5a92yraj572q25gxxc9rgpjbq288q96pshnmi"; fetchSubmodules = false; }; }; @@ -494,12 +490,12 @@ rec { }; heirline-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "heirline.nvim"; - version = "2022-10-24"; + version = "2022-10-26"; src = pkgs.fetchFromGitHub { owner = "rebelot"; repo = "heirline.nvim"; - rev = "f46554a0a4ea096867deb6ef8877cccbf5b7261b"; - sha256 = "0v78limimn5ycybcibm4fkna4ad7aqnvczvcmc9igak7d5y4wsxr"; + rev = "d72ec3d3ca8406dffd7da72ae6d355e94d8c59fe"; + sha256 = "19r672f2wcnbqr9in8k6wa2zrwaq7l91f9vlbxkgj8cbm9z31la0"; fetchSubmodules = false; }; }; @@ -549,12 +545,12 @@ rec { }; gitsigns-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-10-21"; + version = "2022-10-25"; src = pkgs.fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "21ab05c2629ef613b1c3452d12469f936855648b"; - sha256 = "0c7m07h56fk273780awlrx234dlxzbb75a1i2x65i1hvysjw67bz"; + rev = "851cd32caaea84f303c4fdf51d72dfa5fcd795bb"; + sha256 = "0d5fbxljh2mqsjjmzbk4hgwgq9cyl7vrqplsqvxzrhs58c41f9m5"; fetchSubmodules = false; }; }; diff --git a/home/programs/nvim/plugins.yaml b/home/programs/nvim/plugins.yaml index 9bd7641..fa95cc9 100644 --- a/home/programs/nvim/plugins.yaml +++ b/home/programs/nvim/plugins.yaml @@ -23,16 +23,9 @@ # Telescope - src: nvim-telescope/telescope.nvim -- src: natecraddock/telescope-zf-native.nvim - fetchSubmodules: true - nativeBuildInputs: - - just - - zig +- src: nvim-telescope/telescope-fzf-native.nvim buildPhase: |- - just clean - XDG_CACHE_HOME=./xdg_cache just build - mv lib/libzf.so lib/libzf-osx-arm64.so - rm -rf ./xdg_cache + make - src: ahmedkhalf/project.nvim - src: folke/todo-comments.nvim - src: nvim-telescope/telescope-ui-select.nvim diff --git a/patches/darwin/ventura-fontrestore.patch b/patches/darwin/ventura-fontrestore.patch deleted file mode 100644 index 315ee06..0000000 --- a/patches/darwin/ventura-fontrestore.patch +++ /dev/null @@ -1,51 +0,0 @@ -From f34b284d3f2b6cdeb08f247c16d5b7a69cb45061 Mon Sep 17 00:00:00 2001 -From: Pavel Shirshov -Date: Tue, 25 Oct 2022 22:01:55 +0100 -Subject: [PATCH] fixes #559, #485: workaround for broken fontrestore on - Ventura - ---- - modules/fonts/default.nix | 30 ++++++++++++++++-------------- - 1 file changed, 16 insertions(+), 14 deletions(-) - -diff --git a/modules/fonts/default.nix b/modules/fonts/default.nix -index 14f9529f..44ea58bb 100644 ---- a/modules/fonts/default.nix -+++ b/modules/fonts/default.nix -@@ -58,20 +58,22 @@ in - fi - done - -- fontrestore default -n 2>&1 | while read -r f; do -- case $f in -- /Library/Fonts/*) -- font=''${f##*/} -- if [ ! -e "$systemConfig/Library/Fonts/$font" ]; then -- echo "removing font $font..." >&2 -- rm "/Library/Fonts/$font" -- fi -- ;; -- /*) -- # ignoring unexpected fonts -- ;; -- esac -- done -+ if [[ "`sw_vers -productVersion`" < "13.0" ]]; then -+ fontrestore default -n 2>&1 | while read -r f; do -+ case $f in -+ /Library/Fonts/*) -+ font=''${f##*/} -+ if [ ! -e "$systemConfig/Library/Fonts/$font" ]; then -+ echo "removing font $font..." >&2 -+ rm "/Library/Fonts/$font" -+ fi -+ ;; -+ /*) -+ # ignoring unexpected fonts -+ ;; -+ esac -+ done -+ fi - ''; - - }; diff --git a/system/flakes/Styx.nix b/system/flakes/Styx.nix index 0638887..3a481d5 100644 --- a/system/flakes/Styx.nix +++ b/system/flakes/Styx.nix @@ -8,9 +8,7 @@ let src = nixpkgs.legacyPackages.${default-system}.applyPatches { name = "nix-darwin"; src = darwin; - patches = [ - ../../patches/darwin/ventura-fontrestore.patch - ]; + patches = [ ]; }; in nixpkgs.lib.fix (self: (import "${src}/flake.nix").outputs { inherit self nixpkgs; });