From d3a94c834a622cc0ccb50f04cfe3ba49e6bcd965 Mon Sep 17 00:00:00 2001
From: uttarayan21 <email@uttarayan.me>
Date: Thu, 20 Mar 2025 13:35:31 +0530
Subject: [PATCH] feat: Added apps folder

---
 home/apps/bambu-studio.nix  |  8 ++++++++
 home/apps/default.nix       |  9 +++++++++
 home/apps/guitarix.nix      |  5 +++++
 home/apps/zed.nix           |  5 +++++
 home/default.nix            |  2 +-
 home/programs/default.nix   |  6 ------
 nixos/ryu/configuration.nix |  5 ++++-
 overlays.nix                | 37 +++++++++++++++++++------------------
 8 files changed, 51 insertions(+), 26 deletions(-)
 create mode 100644 home/apps/bambu-studio.nix
 create mode 100644 home/apps/default.nix
 create mode 100644 home/apps/guitarix.nix
 create mode 100644 home/apps/zed.nix

diff --git a/home/apps/bambu-studio.nix b/home/apps/bambu-studio.nix
new file mode 100644
index 00000000..539506b6
--- /dev/null
+++ b/home/apps/bambu-studio.nix
@@ -0,0 +1,8 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    (bambu-studio.overrideAttrs (oldAttrs: {
+      nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [pkgs.cudatoolkit];
+      buildInputs = oldAttrs.buildInputs ++ [pkgs.cudatoolkit];
+    }))
+  ];
+}
diff --git a/home/apps/default.nix b/home/apps/default.nix
new file mode 100644
index 00000000..6215e6f6
--- /dev/null
+++ b/home/apps/default.nix
@@ -0,0 +1,9 @@
+{pkgs, ...}: {
+  imports = [
+    ./guitarix.nix
+    ./bambu-studio.nix
+    ./guitar.nix
+  ];
+  home.packages = [
+  ];
+}
diff --git a/home/apps/guitarix.nix b/home/apps/guitarix.nix
new file mode 100644
index 00000000..6cffeacf
--- /dev/null
+++ b/home/apps/guitarix.nix
@@ -0,0 +1,5 @@
+{pkgs, ...}: {
+  home.packages = [
+    pkgs.guitarix
+  ];
+}
diff --git a/home/apps/zed.nix b/home/apps/zed.nix
new file mode 100644
index 00000000..ac284f5b
--- /dev/null
+++ b/home/apps/zed.nix
@@ -0,0 +1,5 @@
+{pkgs, ...}: {
+  home.packages = [
+    pkgs.zed-editor
+  ];
+}
diff --git a/home/default.nix b/home/default.nix
index c9cc7d5b..6f5fc834 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -16,7 +16,7 @@
       ./services
     ]
     ++ lib.optionals device.isLinux [./linux]
-    ++ lib.optionals device.hasGui [./gui-programs];
+    ++ lib.optionals device.hasGui [./gui-programs ./apps];
 
   # ++ lib.optionals.device.isDarwin [./macos];
 
diff --git a/home/programs/default.nix b/home/programs/default.nix
index 457e83c6..0181d6d4 100644
--- a/home/programs/default.nix
+++ b/home/programs/default.nix
@@ -35,11 +35,6 @@
   ];
   home.packages = with pkgs;
     [
-      (bambu-studio.overrideAttrs (oldAttrs: {
-        nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [pkgs.cudatoolkit];
-        buildInputs = oldAttrs.buildInputs ++ [pkgs.cudatoolkit];
-      }))
-      opencv4
       aria2
       nb
       (nixvim.makeNixvim (import ../../neovim))
@@ -84,7 +79,6 @@
       qmk
       ttyper
       yarn
-      zed-editor
     ]
     ++ lib.optionals device.isLinux [
       dig
diff --git a/nixos/ryu/configuration.nix b/nixos/ryu/configuration.nix
index 902429db..53551e41 100644
--- a/nixos/ryu/configuration.nix
+++ b/nixos/ryu/configuration.nix
@@ -82,7 +82,7 @@
 
   users.users.servius = {
     isNormalUser = true;
-    extraGroups = ["wheel" "audio" "i2c" "media"];
+    extraGroups = ["wheel" "audio" "i2c" "media" "openrazer"];
     openssh.authorizedKeys.keyFiles = [
       ../../secrets/id_ed25519.pub
       ../../secrets/id_ios.pub
@@ -165,6 +165,7 @@
   # };
   hardware = {
     keyboard.qmk.enable = true;
+    openrazer.enable = true;
     bluetooth = {
       enable = true;
       powerOnBoot = true;
@@ -256,6 +257,8 @@
     # List packages installed in system profile. To search, run:
     # $ nix search wget
     systemPackages = with pkgs; [
+      polychromatic
+      openrazer-daemon
       cudatoolkit
       # Wine
       wine-wayland
diff --git a/overlays.nix b/overlays.nix
index e41939d4..5f6aec14 100644
--- a/overlays.nix
+++ b/overlays.nix
@@ -177,24 +177,25 @@
       zjstatus = inputs.zjstatus.packages.${prev.system}.default;
     };
   };
-  # libfprint = final: prev: {
-  #   libfprint = prev.libfprint.overrideAttrs (oldAttrs: {
-  #     version = "git";
-  #     src = final.fetchFromGitHub {
-  #       owner = "ericlinagora";
-  #       repo = "libfprint-CS9711";
-  #       rev = "058851c20d1e98d7c8ba82e6bfc9da08f791593f";
-  #       sha256 = "sha256-LCXKQmOzi/l4jQ40qkgL2gqMtmu0n30Yo6HMgUpW+uI";
-  #     };
-  #     nativeBuildInputs =
-  #       oldAttrs.nativeBuildInputs
-  #       ++ [
-  #         final.opencv
-  #         final.cmake
-  #         final.doctest
-  #       ];
-  #   });
-  # };
+  libfprint = final: prev: {
+    libfprint = prev.libfprint.overrideAttrs (oldAttrs: {
+      version = "git";
+      src = final.fetchFromGitHub {
+        owner = "ericlinagora";
+        repo = "libfprint-CS9711";
+        rev = "03ace5b20146eb01c77fb3ea63e1909984d6d377";
+        sha256 = "sha256-gr3UvFB6D04he/9zawvQIuwfv0B7fEZb6BGiNAbLids";
+      };
+      buildInputs = oldAttrs.buildInputs ++ [final.nss_latest];
+      nativeBuildInputs =
+        oldAttrs.nativeBuildInputs
+        ++ [
+          final.opencv
+          final.cmake
+          final.doctest
+        ];
+    });
+  };
   csshacks = final: prev: {
     csshacks = inputs.csshacks;
   };