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

@@ -42,7 +42,6 @@
         xiv.enable = true;
         godot.enable = true;
         minecraft.enable = true;
-        emulationstation.enable = true;
       };
     };
     #   system.boot.grub.enable = true;

hosts/shared/nixos/shared_config.nix

@@ -11,7 +11,8 @@
         git
         wine
         bottles
-        
+        onlyoffice-bin
+        google-chrome
 
         /* ---------------------------- System Utilities ---------------------------- */
         gnupg ffmpeg unzip

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

modules/desktop/apps/emulationstation.nix

@@ -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
-    ];
-  };
-}

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

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