From a1b0cc86fa4c8aa12391c750faec72c86fbe355a Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Tue, 28 Dec 2021 16:50:05 +0100 Subject: [PATCH 1/4] Added newton ssh key --- machines/newton/home-julien.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/machines/newton/home-julien.nix b/machines/newton/home-julien.nix index 0c22622..40c1366 100644 --- a/machines/newton/home-julien.nix +++ b/machines/newton/home-julien.nix @@ -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; From f4d869ae91e6265e03339c15ea8ff32458926753 Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Tue, 28 Dec 2021 17:00:29 +0100 Subject: [PATCH 2/4] Added key for macintosh --- machines/macintosh/home-julien.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/machines/macintosh/home-julien.nix b/machines/macintosh/home-julien.nix index a47e9f3..312c041 100644 --- a/machines/macintosh/home-julien.nix +++ b/machines/macintosh/home-julien.nix @@ -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; From 1718eb1a62bc330717b52071d3778045c5ef421f Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Tue, 28 Dec 2021 17:05:08 +0100 Subject: [PATCH 3/4] Fixing wrong user for drone --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 09b3b50..1381e3c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -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: From e532889292e10ab0227b33dbe9cb829d0a11af34 Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Tue, 28 Dec 2021 17:37:27 +0100 Subject: [PATCH 4/4] Added jftui program --- machines/macintosh/home-julien.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/machines/macintosh/home-julien.nix b/machines/macintosh/home-julien.nix index 312c041..9706844 100644 --- a/machines/macintosh/home-julien.nix +++ b/machines/macintosh/home-julien.nix @@ -49,6 +49,7 @@ ungoogled-chromium networkmanagerapplet sops + jftui ];