add embedtube input and shorten names of flake inputs + combine them into single lines

2 files changed, 37 insertions, 36 deletions

diff --git a/flake.lock b/flake.lock
index 012dac4..f4f2e8c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -22,7 +22,27 @@
         "type": "github"
       }
     },
-    "firefox-userchrome": {
+    "embedtube": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1790115704,
+        "narHash": "sha256-HcUHd14yJAE2yBbZM/55OfrF2r4IMEWasZgPpQNbdMI=",
+        "ref": "refs/heads/master",
+        "rev": "d57c816092db4bdf7ee8db45778b7d7c85e86faa",
+        "revCount": 25,
+        "type": "git",
+        "url": "git://git.tjkeller.xyz/embedtube"
+      },
+      "original": {
+        "type": "git",
+        "url": "git://git.tjkeller.xyz/embedtube"
+      }
+    },
+    "ff-userchrome": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
@@ -101,7 +121,7 @@
         "type": "github"
       }
     },
-    "neovim-vanilla-wrapped": {
+    "neovim-vanilla": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
@@ -153,7 +173,7 @@
         "type": "github"
       }
     },
-    "open-bamboo-networking": {
+    "open-bamboo": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
@@ -222,12 +242,13 @@
     "root": {
       "inputs": {
         "arkenfox": "arkenfox",
-        "firefox-userchrome": "firefox-userchrome",
+        "embedtube": "embedtube",
+        "ff-userchrome": "ff-userchrome",
         "home-manager": "home-manager",
-        "neovim-vanilla-wrapped": "neovim-vanilla-wrapped",
+        "neovim-vanilla": "neovim-vanilla",
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable",
-        "open-bamboo-networking": "open-bamboo-networking",
+        "open-bamboo": "open-bamboo",
         "reposync": "reposync",
         "sops-nix": "sops-nix"
       }
diff --git a/flake.nix b/flake.nix
index b0f23fb..c8d54bb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,34 +5,14 @@ rec {
 		nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
 		nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
-		sops-nix = {
-			url = "github:Mic92/sops-nix";
-			inputs.nixpkgs.follows = "nixpkgs";
-		};
-		home-manager = {
-			url = "github:nix-community/home-manager/release-26.05";
-			inputs.nixpkgs.follows = "nixpkgs";
-		};
-		arkenfox = {
-			url = "github:dwarfmaster/arkenfox-nixos";
-			inputs.nixpkgs.follows = "nixpkgs";
-		};
-		reposync = {
-			url = "git://git.tjkeller.xyz/hm-reposync";
-			inputs.nixpkgs.follows = "nixpkgs";
-		};
-		open-bamboo-networking = {
-			url = "git://git.tjkeller.xyz/open-bamboo-network-plugin-flake";
-			inputs.nixpkgs.follows = "nixpkgs";
-		};
-		neovim-vanilla-wrapped = {
-			url = "git://git.tjkeller.xyz/neovim-vanilla-wrapped";
-			inputs.nixpkgs.follows = "nixpkgs";
-		};
-		firefox-userchrome = {
-			url = "git://git.tjkeller.xyz/firefox-chrome";
-			inputs.nixpkgs.follows = "nixpkgs";
-		};
+		sops-nix       = { url = "github:Mic92/sops-nix"                                   ; inputs.nixpkgs.follows = "nixpkgs"; };
+		home-manager   = { url = "github:nix-community/home-manager/release-26.05"         ; inputs.nixpkgs.follows = "nixpkgs"; };
+		arkenfox       = { url = "github:dwarfmaster/arkenfox-nixos"                       ; inputs.nixpkgs.follows = "nixpkgs"; };
+		reposync       = { url = "git://git.tjkeller.xyz/hm-reposync"                      ; inputs.nixpkgs.follows = "nixpkgs"; };
+		open-bamboo    = { url = "git://git.tjkeller.xyz/open-bamboo-network-plugin-flake" ; inputs.nixpkgs.follows = "nixpkgs"; };
+		neovim-vanilla = { url = "git://git.tjkeller.xyz/neovim-vanilla-wrapped"           ; inputs.nixpkgs.follows = "nixpkgs"; };
+		ff-userchrome  = { url = "git://git.tjkeller.xyz/firefox-chrome"                   ; inputs.nixpkgs.follows = "nixpkgs"; };
+		embedtube      = { url = "git://git.tjkeller.xyz/embedtube"                        ; inputs.nixpkgs.follows = "nixpkgs"; };
 	};
 
 	outputs = { nixpkgs, home-manager, ... }@inputs: let
@@ -41,8 +21,8 @@ rec {
 		homeManagerModules = [
 			inputs.arkenfox.hmModules.arkenfox
 			inputs.reposync.hmModules.reposync
-			inputs.open-bamboo-networking.hmModules.open-bamboo-networking
-			inputs.neovim-vanilla-wrapped.hmModules.neovim-vanilla-wrapped
+			inputs.open-bamboo.hmModules.open-bamboo-networking
+			inputs.neovim-vanilla.hmModules.neovim-vanilla-wrapped
 			./home-manager
 		];
 		mkNixosConfiguration = system: hostname: nixpkgs.lib.nixosSystem {