From 762e77a900c9b00d442009f56945ba7d640d0888 Mon Sep 17 00:00:00 2001
From: alsaiduq-lab <riiidge.racer@gmail.com>
Date: Wed, 2 Jul 2025 02:12:38 -0600
Subject: [PATCH] refactored

---
 home-manager/cobray.nix            |  3 ++-
 home-manager/modules/discord.nix   |  1 -
 home-manager/modules/emulators.nix |  3 ---
 home-manager/modules/lazygit.nix   | 14 +++++++++-----
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/home-manager/cobray.nix b/home-manager/cobray.nix
index e3d812a..e45a65f 100644
--- a/home-manager/cobray.nix
+++ b/home-manager/cobray.nix
@@ -21,7 +21,8 @@
     ./modules/spotify.nix
     ./modules/obs.nix
     ./modules/udiskie.nix
-    ./modules/bambustudio.nix
+    # temp removed, currently broken on nixpkgs? lmao
+    # ./modules/bambustudio.nix
   ];
 
   home.username = "cobray";
diff --git a/home-manager/modules/discord.nix b/home-manager/modules/discord.nix
index 31509c7..0ce69eb 100644
--- a/home-manager/modules/discord.nix
+++ b/home-manager/modules/discord.nix
@@ -1,6 +1,5 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
-    discord
     vesktop
   ];
 }
diff --git a/home-manager/modules/emulators.nix b/home-manager/modules/emulators.nix
index 325189d..df457bf 100644
--- a/home-manager/modules/emulators.nix
+++ b/home-manager/modules/emulators.nix
@@ -1,12 +1,9 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
     desmume
-    duckstation
     ryujinx
     retroarch
-    mednafen
     waydroid
-    shadps4
     rpcs3_latest
   ];
 }
diff --git a/home-manager/modules/lazygit.nix b/home-manager/modules/lazygit.nix
index fe8fada..2d3841c 100644
--- a/home-manager/modules/lazygit.nix
+++ b/home-manager/modules/lazygit.nix
@@ -1,19 +1,23 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  config,
+  ...
+}: {
   home.packages = with pkgs; [
     lazygit
     git
     git-lfs
-    gitAndTools.gh
-    gitAndTools.diff-so-fancy
+    gh
+    diff-so-fancy
   ];
 
   programs.git = {
     enable = true;
     includes = [
-      {path = "./.secrets/.git-config";}
+      {path = "${config.home.homeDirectory}/nix/.secrets/.git-config";}
     ];
     extraConfig = {
-      credential.helper = "store --file ./.secrets/.git-credentials";
+      credential.helper = "store --file=${config.home.homeDirectory}/nix/.secrets/.git-credentials";
     };
   };
 }