Skip to content

Commit fdafce6

Browse files
committed
disable tree-sitter parsers to see if we can fix determinate build
1 parent 255b97d commit fdafce6

File tree

10 files changed

+391
-433
lines changed

10 files changed

+391
-433
lines changed

INIT.md

Whitespace-only changes.

flake.lock

+1-18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
nvim-web-devicons.flake = false;
6565
vim-copilot.url = "github:github/copilot.vim/v1.41.0";
6666
vim-copilot.flake = false;
67-
vim-misc.url = "github:mitchellh/vim-misc";
68-
vim-misc.flake = false;
67+
# vim-misc.url = "github:mitchellh/vim-misc";
68+
# vim-misc.flake = false;
6969
};
7070

7171
outputs = { self, nixpkgs, nixos-hardware, home-manager, darwin, ... }@inputs: let

hosts/mac-studio-m1.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
# We install Nix using a separate installer so we don't want nix-darwin
66
# to manage it for us. This tells nix-darwin to just use whatever is running.
7-
nix.useDaemon = true
7+
nix.useDaemon = true;
88
nix.enable = false;
99

1010
# Don't let nix-darwin manage nix configuration since we use Determinate

nix/sources.json

+372-384
Large diffs are not rendered by default.

users/joost/darwin.nix

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
"monodraw"
4545
"mx-power-gadget"
4646
"obs"
47+
"obsidian"
4748
"rapidapi"
4849
"screenflow"
4950
"sublime-text"

users/joost/ghostty.linux

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
font-size = 12
1+
font-size = 14
22
font-family = JetBrains Mono
33
background-opacity = 0.95
44
background-blur-radius = 20

users/joost/home-manager.nix

+9-8
Original file line numberDiff line numberDiff line change
@@ -229,13 +229,14 @@ in {
229229
# "zed/settings.json".text = builtins.readFile ./zed.json; # breaks Zed; i.e. changing llm
230230

231231
# tree-sitter parsers
232-
"nvim/parser/proto.so".source = "${pkgs.tree-sitter-proto}/parser";
233-
"nvim/queries/proto/folds.scm".source =
234-
"${sources.tree-sitter-proto}/queries/folds.scm";
235-
"nvim/queries/proto/highlights.scm".source =
236-
"${sources.tree-sitter-proto}/queries/highlights.scm";
237-
"nvim/queries/proto/textobjects.scm".source =
238-
./textobjects.scm;
232+
# "nvim/parser/proto.so".source = "${pkgs.tree-sitter-proto}/parser";
233+
# "nvim/queries/proto/folds.scm".source =
234+
# "${sources.tree-sitter-proto}/queries/folds.scm";
235+
# "nvim/queries/proto/highlights.scm".source =
236+
# "${sources.tree-sitter-proto}/queries/highlights.scm";
237+
# "nvim/queries/proto/textobjects.scm".source =
238+
# ./textobjects.scm;
239+
239240
} // (if isDarwin then {
240241
# Rectangle.app. This has to be imported manually using the app.
241242
"rectangle/RectangleConfig.json".text = builtins.readFile ./RectangleConfig.json;
@@ -542,7 +543,7 @@ in {
542543
customVim.vim-fish
543544
customVim.vim-fugitive
544545
customVim.vim-glsl
545-
customVim.vim-misc
546+
# customVim.vim-misc
546547
customVim.vim-pgsql
547548
customVim.vim-tla
548549
# customVim.vim-zig

users/joost/vim-config.nix

+4-12
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ if has('nvim')
2727
set mouse=a
2828
set termguicolors
2929
set clipboard+=unnamedplus
30-
30+
3131
" Basic settings from vim-misc that we still want
3232
set encoding=utf-8
3333
set autoread
@@ -44,18 +44,18 @@ if has('nvim')
4444
set splitbelow
4545
set splitright
4646
set visualbell
47-
47+
4848
" Color scheme settings
4949
syntax on
5050
set runtimepath+=pack/*/start/onehalf/vim
5151
colorscheme onehalfdark
52-
52+
5353
" Search settings
5454
set hlsearch
5555
set ignorecase
5656
set incsearch
5757
set smartcase
58-
58+
5959
" Tab settings
6060
set expandtab
6161
set tabstop=4
@@ -68,14 +68,6 @@ lua <<EOF
6868
-- Add our custom treesitter parsers
6969
local parser_config = require "nvim-treesitter.parsers".get_parser_configs()
7070
71-
parser_config.proto = {
72-
install_info = {
73-
url = "${sources.tree-sitter-proto}", -- local path or git repo
74-
files = {"src/parser.c"}
75-
},
76-
filetype = "proto", -- if filetype does not agrees with parser name
77-
}
78-
7971
---------------------------------------------------------------------
8072
-- Add our treesitter textobjects
8173
require'nvim-treesitter.configs'.setup {

users/joost/vim.nix

-7
Original file line numberDiff line numberDiff line change
@@ -142,13 +142,6 @@ let sources = import ../../nix/sources.nix; in rec {
142142
};
143143
};
144144

145-
tree-sitter-proto = self.callPackage
146-
(sources.nixpkgs + /pkgs/development/tools/parsing/tree-sitter/grammar.nix) { } {
147-
language = "proto";
148-
version = "0.1.0";
149-
source = sources.tree-sitter-proto;
150-
};
151-
152145
tree-sitter-hcl = self.callPackage
153146
(sources.nixpkgs + /pkgs/development/tools/parsing/tree-sitter/grammar.nix) { } {
154147
language = "hcl";

0 commit comments

Comments
 (0)