sammy/nix-infra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: sammy:480c28581e422fbd24d6e41a6bad9055a72a15a5
Branches Tags
sammy:main
..
compare: sammy:8a3dd8b209b48c5a543d99761ad9055a60dbb17d
Branches Tags
sammy:main

No commits in common. "480c28581e422fbd24d6e41a6bad9055a72a15a5" and "8a3dd8b209b48c5a543d99761ad9055a60dbb17d" have entirely different histories.
480c28581e ... 8a3dd8b209

4 changed files with 27 additions and 34 deletions
Show stats Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -2,6 +2,3 @@
path = misc/nixos-infect path = misc/nixos-infect
url = ../nixos-infect url = ../nixos-infect
branch = sammy branch = sammy
[submodule "secrets"]
path = secrets
url = git@git.cherrykitten.dev:sammy/secret-store

52
flake.lock
View file

@ -8,11 +8,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724832240, "lastModified": 1718199808,
"narHash": "sha256-9v4ZrxiXzayBk4sYhOL7PNCNFpVqEj0am7/LOM51qgw=", "narHash": "sha256-w6CguX9/wdsffneEXyLftPaZKwHU0w9Cc9aBExS9cAE=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "c473d7d4493f10233c949f3dd46d6ff79869c3a9", "rev": "dd5c41f7175513be657367f6819fcdf4a64a0fb5",
"revCount": 55, "revCount": 51,
"type": "git", "type": "git",
"url": "https://git.cherrykitten.dev/sammy/cherrykitten.dev" "url": "https://git.cherrykitten.dev/sammy/cherrykitten.dev"
}, },
@ -65,11 +65,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1726153070, "lastModified": 1719994518,
"narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -118,11 +118,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725703823, "lastModified": 1719827385,
"narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=", "narHash": "sha256-qs+nU20Sm8czHg3bhGCqiH+8e13BJyRrKONW34g3i50=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba", "rev": "391ca6e950c2525b4f853cbe29922452c14eda82",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -134,11 +134,11 @@
}, },
"impermanence": { "impermanence": {
"locked": { "locked": {
"lastModified": 1725690722, "lastModified": 1719091691,
"narHash": "sha256-4qWg9sNh5g1qPGO6d/GV2ktY+eDikkBTbWSg5/iD2nY=", "narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "63f4d0443e32b0dd7189001ee1894066765d18a5", "rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -149,11 +149,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1725885300, "lastModified": 1719895800,
"narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=", "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e", "rev": "6e253f12b1009053eff5344be5e835f604bb64cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -165,11 +165,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1726098845, "lastModified": 1719956923,
"narHash": "sha256-MSZVdToifpvMkOZrxW0TK/1bIH7SMKcqoPWJyYH+054=", "narHash": "sha256-nNJHJ9kfPdzYsCOlHOnbiiyKjZUW5sWbwx3cakg3/C4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c5672ec7cbac38685781356e7c24595028c810b2", "rev": "706eef542dec88cc0ed25b9075d3037564b2d164",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -180,23 +180,23 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1725233747, "lastModified": 1719876945,
"narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1726142289, "lastModified": 1719931832,
"narHash": "sha256-Jks8O42La+nm5AMTSq/PvM5O+fUAhIy0Ce1QYqLkyZ4=", "narHash": "sha256-0LD+KePCKKEb4CcPsTBOwf019wDtZJanjoKm1S8q3Do=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "280db3decab4cbeb22a4599bd472229ab74d25e1", "rev": "0aeab749216e4c073cece5d34bc01b79e717c3e0",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
flake.nix
View file

@ -47,14 +47,11 @@
{ {
default = pkgs.mkShell { default = pkgs.mkShell {
nativeBuildInputs = packages; nativeBuildInputs = packages;
shellHook = '' shellHook = "exec $SHELL";
export PASSWORD_STORE_DIR=./secrets
exec $SHELL'';
}; };
hcloud = pkgs.mkShell { hcloud = pkgs.mkShell {
nativeBuildInputs = packages ++ [ pkgs.hcloud ]; nativeBuildInputs = packages ++ [ pkgs.hcloud ];
shellHook = '' shellHook = ''
export PASSWORD_STORE_DIR=./secrets
export HCLOUD_TOKEN=$(pass services/hcloud/api_token) export HCLOUD_TOKEN=$(pass services/hcloud/api_token)
exec $SHELL exec $SHELL
''; '';

1
secrets

@ -1 +0,0 @@
Subproject commit 6c55eef247c404c243b51a4230f2d29fc8d55862