From f986493354fce76ffa79e7e551f1800453c149e3 Mon Sep 17 00:00:00 2001
From: grimhilt <grimhilt@users.noreply.github.com>
Date: Mon, 9 Jan 2023 20:59:55 +0100
Subject: [PATCH] add gnome/nix

---
 configuration.nix => nixos/configuration.nix  | 39 ++-----------------
 nixos/gnome.nix                               | 27 +++++++++++++
 .../hardware-configuration.nix                |  0
 ledger.nix => nixos/ledger.nix                |  0
 nixos/xfce_bspwm.nix                          | 21 ++++++++++
 5 files changed, 52 insertions(+), 35 deletions(-)
 rename configuration.nix => nixos/configuration.nix (87%)
 mode change 100755 => 100644
 create mode 100644 nixos/gnome.nix
 rename hardware-configuration.nix => nixos/hardware-configuration.nix (100%)
 rename ledger.nix => nixos/ledger.nix (100%)
 create mode 100644 nixos/xfce_bspwm.nix

diff --git a/configuration.nix b/nixos/configuration.nix
old mode 100755
new mode 100644
similarity index 87%
rename from configuration.nix
rename to nixos/configuration.nix
index 5d7c871..48a2839
--- a/configuration.nix
+++ b/nixos/configuration.nix
@@ -23,8 +23,6 @@ programs.nix-ld.enable = true;
 
   #networking.hostName = "nixos"; # Define your hostname.
   networking.networkmanager.enable = true;
-
-
   #networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
   # Set your time zone.
@@ -48,8 +46,6 @@ programs.nix-ld.enable = true;
   #   keyMap = "us";
   # };
 
-
-
   # Enable the X11 windowing system.
   services.xserver = {
 	enable = true;
@@ -65,23 +61,17 @@ programs.nix-ld.enable = true;
 	autoRepeatDelay = 200;
 	autoRepeatInterval = 35;		
 		
-		
 	windowManager.bspwm.enable = true;
-	#desktopManager.xterm.enable = true;
 	
-	# gnome
-	#displayManager.gdm.enable = true;
-	#desktopManager.gnome.enable = true;	
-
 	displayManager.defaultSession = "none+bspwm";
-	#displayManager.startx.enable = true;
-	libinput = {
 
+	libinput = {
   		# Enable touchpad support (enabled default in most desktopManager).
 		enable = true;
 		touchpad.accelSpeed = "0.155";
 	};
   };
+
   virtualisation.docker.enable = true;  
 
   # Enable CUPS to print documents.
@@ -106,7 +96,7 @@ programs.nix-ld.enable = true;
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
-   environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [
     # editors
     vim
     neovim
@@ -161,30 +151,8 @@ programs.nix-ld.enable = true;
     python311
     geany
     nasm
-
-    # tmp
-    # gsettings-desktop-schemas
   ];
 
-#  environment.gnome.excludePackages = (with pkgs; [
-#  	  gnome-photos
-#  	  gnome-tour
-#  ]) ++ (with pkgs.gnome; [
-#  	  cheese # webcam tool
-#  	  gnome-music
-#  	  gnome-terminal
-#  	  gedit # text editor
-#  	  epiphany # web browser
-#  	  geary # email reader
-#  	  evince # document viewer
-#  	  gnome-characters
-#  	  totem # video player
-#  	  tali # poker game
-#  	  iagno # go game
-#  	  hitori # sudoku game
-#  	  atomix # puzzle game
-#  ]);
-  
   fonts.fonts = [ pkgs.font-awesome ];
   
   nixpkgs.config.allowUnfree = true;
@@ -197,6 +165,7 @@ programs.nix-ld.enable = true;
     enable = true;
     theme = "candy-kingdom";
   };
+
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
diff --git a/nixos/gnome.nix b/nixos/gnome.nix
new file mode 100644
index 0000000..ce86eee
--- /dev/null
+++ b/nixos/gnome.nix
@@ -0,0 +1,27 @@
+{
+    services.xserver = {
+
+        displayManager.gdm.enable = true;
+        desktopManager.gnome.enable = true;
+    }
+
+    environment.gnome.excludePackages = (with pkgs; [
+        gnome-photos
+        gnome-tour
+    ]) ++ (with pkgs.gnome; [
+        cheese
+        gnome-music
+        gnome-terminal
+        gedit
+        epiphany
+        geary
+        evince
+        gnome-characters
+        totem
+        tali
+        iagno
+        hitori
+        atomix
+    ]);
+
+}
diff --git a/hardware-configuration.nix b/nixos/hardware-configuration.nix
similarity index 100%
rename from hardware-configuration.nix
rename to nixos/hardware-configuration.nix
diff --git a/ledger.nix b/nixos/ledger.nix
similarity index 100%
rename from ledger.nix
rename to nixos/ledger.nix
diff --git a/nixos/xfce_bspwm.nix b/nixos/xfce_bspwm.nix
new file mode 100644
index 0000000..35d5657
--- /dev/null
+++ b/nixos/xfce_bspwm.nix
@@ -0,0 +1,21 @@
+{ config, lib, pkgs, ...}: with lib;
+{
+	services.xserver = {
+
+		desktopManager.xfce = {
+			enable = true;
+			enableXfwm = false;
+		};
+
+		windowManager.bspwm.enable = true;
+		#iwindowManager.bspwm.configFile = "/home/grimhilt/dotfiles/common/bspwm/bspwmrc";
+		#windowManager.bspwm.sxhkd.configFile = "/home/grimhilt/dotfiles/common/bspwm/sxhkdrc";
+		desktopManager.xterm.enable = false;
+		
+	};
+
+	#services.xserver.displayManager.defaultSession = "none+bspwm";
+
+}
+		
+