refactored

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";

home-manager/modules/discord.nix

@@ -1,6 +1,5 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
-    discord
     vesktop
   ];
 }

home-manager/modules/emulators.nix

@@ -1,12 +1,9 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
     desmume
-    duckstation
     ryujinx
     retroarch
-    mednafen
     waydroid
-    shadps4
     rpcs3_latest
   ];
 }

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";
     };
   };
 }