about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--flake.lock115
-rw-r--r--flake.nix8
-rw-r--r--home/packages/default.nix13
-rw-r--r--nix/mkHomeManagerConfiguration.nix1
4 files changed, 132 insertions, 5 deletions
diff --git a/flake.lock b/flake.lock
index 1718cb3..387185d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -69,6 +69,21 @@
         "type": "github"
       }
     },
+    "flake-utils_3": {
+      "locked": {
+        "lastModified": 1656928814,
+        "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "futils": {
       "locked": {
         "lastModified": 1659877975,
@@ -84,6 +99,32 @@
         "type": "github"
       }
     },
+    "gh-ssh-keys": {
+      "inputs": {
+        "flake-utils": [
+          "futils"
+        ],
+        "naersk": "naersk",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1664809112,
+        "narHash": "sha256-b7aRsocO+ECgmivKYzuxYJ/zXE0UFyZU5UNg75fndJE=",
+        "ref": "main",
+        "rev": "de753cd61c1b75879010c4d2452598ada629e489",
+        "revCount": 7,
+        "type": "git",
+        "url": "ssh://git@github.com/fcuny/gh-ssh-keys"
+      },
+      "original": {
+        "ref": "main",
+        "type": "git",
+        "url": "ssh://git@github.com/fcuny/gh-ssh-keys"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -112,6 +153,24 @@
       "locked": {
         "lastModified": 1662220400,
         "narHash": "sha256-9o2OGQqu4xyLZP9K6kNe1pTHnyPz0Wr3raGYnr9AIgY=",
+        "owner": "nmattia",
+        "repo": "naersk",
+        "rev": "6944160c19cb591eb85bbf9b2f2768a935623ed3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nmattia",
+        "repo": "naersk",
+        "type": "github"
+      }
+    },
+    "naersk_2": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_4"
+      },
+      "locked": {
+        "lastModified": 1662220400,
+        "narHash": "sha256-9o2OGQqu4xyLZP9K6kNe1pTHnyPz0Wr3raGYnr9AIgY=",
         "owner": "nix-community",
         "repo": "naersk",
         "rev": "6944160c19cb591eb85bbf9b2f2768a935623ed3",
@@ -169,6 +228,36 @@
     },
     "nixpkgs_3": {
       "locked": {
+        "lastModified": 1659102345,
+        "narHash": "sha256-Vbzlz254EMZvn28BhpN8JOi5EuKqnHZ3ujFYgFcSGvk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "11b60e4f80d87794a2a4a8a256391b37c59a1ea7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1664676151,
+        "narHash": "sha256-Z1SgO3HP2yGVkOne67Tv7BtGDC7oXw2cbDwVP8KjyT0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "8e0f159ff2d17faabbce0d60b14f50710e882eab",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
         "lastModified": 1664728205,
         "narHash": "sha256-atJ2OHPDDYAHA7aIAaKcNp2em8QCvvBs1yLCAbqzjWY=",
         "owner": "nixos",
@@ -227,9 +316,10 @@
         "agenix": "agenix",
         "emacs-overlay": "emacs-overlay",
         "futils": "futils",
+        "gh-ssh-keys": "gh-ssh-keys",
         "home-manager": "home-manager",
-        "naersk": "naersk",
-        "nixpkgs": "nixpkgs_3",
+        "naersk": "naersk_2",
+        "nixpkgs": "nixpkgs_5",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nur": "nur",
         "pre-commit-hooks": "pre-commit-hooks",
@@ -238,7 +328,7 @@
     },
     "rust": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils_3",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -256,6 +346,25 @@
         "repo": "rust-overlay",
         "type": "github"
       }
+    },
+    "rust-overlay": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1664679821,
+        "narHash": "sha256-rzOIFyQPZ3e/p5cDq4GH4mJNj5E0NHbwQ7LyrpneVW8=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "a09b07580c024fa08aa33dab9b4fae16be3f71bd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 2bfcf2e..bdb3b21 100644
--- a/flake.nix
+++ b/flake.nix
@@ -39,6 +39,14 @@
         nixpkgs.follows = "nixpkgs";
       };
     };
+
+    gh-ssh-keys = {
+      url = "git+ssh://git@github.com/fcuny/gh-ssh-keys?ref=main";
+      inputs = {
+        flake-utils.follows = "futils";
+        nixpkgs.follows = "nixpkgs";
+      };
+    };
   };
 
   # Output config, or config for NixOS system
diff --git a/home/packages/default.nix b/home/packages/default.nix
index a459995..39798a5 100644
--- a/home/packages/default.nix
+++ b/home/packages/default.nix
@@ -27,6 +27,15 @@ in
   };
   config.home.packages = with pkgs;
     lib.mkIf cfg.enable
-      ([ util-linux jq ripgrep album-to-nas tools.ipconverter ]
-        ++ cfg.additionalPackages);
+      ([
+        util-linux
+        jq
+        ripgrep
+
+        # custom tools
+        album-to-nas
+        tools.ipconverter
+        gh-ssh-keys
+      ]
+      ++ cfg.additionalPackages);
 }
diff --git a/nix/mkHomeManagerConfiguration.nix b/nix/mkHomeManagerConfiguration.nix
index 70e875d..29aa73c 100644
--- a/nix/mkHomeManagerConfiguration.nix
+++ b/nix/mkHomeManagerConfiguration.nix
@@ -23,6 +23,7 @@ inputs.home-manager.lib.homeManagerConfiguration {
       inputs.nur.overlay
       inputs.naersk.overlay
       inputs.rust.overlays.default
+      inputs.gh-ssh-keys.overlay
       (final: prev:
         {
           tools = import "${self}/tools" { pkgs = prev; inherit naersk; };