From 418034d79c5125eefbdf7352bf63aa685b7ec433 Mon Sep 17 00:00:00 2001
From: Alexander Szczepanski <alexander@szczepan.ski>
Date: Tue, 3 Aug 2021 00:58:52 +0200
Subject: [PATCH] moved cups

---
 configs/common.nix   |  4 ++++
 configs/gui.nix      | 10 ++++++++++
 machine/thinkpad.nix | 12 ++++--------
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/configs/common.nix b/configs/common.nix
index 211b7f7..e316548 100644
--- a/configs/common.nix
+++ b/configs/common.nix
@@ -68,10 +68,14 @@
     tree
     usbutils
     wget
+    unzip
     zsh
     neofetch
     cargo
     youtube-dl
+    git-secrets
+    gnupg
+    nmap
   ];
 
   documentation.enable = false;
diff --git a/configs/gui.nix b/configs/gui.nix
index 25cff17..a554408 100644
--- a/configs/gui.nix
+++ b/configs/gui.nix
@@ -31,10 +31,16 @@
     fslint
     transmission-gtk
     bitwarden
+    gnome.gnome-tweaks
+    juno-theme
+    elementary-xfce-icon-theme
     libreoffice
     etcher
     mangohud
     minecraft
+    jellyfin-mpv-shim
+    jellyfin-media-player
+    teams
   ];
 
   programs.steam.enable = true;
@@ -71,6 +77,10 @@
 
   programs.dconf.enable = true;
 
+  # Enable CUPS to print documents.
+  services.printing.enable = true;
+  services.printing.drivers = [ pkgs.brlaser ];
+
   nixpkgs.config.chromium.commandLineArgs = "--enable-features=WebUIDarkMode,NativeNotifications,VaapiVideoDecoder --ignore-gpu-blocklist --use-gl=desktop --force-dark-mode --disk-cache-dir=/tmp/cache";
   programs.chromium = {
     enable = true;
diff --git a/machine/thinkpad.nix b/machine/thinkpad.nix
index 25d0417..7f8e66b 100644
--- a/machine/thinkpad.nix
+++ b/machine/thinkpad.nix
@@ -42,9 +42,9 @@ in
   boot.loader.efi.canTouchEfiVariables = true;
   boot.loader.grub.gfxmodeEfi = "1024x768";
 
-  #boot.plymouth.enable = true;
+  # boot.plymouth.enable = true;
 
-  environment.etc."issue.d/ip.issue".text = "\\4\n";
+  # environment.etc."issue.d/ip.issue".text = "\\4\n";
 
   networking.hostName = "thinkpad"; # Define your hostname.
 
@@ -67,9 +67,8 @@ in
 
   # Enable the X11 windowing system.
   services.xserver.enable = true;
-  services.xserver.desktopManager.pantheon.enable = true;
-  services.xserver.desktopManager.pantheon.extraWingpanelIndicators = [ pkgs.pantheon.wingpanel-indicator-nightlight ];
-  #services.xserver.dpi = 144;
+  services.xserver.displayManager.gdm.enable = true;
+  services.xserver.desktopManager.gnome.enable = true;
 
   services.xserver = {
     videoDrivers = [ "nvidia" ];
@@ -123,9 +122,6 @@ in
     vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
   };
 
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-  services.printing.drivers = [ pkgs.brlaser ];
   # Enable sound.
   sound.enable = true;
   hardware.pulseaudio = {