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

Added alejandra

Browse source
This commit is contained in:
Erwin Boskma 2022-03-01 22:18:44 +01:00
parent b071f6c695
commit 4bb96c16be
Signed by: erwin
GPG key ID: 270B20D17394F7E5
4 changed files with 97 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
flake.lock
View file

@ -1,5 +1,26 @@
{ {
"nodes": { "nodes": {
"alejandra": {
"inputs": {
"flakeCompat": "flakeCompat",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1646107632,
"narHash": "sha256-jhmNDzNICcXc0p+Esi+uWCL1wOkGDyrJGBa0IEnkE08=",
"owner": "kamadorueda",
"repo": "alejandra",
"rev": "47cbeddfbf60f5b4bbf8723e90b6106ef5da3fbb",
"type": "github"
},
"original": {
"owner": "kamadorueda",
"repo": "alejandra",
"type": "github"
}
},
"cadquery-src": { "cadquery-src": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -92,6 +113,22 @@
"type": "github" "type": "github"
} }
}, },
"flakeCompat": {
"flake": false,
"locked": {
"lastModified": 1641205782,
"narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"ha-now-playing": { "ha-now-playing": {
"inputs": { "inputs": {
"naersk": [ "naersk": [
@ -324,6 +361,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"alejandra": "alejandra",
"cq-flake": "cq-flake", "cq-flake": "cq-flake",
"emacs-overlay": "emacs-overlay", "emacs-overlay": "emacs-overlay",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",

5
flake.nix
View file

@ -48,6 +48,11 @@
inputs.flake-utils.follows = "flake-utils"; inputs.flake-utils.follows = "flake-utils";
}; };
alejandra = {
url = "github:kamadorueda/alejandra";
inputs.nixpkgs.follows = "nixpkgs";
};
ha-now-playing = { ha-now-playing = {
url = "git+ssh://git@git.datarift.nl/erwin/ha-now-playing.git?ref=main"; url = "git+ssh://git@git.datarift.nl/erwin/ha-now-playing.git?ref=main";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

96
home-manager/modules/vscode/default.nix
View file

@ -1,4 +1,4 @@
{ lib, pkgs, config, ... }: { lib, pkgs, config, flake-inputs, ... }:
with lib; with lib;
let cfg = config.eboskma.programs.vscode; let cfg = config.eboskma.programs.vscode;
in in
@ -10,52 +10,53 @@ in
programs.vscode = { programs.vscode = {
enable = true; enable = true;
package = pkgs.vscode; package = pkgs.vscode;
extensions = with pkgs.vscode-extensions; [ extensions =
arrterian.nix-env-selector (with pkgs.vscode-extensions; [
bbenoist.nix arrterian.nix-env-selector
brettm12345.nixfmt-vscode bbenoist.nix
# aaronduino.nix-lsp # brettm12345.nixfmt-vscode
# aliariff.auto-add-brackets # aaronduino.nix-lsp
bradlc.vscode-tailwindcss # aliariff.auto-add-brackets
# bungcip.better-toml bradlc.vscode-tailwindcss
coolbear.systemd-unit-file # bungcip.better-toml
# dawhite.mustache coolbear.systemd-unit-file
dbaeumer.vscode-eslint # dawhite.mustache
denoland.vscode-deno dbaeumer.vscode-eslint
# dlasagno.rasi denoland.vscode-deno
# dprint.dprint # dlasagno.rasi
editorconfig.editorconfig # dprint.dprint
esbenp.prettier-vscode editorconfig.editorconfig
# EugenWiens.bitbake esbenp.prettier-vscode
elixir-lsp.vscode-elixir-ls # this is the one by Jake Becker, not the deprecated one # EugenWiens.bitbake
# kumar-harsh.graphql-for-vscode elixir-lsp.vscode-elixir-ls # this is the one by Jake Becker, not the deprecated one
matklad.rust-analyzer # kumar-harsh.graphql-for-vscode
# monokai.theme-monokai-pro-vscode matklad.rust-analyzer
ms-azuretools.vscode-docker # monokai.theme-monokai-pro-vscode
ms-python.python ms-azuretools.vscode-docker
ms-python.vscode-pylance ms-python.python
ms-toolsai.jupyter ms-python.vscode-pylance
# ms-toolsai.jupyter-keymap ms-toolsai.jupyter
# ms-toolsai.jupyter-renderers # ms-toolsai.jupyter-keymap
# ms-vscode-remote.remote-containers # ms-toolsai.jupyter-renderers
ms-vscode-remote.remote-ssh # ms-vscode-remote.remote-containers
# ms-vscode-remote.remote-ssh-edit ms-vscode-remote.remote-ssh
# ms-vscode.cmake-tools # ms-vscode-remote.remote-ssh-edit
ms-vscode.cpptools # ms-vscode.cmake-tools
# msaraiva.surface ms-vscode.cpptools
# pgourlain.erlang # msaraiva.surface
# phoenixframework.phoenix # pgourlain.erlang
rubymaniac.vscode-paste-and-indent # phoenixframework.phoenix
# surajbarkale.ninja rubymaniac.vscode-paste-and-indent
timonwong.shellcheck # surajbarkale.ninja
# twxs.cmake timonwong.shellcheck
vadimcn.vscode-lldb # twxs.cmake
# vscode-icons-team.vscode-icons vadimcn.vscode-lldb
vscodevim.vim # vscode-icons-team.vscode-icons
wholroyd.jinja vscodevim.vim
xaver.clang-format wholroyd.jinja
zxh404.vscode-proto3 xaver.clang-format
]; zxh404.vscode-proto3
]);
keybindings = [ keybindings = [
{ {
@ -78,6 +79,7 @@ in
home.packages = with pkgs; [ home.packages = with pkgs; [
rnix-lsp rnix-lsp
shellcheck shellcheck
flake-inputs.alejandra.defaultPackage.${pkgs.system}
]; ];
}; };
} }

6
home-manager/modules/vscode/settings.json
View file

@ -21,7 +21,10 @@
"editor.defaultFormatter": "esbenp.prettier-vscode" "editor.defaultFormatter": "esbenp.prettier-vscode"
}, },
"[nix]": { "[nix]": {
"editor.defaultFormatter": "aaronduino.nix-lsp" "editor.defaultFormatter": "kamadorueda.alejandra",
"editor.formatOnPaste": true,
"editor.formatOnSave": true,
"editor.formatOnType": false
}, },
"[python]": { "[python]": {
"editor.tabSize": 4 "editor.tabSize": 4
@ -38,6 +41,7 @@
"[typescriptreact]": { "[typescriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode" "editor.defaultFormatter": "esbenp.prettier-vscode"
}, },
"alejandra.program": "alejandra",
"docker.showStartPage": false, "docker.showStartPage": false,
"editor.bracketPairColorization.enabled": true, "editor.bracketPairColorization.enabled": true,
"editor.cursorStyle": "line", "editor.cursorStyle": "line",