Compare commits

..

No commits in common. "7b37393bc5e4622f9a8865eeecf8144685dc0045" and "2ef25db9c3b66d6b65d8fb47a68740f4226b892f" have entirely different histories.

4 changed files with 31 additions and 59 deletions

View file

@ -150,11 +150,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1659622306, "lastModified": 1659280786,
"narHash": "sha256-Kpfm2PNs+kZU0W7qcugoPATLG8I2P7FJFGTgsf1LJiU=", "narHash": "sha256-UOfdm7ArZzfylo/iFdyZB9lqsRy+Ulc9rnEP7+DVh9k=",
"owner": "divnix", "owner": "divnix",
"repo": "digga", "repo": "digga",
"rev": "d1193743a535d7fbbc7f3eda4e51295b10bd4d2c", "rev": "c8eb0a63889047c2130fc40b473f10eebaf78d30",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -169,11 +169,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1660458418, "lastModified": 1659248763,
"narHash": "sha256-vBWAv4QhXa9VmyaJUsTfQmKs+uw83Pfv/FmN5GD3KkE=", "narHash": "sha256-YCaOwmtgpnEJGmZNHwnQArCeB3arQf1LPr/OSZVmHZ8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "54253fb23a5871466ada5c0334b6e39a0bcdb4db", "rev": "e4787a9b299117979bd04d396466c9c7cb4ac568",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -266,16 +266,15 @@
"flake-utils": "flake-utils_2" "flake-utils": "flake-utils_2"
}, },
"locked": { "locked": {
"lastModified": 1654029967, "lastModified": 1657226504,
"narHash": "sha256-my3GQ3mQIw/1f6GPV1IhUZrcYQSWh0YJAMPNBjhXJDw=", "narHash": "sha256-GIYNjuq4mJlFgqKsZ+YrgzWm0IpA4axA3MCrdKYj7gs=",
"owner": "gytis-ivaskevicius", "owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus", "repo": "flake-utils-plus",
"rev": "6271cf3842ff9c8a9af9e3508c547f86bc77d199", "rev": "2bf0f91643c2e5ae38c1b26893ac2927ac9bd82a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "gytis-ivaskevicius", "owner": "gytis-ivaskevicius",
"ref": "refs/pull/120/head",
"repo": "flake-utils-plus", "repo": "flake-utils-plus",
"type": "github" "type": "github"
} }
@ -297,11 +296,11 @@
}, },
"flake-utils_3": { "flake-utils_3": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1656928814,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -379,11 +378,11 @@
}, },
"latest": { "latest": {
"locked": { "locked": {
"lastModified": 1660396586, "lastModified": 1659219666,
"narHash": "sha256-ePuWn7z/J5p2lO7YokOG1o01M0pDDVL3VrStaPpS5Ig=", "narHash": "sha256-pzYr5fokQPHv7CmUXioOhhzDy/XyWOIXP4LZvv/T7Mk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e105167e98817ba9fe079c6c3c544c6ef188e276", "rev": "7b9be38c7250b22d829ab6effdee90d5e40c6e5c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -400,11 +399,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1659610603, "lastModified": 1655042882,
"narHash": "sha256-LYgASYSPYo7O71WfeUOaEUzYfzuXm8c8eavJcel+pfI=", "narHash": "sha256-9BX8Fuez5YJlN7cdPO63InoyBy7dm3VlJkkmTt6fS1A=",
"owner": "nmattia", "owner": "nmattia",
"repo": "naersk", "repo": "naersk",
"rev": "c6a45e4277fa58abd524681466d3450f896dc094", "rev": "cddffb5aa211f50c4b8750adbec0bbbdfb26bb9f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -415,11 +414,11 @@
}, },
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1660406417, "lastModified": 1659153955,
"narHash": "sha256-ekKl2IWxAEjwrAtE//PgR95UcvqFK+FaT4kR5XFcdjQ=", "narHash": "sha256-BAdA1WBHi/TBSaeyDjsVIqe62r0w/5ZvsaglXivOLLM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d816f474aa79d020a75cc3e69113759e32aabc2e", "rev": "1e5d0fbd82f0f1370c70026d255deda2d9c8a585",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -431,11 +430,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1660407119, "lastModified": 1659256765,
"narHash": "sha256-04lWO0pDbhAXFdL4v2VzzwgxrZ5IefKn+TmZPiPeKxg=", "narHash": "sha256-RE4l6J+ApJ1vd4QFDhbEasv0M/deTxSK5IsIBYXuHmE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "12620020f76b1b5d2b0e6fbbda831ed4f5fe56e1", "rev": "727a099e871ff10ae09a1ebd056a5ba4b9dbe50f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -446,11 +445,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1660305968, "lastModified": 1659131907,
"narHash": "sha256-r0X1pZCSEA6mzt5OuTA7nHuLmvnbkwgpFAh1iLIx4GU=", "narHash": "sha256-8bz4k18M/FuVC+EVcI4aREN2PsEKT7LGmU2orfjnpCg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c4a0efdd5a728e20791b8d8d2f26f90ac228ee8d", "rev": "8d435fca5c561da8168abb30270788d2da2a7951",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -567,11 +566,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1660416638, "lastModified": 1659167628,
"narHash": "sha256-DllHrfAUUjg0tBYvj32jr4NQZrH0dC9sRiBPqN8C03w=", "narHash": "sha256-hl3zom2TrPnwadl0bdoTxNXcSSW8OTx/iASF8VsrRlc=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "010f68cacfdddcc50234b54965e1326d7ad925ab", "rev": "e0ff4befdacf187621bebba84f824d2e41ab0607",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -5,7 +5,6 @@ let
in in
{ {
imports = [ imports = [
./js.nix
./go.nix ./go.nix
./rust.nix ./rust.nix
./web_dev.nix ./web_dev.nix

View file

@ -1,26 +0,0 @@
{ lib, pkgs, config, ... }:
let
cfg = config.mae.nvim;
in
with lib;
{
options.mae.nvim.js = {
tsserver.enable = mkEnableOption "Enable js/ts support in nvim with tsserver";
};
config = mkIf cfg.js.tsserver.enable {
programs.neovim = {
coc.enable = true;
plugins = with pkgs.vimPlugins; [
coc-tsserver
{
plugin = vim-jsdoc;
config = ''
let g:jsdoc_formatter = "tsdoc"
let g:typescript_indent_disable = 1
'';
}
];
};
};
}

View file

@ -2,7 +2,7 @@
{ {
mae.nvim = { mae.nvim = {
enable = true; enable = true;
# js.tsserver.enable = true; js.enable = true;
nix.enable = true; nix.enable = true;
rust.enable = true; rust.enable = true;
clangd.enable = true; clangd.enable = true;