dotfiles/nixos-config
1
0
Fork 0
mirror of https://github.com/srid/nixos-config.git synced 2025-12-28 00:05:00 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

darwin: use hci from master

Browse source
This commit is contained in:
Sridhar Ratnakumar 2022-12-23 15:01:09 -05:00
parent e81b36dca5
commit 4e1aaaaf29
3 changed files with 145 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

138
flake.lock generated
View file

@ -187,6 +187,24 @@
"type": "github"
}
},
"flake-parts_3": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_3"
},
"locked": {
"lastModified": 1666885127,
"narHash": "sha256-uXA/3lhLhwOTBMn9a5zJODKqaRT+SuL5cpEmOz2ULoo=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "0e101dbae756d35a376a5e1faea532608e4a4b9a",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": {
"locked": {
"lastModified": 1667395993,
@ -202,6 +220,21 @@
"type": "github"
}
},
"flake-utils_2": {
"locked": {
"lastModified": 1667077288,
"narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"haskell-flake": {
"locked": {
"lastModified": 1668167720,
@ -217,6 +250,27 @@
"type": "github"
}
},
"hci": {
"inputs": {
"flake-parts": "flake-parts_3",
"nix-darwin": "nix-darwin",
"nixpkgs": "nixpkgs_3",
"pre-commit-hooks-nix": "pre-commit-hooks-nix"
},
"locked": {
"lastModified": 1671131253,
"narHash": "sha256-LKVuohzil/Hbwqy7D+3d5Liv3CbljSDdOQ4+E7QyusU=",
"owner": "hercules-ci",
"repo": "hercules-ci-agent",
"rev": "c8ade27f903c8ddb0309ff810f612d3e557146c2",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "hercules-ci-agent",
"type": "github"
}
},
"heist": {
"flake": false,
"locked": {
@ -292,6 +346,27 @@
"type": "github"
}
},
"nix-darwin": {
"inputs": {
"nixpkgs": [
"hci",
"nixpkgs"
]
},
"locked": {
"lastModified": 1667419884,
"narHash": "sha256-oLNw87ZI5NxTMlNQBv1wG2N27CUzo9admaFlnmavpiY=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "cfc0125eafadc9569d3d6a16ee928375b77e3100",
"type": "github"
},
"original": {
"owner": "LnL7",
"repo": "nix-darwin",
"type": "github"
}
},
"nixos-hardware": {
"locked": {
"lastModified": 1669146234,
@ -309,7 +384,7 @@
},
"nixos-shell": {
"inputs": {
"nixpkgs": "nixpkgs_3"
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1646257415,
@ -389,6 +464,24 @@
"type": "github"
}
},
"nixpkgs-lib_3": {
"locked": {
"dir": "lib",
"lastModified": 1665349835,
"narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1",
"type": "github"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1668443372,
@ -406,6 +499,22 @@
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1670495322,
"narHash": "sha256-PYwHXymeQZBrTylwDd4LgozTAgrJmp3UGf3mgnKPRr0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "80b1fb3d5e91f9027a788b4b5f7c1c9bd6d4546b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1628465643,
"narHash": "sha256-QSNw9bDq9uGUniQQtakRuw4m21Jxugm23SXLVgEV4DM=",
@ -420,7 +529,7 @@
"type": "indirect"
}
},
"nixpkgs_4": {
"nixpkgs_5": {
"locked": {
"lastModified": 1671200928,
"narHash": "sha256-mZfzDyzojwj6I0wyooIjGIn81WtGVnx6+avU5Wv+VKU=",
@ -436,6 +545,28 @@
"type": "github"
}
},
"pre-commit-hooks-nix": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": [
"hci",
"nixpkgs"
]
},
"locked": {
"lastModified": 1667760143,
"narHash": "sha256-+X5CyeNEKp41bY/I1AJgW/fn69q5cLJ1bgiaMMCKB3M=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "06f48d63d473516ce5b8abe70d15be96a0147fcd",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"type": "github"
}
},
"root": {
"inputs": {
"coc-rust-analyzer": "coc-rust-analyzer",
@ -444,11 +575,12 @@
"emacs-overlay": "emacs-overlay",
"emanote": "emanote",
"flake-parts": "flake-parts_2",
"hci": "hci",
"home-manager": "home-manager",
"nixos-hardware": "nixos-hardware",
"nixos-shell": "nixos-shell",
"nixos-vscode-server": "nixos-vscode-server",
"nixpkgs": "nixpkgs_4",
"nixpkgs": "nixpkgs_5",
"zk-nvim": "zk-nvim"
}
},

2
flake.nix
View file

@ -12,6 +12,8 @@
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
hci.url = "github:hercules-ci/hercules-ci-agent";
# Supportive inputs
nixos-shell.url = "github:Mic92/nixos-shell";
nixos-hardware.url = "github:NixOS/nixos-hardware";

9
systems/darwin.nix
View file

@ -75,7 +75,14 @@
services.nix-daemon.enable = true;
# nix.package = pkgs.nix;
services.hercules-ci-agent.enable = true;
# TODO: use agenix to manage
# - secrets
# - ssh keys
services.hercules-ci-agent = {
enable = true;
# cache push to ssh fix is in master branch only. --Dec 23, 2022
package = inputs.hci.packages.${system}.hercules-ci-agent;
};
# Create /etc/bashrc that loads the nix-darwin environment.
# programs.zsh.enable = true; # default shell on catalina