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

.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 --add url."git@github.com:".insteadOf "https://github.com/"
-  - git config core.sshCommand 'ssh -i /home/droneserver/.ssh/id_rsa' 
+  - git config core.sshCommand 'ssh -i /home/drone/.ssh/id_rsa' 
   - git push --force --set-upstream origin flake-update 
 
 trigger:

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;
@@ -32,6 +49,7 @@
       ungoogled-chromium
       networkmanagerapplet
       sops
+      jftui
     ];
 
 

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;