Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(neovim): add biome, prettierd, nixfmt and semgrep #317

Merged
merged 2 commits into from
Apr 7, 2024
Merged

chore(neovim): add biome, prettierd, nixfmt and semgrep #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
caff294
chore(neovim): add biome, prettierd, nixfmt and semgrep
izumin5210 Apr 7, 2024
e25f4e1
format nix files
izumin5210 Apr 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions config/.config/nvim/lua/pluginconfig/lspconfig.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,13 @@ function M.setup_null_ls()
null_ls.setup({
sources = {
-- JavaScript
null_ls.builtins.formatting.prettier,
-- Ppotocol Buffers
null_ls.builtins.formatting.biome,
null_ls.builtins.formatting.prettierd,
-- Potocol Buffers
null_ls.builtins.diagnostics.buf,
null_ls.builtins.formatting.buf,
-- Nix
null_ls.builtins.formatting.nixfmt,
-- Dockerfile
null_ls.builtins.diagnostics.hadolint,
-- GitHub Actions
Expand All @@ -87,6 +90,8 @@ function M.setup_null_ls()
null_ls.builtins.formatting.shfmt.with({
extra_args = { "-i", "2" },
}),
-- misc
null_ls.builtins.diagnostics.semgrep,
},
on_attach = function(client, bufnr)
if client.supports_method('textDocument/formatting') then
Expand Down
53 changes: 32 additions & 21 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,41 @@
pkgs = nixpkgs.legacyPackages.${system};

users = [
{ username = "izumin"; homeDir = "/Users/izumin"; hostname = "fleur.local"; }
{ username = "masayuki.izumi"; homeDir = "/Users/masayuki.izumi"; hostname = "CM2NX3M6CH"; }
{
username = "izumin";
homeDir = "/Users/izumin";
hostname = "fleur.local";
}
{
username = "masayuki.izumi";
homeDir = "/Users/masayuki.izumi";
hostname = "CM2NX3M6CH";
}
];

genHomeConfigurations = usersList: builtins.foldl' (acc: user:
acc // {
"${user.username}" = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = [
{ home.username = user.username; home.homeDirectory = user.homeDir; }
./home.nix
];
};
}
) { } usersList;
genHomeConfigurations = usersList:
builtins.foldl' (acc: user:
acc // {
"${user.username}" = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = [
{
home.username = user.username;
home.homeDirectory = user.homeDir;
}
./home.nix
];
};
}) { } usersList;

genDarwinConfigurations = usersList: builtins.foldl' (acc: user:
acc // {
"${user.hostname}" = nix-darwin.lib.darwinSystem {
inherit pkgs;
modules = [ ./darwin-configuration.nix ];
};
}
) { } usersList;
genDarwinConfigurations = usersList:
builtins.foldl' (acc: user:
acc // {
"${user.hostname}" = nix-darwin.lib.darwinSystem {
inherit pkgs;
modules = [ ./darwin-configuration.nix ];
};
}) { } usersList;
in {
homeConfigurations = genHomeConfigurations users;
darwinConfigurations = genDarwinConfigurations users;
Expand Down
12 changes: 6 additions & 6 deletions home.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
{ config, lib, pkgs, ... }:

{
nixpkgs.overlays = [
(import ./overlays/sheldon.nix)
];
nixpkgs.overlays = [ (import ./overlays/sheldon.nix) ];

nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"ngrok"
];
nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [ "ngrok" ];
# Home Manager needs a bit of information about you and the paths it should
# manage.
# home.username = user.name;
Expand Down Expand Up @@ -59,6 +56,9 @@
pkgs.tmux
pkgs.reattach-to-user-namespace # only darwin

# nix
pkgs.nixfmt

# middlewares
pkgs.postgresql_16
pkgs.mysql80
Expand Down
Loading