darkkirb/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Packages Wiki Activity Actions

fix eval

Browse source
This commit is contained in:
Charlotte 🦝 Delenk 2023-06-13 07:07:34 +01:00
parent 64fc02a60f
commit 81d70b764f
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
4 changed files with 198 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
config/programs/vim/modules/lsp/misc.nix
View file

@ -14,7 +14,6 @@
nodePackages.vscode-html-languageserver-bin
nodePackages.vscode-json-languageserver
lua-language-server
marksman
nil
pyright
nodePackages.typescript
@ -23,7 +22,7 @@
]
++ (
if pkgs.system != "riscv64-linux"
then with pkgs; [ltex-ls]
then with pkgs; [ltex-ls marksman]
else []
);
lspconfig =
@ -40,7 +39,6 @@
html = {};
jsonls = {};
lua_ls = {};
marksman = {};
nil_ls = {};
pyright = {};
tsserver = {};
@ -50,6 +48,7 @@
if pkgs.system != "riscv64-linux"
then {
ltex = {};
marksman = {};
}
else {}
);

1
config/services/atticd.nix
View file

@ -4,6 +4,7 @@
lib,
nix-packages,
system,
pkgs,
...
}: {
imports = [attic.nixosModules.atticd];

192
flake.lock
View file

@ -153,6 +153,21 @@
"type": "github"
}
},
"check-flake_2": {
"locked": {
"lastModified": 1662502605,
"narHash": "sha256-jAT55UhabAxLAVGanxjnNdzH2/oX2ZjLsL4i2jPIP+g=",
"owner": "srid",
"repo": "check-flake",
"rev": "48a17393ed4fcd523399d6602c283775b5127295",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "check-flake",
"type": "github"
}
},
"chir-rs": {
"inputs": {
"cargo2nix": [
@ -376,6 +391,47 @@
}
},
"ema": {
"inputs": {
"check-flake": [
"emanote",
"check-flake"
],
"flake-parts": [
"emanote",
"flake-parts"
],
"flake-root": [
"emanote",
"flake-root"
],
"haskell-flake": [
"emanote",
"haskell-flake"
],
"nixpkgs": [
"emanote",
"nixpkgs"
],
"treefmt-nix": [
"emanote",
"treefmt-nix"
]
},
"locked": {
"lastModified": 1678746319,
"narHash": "sha256-vOh7o0AK2PohGa1LPTAGIPmua1beR67XowEcaI8UPhg=",
"owner": "srid",
"repo": "ema",
"rev": "b46a08d7a26491b9801642ab9c13e94f929c6a90",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "ema",
"type": "github"
}
},
"ema_2": {
"inputs": {
"check-flake": [
"nixos-config-for-netboot",
@ -424,14 +480,45 @@
},
"emanote": {
"inputs": {
"cachix-push": "cachix-push",
"check-flake": "check-flake",
"ema": "ema",
"flake-parts": [
"flake-parts"
],
"flake-root": "flake-root",
"haskell-flake": [
"haskell-flake"
],
"nixpkgs": [
"nixpkgs"
],
"systems": "systems",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1685727810,
"narHash": "sha256-Xms7zCEH7HkrOeyQI/puQx3wviz1GwIUcsUHR5kWTcA=",
"owner": "EmaApps",
"repo": "emanote",
"rev": "5b24bd04f94e03afe66ee01da723e4a05d854953",
"type": "github"
},
"original": {
"owner": "EmaApps",
"repo": "emanote",
"type": "github"
}
},
"emanote_2": {
"inputs": {
"cachix-push": "cachix-push",
"check-flake": "check-flake_2",
"ema": "ema_2",
"flake-parts": [
"nixos-config-for-netboot",
"flake-parts"
],
"flake-root": "flake-root",
"flake-root": "flake-root_2",
"haskell-flake": [
"nixos-config-for-netboot",
"haskell-flake"
@ -440,8 +527,8 @@
"nixos-config-for-netboot",
"nixpkgs"
],
"systems": "systems",
"treefmt-nix": "treefmt-nix"
"systems": "systems_2",
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
"lastModified": 1682633604,
@ -586,6 +673,26 @@
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1685662779,
"narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"nixos-config-for-netboot",
@ -621,6 +728,21 @@
"type": "github"
}
},
"flake-root_2": {
"locked": {
"lastModified": 1671378805,
"narHash": "sha256-yqGxyzMN2GuppwG3dTWD1oiKxi+jGYP7D1qUSc5vKhI=",
"owner": "srid",
"repo": "flake-root",
"rev": "dc7ba6166e478804a9da6881aa48c45d300075cf",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "flake-root",
"type": "github"
}
},
"flake-utils": {
"locked": {
"lastModified": 1677835344,
@ -638,7 +760,7 @@
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
"systems": "systems_3"
},
"locked": {
"lastModified": 1681202837,
@ -707,6 +829,21 @@
}
},
"haskell-flake": {
"locked": {
"lastModified": 1686160859,
"narHash": "sha256-UE+0TQHyPxF8jhbLEeqvNQAy7B79bBix/rpFrf5nsn0=",
"owner": "srid",
"repo": "haskell-flake",
"rev": "908a59167f78035a123ab71ed77af79bed519771",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "haskell-flake",
"type": "github"
}
},
"haskell-flake_2": {
"locked": {
"lastModified": 1684780604,
"narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=",
@ -1187,10 +1324,10 @@
"colorpickle": "colorpickle_2",
"crane": "crane_2",
"dns": "dns_2",
"emanote": "emanote",
"flake-parts": "flake-parts",
"emanote": "emanote_2",
"flake-parts": "flake-parts_2",
"flake-utils": "flake-utils_2",
"haskell-flake": "haskell-flake",
"haskell-flake": "haskell-flake_2",
"home-manager": "home-manager_2",
"hosts-list": "hosts-list_2",
"hydra": "hydra_2",
@ -1467,7 +1604,10 @@
"colorpickle": "colorpickle",
"crane": "crane",
"dns": "dns",
"emanote": "emanote",
"flake-parts": "flake-parts",
"flake-utils": "flake-utils",
"haskell-flake": "haskell-flake",
"home-manager": "home-manager",
"hosts-list": "hosts-list",
"naersk": "naersk",
@ -1609,6 +1749,21 @@
"type": "github"
}
},
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"tomlplusplus": {
"flake": false,
"locked": {
@ -1642,6 +1797,27 @@
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"emanote",
"nixpkgs"
]
},
"locked": {
"lastModified": 1675588998,
"narHash": "sha256-CLeFLmah0mxNp/EIW0PMG3YutKxVIIs4B0f5oJhwe8E=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "70e03145e26c2f3199f4320ecd9fd343f1129c60",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_2": {
"inputs": {
"nixpkgs": [
"nixos-config-for-netboot",

11
flake.nix
View file

@ -41,7 +41,18 @@ rec {
inputs.flake-utils.follows = "flake-utils";
inputs.nixpkgs.follows = "nixpkgs";
};
emanote = {
url = "github:EmaApps/emanote";
inputs.flake-parts.follows = "flake-parts";
inputs.haskell-flake.follows = "haskell-flake";
inputs.nixpkgs.follows = "nixpkgs";
};
flake-parts = {
url = "github:hercules-ci/flake-parts";
inputs.nixpkgs-lib.follows = "nixpkgs";
};
flake-utils.url = "github:DarkKirb/flake-utils";
haskell-flake.url = "github:srid/haskell-flake";
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";