ooks/ooknet
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

helix why

Browse source
This commit is contained in:
ooks-io 2024-01-29 13:34:30 +13:00
parent dcea7ca2d8
commit e5fba5a6fd
4 changed files with 136 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

40
flake.lock generated
View file

@ -130,9 +130,7 @@
"inputs": { "inputs": {
"crane": "crane", "crane": "crane",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"nixpkgs": [ "nixpkgs": "nixpkgs",
"nixpkgs"
],
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
@ -262,7 +260,7 @@
}, },
"hyprlang_2": { "hyprlang_2": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1704230242, "lastModified": 1704230242,
@ -281,7 +279,7 @@
"hyprpaper": { "hyprpaper": {
"inputs": { "inputs": {
"hyprlang": "hyprlang_2", "hyprlang": "hyprlang_2",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1704406943, "lastModified": 1704406943,
@ -359,7 +357,7 @@
"nix-gaming": { "nix-gaming": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1706477838, "lastModified": 1706477838,
@ -377,15 +375,15 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1702645756, "lastModified": 1706191920,
"narHash": "sha256-qKI6OR3TYJYQB3Q8mAZ+DG4o/BR9ptcv9UnRV2hzljc=", "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "40c3c94c241286dd2243ea34d3aef8a488f9e4d0", "rev": "ae5c332cbb5827f6b1f02572496b141021de335f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
@ -425,6 +423,22 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1702645756,
"narHash": "sha256-qKI6OR3TYJYQB3Q8mAZ+DG4o/BR9ptcv9UnRV2hzljc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "40c3c94c241286dd2243ea34d3aef8a488f9e4d0",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1703637592, "lastModified": 1703637592,
"narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=",
@ -440,7 +454,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1706173671, "lastModified": 1706173671,
"narHash": "sha256-lciR7kQUK2FCAYuszyd7zyRRmTaXVeoZsCyK6QFpGdk=", "narHash": "sha256-lciR7kQUK2FCAYuszyd7zyRRmTaXVeoZsCyK6QFpGdk=",
@ -456,7 +470,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1706191920, "lastModified": 1706191920,
"narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=",
@ -485,7 +499,7 @@
"nh": "nh", "nh": "nh",
"nix-colors": "nix-colors", "nix-colors": "nix-colors",
"nix-gaming": "nix-gaming", "nix-gaming": "nix-gaming",
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_5"
} }
}, },
"rust-overlay": { "rust-overlay": {

1
flake.nix
View file

@ -34,7 +34,6 @@
helix = { helix = {
url = "github:helix-editor/helix"; url = "github:helix-editor/helix";
inputs.nixpkgs.follows = "nixpkgs";
}; };
nh = { nh = {

40
home/modules/console/editor/helix/default.nix
View file

@ -5,35 +5,23 @@ let
in in
{ {
imports = [ # imports = [
./languages.nix # ./languages.nix
]; # ];
config = { config = lib.mkIf cfg.enable {
programs.helix = lib.mkIf cfg.enable { home.packages = with pkgs; [
marksman
clang-tools
nil
nodePackages.bash-language-server
nodePackages.vscode-css-languageserver-bin
nodePackages.vscode-langservers-extracted
shellcheck
];
programs.helix = {
enable = true; enable = true;
defaultEditor = lib.mkIf cfg.default true; defaultEditor = lib.mkIf cfg.default true;
package =
inputs.helix.packages.${pkgs.system}.default.overrideAttrs (self: {
makeWrapperArgs = with pkgs;
self.makeWrapperArgs
or []
++ [
"--suffix"
"PATH"
":"
(lib.makeBinPath [
clang-tools
marksman
nil
nodePackages.bash-language-server
nodePackages.vscode-css-languageserver-bin
nodePackages.vscode-langservers-extracted
shellcheck
])
];
});
settings = { settings = {
theme = colorscheme.slug; theme = colorscheme.slug;
editor = { editor = {

189
home/modules/console/editor/helix/languages.nix
View file

@ -1,106 +1,107 @@
{ pkgs, lib, config, ... }:
let
cfg = config.homeModules.console.editor.helix;
in
{ {
config = lib.mkIf cfg.enable { pkgs,
programs.helix.languages = { lib,
language = let ...
deno = lang: { }: {
command = "${pkgs.deno}/bin/deno"; programs.helix.languages = {
args = ["fmt" "-" "--ext" lang]; language = let
}; deno = lang: {
command = "${pkgs.deno}/bin/deno";
args = ["fmt" "-" "--ext" lang];
};
prettier = lang: { prettier = lang: {
command = "${pkgs.nodePackages.prettier}/bin/prettier"; command = "${pkgs.nodePackages.prettier}/bin/prettier";
args = ["--parser" lang]; args = ["--parser" lang];
}; };
prettierLangs = map (e: { prettierLangs = map (e: {
name = e; name = e;
formatter = prettier e; formatter = prettier e;
}); });
langs = ["css" "scss" "html"]; langs = ["css" "scss" "html"];
in in
[ [
{ {
name = "bash"; name = "bash";
auto-format = true; auto-format = true;
formatter = { formatter = {
command = "${pkgs.shfmt}/bin/shfmt"; command = "${pkgs.shfmt}/bin/shfmt";
args = ["-i" "2"]; args = ["-i" "2"];
}; };
} }
{ {
name = "clojure"; name = "clojure";
injection-regex = "(clojure|clj|edn|boot|yuck)"; injection-regex = "(clojure|clj|edn|boot|yuck)";
file-types = ["clj" "cljs" "cljc" "clje" "cljr" "cljx" "edn" "boot" "yuck"]; file-types = ["clj" "cljs" "cljc" "clje" "cljr" "cljx" "edn" "boot" "yuck"];
} }
{ {
name = "javascript"; name = "javascript";
auto-format = true; auto-format = true;
language-servers = ["deno-lsp"]; language-servers = ["deno-lsp"];
} }
{ {
name = "json"; name = "json";
formatter = deno "json"; formatter = deno "json";
} }
{ {
name = "markdown"; name = "markdown";
auto-format = true; auto-format = true;
formatter = deno "md"; formatter = deno "md";
} }
] {
++ prettierLangs langs; name = "typescript";
auto-format = true;
language-servers = ["deno-lsp"];
}
]
++ prettierLangs langs;
language-server = { language-server = {
bash-language-server = { bash-language-server = {
command = "${pkgs.nodePackages.bash-language-server}/bin/bash-language-server"; command = "${pkgs.nodePackages.bash-language-server}/bin/bash-language-server";
args = ["start"]; args = ["start"];
}; };
clangd = { clangd = {
command = "${pkgs.clang-tools}/bin/clangd"; command = "${pkgs.clang-tools}/bin/clangd";
clangd.fallbackFlags = ["-std=c++2b"]; clangd.fallbackFlags = ["-std=c++2b"];
}; };
deno-lsp = { deno-lsp = {
command = "${pkgs.deno}/bin/deno"; command = "${pkgs.deno}/bin/deno";
args = ["lsp"]; args = ["lsp"];
environment.NO_COLOR = "1"; environment.NO_COLOR = "1";
config.deno = { config.deno = {
enable = true; enable = true;
lint = true; lint = true;
unstable = true; unstable = true;
suggest = { suggest = {
completeFunctionCalls = false; completeFunctionCalls = false;
imports = {hosts."https://deno.land" = true;}; imports = {hosts."https://deno.land" = true;};
}; };
inlayHints = { inlayHints = {
enumMemberValues.enabled = true; enumMemberValues.enabled = true;
functionLikeReturnTypes.enabled = true; functionLikeReturnTypes.enabled = true;
parameterNames.enabled = "all"; parameterNames.enabled = "all";
parameterTypes.enabled = true; parameterTypes.enabled = true;
propertyDeclarationTypes.enabled = true; propertyDeclarationTypes.enabled = true;
variableTypes.enabled = true; variableTypes.enabled = true;
};
}; };
}; };
};
nil = { nil = {
command = lib.getExe pkgs.nil; command = lib.getExe pkgs.nil;
config.nil.formatting.command = ["${lib.getExe pkgs.alejandra}" "-q"]; config.nil.formatting.command = ["${lib.getExe pkgs.alejandra}" "-q"];
}; };
vscode-css-language-server = { vscode-css-language-server = {
command = "${pkgs.nodePackages.vscode-css-languageserver-bin}/bin/css-languageserver"; command = "${pkgs.nodePackages.vscode-css-languageserver-bin}/bin/css-languageserver";
args = ["--stdio"]; args = ["--stdio"];
config = { config = {
provideFormatter = true; provideFormatter = true;
css.validate.enable = true; css.validate.enable = true;
scss.validate.enable = true; scss.validate.enable = true;
};
}; };
}; };
}; };