From bb0e7ea79524903e02d52703c2b681d6c730d58e Mon Sep 17 00:00:00 2001
From: iFargle <albert@sysctl.io>
Date: Mon, 10 Jul 2023 19:50:05 +0900
Subject: [PATCH] Try stable gnome

---
 README.md                   |  7 +----
 desktops/gnome-unstable.nix | 63 +++++++++++++++++++++++++++++++++++++
 desktops/gnome.nix          | 10 +++---
 3 files changed, 69 insertions(+), 11 deletions(-)
 create mode 100644 desktops/gnome-unstable.nix

diff --git a/README.md b/README.md
index 378f47cb..3986e1c8 100644
--- a/README.md
+++ b/README.md
@@ -30,9 +30,4 @@ Repo for nix configuration files
 1.  To edit a file: cd to `/path/to/nix-files/` and run:
     * `nix-shell -p sops --run "sops secrets/secret_file.yml`
     * New shell alias: `sops secrets/secret_file.yml`
-2.  Ensure your GPG keys are set up.
-
-# Names
-* Constellation
-* Aquilla 
-* 
\ No newline at end of file
+2.  Ensure your GPG keys are set up.
\ No newline at end of file
diff --git a/desktops/gnome-unstable.nix b/desktops/gnome-unstable.nix
new file mode 100644
index 00000000..09679fd1
--- /dev/null
+++ b/desktops/gnome-unstable.nix
@@ -0,0 +1,63 @@
+{ config, unstable, ... }: {
+  # Use "unstable" instead of "pkgs" to get the latest packages, defined in "flake.nix"
+  services.xserver = with unstable.pkgs; {
+    # https://nixos.org/manual/nixos/stable/index.html#chap-gnome
+    # Enable the GNOME Desktop Environment.
+    displayManager.gdm.enable = true;
+    desktopManager.gnome.enable = true;
+  };
+
+  # Set Gnome settings:
+  services.gnome = { 
+    games.enable = false; 
+    core-utilities.enable = true;
+  };
+
+  # https://nixos.wiki/wiki/GNOME
+  # Remove unwanted packages
+  environment.gnome.excludePackages = (with unstable.pkgs; [
+    gnome.cheese
+    gnome.gnome-music
+    gnome.epiphany
+    gnome.geary
+    gnome.totem
+    gnome.gnome-characters
+    gnome-tour
+    gnome-photos
+    gnome.yelp
+    gnome.gnome-font-viewer
+    gnome-connections
+    gnome.gnome-contacts
+    gnome.gnome-logs
+    gnome.gnome-maps
+    gnome.simple-scan
+  ]);
+
+  environment.systemPackages = with unstable.pkgs; [
+    # Gnome Extensions
+    gnomeExtensions.tiling-assistant
+    gnomeExtensions.dash-to-dock
+    gnomeExtensions.blur-my-shell
+    gnomeExtensions.vitals
+    gnomeExtensions.user-themes
+    gnomeExtensions.caffeine
+    gnomeExtensions.hibernate-status-button
+    gnomeExtensions.night-theme-switcher
+
+    # Gnome relevant packages
+    gnome3.gnome-tweaks
+    papirus-icon-theme
+  ];
+
+  imports = [ 
+    # Gnome Themes
+    ./gnome/themes/gruvbox.nix
+    ./gnome/themes/tokyo-night.nix
+    ./gnome/themes/nordic.nix
+    ./gnome/themes/vimix.nix
+    ./gnome/themes/fluent.nix
+    # You may need to edit which theme you're using in dconf.nix if you remove themes
+   ];
+  # Idea... Move these to a separate file and tie it into dconf
+  # sections that load the theme automatically when I want it.
+}
diff --git a/desktops/gnome.nix b/desktops/gnome.nix
index 09679fd1..d0e26907 100644
--- a/desktops/gnome.nix
+++ b/desktops/gnome.nix
@@ -1,6 +1,6 @@
-{ config, unstable, ... }: {
-  # Use "unstable" instead of "pkgs" to get the latest packages, defined in "flake.nix"
-  services.xserver = with unstable.pkgs; {
+{ config, pkgs, ... }: {
+  # Use "pkgs" instead of "pkgs" to get the latest packages, defined in "flake.nix"
+  services.xserver = with pkgs; {
     # https://nixos.org/manual/nixos/stable/index.html#chap-gnome
     # Enable the GNOME Desktop Environment.
     displayManager.gdm.enable = true;
@@ -15,7 +15,7 @@
 
   # https://nixos.wiki/wiki/GNOME
   # Remove unwanted packages
-  environment.gnome.excludePackages = (with unstable.pkgs; [
+  environment.gnome.excludePackages = (with pkgs; [
     gnome.cheese
     gnome.gnome-music
     gnome.epiphany
@@ -33,7 +33,7 @@
     gnome.simple-scan
   ]);
 
-  environment.systemPackages = with unstable.pkgs; [
+  environment.systemPackages = with pkgs; [
     # Gnome Extensions
     gnomeExtensions.tiling-assistant
     gnomeExtensions.dash-to-dock