From 00468fd9f8b0df8060149e5fb34d959bd5b43e69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20B=C3=B6hme?= <mail@moritzboeh.me>
Date: Mon, 13 Mar 2023 21:16:40 +0100
Subject: [PATCH] refactor(flake): reduce lines for inputs

---
 flake.nix | 120 +++++++++++++++++++++---------------------------------
 1 file changed, 47 insertions(+), 73 deletions(-)

diff --git a/flake.nix b/flake.nix
index 6d7c237..2b99d15 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,85 +14,59 @@
 
     flake-utils.url = "github:numtide/flake-utils";
 
-    utils = {
-      url = "github:gytis-ivaskevicius/flake-utils-plus";
-      inputs.flake-utils.follows = "flake-utils";
-    };
+    utils.url = "github:gytis-ivaskevicius/flake-utils-plus";
+    utils.inputs.flake-utils.follows = "flake-utils";
 
-    agenix = {
-      url = "github:ryantm/agenix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    agenix.url = "github:ryantm/agenix";
+    agenix.inputs.nixpkgs.follows = "nixpkgs";
 
-    home-manager = {
-      url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.utils.follows = "flake-utils";
-    };
+    home-manager.url = "github:nix-community/home-manager";
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    home-manager.inputs.utils.follows = "flake-utils";
 
     # Zsh specific
-    forgit-git = {
-      url = "github:wfxr/forgit";
-      flake = false;
-    };
+    forgit-git.url = "github:wfxr/forgit";
+    forgit-git.flake = false;
 
     # Laptop Touchpad
-    asus-touchpad-numpad-driver = {
-      url = "github:MoritzBoehme/asus-touchpad-numpad-driver/german-layout";
-      flake = false;
-    };
+    asus-touchpad-numpad-driver.url = "github:MoritzBoehme/asus-touchpad-numpad-driver/german-layout";
+    asus-touchpad-numpad-driver.flake = false;
 
-    arkenfox-userjs = {
-      url = "github:arkenfox/user.js";
-      flake = false;
-    };
+    arkenfox-userjs.url = "github:arkenfox/user.js";
+    arkenfox-userjs.flake = false;
 
-    howdy = {
-      url = "sourcehut:~moritzboehme/howdy";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    howdy.url = "sourcehut:~moritzboehme/howdy";
+    howdy.inputs.nixpkgs.follows = "nixpkgs";
 
     emacs.url = "git+ssh://git@gitea.moritzboeh.me/moritz/emacs.git?ref=main";
 
     neovim.url = "github:neovim/neovim?dir=contrib";
 
-    nil = {
-      url = "github:oxalica/nil";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
-    };
+    nil.url = "github:oxalica/nil";
+    nil.inputs.nixpkgs.follows = "nixpkgs";
+    nil.inputs.flake-utils.follows = "flake-utils";
 
     # Hyprland
     hyprland.url = "github:hyprwm/Hyprland";
     hyprpaper.url = "github:hyprwm/hyprpaper";
     hypr-contrib.url = "github:hyprwm/contrib";
 
-    nvim-treesitter-textsubjects = {
-      url = "github:RRethy/nvim-treesitter-textsubjects";
-      flake = false;
-    };
+    nvim-treesitter-textsubjects.url = "github:RRethy/nvim-treesitter-textsubjects";
+    nvim-treesitter-textsubjects.flake = false;
 
-    smartcolumn-nvim = {
-      url = "github:m4xshen/smartcolumn.nvim";
-      flake = false;
-    };
+    smartcolumn-nvim.url = "github:m4xshen/smartcolumn.nvim";
+    smartcolumn-nvim.flake = false;
 
-    copilot-lua = {
-      url = "github:zbirenbaum/copilot.lua";
-      flake = false;
-    };
+    copilot-lua.url = "github:zbirenbaum/copilot.lua";
+    copilot-lua.flake = false;
 
-    lspsaga-nvim = {
-      url = "github:glepnir/lspsaga.nvim";
-      flake = false;
-    };
+    lspsaga-nvim.url = "github:glepnir/lspsaga.nvim";
+    lspsaga-nvim.flake = false;
 
-    attic = {
-      url = "github:zhaofengli/attic";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.nixpkgs-stable.follows = "stable";
-      inputs.flake-utils.follows = "flake-utils";
-    };
+    attic.url = "github:zhaofengli/attic";
+    attic.inputs.nixpkgs.follows = "nixpkgs";
+    attic.inputs.nixpkgs-stable.follows = "stable";
+    attic.inputs.flake-utils.follows = "flake-utils";
   };
 
   outputs =
@@ -140,23 +114,23 @@
         ./modules/profiles/gaming.nix
         ./modules/profiles/desktop.nix
       ];
-      hostDefaults = {
-        modules = [
-          ./modules/default.nix
-          self.nixosModules.base
-          inputs.home-manager.nixosModule
-          {
-            home-manager = {
-              useGlobalPkgs = true;
-              useUserPackages = true;
-              extraSpecialArgs = { inherit inputs self; };
-            };
-          }
-          inputs.hyprland.nixosModules.default
-          inputs.agenix.nixosModules.age
-          inputs.howdy.nixosModules.default
-        ];
-      };
+
+      hostDefaults.modules = [
+        ./modules/default.nix
+        self.nixosModules.base
+        inputs.home-manager.nixosModule
+        {
+          home-manager = {
+            useGlobalPkgs = true;
+            useUserPackages = true;
+            extraSpecialArgs = { inherit inputs self; };
+          };
+        }
+        inputs.hyprland.nixosModules.default
+        inputs.agenix.nixosModules.age
+        inputs.howdy.nixosModules.default
+      ];
+
 
       hosts.nixos-laptop.modules = [
         ./hosts/nixos-laptop