From ea15e4fa9865ff3b91ca22f3c261e8b4b0893aee Mon Sep 17 00:00:00 2001
From: Hadi <112569860+anotherhadi@users.noreply.github.com>
Date: Fri, 14 Jun 2024 14:20:06 +0200
Subject: [PATCH] Refactor

---
 flake.nix                           | 54 ++++++++++++++---------------
 home/programs/spicetify/default.nix |  6 ++--
 home/system/hyprland/default.nix    |  4 +--
 home/system/sops/laptop.nix         |  4 +--
 4 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/flake.nix b/flake.nix
index 897a7e3..adfafe4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,9 @@
 {
-  description =
-    "My NixOs dotfiles - Home-manager, hyprland, nixvim, sops, kitty, wofi, waybar, lf, dunst, qutebrowser, tmux, ...";
+  # https://github.com/anotherhadi/nixy
+  description = ''
+    Nixy is a NixOS configuration with home-manager, secrets and custom theming all in one place.
+    It's a simple way to manage your system configuration and dotfiles.
+  '';
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
@@ -23,33 +26,28 @@
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
   };
 
-  outputs = inputs@{ nixpkgs, home-manager, sops-nix, hyprland, spicetify-nix
-    , nur, nixos-hardware, ... }: {
-      nixosConfigurations = {
+  outputs = inputs@{ nixpkgs, nur, ... }: {
+    nixosConfigurations = {
 
-        nixy = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          modules = [
-            { nixpkgs.overlays = [ nur.overlay ]; }
-            ./hosts/laptop/configuration.nix
-            nixos-hardware.nixosModules.omen-16-n0005ne
-            { _module.args = { inherit inputs; }; }
-            home-manager.nixosModules.home-manager
-            {
-              home-manager = {
-                useGlobalPkgs = true;
-                useUserPackages = true;
-                users."hadi" = import ./home/laptop.nix; # CHANGE ME
-                extraSpecialArgs = {
-                  inherit inputs;
-                  inherit spicetify-nix;
-                  inherit sops-nix;
-                  inherit hyprland;
-                };
-              };
-            }
-          ];
-        };
+      nixy = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          ./hosts/laptop/configuration.nix
+          inputs.nixos-hardware.nixosModules.omen-16-n0005ne
+          inputs.home-manager.nixosModules.home-manager
+          {
+            nixpkgs.overlays = [ nur.overlay ];
+            _module.args = { inherit inputs; };
+            home-manager = {
+              useGlobalPkgs = true;
+              useUserPackages = true;
+              users."hadi" = import ./home/laptop.nix; # CHANGE ME
+              extraSpecialArgs = { inherit inputs; };
+            };
+          }
+        ];
       };
+
     };
+  };
 }
diff --git a/home/programs/spicetify/default.nix b/home/programs/spicetify/default.nix
index 32294cf..26ccf14 100644
--- a/home/programs/spicetify/default.nix
+++ b/home/programs/spicetify/default.nix
@@ -1,8 +1,8 @@
-{ pkgs, config, lib, spicetify-nix, ... }:
-let spicePkgs = spicetify-nix.packages.${pkgs.system}.default;
+{ pkgs, config, lib, inputs, ... }:
+let spicePkgs = inputs.spicetify-nix.packages.${pkgs.system}.default;
 in {
 
-  imports = [ spicetify-nix.homeManagerModules.default ];
+  imports = [ inputs.spicetify-nix.homeManagerModules.default ];
   nixpkgs.config.allowUnfreePredicate = pkg:
     builtins.elem (lib.getName pkg) [ "spotify" ];
   programs.spicetify = {
diff --git a/home/system/hyprland/default.nix b/home/system/hyprland/default.nix
index f7e70c5..d7dc8b6 100644
--- a/home/system/hyprland/default.nix
+++ b/home/system/hyprland/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, hyprland, ... }: {
+{ pkgs, config, inputs, ... }: {
 
   imports = [ ./hyprlock.nix ./hypridle.nix ./hyprpaper.nix ];
 
@@ -26,7 +26,7 @@
   wayland.windowManager.hyprland = {
     enable = true;
     xwayland.enable = true;
-    package = hyprland.packages."${pkgs.system}".hyprland;
+    package = inputs.hyprland.packages."${pkgs.system}".hyprland;
 
     settings = {
       "$mod" = "SUPER";
diff --git a/home/system/sops/laptop.nix b/home/system/sops/laptop.nix
index 8c40f83..4ec691f 100644
--- a/home/system/sops/laptop.nix
+++ b/home/system/sops/laptop.nix
@@ -1,5 +1,5 @@
-{ pkgs, sops-nix, ... }: {
-  imports = [ sops-nix.homeManagerModules.sops ];
+{ pkgs, inputs, ... }: {
+  imports = [ inputs.sops-nix.homeManagerModules.sops ];
 
   home.packages = with pkgs; [ sops age ];