return of discord

orzklv · Sep 1, 2024 · ebd7c72 · ebd7c72
1 parent eec3241
commit ebd7c72
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 18 deletions.
diff --git a/home/macos.nix b/home/macos.nix
@@ -1,8 +1,8 @@
 { inputs
+, outputs
 , lib
 , pkgs
 , config
-, outputs
 , packages
 , ...
 }: {

diff --git a/modules/nixos/desktop/gnome.nix b/modules/nixos/desktop/gnome.nix
@@ -4,18 +4,16 @@
 # =================================
 { pkgs, ... }:
 let
- x86_64-opengl = {
- enable = true;
- driSupport = true;
- driSupport32Bit = true;
- };
+ x86_64-opengl =
+ if (!pkgs.stdenv.hostPlatform.isAarch64)
+ then {
+  driSupport32Bit = true;
+  } else { };
 
- aarch64-opengl = {
+ all-opengl = {
  enable = true;
  driSupport = true;
  };
-
- opengl = if pkgs.stdenv.hostPlatform.isAarch64 then aarch64-opengl else x86_64-opengl;
 in
 {
  config = {
@@ -125,7 +123,7 @@ in
  };
 
  # Make sure opengl is enabled
- hardware.opengl = opengl;
+ hardware.opengl = all-opengl // x86_64-opengl;
 
  # Exclude some packages from the Gnome desktop environment.
  environment.gnome.excludePackages =

diff --git a/modules/nixos/users/sakhib.nix b/modules/nixos/users/sakhib.nix
@@ -5,7 +5,28 @@
 , config
 , packages
 , ...
-}: {
+}:
+let
+ # If unstable packages are needed, add to pkgs list
+ # ++ (with pkgs.unstable; [ ])
+
+ # Packages that aren't available on aarch64
+ arm-incs =
+ if (pkgs.stdenv.hostPlatform.isAarch64)
+ then [ ]
+ else with pkgs;[
+ discord
+ ];
+
+ # General packages
+ any-pkgs = with pkgs;[
+ telegram-desktop
+ github-desktop
+ spotify
+ zed-editor
+ ];
+in
+{
  config = {
  users.users = {
  sakhib = {
@@ -16,13 +37,7 @@
  "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDAGqU+JleLM0T44P2quirtLPrhFExOi6EOe0GYXkTFcTSjhw9LqiuX1/FbqNdKTaP9k6CdV3xc/8Z5wxbNOhpcPi9XLoupv9oNyIew7QYl+ZoAck6/qPsM7uptGYCwo0/ErzPNLd3ERD3KT1axCqrI6rWJ+JFOMAPtGeAZZxIedksViZ5SuNhpzXCIzS2PACqDTxFj7JwXK/pQ200h9ZS0MSh7iLKggXQfRVDndJxRnVY69NmbRa4MqkjgyxqWSDbqrDAXuTHpqKJ5kpXJ6p2a82EIHcCwXXpEmLwKxatxWJWJb9nurm3aS74BYmT3pRVVSPC6n5a2LWN9GxzvVh3AXXZtWGvjXSqBxHdSyUoDPuZnDneycdRC5vs6I1jSGTyDFdc4Etq1M5uUYb6SqCjJIBvTNqVnOf8nzFwl/ENvc8sbIVtILgAbBdwDiiQSu8xppqWMZfkQJy+uI5Ok7TZ8o5rGIblzfKyTiljCQb7RO7Klg3TwysetREn8ZEykBx0= This world soon will cherish into my darkness of my madness"
  ];
  extraGroups = [ "networkmanager" "wheel" "docker" "vboxusers" "admins" ];
- packages = (with pkgs; [
- telegram-desktop
- github-desktop
- spotify
- zed-editor
- ])
- ++ (with pkgs.unstable; [ ]);
+ packages = any-pkgs // arm-incs;
  };
  };