diff --git a/flake.lock b/flake.lock index 398d992..314dd8c 100644 --- a/flake.lock +++ b/flake.lock @@ -1,26 +1,5 @@ { "nodes": { - "alejandra": { - "inputs": { - "flakeCompat": "flakeCompat", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1649191071, - "narHash": "sha256-35hEJuMvRswOPKb9lbB9ZuHVe0eJN6WJc4T8Frn0hYQ=", - "owner": "kamadorueda", - "repo": "alejandra", - "rev": "3d3f24127a8e2b28998a81c444f8b4b4f11da6c6", - "type": "github" - }, - "original": { - "owner": "kamadorueda", - "repo": "alejandra", - "type": "github" - } - }, "cadquery-src": { "flake": false, "locked": { @@ -113,22 +92,6 @@ "type": "github" } }, - "flakeCompat": { - "flake": false, - "locked": { - "lastModified": 1648199409, - "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "ha-now-playing": { "inputs": { "naersk": [ @@ -361,7 +324,6 @@ }, "root": { "inputs": { - "alejandra": "alejandra", "cq-flake": "cq-flake", "emacs-overlay": "emacs-overlay", "flake-utils": "flake-utils", diff --git a/flake.nix b/flake.nix index 1f34952..362507f 100644 --- a/flake.nix +++ b/flake.nix @@ -36,23 +36,12 @@ url = "github:nix-community/emacs-overlay"; }; - # nix-doom-emacs = { - # url = "github:nix-community/nix-doom-emacs"; - # inputs.nixpkgs.follows = "nixpkgs"; - # inputs.flake-utils.follows = "flake-utils"; - # }; - cq-flake = { url = "github:marcus7070/cq-flake"; inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "flake-utils"; }; - alejandra = { - url = "github:kamadorueda/alejandra"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - ha-now-playing = { url = "git+https://git.datarift.nl/erwin/ha-now-playing.git?ref=main"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home-manager/modules/vscode/default.nix b/home-manager/modules/vscode/default.nix index 99343a7..b43f94f 100644 --- a/home-manager/modules/vscode/default.nix +++ b/home-manager/modules/vscode/default.nix @@ -83,7 +83,6 @@ in home.packages = with pkgs; [ rnix-lsp shellcheck - flake-inputs.alejandra.defaultPackage.${pkgs.system} ]; }; } diff --git a/home-manager/modules/vscode/settings.json b/home-manager/modules/vscode/settings.json index 95c512f..b85297c 100644 --- a/home-manager/modules/vscode/settings.json +++ b/home-manager/modules/vscode/settings.json @@ -21,7 +21,6 @@ "editor.defaultFormatter": "esbenp.prettier-vscode" }, "[nix]": { - "editor.defaultFormatter": "kamadorueda.alejandra", "editor.formatOnPaste": true, "editor.formatOnSave": true, "editor.formatOnType": false @@ -41,7 +40,6 @@ "[typescriptreact]": { "editor.defaultFormatter": "esbenp.prettier-vscode" }, - "alejandra.program": "alejandra", "docker.showStartPage": false, "editor.bracketPairColorization.enabled": true, "editor.cursorStyle": "line",