ref: move devshell module here to devos again

This commit is contained in:
David Arnold 2021-07-07 19:31:12 -05:00 committed by David Arnold
parent 62f9d95259
commit 33fb25e011
8 changed files with 240 additions and 62 deletions

2
.gitignore vendored
View File

@ -1,6 +1,4 @@
result result
up
hosts/up-*
.direnv .direnv
doc/index.html doc/index.html

View File

@ -20,6 +20,25 @@
"type": "github" "type": "github"
} }
}, },
"bud": {
"inputs": {
"devshell": "devshell",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1625703505,
"narHash": "sha256-PNtHOR5wp3R/cysCHTIFcxCHHuisljbrS6iNyP/Ivfk=",
"owner": "divnix",
"repo": "bud",
"rev": "baefc56e5819375736b51e93df9e2154a120ea3d",
"type": "github"
},
"original": {
"owner": "divnix",
"repo": "bud",
"type": "github"
}
},
"ci-agent": { "ci-agent": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
@ -35,11 +54,11 @@
"pre-commit-hooks-nix": "pre-commit-hooks-nix" "pre-commit-hooks-nix": "pre-commit-hooks-nix"
}, },
"locked": { "locked": {
"lastModified": 1619088868, "lastModified": 1624885917,
"narHash": "sha256-l9db+HpNIkY41MonGE8z4pbkjBa5BdzJTG5AxV7V7Lw=", "narHash": "sha256-CaAEhMKzuTyN9krTLZ1jWW3C5HzvKRZY/doVOezZZx0=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "hercules-ci-agent", "repo": "hercules-ci-agent",
"rev": "08f953a263518a3af0ca28cd887020ff3465bdf5", "rev": "5eba6597af97e358542c6f968f6ef680ffd2a401",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -55,11 +74,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1613595894, "lastModified": 1622060422,
"narHash": "sha256-MOk/7rCAUB5Lf4GL+HimvyAAZXYEw8gWsq5nW4PPQQA=", "narHash": "sha256-hPVlvrAyf6zL7tTx0lpK+tMxEfZeMiIZ/A2xaJ41WOY=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "5c3146b75d5d478f0693d0ea6c83f1da8382ff56", "rev": "007d700e644ac588ad6668e6439950a5b6e2ff64",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -73,20 +92,16 @@
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"naersk": "naersk", "naersk": "naersk",
"nixpkgs": [ "nixpkgs": [
"digga", "nixos"
"nixpkgs"
], ],
"utils": [ "utils": "utils"
"digga",
"utils"
]
}, },
"locked": { "locked": {
"lastModified": 1623011836, "lastModified": 1625248509,
"narHash": "sha256-02M4P3eqUdV+ouZb8n1KDR1CXeZQm17cKpjKZKi0c10=", "narHash": "sha256-G721I9brAMCkZKXIFsgOQ1JCZ9Rj9DM7QSm0pvpQldc=",
"owner": "serokell", "owner": "serokell",
"repo": "deploy-rs", "repo": "deploy-rs",
"rev": "70d71b3027b1793b780f1e2435bdbbe1b0cb9ac6", "rev": "364ef202e400e4c941e18833ca38fa848ac5a148",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -97,11 +112,26 @@
}, },
"devshell": { "devshell": {
"locked": { "locked": {
"lastModified": 1622013274, "lastModified": 1625086391,
"narHash": "sha256-mK/Lv0lCbl07dI5s7tR/7nb79HunKnJik3KyR6yeI2k=", "narHash": "sha256-IpNPv1v8s4L3CoxhwcgZIitGpcrnNgnj09X7TA0QV3k=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "e7faf69e6bf8546517cc936c7f6d31c7eb3abcb2", "rev": "4b5ac7cf7d9a1cc60b965bb51b59922f2210cbc7",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "devshell",
"type": "github"
}
},
"devshell_2": {
"locked": {
"lastModified": 1625086391,
"narHash": "sha256-IpNPv1v8s4L3CoxhwcgZIitGpcrnNgnj09X7TA0QV3k=",
"owner": "numtide",
"repo": "devshell",
"rev": "4b5ac7cf7d9a1cc60b965bb51b59922f2210cbc7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -112,19 +142,21 @@
}, },
"digga": { "digga": {
"inputs": { "inputs": {
"deploy": "deploy", "deploy": [
"devshell": "devshell", "deploy"
],
"devshell": "devshell_2",
"nixlib": "nixlib", "nixlib": "nixlib",
"nixos-generators": "nixos-generators", "nixos-generators": "nixos-generators",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs_2",
"utils": "utils" "utils": "utils_2"
}, },
"locked": { "locked": {
"lastModified": 1624576193, "lastModified": 1625701039,
"narHash": "sha256-EPemiDnTx0V622bMtGpcgclSExljWK3+qXZMiZVvvEc=", "narHash": "sha256-4IqBKop1XmS2z7Y5nsf8Af4wSCYJfy4kXUt/zgPwhSU=",
"owner": "divnix", "owner": "divnix",
"repo": "digga", "repo": "digga",
"rev": "241896d3942fe3f818ce9a153955dbcadd9f00fc", "rev": "05ee310fdfa81b1a8ecc7a8075d62ed702d72430",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -219,11 +251,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1616724076, "lastModified": 1625694413,
"narHash": "sha256-SwbPXLjN2sLy4NL/GhodiJrdkIVZwGGTGiCN3JxH1cU=", "narHash": "sha256-goRLk1I/OMclS9i17g932wyHyjiKI+htbuFIWIkzTbw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "fedfd430f96695997b3eaf8d7e82ca79406afa23", "rev": "06ee8ec8dfc4554c374052cd7b7083765748af99",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -234,11 +266,11 @@
}, },
"latest": { "latest": {
"locked": { "locked": {
"lastModified": 1619400530, "lastModified": 1625702968,
"narHash": "sha256-7ZO7B+b9i1wFbHw62EFT+iwuBBpXeA/fcHlR63Z4J0w=", "narHash": "sha256-MadGtaIuPvTh9JLZULkQerZae8TFBczg8c12AijZc+s=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e8dc8adab655eb27957859c62bef11484b53f639", "rev": "46c8ac79dbc9a4bcb7db4592d4708fb009284e13",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -249,7 +281,7 @@
"naersk": { "naersk": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"digga", "deploy",
"nixpkgs" "nixpkgs"
] ]
}, },
@ -285,11 +317,11 @@
}, },
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1624575719, "lastModified": 1625702791,
"narHash": "sha256-MVQJ2ltjqrxdB8zHj2s05ujgX6VbCDZ/+K8j2xh59Hk=", "narHash": "sha256-3aiSEfGaBwi1mumzfSgwiO3kxGD+IHe9HAv3S227KI8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "001f78ff0044adf3ca972643eaf3fc5cbc8f634c", "rev": "977b522d3101ad847fd51d695b817fe2cf8efaf6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -321,11 +353,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1615652054, "lastModified": 1625333638,
"narHash": "sha256-jqXKU8Ovpi7MmPRqGf2FB3QOPcZtGwO2MFc0AYiOPjg=", "narHash": "sha256-M6J9RN60XJyv6nUfDFCwnz5aVjhe8+GJnV8Q9VpdQQQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "31f61b90ddb9257b94888ee17ccf96236e180c76", "rev": "41775780a0b6b32b3d32dcc32bb9bc6df809062d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -335,6 +367,20 @@
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": {
"lastModified": 1624831744,
"narHash": "sha256-gGSxxnWnXRALLKfStsG3C4X+XUzAkHlKx02xHzkGZio=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "dbf5cd2d90cbf8b281c1938632b431d1e61d3249",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1624148921, "lastModified": 1624148921,
"narHash": "sha256-FAhKTXZV67C36hK5lPvZfsFt+QY1QSHYQXwGXqpOChs=", "narHash": "sha256-FAhKTXZV67C36hK5lPvZfsFt+QY1QSHYQXwGXqpOChs=",
@ -351,11 +397,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1615921934, "lastModified": 1625695235,
"narHash": "sha256-nURGM869KKA1+c1SHHsXKYcPXhHIuxWBjNXjJ90OzRQ=", "narHash": "sha256-xJ8jHWkX7IyAImQ8MpWTbUonski38R4bWDNs8pJJzpk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "faf862e8cf009edfa38ecc61188f7a6ace293552", "rev": "9e2254aee0cce4b05f27447e51c001ab66aed7e0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -372,11 +418,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1624534673, "lastModified": 1624890984,
"narHash": "sha256-7HWt8Xh4aIFfGKAFQus5euhYxcWLe6kXz1DsGuV0WbU=", "narHash": "sha256-RMQtTm4OoEc8BHWk4/Yfu1y4uHlG4HCP+DeC0J0zGqQ=",
"owner": "berberman", "owner": "berberman",
"repo": "nvfetcher", "repo": "nvfetcher",
"rev": "a8514f53c7999d23b48d2f42de63660bc3d7850f", "rev": "d3efa8c58057dbcc1565dca3105d31d9f25fd5ca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -388,11 +434,11 @@
"pre-commit-hooks-nix": { "pre-commit-hooks-nix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1617783930, "lastModified": 1622650193,
"narHash": "sha256-SigoU2LWM1fMggqfM9H8XEIvjOjBVQ/wj/zrn02J28c=", "narHash": "sha256-qSzUpJDv04ajS9FXoCq6NjVF3qOt9IiGIiGh0P8amyw=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "2d169bb1b23f3b71a894a66ea81f45c788943248", "rev": "0398f0649e0a741660ac5e8216760bae5cc78579",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -404,8 +450,10 @@
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"bud": "bud",
"ci-agent": "ci-agent", "ci-agent": "ci-agent",
"darwin": "darwin", "darwin": "darwin",
"deploy": "deploy",
"digga": "digga", "digga": "digga",
"home": "home", "home": "home",
"latest": "latest", "latest": "latest",
@ -416,6 +464,21 @@
} }
}, },
"utils": { "utils": {
"locked": {
"lastModified": 1622445595,
"narHash": "sha256-m+JRe6Wc5OZ/mKw2bB3+Tl0ZbtyxxxfnAWln8Q5qs+Y=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "7d706970d94bc5559077eb1a6600afddcd25a7c8",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_2": {
"inputs": { "inputs": {
"flake-utils": "flake-utils" "flake-utils": "flake-utils"
}, },

View File

@ -8,7 +8,11 @@
digga = { digga = {
url = "github:divnix/digga/develop"; url = "github:divnix/digga/develop";
inputs.nipxkgs.follows = "latest"; inputs.nipxkgs.follows = "latest";
inputs.deploy.follows = "deploy";
}; };
bud.url = "github:divnix/bud"; # no need to follow nixpkgs: it never materialises
deploy.url = "github:serokell/deploy-rs";
deploy.inputs.nixpkgs.follows = "nixos";
ci-agent = { ci-agent = {
url = "github:hercules-ci/hercules-ci-agent"; url = "github:hercules-ci/hercules-ci-agent";
@ -31,6 +35,7 @@
outputs = outputs =
{ self { self
, digga , digga
, bud
, nixos , nixos
, ci-agent , ci-agent
, home , home
@ -38,8 +43,12 @@
, nur , nur
, agenix , agenix
, nvfetcher , nvfetcher
, deploy
, ... , ...
} @ inputs: } @ inputs:
let
bud' = bud self; # rebind to access self.budModules
in
digga.lib.mkFlake { digga.lib.mkFlake {
inherit self inputs; inherit self inputs;
@ -52,6 +61,7 @@
nur.overlay nur.overlay
agenix.overlay agenix.overlay
nvfetcher.overlay nvfetcher.overlay
deploy.overlay
./pkgs/default.nix ./pkgs/default.nix
]; ];
}; };
@ -79,6 +89,7 @@
ci-agent.nixosModules.agent-profile ci-agent.nixosModules.agent-profile
home.nixosModules.home-manager home.nixosModules.home-manager
agenix.nixosModules.age agenix.nixosModules.age
(bud.nixosModules.bud bud')
]; ];
}; };
@ -108,25 +119,20 @@
}; };
}; };
devshell.externalModules = { pkgs, ... }: { devshell.modules = [ (import ./shell bud') ];
commands = [
{ package = pkgs.agenix; category = "secrets"; }
{
name = pkgs.nvfetcher-bin.pname;
help = pkgs.nvfetcher-bin.meta.description;
command = "cd $DEVSHELL_ROOT/pkgs; ${pkgs.nvfetcher-bin}/bin/nvfetcher -c ./sources.toml --no-output $@; nixpkgs-fmt _sources/";
}
];
};
homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations; homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations;
deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { }; deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { };
defaultTemplate = self.templates.flk; defaultTemplate = self.templates.bud;
templates.flk.path = ./.; templates.bud.path = ./.;
templates.flk.description = "flk template"; templates.bud.description = "bud template";
} }
//
{
budModules = { devos = import ./pkgs/bud; };
}
; ;
} }

10
pkgs/bud/default.nix Normal file
View File

@ -0,0 +1,10 @@
{ pkgs, lib, budUtils, ... }: {
bud.cmds = with pkgs; {
get = {
writer = budUtils.writeBashWithPaths [ nixUnstable git coreutils ];
synopsis = "get (core|community) [DEST]";
help = "Copy the desired template to DEST";
script = ./get.bash;
};
};
}

6
pkgs/bud/get.bash Normal file
View File

@ -0,0 +1,6 @@
if [[ "$1" == "core" || "$1" == "community" ]]; then
nix flake new -t "github:divnix/devos/$1" "${2:-devos}"
else
echo "bud get (core|community) [DEST]"
exit 1
fi

62
shell/default.nix Normal file
View File

@ -0,0 +1,62 @@
bud:
{ pkgs, extraModulesPath, ... }:
let
hooks = import ./hooks;
pkgWithCategory = category: package: { inherit package category; };
linter = pkgWithCategory "linter";
docs = pkgWithCategory "docs";
devos = pkgWithCategory "devos";
in {
_file = toString ./.;
imports = [ "${extraModulesPath}/git/hooks.nix" ];
git = { inherit hooks; };
# tempfix: remove when merged https://github.com/numtide/devshell/pull/123
devshell.startup.load_profiles = pkgs.lib.mkForce (pkgs.lib.noDepEntry ''
# PATH is devshell's exorbitant privilige:
# fence against its pollution
_PATH=''${PATH}
# Load installed profiles
for file in "$DEVSHELL_DIR/etc/profile.d/"*.sh; do
# If that folder doesn't exist, bash loves to return the whole glob
[[ -f "$file" ]] && source "$file"
done
# Exert exorbitant privilige and leave no trace
export PATH=''${_PATH}
unset _PATH
'');
packages = with pkgs; [
git-crypt
];
commands = with pkgs; [
(devos (bud {inherit pkgs;}) )
(devos nixUnstable)
(devos agenix)
{
category = "devos";
name = pkgs.nvfetcher-bin.pname;
help = pkgs.nvfetcher-bin.meta.description;
command = "cd $DEVSHELL_ROOT/pkgs; ${pkgs.nvfetcher-bin}/bin/nvfetcher -c ./sources.toml --no-output $@; nixpkgs-fmt _sources/";
}
(linter nixpkgs-fmt)
(linter editorconfig-checker)
# (docs python3Packages.grip) too many deps
(docs mdbook)
]
++ lib.optional
(pkgs ? deploy-rs)
(devos deploy-rs.deploy-rs)
++ lib.optional
(system != "i686-linux")
(devos cachix)
;
}

4
shell/hooks/default.nix Normal file
View File

@ -0,0 +1,4 @@
{
enable = true;
pre-commit.text = builtins.readFile ./pre-commit.sh;
}

29
shell/hooks/pre-commit.sh Executable file
View File

@ -0,0 +1,29 @@
#!/usr/bin/env bash
if git rev-parse --verify HEAD >/dev/null 2>&1
then
against=HEAD
else
# Initial commit: diff against an empty tree object
against=$(${git}/bin/git hash-object -t tree /dev/null)
fi
diff="git diff-index --name-only --cached $against --diff-filter d"
nix_files=($($diff -- '*.nix'))
all_files=($($diff))
# Format staged nix files.
if [[ -n "${nix_files[@]}" ]]; then
nixpkgs-fmt "${nix_files[@]}" \
&& git add "${nix_files[@]}"
fi
# check editorconfig
editorconfig-checker -- "${all_files[@]}"
if [[ $? != '0' ]]; then
printf "%b\n" \
"\nCode is not aligned with .editorconfig" \
"Review the output and commit your fixes" >&2
exit 1
fi