1
0
Fork 0

Compare commits

...

2 commits

Author SHA1 Message Date
24b0710ba5
Update deps
All checks were successful
Build / build-arm64-linux (push) Successful in 8m49s
Build / build-amd64-linux (push) Successful in 30m52s
2023-10-07 13:23:55 +02:00
e8687cb667
nvim/wezterm: indicator changes 2023-10-06 23:47:18 +02:00
5 changed files with 54 additions and 44 deletions

View file

@ -282,11 +282,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1696446489, "lastModified": 1696635169,
"narHash": "sha256-xSjMKdNR+q/3hdSPyg/LUMsZT/WIoUi8dcm5zT4SMUQ=", "narHash": "sha256-gOjLe7maQ58erN/9ykb6d2ePAU7QAT1D8u7qin9gt+c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "68f7d8c0fb0bfc67d1916dd7f06288424360d43a", "rev": "b2a2133c9a0b0aa4d06d72b5891275f263ee08df",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -325,11 +325,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1696580313, "lastModified": 1696669828,
"narHash": "sha256-IPdjO4C6qABKJt/rAjpJQzQ1ZK5A0lJvBXYftpgPsrA=", "narHash": "sha256-HCdE78O9b0z8O33ebZt0PFIblnXlIU+H8yM9jWuz6/4=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "a6cccd728a5b9363661c3daf79046afe4b37a5ee", "rev": "1f864139b2d7e3fcb73fb0b7f5291fbb1c6cad94",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -350,11 +350,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1696581890, "lastModified": 1696676058,
"narHash": "sha256-htNtm3479Pigb8hHFC0zYkkNF81/3rBC93PtBJpSNsI=", "narHash": "sha256-zrIdajktdzdOKpr94uymjBMtL/p1PX/X6zdISW6BTGs=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "424395a91a19df205943b48e93c26b0e9685ffc7", "rev": "834f2e67f61195c5c15f7422b1451611f95a82f6",
"revCount": 518, "revCount": 519,
"type": "git", "type": "git",
"url": "https://git.kempkens.io/daniel/nix-overlay" "url": "https://git.kempkens.io/daniel/nix-overlay"
}, },
@ -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": 1696653406,
"narHash": "sha256-EG/WHSKLwAEqxpO7vB5sUneoSpl6qHlW/GeA0tZnUBk=", "narHash": "sha256-0K9FEM+vwIctSy0FlmLube6C0PW4CBeRVm2dd85mozI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b3e14b9045a7805ddde2790652744b731caebaaf", "rev": "b7a3aaae3859cd1ffd4c4fd850bf45d0304f9033",
"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": {

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}))})

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

View file

@ -401,7 +401,8 @@ in
recursive = true; recursive = true;
}; };
home.file = home = {
file =
let let
nvim-spell-directory = "${config.xdg.configHome}/nvim/spell"; nvim-spell-directory = "${config.xdg.configHome}/nvim/spell";
in in
@ -416,4 +417,10 @@ in
sha256 = "13d0ecf92863d89ef60cd4a8a5eb2a5a13a0e8f9ba8d1c6abe47aba85714a948"; 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()")
'';
};
} }

View file

@ -118,12 +118,12 @@ in
}; };
nvim-treesitter = buildVimPlugin { nvim-treesitter = buildVimPlugin {
pname = "nvim-treesitter"; pname = "nvim-treesitter";
version = "2023-10-06"; version = "2023-10-07";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter"; repo = "nvim-treesitter";
rev = "10bfa4826f2235c600c073a82e0d78718aa7240e"; rev = "957f3f8c15a88ef0f0c77ecd13edf2e2578f176e";
sha256 = "0wnhqqddn1xcj6zdrz7wb3k2lwr47500sy1f6vamp1yhbyjc8y1c"; sha256 = "0gwx5vnhz4nypisv22if48x8wdamyfjwa8hpzrip230pjihxmjj7";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -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;
}; };
}; };