From e8687cb667d86cdec0968434beb069104b3f0ae6 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Fri, 6 Oct 2023 23:47:18 +0200 Subject: [PATCH] nvim/wezterm: indicator changes --- flake.lock | 18 ++++++++-------- home/config/nvim/nifoc/tabline.fnl | 2 +- home/config/wezterm/config.fnl | 7 +++++-- home/programs/nvim/default.nix | 33 ++++++++++++++++++------------ home/programs/nvim/plugins.nix | 12 +++++------ 5 files changed, 41 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index 82c06d4..cff46ae 100644 --- a/flake.lock +++ b/flake.lock @@ -385,11 +385,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1696592614, - "narHash": "sha256-2gnRtjflKQ9G3X039bk/resUwf/c1GM4sojcQzP/tgA=", + "lastModified": 1696614066, + "narHash": "sha256-nAyYhO7TCr1tikacP37O9FnGr2USOsVBD3IgvndUYjM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b31be8f11493e0f79a840370fd17153cd60b9009", + "rev": "bb2db418b616fea536b1be7f6ee72fb45c11afe0", "type": "github" }, "original": { @@ -401,11 +401,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1696561794, - "narHash": "sha256-EG/WHSKLwAEqxpO7vB5sUneoSpl6qHlW/GeA0tZnUBk=", + "lastModified": 1696589439, + "narHash": "sha256-Ye+flokLfswVz9PZEyJ5yGJ1VqmJe3bDgwWt9Z4MuqQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b3e14b9045a7805ddde2790652744b731caebaaf", + "rev": "e462c9172c685f0839baaa54bb5b49276a23dab7", "type": "github" }, "original": { @@ -417,11 +417,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1696419054, - "narHash": "sha256-EdR+dIKCfqL3voZUDYwcvgRDOektQB9KbhBVcE0/3Mo=", + "lastModified": 1696577711, + "narHash": "sha256-94VRjvClIKDym1QRqPkX5LTQoAwZ1E6QE/3dWtOXSIQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7131f3c223a2d799568e4b278380cd9dac2b8579", + "rev": "a2eb207f45e4a14a1e3019d9e3863d1e208e2295", "type": "github" }, "original": { diff --git a/home/config/nvim/nifoc/tabline.fnl b/home/config/nvim/nifoc/tabline.fnl index a643f8d..516c9c1 100644 --- a/home/config/nvim/nifoc/tabline.fnl +++ b/home/config/nvim/nifoc/tabline.fnl @@ -74,7 +74,7 @@ ;; Indicator (set mod.active-indicator {:provider (fn [self] - (if self.is_active "┃ " " ")) + (if self.is_active "│ " " ")) :hl (fn [self] (if self.is_active {:fg colors.purple :bg bg-active :bold true} {:fg fg-inactive :bg bg-inactive :bold true}))}) diff --git a/home/config/wezterm/config.fnl b/home/config/wezterm/config.fnl index 9aab651..0a40598 100644 --- a/home/config/wezterm/config.fnl +++ b/home/config/wezterm/config.fnl @@ -63,7 +63,7 @@ [; Left {:Background {:Color colors.active-background}} {:Foreground {:Color colors.active-indicator}} - {:Text "┃ "} + {:Text "│ "} ; Center {:Foreground {:Color tab-info.color}} {:Text tab-info.icon} @@ -105,7 +105,10 @@ :window_frame {:active_titlebar_bg colors.frame-background :inactive_titlebar_bg colors.frame-background :font (wezterm.font {:family "Berkeley Mono" - :weight :Regular}) + :weight :Regular + :harfbuzz_features [:calt=0 + :clig=0 + :liga=0]}) :font_size 11} :colors {:tab_bar {:background colors.frame-background :inactive_tab_edge colors.frame-background diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix index c963cf3..438796e 100644 --- a/home/programs/nvim/default.nix +++ b/home/programs/nvim/default.nix @@ -401,19 +401,26 @@ in recursive = true; }; - home.file = - let - nvim-spell-directory = "${config.xdg.configHome}/nvim/spell"; - in - { - "${nvim-spell-directory}/de.utf-8.spl".source = builtins.fetchurl { - url = "http://ftp.vim.org/pub/vim/runtime/spell/de.utf-8.spl"; - sha256 = "73c7107ea339856cdbe921deb92a45939c4de6eb9c07261da1b9dd19f683a3d1"; + home = { + file = + let + nvim-spell-directory = "${config.xdg.configHome}/nvim/spell"; + in + { + "${nvim-spell-directory}/de.utf-8.spl".source = builtins.fetchurl { + url = "http://ftp.vim.org/pub/vim/runtime/spell/de.utf-8.spl"; + sha256 = "73c7107ea339856cdbe921deb92a45939c4de6eb9c07261da1b9dd19f683a3d1"; + }; + + "${nvim-spell-directory}/de.utf-8.sug".source = builtins.fetchurl { + url = "http://ftp.vim.org/pub/vim/runtime/spell/de.utf-8.sug"; + sha256 = "13d0ecf92863d89ef60cd4a8a5eb2a5a13a0e8f9ba8d1c6abe47aba85714a948"; + }; }; - "${nvim-spell-directory}/de.utf-8.sug".source = builtins.fetchurl { - url = "http://ftp.vim.org/pub/vim/runtime/spell/de.utf-8.sug"; - sha256 = "13d0ecf92863d89ef60cd4a8a5eb2a5a13a0e8f9ba8d1c6abe47aba85714a948"; - }; - }; + activation.neovimCache = lib.hm.dag.entryAfter [ "linkGeneration" ] /* bash */ '' + $VERBOSE_ECHO "Resetting loader" + $DRY_RUN_CMD ${config.programs.neovim.finalPackage}/bin/nvim -l <(echo "vim.loader.reset()") + ''; + }; } diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index 2ba3bed..99ddc86 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -275,12 +275,12 @@ in }; vim-illuminate = buildVimPlugin { pname = "vim-illuminate"; - version = "2023-09-26"; + version = "2023-10-06"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "1b5d70332a51a1de05f281069851865a2bb1e6d7"; - sha256 = "0dbbak53d5hi8jkp0wxcb3x6kysdi7ry2w1k9n0lj64qkmp5afnb"; + rev = "3bd2ab64b5d63b29e05691e624927e5ebbf0fb86"; + sha256 = "0x3li63dijw9z4imbajpxbrclw32649810bsnx5cawrqgbc7kl99"; fetchSubmodules = false; }; }; @@ -384,12 +384,12 @@ in }; nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; - version = "2023-08-30"; + version = "2023-10-06"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "bd103502252027434ec42f628d2dbf54821d4ce6"; - sha256 = "030z020v4g140a72mv1q7l6bshhrkgisbd6w3hiwlv9a1mgz4bbc"; + rev = "4724694bc03ce1148860a46d9d77c3664d8188ab"; + sha256 = "0ndd08a1s8cifw0w9gg26r8nvzfrky746ip70zg9x4qzg99915vb"; fetchSubmodules = false; }; };