thilobillerbeck/dotfiles
1
0
Fork 0
mirror of https://github.com/thilobillerbeck/dotfiles.git synced 2024-12-22 12:03:05 +01:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: thilobillerbeck:1e4fe55f1220bbd7299dfeb947e7eab9128d1ccb
Branches Tags
thilobillerbeck:main
...
compare: thilobillerbeck:782088bd87f9c228bfb5eb6859de4329e5c44463
Branches Tags
thilobillerbeck:main

3 commits
1e4fe55f12 ... 782088bd87

Author SHA1 Message Date
Thilo Billerbeck
782088bd87 disable droidcam, add builders 2024-03-15 14:42:02 +01:00
Thilo Billerbeck
b5ad5b0e78 flake.lock: Update 
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/096d9c04b3e9438855aa65e24129b97a998bd3d9' (2024-03-14)
  → 'github:nix-community/home-manager/dc2f3812b41f825ed466c24c4211160d75cb890c' (2024-03-15)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/0ad13a6833440b8e238947e47bea7f11071dc2b2' (2024-03-12)
  → 'github:NixOS/nixpkgs/d691274a972b3165335d261cc4671335f5c67de9' (2024-03-14)
 2024-03-15 14:17:39 +01:00
Thilo Billerbeck
87e884207c flake.lock: Update 
Flake lock file updates:

• Updated input 'dagger':
    'github:dagger/nix/60a29c97c5fad161abad8d1d0f3b83ab44a72fb4' (2024-03-05)
  → 'github:dagger/nix/b90d22b30af7e6fb8f765f8a1cde0f4830bf2f0f' (2024-03-12)
• Updated input 'home-manager':
    'github:nix-community/home-manager/017b12de5b899ef9b64e2c035ce257bfe95b8ae2' (2024-03-11)
  → 'github:nix-community/home-manager/096d9c04b3e9438855aa65e24129b97a998bd3d9' (2024-03-14)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/3030f185ba6a4bf4f18b87f345f104e6a6961f34' (2024-03-09)
  → 'github:NixOS/nixpkgs/0ad13a6833440b8e238947e47bea7f11071dc2b2' (2024-03-12)
• Updated input 'nixpkgs-update':
    'github:ryantm/nixpkgs-update/06c801641238b1b57320987337b048c98fa0793d' (2023-12-21)
  → 'github:ryantm/nixpkgs-update/3366df2842bc235d33ec122f856cec4cf2c641e1' (2024-03-14)
 2024-03-15 01:29:41 +01:00
5 changed files with 92 additions and 13 deletions
Show stats Expand all files Collapse all files

1
configs/thilo-laptop/nixos.nix
View file

@ -4,6 +4,7 @@
imports = [ # Include the results of the hardware scan. imports = [ # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
./../../nixos/common.nix ./../../nixos/common.nix
./../../nixos/builders.nix
]; ];
# Bootloader. # Bootloader.

1
configs/thilo-pc/nixos.nix
View file

@ -8,6 +8,7 @@
# Include the results of the hardware scan. # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
./../../nixos/common.nix ./../../nixos/common.nix
./../../nixos/builders.nix
]; ];
# Bootloader. # Bootloader.

24
flake.lock
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709646915, "lastModified": 1710276462,
"narHash": "sha256-Zrk5ffSxWvLqwmyI4Ta/TR2fmgzIbI+g0QMv/zOf64k=", "narHash": "sha256-cLxzlGD5mTM/2Q7B27qs3c0ulAsijqyAhqRHQlRV5pY=",
"owner": "dagger", "owner": "dagger",
"repo": "nix", "repo": "nix",
"rev": "60a29c97c5fad161abad8d1d0f3b83ab44a72fb4", "rev": "b90d22b30af7e6fb8f765f8a1cde0f4830bf2f0f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -119,11 +119,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710164657, "lastModified": 1710506163,
"narHash": "sha256-l64+ZjaQAVkHDVaK0VHwtXBdjcBD6nLBD+p7IfyBp/w=", "narHash": "sha256-Xpl2LzbAIUHcTkAZ08UZM0USxVaQn194I8ma9c8wnAA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "017b12de5b899ef9b64e2c035ce257bfe95b8ae2", "rev": "dc2f3812b41f825ed466c24c4211160d75cb890c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -305,11 +305,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1703122623, "lastModified": 1710455862,
"narHash": "sha256-VHjfwnTNEeVNMaZ9o2XtF/rQt2KenjgzdbWh96aoH20=", "narHash": "sha256-yqAda+WvVIi/vof9s3NNSaq7e3vvoX+Z6LLOxupmUTw=",
"owner": "ryantm", "owner": "ryantm",
"repo": "nixpkgs-update", "repo": "nixpkgs-update",
"rev": "06c801641238b1b57320987337b048c98fa0793d", "rev": "3366df2842bc235d33ec122f856cec4cf2c641e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -320,11 +320,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1709961763, "lastModified": 1710451336,
"narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", "rev": "d691274a972b3165335d261cc4671335f5c67de9",
"type": "github" "type": "github"
}, },
"original": { "original": {

78
nixos/builders.nix Normal file
View file

@ -0,0 +1,78 @@
{
programs.ssh.knownHosts = {
"build1.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE/oyJPRwW3bJoWKtXSrVOiqMaKq+9yd03+N2PuCbMKv";
"build2.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOZ7/eZLTfUD7Ejjio+8ivNFb8iyK1CD5Pq8uCDojT+z";
"build3.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM2D/SwJf46XCoim06lOyO42JqJiTeM8UMkT4bYluJJr";
"build4.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDu9ZsbUYaCzzZv4vn22KrKi/R9pCfOEe4aYWyLd96C1";
};
nix = {
distributedBuilds = true;
buildMachines = [ {
hostName = "build1.darmstadt.ccc.de";
protocol = "ssh";
sshUser = "hexa";
sshKey = "/var/keys/id_remotebuild";
systems = [
"i686-linux"
"x86_64-linux"
];
maxJobs = 4;
speedFactor = 6;
supportedFeatures = [
"big-parallel"
"kvm"
"nixos-test"
];
} {
hostName = "build2.darmstadt.ccc.de";
protocol = "ssh";
sshUser = "hexa";
sshKey = "/var/keys/id_remotebuild";
systems = [
"i686-linux"
"x86_64-linux"
];
maxJobs = 4;
speedFactor = 6;
supportedFeatures = [
"big-parallel"
"kvm"
"nixos-test"
];
} {
hostName = "build3.darmstadt.ccc.de";
protocol = "ssh";
sshUser = "hexa";
sshKey = "/var/keys/id_remotebuild";
systems = [
"i686-linux"
"x86_64-linux"
];
maxJobs = 4;
speedFactor = 6;
supportedFeatures = [
"big-parallel"
"kvm"
"nixos-test"
];
} {
hostName = "build4.darmstadt.ccc.de";
protocol = "ssh";
sshUser = "hexa";
sshKey = "/var/keys/id_remotebuild";
systems = [
"i686-linux"
"x86_64-linux"
];
# this node has half the cpu of the others
maxJobs = 2;
speedFactor = 6;
supportedFeatures = [
"big-parallel"
"kvm"
"nixos-test"
];
} ];
};
}

1
nixos/common.nix
View file

@ -72,7 +72,6 @@
steam.enable = true; steam.enable = true;
zsh.enable = true; zsh.enable = true;
adb.enable = true; adb.enable = true;
droidcam.enable = true;
noisetorch.enable = true; noisetorch.enable = true;
}; };