fix merge conflicts

workstation/configuration.nix

@@ -40,7 +40,8 @@
   #services.xserver.enable = false;
 
   # Enable the GNOME Desktop Environment.
-  #services.xserver.displayManager.gdm.enable = true;
+  services.xserver.displayManager.gdm.enable = true;
+  services.xserver.displayManager.gdm.wayland = true;
   #services.xserver.desktopManager.gnome.enable = false;
 
   # Configure keymap in X11
@@ -54,6 +55,7 @@
   # Enable CUPS to print documents.
   services.printing.enable = true;
   services.udisks2.enable = true;
+  services.nscd.enableNsncd = true;
 
   # Enable sound with pipewire.
   sound.enable = true;
@@ -63,6 +65,14 @@
     extraBackends = [ pkgs.sane-airscan ];
   };
   security.rtkit.enable = true;
+#  services.kmscon = {
+#    enable = false;
+#    extraOptions = "--term xterm-256color";
+#    fonts = [ { name = "Source Code Pro"; package = pkgs.source-code-pro; } ];
+#    extraConfig = ''
+#      font-size=10
+#    '';
+#  };
   services.pipewire = {
     enable = true;
     alsa.enable = true;
@@ -86,7 +96,7 @@
   users.users.don = {
     isNormalUser = true;
     description = "Don Harper";
-    extraGroups = [ "networkmanager" "wheel" "scanner" "lp" ];
+    extraGroups = [ "networkmanager" "wheel" "scanner" "lp" "video" ];
     openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINd8AdVbQQ/Fmw+b9mI8EMYqIoRkwmSwAOtmlte3incL don@loki"
     ];
@@ -117,6 +127,8 @@
     tmux
     tmuxp
     topgrade
+    toot
+    tut
     #vim
     wget
     zoom-us
@@ -198,7 +210,7 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "22.05"; # Did you read the comment?
+  system.stateVersion = "22.11"; # Did you read the comment?
 #  nixpkgs.config.firefox.enableGnomeExtenions = true;
 #  services.gnome.gnome-browser-connector.enable = true;
   programs.msmtp = {