diff --git a/flake.nix b/flake.nix index b166960..523ea72 100644 --- a/flake.nix +++ b/flake.nix @@ -28,39 +28,36 @@ }; }; - outputs = - { - self, - clan-core, - nixpkgs, - ... - }@inputs: - let - # Usage see: https://docs.clan.lol - clan = clan-core.lib.clan { - inherit self; - imports = [ ./clan.nix ]; - specialArgs = { inherit inputs; }; - }; - in - { - inherit (clan.config) nixosConfigurations nixosModules clanInternals; - # Add the Clan cli tool to the dev shell. - # Use "nix develop" to enter the dev shell. - devShells = - nixpkgs.lib.genAttrs - [ - "x86_64-linux" - "aarch64-linux" - "aarch64-darwin" - "x86_64-darwin" - ] - (system: { - default = clan-core.inputs.nixpkgs.legacyPackages.${system}.mkShell { - packages = [ clan-core.packages.${system}.clan-cli ]; - }; - }); - - clan = clan.config; + outputs = { + self, + clan-core, + nixpkgs, + ... + } @ inputs: let + # Usage see: https://docs.clan.lol + clan = clan-core.lib.clan { + inherit self; + imports = [./clan.nix]; + specialArgs = {inherit inputs;}; }; + in { + inherit (clan.config) nixosConfigurations nixosModules clanInternals; + # Add the Clan cli tool to the dev shell. + # Use "nix develop" to enter the dev shell. + devShells = + nixpkgs.lib.genAttrs + [ + "x86_64-linux" + "aarch64-linux" + "aarch64-darwin" + "x86_64-darwin" + ] + (system: { + default = clan-core.inputs.nixpkgs.legacyPackages.${system}.mkShell { + packages = [clan-core.packages.${system}.clan-cli]; + }; + }); + + clan = clan.config; + }; } diff --git a/modules/base.nix b/modules/base.nix index b4e454d..8eb30f1 100644 --- a/modules/base.nix +++ b/modules/base.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { # Must-have packages environment.systemPackages = with pkgs; [ vim diff --git a/users/pedro/home-configuration/helix.nix b/users/pedro/home-configuration/helix.nix index 6a17cea..d0617bc 100644 --- a/users/pedro/home-configuration/helix.nix +++ b/users/pedro/home-configuration/helix.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { programs.helix = { enable = true; defaultEditor = true; @@ -7,49 +6,32 @@ language-server = { pyright = { command = "${pkgs.pyright}/bin/pyright-langserver"; - args = [ "--stdio" ]; - config = { }; + args = ["--stdio"]; + config = {}; }; - nil = { - command = "${pkgs.nil}/bin/nil"; - }; - - vscode-json-language-server.command = "${pkgs.nodePackages.vscode-json-languageserver}/bin/vscode-json-languageserver"; + nil = {command = "${pkgs.nil}/bin/nil";}; }; language = [ { name = "nix"; - language-servers = [ "nil" ]; + language-servers = ["nil"]; auto-format = true; formatter.command = "${pkgs.nixfmt-rfc-style}/bin/nixfmt"; } { name = "python"; - language-servers = [ "pyright" ]; + language-servers = ["pyright"]; auto-format = true; formatter = { command = "${pkgs.black}/bin/black"; - args = [ - "--quiet" - "-" - ]; - }; - } - { - name = "json"; - formatter = { - command = "${pkgs.nodePackages.prettier}/bin/prettier"; - args = [ - "--parser" - "json" - ]; + args = ["--quiet" "-"]; }; } ]; }; - settings = { }; + settings = {}; }; }