diff --git a/.helix/languages.toml b/.helix/languages.toml index 3c254a9..3acf92e 100644 --- a/.helix/languages.toml +++ b/.helix/languages.toml @@ -1,21 +1,21 @@ +# TODO: switch to "%{buffer_name}" when this feature makes it to Helix release + [[language]] name = "nix" -formatter = { command = "treefmt", args = ["--stdin", "$FILE"] } +formatter = { command = "treefmt", args = ["--stdin", ".nix", "--quiet"] } auto-format = true [[language]] name = "toml" -formatter = { command = "treefmt", args = ["--stdin"] } +formatter = { command = "treefmt", args = ["--stdin", ".nix", "--quiet"] } auto-format = true [[language]] name = "yaml" -formatter = { command = "treefmt", args = ["--stdin"] } -# formatter = { command = 'prettier', args = ["--parser", "yaml"] } +formatter = { command = "treefmt", args = ["--stdin", ".nix", "--quiet"] } auto-format = true [[language]] name = "markdown" -formatter = { command = "treefmt", args = ["--stdin"] } -# formatter = { command = 'prettier', args = ["--parser", "markdown"] } +formatter = { command = "treefmt", args = ["--stdin", ".nix", "--quiet"] } auto-format = true diff --git a/flake.nix b/flake.nix index d39d321..e74f6ea 100644 --- a/flake.nix +++ b/flake.nix @@ -2,20 +2,20 @@ { description = "My Home Manager configuration"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; home-manager = { url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; - nur.url = "github:nix-community/NUR"; - nixgl = { - url = "github:nix-community/nixGL"; - inputs.nixpkgs.follows = "nixpkgs"; - }; lix-module = { url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.1.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; }; + nixgl = { + url = "github:nix-community/nixGL"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + nur.url = "github:nix-community/NUR"; sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -26,11 +26,11 @@ outputs = { self, - nixpkgs, home-manager, - nur, - nixgl, lix-module, + nixgl, + nixpkgs, + nur, sops-nix, treefmt-nix, ... @@ -67,16 +67,14 @@ devShells.${system}.default = pkgs.mkShell { buildInputs = [ pkgs.age - pkgs.sops - pkgs.just pkgs.forgejo-cli - pkgs.nil - # pkgs.nixfmt-rfc-style - pkgs.taplo - pkgs.marksman pkgs.helix + pkgs.just + pkgs.marksman + pkgs.nil + pkgs.sops + pkgs.taplo pkgs.uutils-coreutils - pkgs.prettier pkgs.yaml-language-server treefmtEval.config.build.wrapper ]; diff --git a/home.nix b/home.nix index 3b29ad6..fdad769 100644 --- a/home.nix +++ b/home.nix @@ -1,7 +1,7 @@ { - pkgs, - nixgl, config, + nixgl, + pkgs, ... }: diff --git a/treefmt.nix b/treefmt.nix index 4dd2a07..92af710 100644 --- a/treefmt.nix +++ b/treefmt.nix @@ -6,10 +6,10 @@ enable = true; strict = true; }; - taplo = { + prettier = { enable = true; }; - prettier = { + taplo = { enable = true; }; };