Compare commits
3 commits
981fe889ff
...
ec9c0addc0
Author | SHA1 | Date | |
---|---|---|---|
ec9c0addc0 | |||
7588c36d97 | |||
a2a82dbe7c |
24
flake.lock
24
flake.lock
|
@ -28,11 +28,11 @@
|
||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720546205,
|
"lastModified": 1722339003,
|
||||||
"narHash": "sha256-boCXsjYVxDviyzoEyAk624600f3ZBo/DKtUdvMTpbGY=",
|
"narHash": "sha256-ZeS51uJI30ehNkcZ4uKqT4ZDARPyqrHADSKAwv5vVCU=",
|
||||||
"owner": "ryantm",
|
"owner": "ryantm",
|
||||||
"repo": "agenix",
|
"repo": "agenix",
|
||||||
"rev": "de96bd907d5fbc3b14fc33ad37d1b9a3cb15edc6",
|
"rev": "3f1dae074a12feb7327b4bf43cbac0d124488bb7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -176,11 +176,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1721735625,
|
"lastModified": 1723080788,
|
||||||
"narHash": "sha256-4T0FK0b3Q7Dd7oj79M7GhA9+YqKxxGT0iN+h8yqdP7s=",
|
"narHash": "sha256-C5LbM5VMdcolt9zHeLQ0bYMRjUL+N+AL5pK7/tVTdes=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "4698b1ef375e9c904037e0b2049aa73d39ac1b2d",
|
"rev": "ffc1f95f6c28e1c6d1e587b51a2147027a3e45ed",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -480,11 +480,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1721531260,
|
"lastModified": 1722740924,
|
||||||
"narHash": "sha256-O72uxk4gYFQDwNkoBioyrR3GK9EReZmexCStBaORMW8=",
|
"narHash": "sha256-UQPgA5d8azLZuDHZMPmvDszhuKF1Ek89SrTRtqsQ4Ss=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "b6db9fd8dc59bb2ccb403f76d16ba8bbc1d5263d",
|
"rev": "97ca0a0fca0391de835f57e44f369a283e37890f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -592,11 +592,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1721548954,
|
"lastModified": 1722869614,
|
||||||
"narHash": "sha256-7cCC8+Tdq1+3OPyc3+gVo9dzUNkNIQfwSDJ2HSi2u3o=",
|
"narHash": "sha256-7ojM1KSk3mzutD7SkrdSflHXEujPvW1u7QuqWoTLXQU=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "63d37ccd2d178d54e7fb691d7ec76000740ea24a",
|
"rev": "883180e6550c1723395a3a342f830bfc5c371f6b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -22,7 +22,6 @@
|
||||||
./users.nix
|
./users.nix
|
||||||
./containers.nix
|
./containers.nix
|
||||||
./network.nix
|
./network.nix
|
||||||
./keyboard.nix
|
|
||||||
../settings
|
../settings
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -47,6 +47,5 @@
|
||||||
PATH = "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin";
|
PATH = "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin";
|
||||||
NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt";
|
NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt";
|
||||||
};
|
};
|
||||||
tagList = [ "nix" ];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,25 +0,0 @@
|
||||||
{ pkgs, lib, ... }:
|
|
||||||
{
|
|
||||||
services.keyd = {
|
|
||||||
enable = true;
|
|
||||||
keyboards.default = {
|
|
||||||
ids = [ "*" ];
|
|
||||||
settings = {
|
|
||||||
"main" = {
|
|
||||||
# Some programs don't respect colemaks capslock bind, so we force it here
|
|
||||||
"capslock" = "backspace";
|
|
||||||
|
|
||||||
# keyd has incorrect defaults :/
|
|
||||||
"leftshift" = "leftshift";
|
|
||||||
"rightshift" = "rightshift";
|
|
||||||
"leftalt" = "leftalt";
|
|
||||||
"rightalt" = "rightalt";
|
|
||||||
"leftcontrol" = "leftcontrol";
|
|
||||||
"rightcontrol" = "rightcontrol";
|
|
||||||
"leftmeta" = "leftmeta";
|
|
||||||
"rightmeta" = "rightmeta";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -14,18 +14,6 @@ in
|
||||||
enable = true;
|
enable = true;
|
||||||
settings.concurrent = 4;
|
settings.concurrent = 4;
|
||||||
services = {
|
services = {
|
||||||
# ci_test = {
|
|
||||||
# registrationConfigFile = "/srv/gitlab-runner/env/ci_test";
|
|
||||||
# dockerImage = "debian";
|
|
||||||
# dockerPrivileged = true;
|
|
||||||
# };
|
|
||||||
thoreb_builder = {
|
|
||||||
registrationConfigFile =
|
|
||||||
config.age.secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
|
|
||||||
dockerImage = "debian";
|
|
||||||
dockerPrivileged = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# runner for building in docker via host's nix-daemon
|
# runner for building in docker via host's nix-daemon
|
||||||
# nix store will be readable in runner, might be insecure
|
# nix store will be readable in runner, might be insecure
|
||||||
thoreb-telemetria-nix = mkNixRunner config.age.secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.path;
|
thoreb-telemetria-nix = mkNixRunner config.age.secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.path;
|
||||||
|
|
Loading…
Reference in a new issue