From bc4199cb93b1101dfe257e431e5e2a2e74ef36fa Mon Sep 17 00:00:00 2001
From: Seven Of Aces <sevenofaces42@gmail.com>
Date: Mon, 9 Sep 2024 17:43:04 -0700
Subject: [PATCH] 	modified:   hosts/blackstar/nixos/configuration.nix 
 modified:   hosts/shared/nixos/shared_config.nix 	modified:  
 modules/default.nix 	deleted:    modules/desktop/apps/emulationstation.nix 
 modified:   modules/desktop/code.nix 	modified:   modules/desktop/games.nix

---
 hosts/blackstar/nixos/configuration.nix   |  1 -
 hosts/shared/nixos/shared_config.nix      |  3 ++-
 modules/default.nix                       |  1 -
 modules/desktop/apps/emulationstation.nix | 20 --------------------
 modules/desktop/code.nix                  | 10 ++++++++++
 modules/desktop/games.nix                 |  4 ++++
 6 files changed, 16 insertions(+), 23 deletions(-)
 delete mode 100644 modules/desktop/apps/emulationstation.nix

diff --git a/hosts/blackstar/nixos/configuration.nix b/hosts/blackstar/nixos/configuration.nix
index 9ef3584..985b330 100644
--- a/hosts/blackstar/nixos/configuration.nix
+++ b/hosts/blackstar/nixos/configuration.nix
@@ -42,7 +42,6 @@
         xiv.enable = true;
         godot.enable = true;
         minecraft.enable = true;
-        emulationstation.enable = true;
       };
     };
     #   system.boot.grub.enable = true;
diff --git a/hosts/shared/nixos/shared_config.nix b/hosts/shared/nixos/shared_config.nix
index f85c1f4..ade9c30 100644
--- a/hosts/shared/nixos/shared_config.nix
+++ b/hosts/shared/nixos/shared_config.nix
@@ -11,7 +11,8 @@
         git
         wine
         bottles
-        
+        onlyoffice-bin
+        google-chrome
 
         /* ---------------------------- System Utilities ---------------------------- */
         gnupg ffmpeg unzip
diff --git a/modules/default.nix b/modules/default.nix
index a0f3911..2a70406 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -4,7 +4,6 @@
         ./desktop/apps/godot.nix
         ./desktop/apps/xiv.nix
         ./desktop/apps/minecraft.nix
-        ./desktop/apps/emulationstation.nix
 
         ./desktop/cad.nix
         ./desktop/cam.nix
diff --git a/modules/desktop/apps/emulationstation.nix b/modules/desktop/apps/emulationstation.nix
deleted file mode 100644
index 0298e14..0000000
--- a/modules/desktop/apps/emulationstation.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-/* -------------------------------------------------------------------------- */
-/*                          App config: EmulationStation                      */
-/* -------------------------------------------------------------------------- */
-
-{ lib, config, options, pkgs ? import <nixpkgs>, ... }:
-
-with lib;
-let cfg = config.modules.desktop.apps.emulationstation;
-in {
-  options.modules.desktop.apps.emulationstation = {
-    enable = mkEnableOption false;
-  };
-
-  config = mkIf cfg.enable {
-
-    environment.systemPackages = with pkgs.unstable; [
-        emulationstation-de
-    ];
-  };
-}
\ No newline at end of file
diff --git a/modules/desktop/code.nix b/modules/desktop/code.nix
index d94cd31..ddcd818 100644
--- a/modules/desktop/code.nix
+++ b/modules/desktop/code.nix
@@ -19,6 +19,10 @@ in {
         stdenv.cc.cc.lib
       ];
     };
+
+    # ? Android Debug Bridge, used to connect to and debug Android devices.
+    programs.adb.enable = true;
+
     environment.systemPackages = with pkgs; [
       /* ---------------------------- Language support ---------------------------- */
       # Rust
@@ -28,6 +32,10 @@ in {
       # Lua
       lua
       # C/C++
+      gdb
+      lld
+      libcxx
+      glibc
       gcc
       libgcc
       gnumake
@@ -48,6 +56,8 @@ in {
       jetbrains.datagrip
       jetbrains.webstorm
 
+      android-studio
+
       /* ----------------------------- Version Control ---------------------------- */
       git
       github-desktop
diff --git a/modules/desktop/games.nix b/modules/desktop/games.nix
index 3e9dd12..74b275b 100644
--- a/modules/desktop/games.nix
+++ b/modules/desktop/games.nix
@@ -11,6 +11,10 @@ in {
     environment.systemPackages = with pkgs; [
       steam
       lutris
+      osu-lazer-bin
     ];
+
+    programs.alvr.enable = true;
+    programs.alvr.openFirewall = true;
   };
 }
\ No newline at end of file