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

Compare commits

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

8 commits
8a3dd8b209 ... 480c28581e

Author SHA1 Message Date
CherryKitten
480c28581e
add secrets as submodule 2024-09-17 12:15:44 +02:00
CherryKitten
3886cd8724
flake.lock: Update 
Flake lock file updates:

• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/9227223f6d922fee3c7b190b2cc238a99527bbb7' (2024-07-03)
  → 'github:hercules-ci/flake-parts/bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a' (2024-09-12)
• Updated input 'flake-parts/nixpkgs-lib':
    '5daf051448.tar.gz?narHash=sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI%3D' (2024-07-01)
  → '356624c120.tar.gz?narHash=sha256-Ss8QWLXdr2JCBPcYChJhz4xJm%2Bh/xjl4G0c0XlP6a74%3D' (2024-09-01)
• Updated input 'home-manager':
    'github:nix-community/home-manager/e1391fb22e18a36f57e6999c7a9f966dc80ac073' (2024-07-03)
  → 'github:nix-community/home-manager/208df2e558b73b6a1f0faec98493cb59a25f62ba' (2024-09-07)
• Updated input 'impermanence':
    'github:nix-community/impermanence/23c1f06316b67cb5dabdfe2973da3785cfe9c34a' (2024-06-22)
  → 'github:nix-community/impermanence/63f4d0443e32b0dd7189001ee1894066765d18a5' (2024-09-07)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/71b92eab15920df202dd6256c2e2a58cc6e48641' (2024-07-19)
  → 'github:NixOS/nixos-hardware/166dee4f88a7e3ba1b7a243edb1aca822f00680e' (2024-09-09)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/232edbd4b6d9fba4017359dc5f23765e94370c7c' (2024-07-18)
  → 'github:NixOS/nixpkgs/c5672ec7cbac38685781356e7c24595028c810b2' (2024-09-11)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/c3392ad349a5227f4a3464dce87bcc5046692fce' (2024-07-31)
  → 'github:NixOS/nixpkgs/280db3decab4cbeb22a4599bd472229ab74d25e1' (2024-09-12)
 2024-09-13 13:26:07 +02:00
CherryKitten
eabd3211f7
flake.lock: Update 
Flake lock file updates:

• Updated input 'cherrykitten-website':
    'git+https://git.cherrykitten.dev/sammy/cherrykitten.dev?ref=refs/heads/main&rev=381a2b1abecbf085f2c2f13085bcb0335b6fef37' (2024-08-20)
  → 'git+https://git.cherrykitten.dev/sammy/cherrykitten.dev?ref=refs/heads/main&rev=c473d7d4493f10233c949f3dd46d6ff79869c3a9' (2024-08-28)
 2024-08-28 10:04:22 +02:00
CherryKitten
fd9397011a
flake.lock: Update 
Flake lock file updates:

• Updated input 'cherrykitten-website':
    'git+https://git.cherrykitten.dev/sammy/cherrykitten.dev?ref=refs/heads/main&rev=025259c3c54945ad3d1dddd3c4a1f12521e5d954' (2024-08-20)
  → 'git+https://git.cherrykitten.dev/sammy/cherrykitten.dev?ref=refs/heads/main&rev=381a2b1abecbf085f2c2f13085bcb0335b6fef37' (2024-08-20)
 2024-08-20 10:18:01 +02:00
CherryKitten
f527c48f82
flake.lock: Update 
Flake lock file updates:

• Updated input 'cherrykitten-website':
    'git+https://git.cherrykitten.dev/sammy/cherrykitten.dev?ref=refs/heads/main&rev=ccc1f8da318ee99ef460197123941d651d5fad31' (2024-08-02)
  → 'git+https://git.cherrykitten.dev/sammy/cherrykitten.dev?ref=refs/heads/main&rev=025259c3c54945ad3d1dddd3c4a1f12521e5d954' (2024-08-20)
 2024-08-20 10:16:02 +02:00
CherryKitten
4bc6ba7c53
flake.lock: Update 
Flake lock file updates:

• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/af9c15bc7a314c226d7d5d85e159f7a73e8d9fae' (2024-07-19)
  → 'github:NixOS/nixpkgs/c3392ad349a5227f4a3464dce87bcc5046692fce' (2024-07-31)
 2024-08-03 16:55:50 +02:00
CherryKitten
1bf391e7d8
flake.lock: Update 
Flake lock file updates:

• Updated input 'cherrykitten-website':
    'git+https://git.cherrykitten.dev/sammy/cherrykitten.dev?ref=refs/heads/main&rev=dd5c41f7175513be657367f6819fcdf4a64a0fb5' (2024-06-12)
  → 'git+https://git.cherrykitten.dev/sammy/cherrykitten.dev?ref=refs/heads/main&rev=ccc1f8da318ee99ef460197123941d651d5fad31' (2024-08-02)
 2024-08-02 13:01:28 +02:00
CherryKitten
b6dfbb22d8
flake.lock: Update 
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/391ca6e950c2525b4f853cbe29922452c14eda82' (2024-07-01)
  → 'github:nix-community/home-manager/e1391fb22e18a36f57e6999c7a9f966dc80ac073' (2024-07-03)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/6e253f12b1009053eff5344be5e835f604bb64cd' (2024-07-02)
  → 'github:NixOS/nixos-hardware/71b92eab15920df202dd6256c2e2a58cc6e48641' (2024-07-19)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/706eef542dec88cc0ed25b9075d3037564b2d164' (2024-07-02)
  → 'github:NixOS/nixpkgs/232edbd4b6d9fba4017359dc5f23765e94370c7c' (2024-07-18)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/0aeab749216e4c073cece5d34bc01b79e717c3e0' (2024-07-02)
  → 'github:NixOS/nixpkgs/af9c15bc7a314c226d7d5d85e159f7a73e8d9fae' (2024-07-19)
 2024-07-19 18:30:56 +02:00
4 changed files with 34 additions and 27 deletions
Show stats Expand all files Collapse all files

3
.gitmodules vendored
View file

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

52
flake.lock
View file

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

5
flake.nix
View file

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

1
secrets Submodule

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