Compare commits
No commits in common. "5d4f09f4ab498f54731d43d7c0344ddbaa3e87b0" and "86bb47d7a3e498c3408441aef318ab68911c0eec" have entirely different histories.
5d4f09f4ab
...
86bb47d7a3
5 changed files with 36 additions and 69 deletions
18
flake.lock
generated
18
flake.lock
generated
|
|
@ -44,11 +44,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774274588,
|
"lastModified": 1771744638,
|
||||||
"narHash": "sha256-dnHvv5EMUgTzGZmA+3diYjQU2O6BEpGLEOgJ1Qe9LaY=",
|
"narHash": "sha256-EDLi+YAsEEAmMeZe1v6GccuGRbCkpSZp/+A6g+pivR8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "cf9686ba26f5ef788226843bc31fda4cf72e373b",
|
"rev": "cb6c151f5c9db4df0b69d06894dc8484de1f16a0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -66,11 +66,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773876229,
|
"lastModified": 1771243101,
|
||||||
"narHash": "sha256-ncup+eYqHABZzBgwfQzxOXWHIcjN4kkZl9QTb4cgNm8=",
|
"narHash": "sha256-p/qTbQU5wQEqbKWF8M0bZWuryUCrPsWrJB0GlNF1k6M=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NixOS-WSL",
|
"repo": "NixOS-WSL",
|
||||||
"rev": "381bc12a25d49c6b798f98ab33a8d951ec54659b",
|
"rev": "6d52ea6d66cb333c611c7b0e16dd24a05c9263e7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -82,11 +82,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774244481,
|
"lastModified": 1771714954,
|
||||||
"narHash": "sha256-4XfMXU0DjN83o6HWZoKG9PegCvKvIhNUnRUI19vzTcQ=",
|
"narHash": "sha256-nhZJPnBavtu40/L2aqpljrfUNb2rxmWTmSjK2c9UKds=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "4590696c8693fea477850fe379a01544293ca4e2",
|
"rev": "afbbf774e2087c3d734266c22f96fca2e78d3620",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@
|
||||||
"o" = "xdg-open";
|
"o" = "xdg-open";
|
||||||
"update" = "sudo nixos-rebuild switch --flake ~/dev/nixos";
|
"update" = "sudo nixos-rebuild switch --flake ~/dev/nixos";
|
||||||
"rm" = "rm -i";
|
"rm" = "rm -i";
|
||||||
"ls" = "eza --git-ignore -ls type";
|
"ls" = "eza";
|
||||||
};
|
};
|
||||||
|
|
||||||
stateVersion = "25.11";
|
stateVersion = "25.11";
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,6 @@
|
||||||
mattermost-desktop
|
mattermost-desktop
|
||||||
nerd-fonts.adwaita-mono
|
nerd-fonts.adwaita-mono
|
||||||
newsflash
|
newsflash
|
||||||
proton-pass
|
|
||||||
protonmail-bridge-gui
|
protonmail-bridge-gui
|
||||||
signal-desktop
|
signal-desktop
|
||||||
texliveFull
|
texliveFull
|
||||||
|
|
@ -32,7 +31,6 @@
|
||||||
rounded-window-corners-reborn
|
rounded-window-corners-reborn
|
||||||
runcat
|
runcat
|
||||||
tray-icons-reloaded
|
tray-icons-reloaded
|
||||||
useless-gaps
|
|
||||||
window-centering
|
window-centering
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,32 +18,28 @@ in
|
||||||
keys.insert.j.k = "normal_mode";
|
keys.insert.j.k = "normal_mode";
|
||||||
};
|
};
|
||||||
languages = {
|
languages = {
|
||||||
language-server = {
|
language-server.tinymist = {
|
||||||
tinymist = {
|
config.exportPdf = "onSave";
|
||||||
config.exportPdf = "onSave";
|
config.outputPath = "$root/$dir/out/$name";
|
||||||
config.outputPath = "$root/$dir/out/$name";
|
};
|
||||||
};
|
language-server.scls = {
|
||||||
scls = {
|
command = "simple-completion-language-server";
|
||||||
command = "simple-completion-language-server";
|
config.feature_words = false;
|
||||||
config.feature_words = false;
|
config.feature_snippets = true;
|
||||||
config.feature_snippets = true;
|
config.snippets_first = true;
|
||||||
config.snippets_first = true;
|
config.snippets_inline_by_word_tail = false;
|
||||||
config.snippets_inline_by_word_tail = false;
|
config.feature_unicode_input = true;
|
||||||
config.feature_unicode_input = true;
|
config.feature_paths = false;
|
||||||
config.feature_paths = false;
|
config.feature_citations = false;
|
||||||
config.feature_citations = false;
|
environment.RUST_LOG = "info,simple-completion-language-server=info";
|
||||||
environment.RUST_LOG = "info,simple-completion-language-server=info";
|
environment.LOG_FILE = "/tmp/completion.log";
|
||||||
environment.LOG_FILE = "/tmp/completion.log";
|
};
|
||||||
};
|
language-server.ocamllsp = {
|
||||||
ocamllsp = {
|
command = "ocamllsp";
|
||||||
command = "ocamllsp";
|
args = [ "--fallback-read-dot-merlin" ];
|
||||||
args = [ "--fallback-read-dot-merlin" ];
|
};
|
||||||
};
|
language-server.menhir-lsp = {
|
||||||
menhir-lsp.command = "menhir-lsp";
|
command = "menhir-lsp";
|
||||||
dafny-lsp = {
|
|
||||||
command = "dafny";
|
|
||||||
args = [ "server" ];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
language = [
|
language = [
|
||||||
{
|
{
|
||||||
|
|
@ -62,28 +58,6 @@ in
|
||||||
];
|
];
|
||||||
scope = "source.menhir";
|
scope = "source.menhir";
|
||||||
}
|
}
|
||||||
{
|
|
||||||
name = "ocaml";
|
|
||||||
language-servers = [
|
|
||||||
"scls"
|
|
||||||
"ocamllsp"
|
|
||||||
];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "dafny";
|
|
||||||
file-types = [ "dfy" ];
|
|
||||||
language-servers = [ "dafny-lsp" ];
|
|
||||||
scope = "source.dafny";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "zelus";
|
|
||||||
file-types = [
|
|
||||||
"zli"
|
|
||||||
"zls"
|
|
||||||
];
|
|
||||||
language-servers = [ "scls" ];
|
|
||||||
scope = "source.ocaml";
|
|
||||||
}
|
|
||||||
];
|
];
|
||||||
grammar = [
|
grammar = [
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -13,10 +13,7 @@
|
||||||
{
|
{
|
||||||
devShells."${system}".default =
|
devShells."${system}".default =
|
||||||
let
|
let
|
||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs { inherit system; };
|
||||||
inherit system;
|
|
||||||
config.allowUnfree = true;
|
|
||||||
};
|
|
||||||
menhir-lsp = pkgs.callPackage ./menhir-lsp.nix (pkgs // pkgs.ocamlPackages);
|
menhir-lsp = pkgs.callPackage ./menhir-lsp.nix (pkgs // pkgs.ocamlPackages);
|
||||||
in
|
in
|
||||||
pkgs.mkShell {
|
pkgs.mkShell {
|
||||||
|
|
@ -24,20 +21,18 @@
|
||||||
# Build elements
|
# Build elements
|
||||||
autoconf
|
autoconf
|
||||||
ocaml
|
ocaml
|
||||||
|
ocamlPackages.ocaml-lsp
|
||||||
ocamlPackages.findlib
|
ocamlPackages.findlib
|
||||||
ocamlPackages.menhir
|
ocamlPackages.menhir
|
||||||
ocamlPackages.menhirLib
|
ocamlPackages.menhirLib
|
||||||
ocamlPackages.zarith
|
ocamlPackages.zarith
|
||||||
ocamlPackages.lablgtk3
|
ocamlPackages.lablgtk3
|
||||||
ocamlPackages.lablgtk3-sourceview3
|
ocamlPackages.lablgtk3-sourceview3
|
||||||
ocamlPackages.camlzip
|
|
||||||
|
|
||||||
# Provers
|
# Available provers
|
||||||
alt-ergo
|
# alt-ergo
|
||||||
cvc5
|
cvc5
|
||||||
z3
|
z3
|
||||||
# Development tooling
|
|
||||||
ocamlPackages.ocaml-lsp
|
|
||||||
menhir-lsp
|
menhir-lsp
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue