Skip to content

Commit 125b866

Browse files
committed
imp: prepare for nixago (remove conflicting packages)
1 parent 8dcf0e9 commit 125b866

File tree

2 files changed

+2
-45
lines changed

2 files changed

+2
-45
lines changed

flake.nix

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,33 +28,12 @@
2828
commands = baser [
2929
{package = nixpkgs'.arion;}
3030
];
31-
packages = with nixpkgs'; [
32-
treefmt
33-
alejandra
34-
nodePackages.prettier
35-
nodePackages.prettier-plugin-toml
36-
shfmt
37-
editorconfig-checker
38-
pwgen
39-
];
40-
devshell.startup.nodejs-setuphook = nixpkgs'.lib.stringsWithDeps.noDepEntry ''
41-
export NODE_PATH=${nixpkgs'.nodePackages.prettier-plugin-toml}/lib/node_modules:$NODE_PATH
42-
'';
31+
packages = with nixpkgs'; [pwgen];
4332
devshell.startup.iogo-login = nixpkgs'.lib.stringsWithDeps.noDepEntry ''
4433
eval "$(${iogo}/bin/iogo login)"
4534
'';
4635
};
4736

48-
# --------------------------------------
49-
# Hooks: use the default company-wide git hooks
50-
# --------------------------------------
51-
hooks = {extraModulesPath, ...}: {
52-
inherit _file;
53-
imports = ["${extraModulesPath}/git/hooks.nix"];
54-
git.hooks.enable = true;
55-
git.hooks.pre-commit.text = builtins.readFile ./pre-commit.sh;
56-
};
57-
5837
# --------------------------------------
5938
# Cloud: tools for managing the company cloud
6039
# --------------------------------------
@@ -155,6 +134,7 @@
155134
commands = tooler [
156135
{package = nixpkgs'.jq;}
157136
{package = nixpkgs'.ijq;}
137+
{package = nixpkgs'.icdiff;}
158138
{
159139
package = nixpkgs'.fx;
160140
name = "fx";

pre-commit.sh

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)