Merge branch 'main' of github.com:JulienMalka/nix-config

This commit is contained in:
Julien Malka 2021-12-28 22:02:31 +01:00
commit e584520fa7
No known key found for this signature in database
GPG key ID: 3C68E13964FEA07F
7 changed files with 151 additions and 2 deletions

View file

@ -136,8 +136,8 @@ steps:
- git checkout -b flake-update
- git add flake.lock
- git commit -m "Updated flake lock"
- git config --global --add url."git@github.com:".insteadOf "https://github.com/"
- git config core.sshCommand 'ssh -i /home/droneserver/.ssh/id_rsa'
- git config --add url."git@github.com:".insteadOf "https://github.com/"
- git config core.sshCommand 'ssh -i /home/drone/.ssh/id_rsa'
- git push --force --set-upstream origin flake-update
trigger:

View file

@ -1,6 +1,23 @@
{ config, pkgs, lib, ... }:
{
sops.secrets.ssh-macintosh-pub = {
owner = "julien";
path = "/home/julien/.ssh/id_ed25519.pub";
mode = "0644";
format = "binary";
sopsFile = ../../secrets/ssh-macintosh-pub;
};
sops.secrets.ssh-macintosh-priv = {
owner = "julien";
path = "/home/julien/.ssh/id_ed25519";
mode = "0600";
format = "binary";
sopsFile = ../../secrets/ssh-macintosh-priv;
};
luj.hmgr.julien = {
luj.programs.neovim.enable = true;
luj.programs.git.enable = true;
@ -32,6 +49,7 @@
ungoogled-chromium
networkmanagerapplet
sops
jftui
];

View file

@ -1,5 +1,24 @@
{ pkgs, config, lib, ... }:
{
sops.secrets.ssh-newton-pub = {
owner = "julien";
path = "/home/julien/.ssh/id_ed25519.pub";
mode = "0644";
format = "binary";
sopsFile = ../../secrets/ssh-newton-pub;
};
sops.secrets.ssh-newton-priv = {
owner = "julien";
path = "/home/julien/.ssh/id_ed25519";
mode = "0600";
format = "binary";
sopsFile = ../../secrets/ssh-newton-priv;
};
luj.hmgr.julien = {
luj.programs.neovim.enable = true;
luj.programs.git.enable = true;

View file

@ -0,0 +1,28 @@
{
"data": "ENC[AES256_GCM,data:UKPIApuweAuslsHkrnGwGZ7ibnENiKjGvDoEsxvahT20vav+EE8CouJduJeQbzWLdN1LkaAGckd8rO1PsFDR8N9WbfGvBcCUwRd6nJRNbKlXWfrwj0n6GEaITPY2bb4ebKeEhn46sPZQprdepmKuVFHsGaqocninG1N9FE5dHhyooioHuYLeVpBuQkkwiRBFgOuTTtGLFEx383vOQ++UHhnlkCObEoWzw3Ikz7K6q3tqgFMcomZ5gGty9rIEEMyQVW0TCXnZBUQwM4jZpkcBOx4/bg/iTM3dHbUnlqNX482yOph9qe0iYJxzz6fmZ9tOc8Hfpviwn0d/Du/rfWLL26Sg/mVlv9H5Y1/LeIS5L5Y3jRsscMj2WGOB67//7q7RLrz0rgtGq+Lk/GhYNImyrHYEQvtlJ/vjPuj+B5UKEZzWrlst5BMUui0k7anGEFp1ci/YSqZ0+FZiVyPnBJi4qP7cUcTBot1Ja1GeMb2y0ce6LrZ6aAGH9ka/XOplJ8xqnsu4MxI6316JKQfMu11RsCLSoWTfb6Q/PRtM,iv:HGfgBLo65qDxY/o0UPjUnnr+t1Z0huQGx9bSPzWNQzQ=,tag:WiU3Xk5fGran6uFzLwQI+A==,type:str]",
"sops": {
"kms": null,
"gcp_kms": null,
"azure_kv": null,
"hc_vault": null,
"age": [
{
"recipient": "age1ac9aek30209ppmxxxpfc65wet344u57pdy3zmk3whjlta38m6q9s9m666g",
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjRGtuUHBDU3FTNHQ3SzI4\nZ0d3UWlkaldoKzIxZ3NmVmRiTlBPajJIM1NRCjJ3WUs3c3NjWVdjUjBWZjdYL05y\nVWg5aE9JbWhTdTJ5UDZqNzFNRDNMWkUKLS0tIHZVNkNaejhjdVBzSitLWUdYM3Vw\nYVdyQzhpT0JIeWFRTm12cndZQk9tTk0KlGPvXFWuQj4AJPJ4etRysLoFC0YJn9Dj\nLPrl0K+sKqzl2Os6HV/IOrJm8i/C3ekEbCw0bxXLdECEo7iThzDl1g==\n-----END AGE ENCRYPTED FILE-----\n"
},
{
"recipient": "age162v5365xrnzm9tlxy4w3e6fqds7k3h029qezvl73z6rs5skcn9hs7vml45",
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPYWp2YjdONCtHM1RuaWNn\nMkJMZHRxQmhidDhLTlhBSUhXOVMyeUdZMmlvCk5aeElvSksxWlZYQ1NGa1lqVGMv\nUjNHK2NtTFJvVENJSldwTjVGQ0VnaFkKLS0tIGN6SXhLODdSbkxUZE15ajJtUGhL\nVnhzM0liU2lmaVV1bTdpUlVHZW5jb2MKawNE3kNUBWmIGLQXlm1nO5+5kXu/b2f0\nG2viRRnRTEmnvuJmHVUredfBrVEgogLuxV5QZusU8d2ZmstvlJ+bcQ==\n-----END AGE ENCRYPTED FILE-----\n"
},
{
"recipient": "age14shnplzdf2uatzd7wkvnquqw00zjfly3404ak5lqevajanzdw5qqedjw0y",
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpRkJ0Yk1DdUFudm91WUQr\nZnFhUUJVRVhBaUdRMno2L2ZCd2p1RlI4aVZBCk9oamtHS09meW9JNGdFMFRVYjQ4\ncGhLemxpZS82Sk5XRUJuZ0pZbDdQWXMKLS0tIGJzTEtFWEp0SXEwbDBSM2dWM2lT\nLzYwalBFRUZnUk1oWUJFejlHSTl0N0kK34fvHn3voCexuhw8VuJcV2164bd7hV6/\n72X94oYnrVF3NUpNl5EKsc36DZq5NEVGDxx0pdkeRQMwCJ+HfwCf2A==\n-----END AGE ENCRYPTED FILE-----\n"
}
],
"lastmodified": "2021-12-28T15:57:44Z",
"mac": "ENC[AES256_GCM,data:dUt+ylzKH1Q3ngYb4vKKkXCr5sISk5watRMmSe0JvSpMImAqae3KuDcMd67JmHXJr9lMpoke3793906dEMIHUGt27vCBXEtK85xBLvyPWrfNvXVcetUXeTELDjFGzqnnuSMWgYTtQ7GU8a2Qs9jftFHIfvgj8GFRNyT+C8e7mWI=,iv:ICp3yiqT2UxVgZLilXQZUmusaZIPJRPsEgbiPQlm6Hc=,tag:udv2zVmcwiee2UPOZTpBkw==,type:str]",
"pgp": null,
"unencrypted_suffix": "_unencrypted",
"version": "3.7.1"
}
}

28
secrets/ssh-macintosh-pub Normal file
View file

@ -0,0 +1,28 @@
{
"data": "ENC[AES256_GCM,data:/lDz1RN9O7IpRHD0s7WNWTJFSRgfr3HcSlgMdZnIwTrCEOJfDFm5TEXl2or+4XkJRCXH24qVIBhJxejUlwFC0xyv8A1mHMV483nf8H3lJDJ5RWoT7KTy1+6JW1JgakgfGxk=,iv:iAjwvn7y0Q8zI0+slWv3cODiKf/HWDhC1aDzLpcLG5Y=,tag:PHddHkhYRNrtr+tcDMApTA==,type:str]",
"sops": {
"kms": null,
"gcp_kms": null,
"azure_kv": null,
"hc_vault": null,
"age": [
{
"recipient": "age1ac9aek30209ppmxxxpfc65wet344u57pdy3zmk3whjlta38m6q9s9m666g",
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkbFM3N0xoVVpuOGVTVUpK\nNFRCK3FIMGVjeXQycTZzRmJUcHJ5WHA1QldBCkxCaW82bFV4akRmUy9qcmlKTll3\nbGRDRHBvcE5qUVRMam1jTDhSYjZ5S3MKLS0tIE1QYnlpUFh0NlRkSTBMYkdKdW9t\neHYwbDNWNlRYd1Z6RmJRMm1WL0g0dEkKDRLYjdz9IHbwVvW7nD84s+LqLrHCIASk\n31wGOXpU8DLzXjrULCGR2I4CNurTssZfyAcdWNKMCy1foiOMccZTYg==\n-----END AGE ENCRYPTED FILE-----\n"
},
{
"recipient": "age162v5365xrnzm9tlxy4w3e6fqds7k3h029qezvl73z6rs5skcn9hs7vml45",
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBREtKam05aXRQR3I5T3lN\nSGhsZy8xTjZjSG84aG55OVFZcXBsV2pVWDJrClE1QlVIL01CRHFXQ1VnaUFyamd0\nTHByNGRwYlF5ZnJxTU44RHBCZ1d5VFUKLS0tIDBJcXVNZ2RaT1V1NHBMTmpJMjNI\nRjVacGR5ZjM2UWtLR1IvZmVMUDJ3SzQKadK1XMuOdRvO4UAGfdO5LyVAzP7Z1ovw\napi0Cf5UOWOgHyK4+X0GlFaCGVhhz3Gg7N3+FFKVso+v3kMDbRUQqQ==\n-----END AGE ENCRYPTED FILE-----\n"
},
{
"recipient": "age14shnplzdf2uatzd7wkvnquqw00zjfly3404ak5lqevajanzdw5qqedjw0y",
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2ZXh5QTk0WWlwelFTVVIv\nUytPMVBaMGNBNzdrQmdYNkdJcFNGT3JHSFZVCnIwRmxlUzJHUDBJQjVkV2J2V0dT\nVFJFMmpxQmxsM2FPQXNqSGV6RDRjajQKLS0tIElXVkkxaXE2WVhXUjVDYmtzTWZt\nek1qMElQRjQvOENYK28xcDhxTW9xUkEKqa6ALJduKsZ4JzjprAIMNEImlEaUpdKC\nZmBDMFKDfpLXlrV6D9B1R3/9hyVkrnwBm4oZneSWIthRBcl/MIG1oQ==\n-----END AGE ENCRYPTED FILE-----\n"
}
],
"lastmodified": "2021-12-28T15:57:52Z",
"mac": "ENC[AES256_GCM,data:g8odmE5hIMSx8JnXD5DSq2EAXlEPbqOBsx/JKZzSRDgXxekm3+8AFUXRL5b+6EnTAqPhiuQYPDN2ul23f2tiVF4ukECTcen1wzDKr/D5mSgon60FuMpykNiIfQi78dOOcxiW5igzlySRA9KS36T1Zy7IBm1/I1C5MmWBkwWq0ZY=,iv:LRoobivbraMP+iAu8jZTSSPDvSLjChjxbpUOnIcVKXg=,tag:/FC7RbDATzzBvyniXrAIpQ==,type:str]",
"pgp": null,
"unencrypted_suffix": "_unencrypted",
"version": "3.7.1"
}
}

28
secrets/ssh-newton-priv Normal file
View file

@ -0,0 +1,28 @@
{
"data": "ENC[AES256_GCM,data:nQgVmwpX/kn0CQhWeHHOcCEdkljkrXNSqPA9tzCPzHyB5cFpP9BmN359g+FUEGCJM5RZWPkZ51XA8j91KxtTE9YiiKcnaEWKSr13DOCA/knWuVwxVTcunHtPsV5Uz8tWXejmRdGNczJO/K4uUE+utG9CZiUdngLsLocP5DcUy1V10HifiG66i8zuh6bMoRfd95y/lfW5Sj7MMmzmd4NFlP/P3LPNkS1t847L31a416ulIQVICULMFMZQDlkgYCTdpcxu3y1jG013RNpEr2f/ig15nQMp535Nd4rEP/a07OcCO0U77/6wu6vJK/bTNHC9eFL4EgsqdxQ3w3JJNZYg4FxxbTuA76mukXydihQq+1UvtED53t41ozvxBs2PLQv4zpxWkULtWQ4g/zrnZrifiiaYzMZhqzpApLRk6hrRsz1YBd3BsStf3syR15OySntXi4dLZJb22mVN3TKSuYVgi42ACRnTad1XkqZ2s7I81VCwo8uYBUszq/OjkAohwQ3GKrPtdgJkREudr/dEN5jp,iv:y8uYLn7YJXZz1i7loOuKGJJF08kS+JAJb3C2ygnkwGw=,tag:MeEHc6tt/MYVpqwcIIE+yQ==,type:str]",
"sops": {
"kms": null,
"gcp_kms": null,
"azure_kv": null,
"hc_vault": null,
"age": [
{
"recipient": "age1ac9aek30209ppmxxxpfc65wet344u57pdy3zmk3whjlta38m6q9s9m666g",
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuMlNtd3ZuZVhMeFlTMWl6\ndGVTMmliUThWMkdyTXFYS1ArdW0yaWdmdFQ0ClNWWnF4Y00vdEZSc0Y1R0hZb0pp\nSnlXVnQzZ2l6ZU5MYzg3ZDhzdzFFZ28KLS0tIDlDaEVDTEs2Z082KzJQWGVpVUFs\nU1VKRTBZUThsQTJtcW1JcWppSEVxMWMKd4s1jUB1nV3/YKmrKJHQyotmcajt2iHL\nctPZXO29Q6afsqJE7WqtRueinH7jXvq51DNQXBD3/JJKKj9IeFNDjg==\n-----END AGE ENCRYPTED FILE-----\n"
},
{
"recipient": "age162v5365xrnzm9tlxy4w3e6fqds7k3h029qezvl73z6rs5skcn9hs7vml45",
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6Uk5qNks0Z2F2dmVRVHJY\nNm9ORFU4V0Njby9HN0M2a2ZPVWtqVVVNalVrCjI1ZVZkbTFpYVpaQ1ZlOEVGOGx0\nZ0RER0VmdXFQSWUxM2JjU3lMczJHekkKLS0tIDJOaEgyZ2RxL2JZdDM3TUZveFRo\nOHBCMEZybTE5TExreEx6cy9iK1RCNGsKxgicZCON3ityhw1y0DIgaZPjg34t/mph\nyshK1YGqV2+dudDlNum62VDQYAXCVmqzwbxLs9s87h9D/i2G0FBH1A==\n-----END AGE ENCRYPTED FILE-----\n"
},
{
"recipient": "age14shnplzdf2uatzd7wkvnquqw00zjfly3404ak5lqevajanzdw5qqedjw0y",
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxTU4xOWVXMTBIVmtubi9j\nTjJ4eERCVkRHNUtLeGRWMWNiMUtiUHdBbVVNClZDelNKMURaKzRzSlprdVREQ1Zq\nUnRKK2JPcHlyVXFKeWtkck9GbnBaTGMKLS0tIHFxWEQyUldJS093aWNMS2lVN2Jz\namlXeXZnOFBTb1p5MzBld2NkWW01aFkKwuGe000EN1DoPkZd71HiIvbSXyZv0ajw\nedWXwdgsS8SZWR7zDzG+vCrEbqAngyIHj3PESf6+/nmrzv3KtvIeZg==\n-----END AGE ENCRYPTED FILE-----\n"
}
],
"lastmodified": "2021-12-28T15:47:51Z",
"mac": "ENC[AES256_GCM,data:ZAT9cygw1EdIwd+Yi59cCzU00nnajh2KVDDMIWnEBFcf6GWqxBn7xSnWSktv44ly75fbvjfLPMMbjsfUcq3NdvE6HJMjgT8hWcgCUdJRQw3szhHgRcoIgDJ9ZMVKnDlijXkbe01GGj6UV/YZYW9c+CPghB5PHZxxQQpbI4AoAQo=,iv:8CnrRtRps14zApcIONB7ry2dBZW7ROEsRvSHa82UwXk=,tag:9CRSJlPFrXfILIVhxSatCg==,type:str]",
"pgp": null,
"unencrypted_suffix": "_unencrypted",
"version": "3.7.1"
}
}

28
secrets/ssh-newton-pub Normal file
View file

@ -0,0 +1,28 @@
{
"data": "ENC[AES256_GCM,data:XU5Uuw0YYdKNtkaq6npxkjDHJc3d8xi+Pa1MWAjjMyDb6lKxJ8Jek8VpNrS9idwHuSzQv7VY26ag/j++21738pw1udmyZIsAM2zU1P1LnNCK6gKI3l/gPufn/X7ZNyI=,iv:neHLjUgV4OAUYZmHr34nUGzZuAFZU9uCOaKkWfyGCAU=,tag:wgBB7jMHLxfh1uV8BCMNtg==,type:str]",
"sops": {
"kms": null,
"gcp_kms": null,
"azure_kv": null,
"hc_vault": null,
"age": [
{
"recipient": "age1ac9aek30209ppmxxxpfc65wet344u57pdy3zmk3whjlta38m6q9s9m666g",
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKMXI3aG9kbnhSQ2lGVnZO\ndXk3UHZQR3JCaUFURitIdStnS2ZoWWQ1Q0FNClJtbmo5MU1RNEpSY2FGYUNUZ293\nUExuSUJMU0ZsVjN1THRRaVJzSTg0OUkKLS0tIExJNWc2S1g5UUhoVk9XOUhVWGs3\nWDYwbGthWW5QUFB4V05vSC9RRUxhWXMK1WeDIrPrnjcJaHzCzg9w5e4sjPDxtRrg\nRmPYFTRxC/p9YvbAYbgtEwoFGo9jPUAI6pbNaQAjcj7gygzW5ZDjOg==\n-----END AGE ENCRYPTED FILE-----\n"
},
{
"recipient": "age162v5365xrnzm9tlxy4w3e6fqds7k3h029qezvl73z6rs5skcn9hs7vml45",
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0bi90ODAzRlVWYW1xTWll\nR2FqNXo3c0JEMm9EcVNJTFdvWi9Ra3dwaURJCmtpSFdpd2M4cEI3dmJFM2tsa3Bw\ndldYUWsya2gzcCtjV01xZFVMZzRIa3cKLS0tIHdxUXhyTmJKZDlQMVZJemxkTE04\nUUczSHVUUjgyRFB1VDJ3dG94OUNLY0EKfS+QOsAfvMpLTT1XoPQzh0VJ7nyLXxhe\nXqmhtafR8rRThZTYjyW6J8waVN18o6iAU1e++AhUvRWpmA7MptNzDw==\n-----END AGE ENCRYPTED FILE-----\n"
},
{
"recipient": "age14shnplzdf2uatzd7wkvnquqw00zjfly3404ak5lqevajanzdw5qqedjw0y",
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjemZIcVhlYWFoNWNKTW9C\naHplODVQTDl3aXNhTTE2bkw1bkV5RW01YWh3CkNLOHFXQ3BLR1BmUmJVZWdST1BR\nWjZneGlhZGd3Uk94cE9QQnFqUXlNbWsKLS0tIEk1Y2ZmYnZrb0xQa2l1ODZNZjQ5\nYW1KR3R3REtxcjE5MkJEYmRmTHdOWGsK1FE1rdetOl4TvUaBa6eDP7HsVo7jnxjv\nG8GO6QRN673swUVfCpXWexO62b2JAgkUQ+LeLCnZSQlqBjuVULCjIg==\n-----END AGE ENCRYPTED FILE-----\n"
}
],
"lastmodified": "2021-12-28T15:48:04Z",
"mac": "ENC[AES256_GCM,data:8WmNLts4Ab1mT5WAmNQtpt3YvYrDXNmwwUeoFXdePEfubO5g3wmInvFzKNvntdbTplbiGgJS8Gj69ufZYZvDORQ/sRtWFJoDs98YcbfaJ3TP5K+bQQ1fU6ix5fM737IIQd3ewi5CegzGIrgXF94U/L90klfgfoFFwdJMgxdtg1g=,iv:sB7kiv+MFsSEuXCCyuVGhw9ZSepyXV7KlJZNxAQeW/8=,tag:5qYiauzSh4Nt9kAUgiEbmQ==,type:str]",
"pgp": null,
"unencrypted_suffix": "_unencrypted",
"version": "3.7.1"
}
}