flake: shorten input names

6 files changed, 94 insertions, 93 deletions

diff --git a/flake.lock b/flake.lock
index ff7aacc..803b544 100644
--- a/flake.lock
+++ b/flake.lock
@@ -6,7 +6,7 @@
           "darwin"
         ],
         "home-manager": [
-          "home-manager"
+          "hm"
         ],
         "nixpkgs": [
           "nixpkgs"
@@ -76,7 +76,7 @@
         "type": "github"
       }
     },
-    "deploy-rs": {
+    "deploy": {
       "inputs": {
         "flake-compat": [
           "flake-compat"
@@ -102,6 +102,32 @@
         "type": "github"
       }
     },
+    "effects": {
+      "inputs": {
+        "flake-parts": [
+          "parts"
+        ],
+        "hercules-ci-agent": [
+          "hercules-ci-agent"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1689397210,
+        "narHash": "sha256-fVxZnqxMbsDkB4GzGAs/B41K0wt/e+B/fLxmTFF/S20=",
+        "owner": "hercules-ci",
+        "repo": "hercules-ci-effects",
+        "rev": "0a63bfa3f00a3775ea3a6722b247880f1ffe91ce",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "hercules-ci-effects",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -134,26 +160,6 @@
         "type": "github"
       }
     },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1690933134,
-        "narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -175,7 +181,7 @@
     "getchoo": {
       "inputs": {
         "effects": [
-          "hercules-ci-effects"
+          "effects"
         ],
         "flake-compat": [
           "flake-compat"
@@ -187,7 +193,7 @@
           "nixpkgs"
         ],
         "parts": [
-          "flake-parts"
+          "parts"
         ]
       },
       "locked": {
@@ -207,7 +213,7 @@
     "gitignore": {
       "inputs": {
         "nixpkgs": [
-          "pre-commit-hooks",
+          "pre-commit",
           "nixpkgs"
         ]
       },
@@ -231,7 +237,7 @@
           "nixpkgs"
         ],
         "pre-commit-hooks": [
-          "pre-commit-hooks"
+          "pre-commit"
         ]
       },
       "locked": {
@@ -267,7 +273,7 @@
     "hercules-ci-agent": {
       "inputs": {
         "flake-parts": [
-          "flake-parts"
+          "parts"
         ],
         "haskell-flake": "haskell-flake",
         "nixpkgs": [
@@ -288,44 +294,18 @@
         "type": "github"
       }
     },
-    "hercules-ci-effects": {
+    "hm": {
       "inputs": {
-        "flake-parts": [
-          "flake-parts"
-        ],
-        "hercules-ci-agent": [
-          "hercules-ci-agent"
-        ],
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1689397210,
-        "narHash": "sha256-fVxZnqxMbsDkB4GzGAs/B41K0wt/e+B/fLxmTFF/S20=",
-        "owner": "hercules-ci",
-        "repo": "hercules-ci-effects",
-        "rev": "0a63bfa3f00a3775ea3a6722b247880f1ffe91ce",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "hercules-ci-effects",
-        "type": "github"
-      }
-    },
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1692503956,
-        "narHash": "sha256-MOA6FKc1YgfGP3ESnjSYfsyJ1BXlwV5pGlY/u5XdJfY=",
+        "lastModified": 1692763155,
+        "narHash": "sha256-qMrGKZ8c/q/mHO3ZdrcBPwiVVXPLLgXjY98Ejqb5kAA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "958c06303f43cf0625694326b7f7e5475b1a2d5c",
+        "rev": "6a20e40acaebf067da682661aa67da8b36812606",
         "type": "github"
       },
       "original": {
@@ -340,7 +320,7 @@
           "flake-compat"
         ],
         "flake-parts": [
-          "flake-parts"
+          "parts"
         ],
         "flake-utils": [
           "flake-utils"
@@ -349,7 +329,7 @@
           "nixpkgs"
         ],
         "pre-commit-hooks-nix": [
-          "pre-commit-hooks"
+          "pre-commit"
         ]
       },
       "locked": {
@@ -492,7 +472,27 @@
         "type": "github"
       }
     },
-    "pre-commit-hooks": {
+    "parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1690933134,
+        "narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "pre-commit": {
       "inputs": {
         "flake-compat": [
           "flake-compat"
@@ -554,15 +554,14 @@
       "inputs": {
         "agenix": "agenix",
         "darwin": "darwin",
-        "deploy-rs": "deploy-rs",
+        "deploy": "deploy",
+        "effects": "effects",
         "flake-compat": "flake-compat",
-        "flake-parts": "flake-parts",
         "flake-utils": "flake-utils",
         "getchoo": "getchoo",
         "guzzle_api": "guzzle_api",
         "hercules-ci-agent": "hercules-ci-agent",
-        "hercules-ci-effects": "hercules-ci-effects",
-        "home-manager": "home-manager",
+        "hm": "hm",
         "lanzaboote": "lanzaboote",
         "nix-index-database": "nix-index-database",
         "nixos-hardware": "nixos-hardware",
@@ -571,7 +570,8 @@
         "nixpkgs-stable": "nixpkgs-stable",
         "nur": "nur",
         "openwrt-imagebuilder": "openwrt-imagebuilder",
-        "pre-commit-hooks": "pre-commit-hooks",
+        "parts": "parts",
+        "pre-commit": "pre-commit",
         "ragenix": "ragenix"
       }
     },
diff --git a/flake.nix b/flake.nix
index 873d7a0..8d5927d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,21 +20,22 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    # this is just to avoid having multiple versions in flake.lock
     agenix = {
       url = "github:ryantm/agenix";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.darwin.follows = "darwin";
-      inputs.home-manager.follows = "home-manager";
+      inputs.home-manager.follows = "hm";
     };
 
-    deploy-rs = {
+    deploy = {
       url = "github:serokell/deploy-rs";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.utils.follows = "flake-utils";
       inputs.flake-compat.follows = "flake-compat";
     };
 
-    # this is just to avoid having multiple versions in flake.lock
+    # ditto
     flake-compat = {
       url = "github:edolstra/flake-compat";
       flake = false;
@@ -43,7 +44,7 @@
     # ditto
     flake-utils.url = "github:numtide/flake-utils";
 
-    flake-parts = {
+    parts = {
       url = "github:hercules-ci/flake-parts";
       inputs.nixpkgs-lib.follows = "nixpkgs";
     };
@@ -52,31 +53,32 @@
       url = "github:getchoo/nix-exprs";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-compat.follows = "flake-compat";
-      inputs.effects.follows = "hercules-ci-effects";
-      inputs.parts.follows = "flake-parts";
+      inputs.effects.follows = "effects";
+      inputs.parts.follows = "parts";
       inputs.hercules-ci-agent.follows = "hercules-ci-agent";
     };
 
     guzzle_api = {
       url = "github:getchoo/guzzle_api";
       inputs.nixpkgs.follows = "nixpkgs";
-      inputs.pre-commit-hooks.follows = "pre-commit-hooks";
+      inputs.pre-commit-hooks.follows = "pre-commit";
     };
 
+    # ditto
     hercules-ci-agent = {
       url = "github:hercules-ci/hercules-ci-agent";
       inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-parts.follows = "flake-parts";
+      inputs.flake-parts.follows = "parts";
     };
 
-    hercules-ci-effects = {
+    effects = {
       url = "github:hercules-ci/hercules-ci-effects";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.hercules-ci-agent.follows = "hercules-ci-agent";
-      inputs.flake-parts.follows = "flake-parts";
+      inputs.flake-parts.follows = "parts";
     };
 
-    home-manager = {
+    hm = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
@@ -85,9 +87,9 @@
       url = "github:nix-community/lanzaboote";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-compat.follows = "flake-compat";
-      inputs.flake-parts.follows = "flake-parts";
+      inputs.flake-parts.follows = "parts";
       inputs.flake-utils.follows = "flake-utils";
-      inputs.pre-commit-hooks-nix.follows = "pre-commit-hooks";
+      inputs.pre-commit-hooks-nix.follows = "pre-commit";
     };
 
     nix-index-database = {
@@ -110,7 +112,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    pre-commit-hooks = {
+    pre-commit = {
       url = "github:cachix/pre-commit-hooks.nix";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.nixpkgs-stable.follows = "nixpkgs";
@@ -127,20 +129,19 @@
   };
 
   outputs = {
-    flake-parts,
     getchoo,
-    pre-commit-hooks,
+    parts,
+    pre-commit,
     ...
   } @ inputs:
-    flake-parts.lib.mkFlake
-    {inherit inputs;}
-    {
+    parts.lib.mkFlake {inherit inputs;} {
       imports = [
+        pre-commit.flakeModule
+        getchoo.flakeModules.homeConfigurations
+
         ./hosts
         ./parts
         ./users
-        getchoo.flakeModules.homeConfigurations
-        pre-commit-hooks.flakeModule
       ];
     };
 }
diff --git a/hosts/profiles.nix b/hosts/profiles.nix
index ab1122b..6eef5ed 100644
--- a/hosts/profiles.nix
+++ b/hosts/profiles.nix
@@ -11,7 +11,7 @@ in {
 
     modules = with inputs; [
       ragenix.nixosModules.default
-      home-manager.nixosModules.home-manager
+      hm.nixosModules.home-manager
       nur.nixosModules.nur
 
       self.nixosModules.default
@@ -38,7 +38,7 @@ in {
     builder = inputs.darwin.lib.darwinSystem;
     inherit specialArgs;
     modules = with inputs; [
-      home-manager.darwinModules.home-manager
+      hm.darwinModules.home-manager
 
       ../users/seth
       self.darwinModules.default
diff --git a/parts/ci.nix b/parts/ci.nix
index 3dfaee8..839f535 100644
--- a/parts/ci.nix
+++ b/parts/ci.nix
@@ -11,7 +11,7 @@
   ];
 in {
   imports = [
-    inputs.hercules-ci-effects.flakeModule
+    inputs.effects.flakeModule
   ];
 
   herculesCI = {lib, ...} @ herculesCI: {
diff --git a/parts/lib/configs.nix b/parts/lib/configs.nix
index 7b4e428..5cc8b61 100644
--- a/parts/lib/configs.nix
+++ b/parts/lib/configs.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (builtins) attrNames mapAttrs;
-  inherit (inputs) nixpkgs home-manager;
+  inherit (inputs) nixpkgs hm;
   inherit (nixpkgs.lib) genAttrs optional;
 
   mkSystemCfg = name: {
@@ -30,7 +30,7 @@
     extraSpecialArgs ? inputs,
     modules ? [],
   }:
-    home-manager.lib.homeManagerConfiguration {
+    hm.lib.homeManagerConfiguration {
       inherit extraSpecialArgs pkgs;
 
       modules =
diff --git a/parts/lib/utils/deploy.nix b/parts/lib/utils/deploy.nix
index aaa01f1..261af32 100644
--- a/parts/lib/utils/deploy.nix
+++ b/parts/lib/utils/deploy.nix
@@ -1,13 +1,13 @@
 {inputs, ...}: let
   inherit (builtins) mapAttrs;
-  inherit (inputs) deploy-rs;
+  inherit (inputs) deploy;
 in {
   mkDeployNodes = mapAttrs (_: system: let
     inherit (system) pkgs;
     deployPkgs = import pkgs.path {
       inherit (pkgs) system;
       overlays = [
-        deploy-rs.overlay
+        deploy.overlay
         (_: prev: {
           deploy-rs = {
             inherit (pkgs) deploy-rs;