From fcc1f6ce14527ccfe998fb544116721066da7007 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Tue, 27 Sep 2022 09:38:29 -0600
Subject: [PATCH] [NixOS] A bunch of tweaks

---
 nixos/all.nix                   | 7 +++----
 nixos/essential.nix             | 7 ++++---
 nixos/home-manager.nix          | 8 +++++++-
 nixos/machines/adele.nix        | 2 +-
 nixos/machines/stevie-nixos.nix | 2 +-
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/nixos/all.nix b/nixos/all.nix
index e0758fa9..62f0351f 100644
--- a/nixos/all.nix
+++ b/nixos/all.nix
@@ -4,7 +4,7 @@
     # Applications
     alacritty
     # calibre
-    gnome3.cheese
+    gnome.cheese
     dfeet
     discord
     emacs
@@ -33,7 +33,7 @@
 
     # Appearance
     libsForQt5.breeze-gtk
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
     hicolor-icon-theme
     materia-theme
     numix-icon-theme-circle
@@ -47,8 +47,7 @@
     blueman
     clipit
     feh
-    gnome3.gpaste
-    kdeconnect
+    gnome.gpaste
     libnotify
     lxqt.lxqt-powermanagement
     networkmanagerapplet
diff --git a/nixos/essential.nix b/nixos/essential.nix
index a42f5755..317cb3d4 100644
--- a/nixos/essential.nix
+++ b/nixos/essential.nix
@@ -23,7 +23,7 @@ in
     python-with-my-packages
 
     alacritty
-    (emacsWithPackages (epkgs: with epkgs.melpaPackages; [
+    (emacs.pkgs.withPackages (epkgs: with epkgs.melpaPackages; [
       vterm
     ]))
     firefox
@@ -62,8 +62,7 @@ in
     blueman
     clipit
     feh
-    gnome3.gpaste
-    kdeconnect
+    gnome.gpaste
     libnotify
     lxqt.lxqt-powermanagement
     networkmanagerapplet
@@ -83,6 +82,7 @@ in
     playerctl
 
     # Tools
+    bazel
     binutils
     gawk
     gitFull
@@ -92,6 +92,7 @@ in
     lsof
     pass
     protobuf
+    rclone
     rcm
     ripgrep
     silver-searcher
diff --git a/nixos/home-manager.nix b/nixos/home-manager.nix
index 1b03d996..54ef3bb8 100644
--- a/nixos/home-manager.nix
+++ b/nixos/home-manager.nix
@@ -1,4 +1,5 @@
 { pkgs, config, ... }: {
+  home.stateVersion = "20.03";
   xsession = {
     enable = true;
     preferStatusNotifierItems = true;
@@ -17,11 +18,16 @@
   #   enable = true;
   # };
 
+  services.xscreensaver = {
+    enable = true;
+  };
+
   services.gpg-agent = {
     enable = true;
     defaultCacheTtl = 8 * 60 * 60;
     maxCacheTtl = 8 * 60 * 60;
     enableSshSupport = true;
+    pinentryFlavor = "qt";
   };
 
   services.blueman-applet = {
@@ -55,7 +61,7 @@
 
   services.random-background = {
     enable = true;
-    display = "center";
+    display = "fill";
     interval = "1h";
     imageDirectory = "%h/Pictures/wallpaper/use";
   };
diff --git a/nixos/machines/adele.nix b/nixos/machines/adele.nix
index 15d12cd3..879bf9fb 100644
--- a/nixos/machines/adele.nix
+++ b/nixos/machines/adele.nix
@@ -34,7 +34,7 @@
 
   networking.hostName = "adele";
 
-  nix.maxJobs = lib.mkDefault 12;
+  nix.settings.maxJobs = lib.mkDefault 12;
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 
   services.redshift.enable = true;
diff --git a/nixos/machines/stevie-nixos.nix b/nixos/machines/stevie-nixos.nix
index e2c12683..f792b7a8 100644
--- a/nixos/machines/stevie-nixos.nix
+++ b/nixos/machines/stevie-nixos.nix
@@ -73,7 +73,7 @@
 
   networking.hostName = "stevie-nixos";
 
-  nix.maxJobs = lib.mkDefault 16;
+  nix.settings.maxJobs = lib.mkDefault 16;
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 
   hardware.video.hidpi.enable = true;