daniel/dotfiles
1
0
Fork 0
Code Activity Actions

nvim/wezterm: indicator changes

Browse source
This commit is contained in:
Daniel Kempkens 2023-10-06 23:47:18 +02:00
parent b154c0e3f8
commit e8687cb667
Signed by: daniel
SSH key fingerprint: SHA256:Ks/MyhQYcPRQiwMKLAKquWCdCPe3JXlb1WttgnAoSeM
5 changed files with 41 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
flake.lock
View file

@ -385,11 +385,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1696592614, "lastModified": 1696614066,
"narHash": "sha256-2gnRtjflKQ9G3X039bk/resUwf/c1GM4sojcQzP/tgA=", "narHash": "sha256-nAyYhO7TCr1tikacP37O9FnGr2USOsVBD3IgvndUYjM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "b31be8f11493e0f79a840370fd17153cd60b9009", "rev": "bb2db418b616fea536b1be7f6ee72fb45c11afe0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -401,11 +401,11 @@
}, },
"nixos-unstable": { "nixos-unstable": {
"locked": { "locked": {
"lastModified": 1696561794, "lastModified": 1696589439,
"narHash": "sha256-EG/WHSKLwAEqxpO7vB5sUneoSpl6qHlW/GeA0tZnUBk=", "narHash": "sha256-Ye+flokLfswVz9PZEyJ5yGJ1VqmJe3bDgwWt9Z4MuqQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b3e14b9045a7805ddde2790652744b731caebaaf", "rev": "e462c9172c685f0839baaa54bb5b49276a23dab7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -417,11 +417,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1696419054, "lastModified": 1696577711,
"narHash": "sha256-EdR+dIKCfqL3voZUDYwcvgRDOektQB9KbhBVcE0/3Mo=", "narHash": "sha256-94VRjvClIKDym1QRqPkX5LTQoAwZ1E6QE/3dWtOXSIQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7131f3c223a2d799568e4b278380cd9dac2b8579", "rev": "a2eb207f45e4a14a1e3019d9e3863d1e208e2295",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
home/config/nvim/nifoc/tabline.fnl
View file

@ -74,7 +74,7 @@
;; Indicator ;; Indicator
(set mod.active-indicator (set mod.active-indicator
{:provider (fn [self] {:provider (fn [self]
(if self.is_active "┃ " " ")) (if self.is_active "│ " " "))
:hl (fn [self] :hl (fn [self]
(if self.is_active {:fg colors.purple :bg bg-active :bold true} (if self.is_active {:fg colors.purple :bg bg-active :bold true}
{:fg fg-inactive :bg bg-inactive :bold true}))}) {:fg fg-inactive :bg bg-inactive :bold true}))})

7
home/config/wezterm/config.fnl
View file

@ -63,7 +63,7 @@
[; Left [; Left
{:Background {:Color colors.active-background}} {:Background {:Color colors.active-background}}
{:Foreground {:Color colors.active-indicator}} {:Foreground {:Color colors.active-indicator}}
{:Text "┃ "} {:Text "│ "}
; Center ; Center
{:Foreground {:Color tab-info.color}} {:Foreground {:Color tab-info.color}}
{:Text tab-info.icon} {:Text tab-info.icon}
@ -105,7 +105,10 @@
:window_frame {:active_titlebar_bg colors.frame-background :window_frame {:active_titlebar_bg colors.frame-background
:inactive_titlebar_bg colors.frame-background :inactive_titlebar_bg colors.frame-background
:font (wezterm.font {:family "Berkeley Mono" :font (wezterm.font {:family "Berkeley Mono"
:weight :Regular}) :weight :Regular
:harfbuzz_features [:calt=0
:clig=0
:liga=0]})
:font_size 11} :font_size 11}
:colors {:tab_bar {:background colors.frame-background :colors {:tab_bar {:background colors.frame-background
:inactive_tab_edge colors.frame-background :inactive_tab_edge colors.frame-background

33
home/programs/nvim/default.nix
View file

@ -401,19 +401,26 @@ in
recursive = true; recursive = true;
}; };
home.file = home = {
let file =
nvim-spell-directory = "${config.xdg.configHome}/nvim/spell"; let
in 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"; "${nvim-spell-directory}/de.utf-8.spl".source = builtins.fetchurl {
sha256 = "73c7107ea339856cdbe921deb92a45939c4de6eb9c07261da1b9dd19f683a3d1"; 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 { activation.neovimCache = lib.hm.dag.entryAfter [ "linkGeneration" ] /* bash */ ''
url = "http://ftp.vim.org/pub/vim/runtime/spell/de.utf-8.sug"; $VERBOSE_ECHO "Resetting loader"
sha256 = "13d0ecf92863d89ef60cd4a8a5eb2a5a13a0e8f9ba8d1c6abe47aba85714a948"; $DRY_RUN_CMD ${config.programs.neovim.finalPackage}/bin/nvim -l <(echo "vim.loader.reset()")
}; '';
}; };
} }

12
home/programs/nvim/plugins.nix
View file

@ -275,12 +275,12 @@ in
}; };
vim-illuminate = buildVimPlugin { vim-illuminate = buildVimPlugin {
pname = "vim-illuminate"; pname = "vim-illuminate";
version = "2023-09-26"; version = "2023-10-06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "RRethy"; owner = "RRethy";
repo = "vim-illuminate"; repo = "vim-illuminate";
rev = "1b5d70332a51a1de05f281069851865a2bb1e6d7"; rev = "3bd2ab64b5d63b29e05691e624927e5ebbf0fb86";
sha256 = "0dbbak53d5hi8jkp0wxcb3x6kysdi7ry2w1k9n0lj64qkmp5afnb"; sha256 = "0x3li63dijw9z4imbajpxbrclw32649810bsnx5cawrqgbc7kl99";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -384,12 +384,12 @@ in
}; };
nvim-treesitter-textobjects = buildVimPlugin { nvim-treesitter-textobjects = buildVimPlugin {
pname = "nvim-treesitter-textobjects"; pname = "nvim-treesitter-textobjects";
version = "2023-08-30"; version = "2023-10-06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects"; repo = "nvim-treesitter-textobjects";
rev = "bd103502252027434ec42f628d2dbf54821d4ce6"; rev = "4724694bc03ce1148860a46d9d77c3664d8188ab";
sha256 = "030z020v4g140a72mv1q7l6bshhrkgisbd6w3hiwlv9a1mgz4bbc"; sha256 = "0ndd08a1s8cifw0w9gg26r8nvzfrky746ip70zg9x4qzg99915vb";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };