From a2a82dbe7c63fae95341168fd209bad2e14483a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 8 Aug 2024 00:26:35 -0300 Subject: [PATCH 1/3] keyboard: remove config, too buggy --- system/configuration.nix | 1 - system/keyboard.nix | 25 ------------------------- 2 files changed, 26 deletions(-) delete mode 100644 system/keyboard.nix diff --git a/system/configuration.nix b/system/configuration.nix index 516a3ff..6661e40 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -22,7 +22,6 @@ ./users.nix ./containers.nix ./network.nix - ./keyboard.nix ../settings ]; diff --git a/system/keyboard.nix b/system/keyboard.nix deleted file mode 100644 index bdb9f24..0000000 --- a/system/keyboard.nix +++ /dev/null @@ -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"; - }; - }; - }; - }; -} From 7588c36d97c7c8f5fcd2fe19deb3323e36113551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 8 Aug 2024 00:26:57 -0300 Subject: [PATCH 2/3] gitlab: remove old configs --- system/gitlab-runner.nix | 1 - system/monolith-gitlab-runner.nix | 12 ------------ 2 files changed, 13 deletions(-) diff --git a/system/gitlab-runner.nix b/system/gitlab-runner.nix index fa426e2..c50e1b9 100644 --- a/system/gitlab-runner.nix +++ b/system/gitlab-runner.nix @@ -47,6 +47,5 @@ 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"; }; - tagList = [ "nix" ]; }; } diff --git a/system/monolith-gitlab-runner.nix b/system/monolith-gitlab-runner.nix index 8e419d1..f17fbe3 100644 --- a/system/monolith-gitlab-runner.nix +++ b/system/monolith-gitlab-runner.nix @@ -14,18 +14,6 @@ in enable = true; settings.concurrent = 4; 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 # nix store will be readable in runner, might be insecure thoreb-telemetria-nix = mkNixRunner config.age.secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.path; From ec9c0addc043fa423cb045a964b55166f54cdb67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 8 Aug 2024 00:27:08 -0300 Subject: [PATCH 3/3] update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index c9f3362..f7fc1e7 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1720546205, - "narHash": "sha256-boCXsjYVxDviyzoEyAk624600f3ZBo/DKtUdvMTpbGY=", + "lastModified": 1722339003, + "narHash": "sha256-ZeS51uJI30ehNkcZ4uKqT4ZDARPyqrHADSKAwv5vVCU=", "owner": "ryantm", "repo": "agenix", - "rev": "de96bd907d5fbc3b14fc33ad37d1b9a3cb15edc6", + "rev": "3f1dae074a12feb7327b4bf43cbac0d124488bb7", "type": "github" }, "original": { @@ -176,11 +176,11 @@ ] }, "locked": { - "lastModified": 1721735625, - "narHash": "sha256-4T0FK0b3Q7Dd7oj79M7GhA9+YqKxxGT0iN+h8yqdP7s=", + "lastModified": 1723080788, + "narHash": "sha256-C5LbM5VMdcolt9zHeLQ0bYMRjUL+N+AL5pK7/tVTdes=", "owner": "nix-community", "repo": "disko", - "rev": "4698b1ef375e9c904037e0b2049aa73d39ac1b2d", + "rev": "ffc1f95f6c28e1c6d1e587b51a2147027a3e45ed", "type": "github" }, "original": { @@ -480,11 +480,11 @@ ] }, "locked": { - "lastModified": 1721531260, - "narHash": "sha256-O72uxk4gYFQDwNkoBioyrR3GK9EReZmexCStBaORMW8=", + "lastModified": 1722740924, + "narHash": "sha256-UQPgA5d8azLZuDHZMPmvDszhuKF1Ek89SrTRtqsQ4Ss=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "b6db9fd8dc59bb2ccb403f76d16ba8bbc1d5263d", + "rev": "97ca0a0fca0391de835f57e44f369a283e37890f", "type": "github" }, "original": { @@ -592,11 +592,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1721548954, - "narHash": "sha256-7cCC8+Tdq1+3OPyc3+gVo9dzUNkNIQfwSDJ2HSi2u3o=", + "lastModified": 1722869614, + "narHash": "sha256-7ojM1KSk3mzutD7SkrdSflHXEujPvW1u7QuqWoTLXQU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "63d37ccd2d178d54e7fb691d7ec76000740ea24a", + "rev": "883180e6550c1723395a3a342f830bfc5c371f6b", "type": "github" }, "original": {