t14: 22 current 2024-09-29 18:27:20 24.05.20240928.fbca5e7 6.6.52 *

2 files changed, 1 insertions, 112 deletions

diff --git a/machines/x220-gnome/configuration.nix b/machines/x220-gnome/configuration.nix
index ea23c3e..f5e953b 100644
--- a/machines/x220-gnome/configuration.nix
+++ b/machines/x220-gnome/configuration.nix
@@ -4,7 +4,7 @@
 	imports =
 		[ # Include the results of the hardware scan.
 		../base.nix
-		./gnome.nix
+		../../modules/gnome.nix
 		./pass.nix
 		./hardware-configuration.nix
 		./pn.nix
diff --git a/machines/x220-gnome/gnome.nix b/machines/x220-gnome/gnome.nix
deleted file mode 100644
index e667cea..0000000
--- a/machines/x220-gnome/gnome.nix
+++ /dev/null
@@ -1,111 +0,0 @@
-{ pkgs, ... }:
-{
-# Enable the X11 windowing system.
-	services.xserver.enable = true;
-
-# Enable the GNOME Desktop Environment.
-	services.xserver.displayManager.gdm.enable = true;
-	services.xserver.desktopManager.gnome.enable = true;
-	services.xserver.desktopManager.xterm.enable = false;
-	services.xserver.excludePackages = [ pkgs.xterm ];
-
-	environment.gnome.excludePackages = with pkgs.gnome; [
-		pkgs.epiphany
-		baobab totem yelp file-roller seahorse gnome-clocks pkgs.gnome-connections
-			pkgs.gnome-tour
-	];
-
-	programs.dconf = {
-		enable = true;
-		profiles.user.databases = [
-			{
-				lockAll = true;
-				settings = {
-					"org/gnome/shell" = {
-						favorite-apps = [ "brave-browser.desktop" "org.gnome.Geary.desktop" "org.gnome.Nautilus.desktop" ];
-					};
-
-					"org/gnome/desktop/interface" = {
-						enable-hot-corners = false;
-					};
-
-					"org/gnome/desktop/wm/keybindings" = {
-						close = ["<Super>q"];
-					};
-					
-            				"org/gnome/settings-daemon/plugins/media-keys" = {
-              					custom-keybindings = [
-                					"/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"
-             					 ];
-					};
-
-            				"org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
-              					binding = "<Super>Return";
-              					command = "kgx";
-              					name = "GNOME Console";
-
-            				};
-
-				};
-			}
-		];
-	};
-
-	##services.xserver.desktopManager.gnome.extraGSettingsOverrides = ''
-		##[org.gnome.shell]
-		##favorite-apps = [ "brave-browser.desktop", "org.gnome.Geary.desktop", "org.gnome.Nautilus.desktop" ]
-##
-		##[org.gnome.desktop.wm.keybindings]
-		##close = ["<Super>q"]
-##
-		##[org.gnome.settings-daemon.plugins.media-keys]
-		##custom-keybindings = ["org/gnome/settings-daemon/plugins/media-keys/custom0/"]
-##
-		##[org.gnome.settings-daemon.plugins.media-keys.custom0]
-		##binding = ["<Super><Enter>"]
-		##command = ["kgx"]
-		##name = ["GNOME Console"]
-	##'';
-
-# Configure keymap in X11
-	services.xserver = {
-		xkb.layout = "pl";
-		xkb.variant = "";
-	};
-
-# Configure console keymap
-	console.keyMap = "pl2";
-
-# Enable CUPS to print documents.
-	services.printing.enable = true;
-
-# Enable sound with pipewire.
-	hardware.pulseaudio.enable = false;
-	security.rtkit.enable = true;
-	services.pipewire = {
-		enable = true;
-		alsa.enable = true;
-		alsa.support32Bit = true;
-		pulse.enable = true;
-# If you want to use JACK applications, uncomment this
-#jack.enable = true;
-
-# use the example session manager (no others are packaged yet so this is enabled by default,
-# no need to redefine it in your config for now)
-#media-session.enable = true;
-	};
-
-	environment.systemPackages = with pkgs; [
-		libnotify
-		gnome.gnome-boxes
-		gnome.file-roller
-		brave
-		newsflash
-		spotify
-		fragments
-	];
-
-	nixpkgs.config.allowUnfree = true;
-
-	documentation.nixos.enable = false;
-}