Compare commits

...

3 Commits

Author SHA1 Message Date
Noah Masur
ef2ee7b871 fix: tree-sitter-python errors 2023-07-30 12:43:44 -04:00
Noah Masur
fc867d60cd add description for caddy overlay 2023-07-30 12:43:27 -04:00
Noah Masur
d395347a29 chore: fonts.fonts renamed to fonts.packages 2023-07-30 12:42:45 -04:00
3 changed files with 20 additions and 4 deletions

View File

@ -6,7 +6,7 @@ in {
config = lib.mkIf (config.gui.enable && pkgs.stdenv.isLinux) {
fonts.fonts = with pkgs; [
fonts.packages = with pkgs; [
victor-mono # Used for Vim and Terminal
(nerdfonts.override { fonts = [ "Hack" ]; }) # For Polybar, Rofi
];

View File

@ -1,3 +1,5 @@
# Adds the Cloudflare DNS validation module
{ lib, buildGo118Module, fetchFromGitHub, plugins ? [ ] }:
let
goImports = lib.flip lib.concatMapStrings plugins (pkg: " _ \"${pkg}\"\n");

View File

@ -1,8 +1,8 @@
# Fix: bash highlighting doesn't work as of this commit:
# https://github.com/NixOS/nixpkgs/commit/49cce41b7c5f6b88570a482355d9655ca19c1029
inputs: _final: prev: {
tree-sitter-grammars = prev.tree-sitter-grammars // {
# Fix: bash highlighting doesn't work as of this commit:
# https://github.com/NixOS/nixpkgs/commit/49cce41b7c5f6b88570a482355d9655ca19c1029
tree-sitter-bash = prev.tree-sitter-grammars.tree-sitter-bash.overrideAttrs
(old: {
src = prev.fetchFromGitHub {
@ -12,6 +12,20 @@ inputs: _final: prev: {
sha256 = "sha256-gl5F3IeZa2VqyH/qFj8ey2pRbGq4X8DL5wiyvRrH56U=";
};
});
# Fix: invalid node in position. Broken as of this commit (replaced with newer):
# https://github.com/NixOS/nixpkgs/commit/8ec3627796ecc899e6f47f5bf3c3220856ead9c5
tree-sitter-python =
prev.tree-sitter-grammars.tree-sitter-python.overrideAttrs (old: {
src = prev.fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-python";
rev = "5af00f64af6bbf822f208243cce5cf75396fb6f5";
sha256 = "sha256-2btd/NRE6NuGNlx4cq535OrwtWXihiP3VMCJjPCiDOk=";
};
});
# Add grammars not in nixpks
tree-sitter-ini = prev.tree-sitter.buildGrammar {
language = "ini";
version = "1.0.0";