From 3b31438f060d484bdc27869b4bac5edc261bef50 Mon Sep 17 00:00:00 2001
From: Yusuf Bera Ertan <y.bera003.06@protonmail.com>
Date: Sun, 17 Jan 2021 18:34:34 +0300
Subject: [PATCH] feat(de): switch to gnome

---
 users/patriot/default.nix | 17 +++++++----------
 users/patriot/home.nix    | 26 ++++++++++++++------------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/users/patriot/default.nix b/users/patriot/default.nix
index 40f3aec..1432e8b 100644
--- a/users/patriot/default.nix
+++ b/users/patriot/default.nix
@@ -30,18 +30,15 @@
     };
   };
 
-  /*services = {
+  security.pam.services.patriot.enableGnomeKeyring = true;
+  services = {
+    gnome3 = {
+      gnome-keyring.enable = true;
+    };
     xserver = {
       enable = true;
-      desktopManager.plasma5.enable = true;
-      displayManager = {
-        autoLogin = {
-          enable = true;
-          user = "patriot";
-        };
-        sddm.enable = true;
-      };
+      desktopManager.gnome3.enable = true;
+      displayManager.gdm.enable = true;
     };
   };
-  environment.systemPackages = [ pkgs.kde-gtk-config ];*/
 }
diff --git a/users/patriot/home.nix b/users/patriot/home.nix
index abc2085..c983c82 100644
--- a/users/patriot/home.nix
+++ b/users/patriot/home.nix
@@ -213,6 +213,8 @@ in
           font-awesome
           (nerdfonts.override { fonts = [ "Iosevka" ]; })
           # Programs
+          gnome3.gnome-tweaks
+          gnome3.seahorse
           wine-staging
           cachix
           plasma5.plasma-browser-integration
@@ -253,7 +255,7 @@ in
         inherit font;
       };
       sway = {
-        enable = true;
+        enable = false;
         extraSessionCommands = ''
           export SDL_VIDEODRIVER=wayland
           # needs qt5.qtwayland in systemPackages
@@ -338,7 +340,7 @@ in
 
     programs = {
       alacritty = {
-        enable = true;
+        enable = false;
         settings = {
           font = {
             normal = { family = font; };
@@ -481,15 +483,15 @@ in
           # use this if they aren't displayed properly:
           export _JAVA_AWT_WM_NONREPARENTING=1
         '';
-        loginExtra =
-          let
-            deCmd = if config.wayland.windowManager.sway.enable then "sway" else (if config.wayland.windowManager.hikari.enable then "hikari" else throw "Need a window manager to start!");
-          in
-          ''
-            if [ "$(${pkgs.coreutils}/bin/tty)" = "/dev/tty1" ]; then
-                exec ${pkgBin deCmd}
-            fi
-          '';
+        # loginExtra =
+        #   let
+        #     deCmd = if config.wayland.windowManager.sway.enable then "sway" else (if config.wayland.windowManager.hikari.enable then "hikari" else throw "Need a window manager to start!");
+        #   in
+        #   ''
+        #     if [ "$(${pkgs.coreutils}/bin/tty)" = "/dev/tty1" ]; then
+        #         exec ${pkgBin deCmd}
+        #     fi
+        #   '';
         initExtra = ''
           bindkey "$terminfo[kRIT5]" forward-word
           bindkey "$terminfo[kLFT5]" backward-word
@@ -528,7 +530,7 @@ in
           acc = "#${acColor}";
         in
         {
-          enable = true;
+          enable = false;
           colors = {
             window = {
               background = bgc;