From 531568d0cbac946f99885adc1a15c4201fd82175 Mon Sep 17 00:00:00 2001
From: Devin Finlinson <devin.finlinson@pm.me>
Date: Sat, 15 Jun 2024 23:30:22 -0600
Subject: trying to make custom package

---
 flake.nix                    | 21 +++++++++++----------
 modules/nixos/hyprland.nix   |  2 +-
 packages/zeit/derivation.nix |  3 ++-
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/flake.nix b/flake.nix
index 356d16c..e7b826f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,15 +14,15 @@
     };
 
     # alternative nix compiler
-    lix = {
-      url = "git+https://git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1";
-      flake = false;
-    };
-    lix-module = {
-      url = "git+https://git.lix.systems/lix-project/nixos-module";
-      inputs.lix.follows = "lix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    # lix = {
+    #   url = "git+https://git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1";
+    #   flake = false;
+    # };
+    # lix-module = {
+    #   url = "git+https://git.lix.systems/lix-project/nixos-module";
+    #   inputs.lix.follows = "lix";
+    #   inputs.nixpkgs.follows = "nixpkgs";
+    # };
 
     # modern window compositor
     hyprland = {
@@ -239,7 +239,7 @@
         specialArgs = { inherit inputs; };
         modules = [
           ./machines/zenbook/configuration.nix
-          lix-module.nixosModules.default
+          # lix-module.nixosModules.default
 
           # Default users
           ./modules/users/defin.nix
@@ -257,6 +257,7 @@
             home-manager.extraSpecialArgs = { inherit inputs; };
           }
 
+          ./modules/nixos/asus-numpad-touchpad.nix
           ./modules/nixos/bluetooth.nix
           ./modules/nixos/environment.nix
           ./modules/nixos/kde-connect.nix
diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix
index afc96df..bbf7814 100644
--- a/modules/nixos/hyprland.nix
+++ b/modules/nixos/hyprland.nix
@@ -1,4 +1,4 @@
-{ pkgs, inputs, ...}: {
+{ pkgs, ...}: {
   xdg.portal = {
     enable = true;
     wlr.enable = true;
diff --git a/packages/zeit/derivation.nix b/packages/zeit/derivation.nix
index 46b5b0b..7f6e897 100644
--- a/packages/zeit/derivation.nix
+++ b/packages/zeit/derivation.nix
@@ -1,4 +1,5 @@
-{ buildGoModule, pkgs, fetchFromGitHub }:
+{ buildGoModule, pkgs, fetchFromGitHub }: 
+with import <nixpkgs> {}; # bring all of Nixpkgs into scope
 # stdenv.mkDerivation rec {
 buildGoModule rec {
   pname = "zeit";
-- 
cgit v1.2.3