From 7da4726b9ca58146e161d6904714bd3f832b1512 Mon Sep 17 00:00:00 2001
From: Stefan Ellmauthaler <stefan.ellmauthaler@tu-dresden.de>
Date: Tue, 31 May 2022 14:41:29 +0200
Subject: [PATCH] Fix deprecated package names

---
 modules/base.nix          |  2 +-
 modules/emacs/default.nix |  2 +-
 modules/graphical.nix     |  2 +-
 modules/nix-index-db.nix  | 55 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 modules/nix-index-db.nix

diff --git a/modules/base.nix b/modules/base.nix
index 8bb0416..bf65a6f 100644
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -5,7 +5,7 @@ with lib; {
     services = {
       dbus = {
         enable = true;
-        packages = with pkgs; [ gnome3.dconf ];
+        packages = with pkgs; [ dconf ];
       };
     };
 
diff --git a/modules/emacs/default.nix b/modules/emacs/default.nix
index aa6ef87..0647f3a 100644
--- a/modules/emacs/default.nix
+++ b/modules/emacs/default.nix
@@ -8,7 +8,7 @@ let
      mkdir -p $out/share/emacs/site-lisp
      cp ${defaultEl} $out/share/emacs/site-lisp/default.el
   '';
-  emacsPackage = (pkgs.emacsPackagesGen pkgs.emacs).emacsWithPackages
+  emacsPackage = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages
     (epkgs:
       let
         lpkgs = import ./packages.nix {
diff --git a/modules/graphical.nix b/modules/graphical.nix
index 1783d61..2d0b1d9 100644
--- a/modules/graphical.nix
+++ b/modules/graphical.nix
@@ -72,7 +72,7 @@ with lib; {
         texlive.combined.scheme-full
         usbutils
         keepassxc
-        gnome.libsecret
+        libsecret
         arandr
       ];
     };
diff --git a/modules/nix-index-db.nix b/modules/nix-index-db.nix
new file mode 100644
index 0000000..4fb336b
--- /dev/null
+++ b/modules/nix-index-db.nix
@@ -0,0 +1,55 @@
+{ config, pkgs, lib, ... }:
+
+with lib; {
+  options.elss.nix-index-db-update.enable = mkEnableOption "periodically update the nix-index database";
+
+  config =
+    let
+      cfg = config.elss.nix-index-db-update;
+      nix-index-db-update = pkgs.writeShellScript "nix-index-db-update" ''
+        set -euo pipefail
+        filename="index-x86_64-$(${pkgs.coreutils}/bin/uname | ${pkgs.coreutils}/bin/tr A-Z a-z)"
+        cd /var/db/nix-index/
+        ${pkgs.wget}/bin/wget -q -N https://github.com/Mic92/nix-index-database/releases/latest/download/$filename
+        ${pkgs.coreutils}/bin/ln -f $filename files
+      '';
+      inherit (lib.elss.withConfig config) mapAllUsers;
+    in
+    mkIf cfg.enable {
+      systemd = {
+        services.nix-index-db-update = {
+          description = "Update nix-index database";
+
+          serviceConfig = {
+            CPUSchedulingPolicy = "idle";
+            IOSchedulingClass = "idle";
+            ExecStartPre = ''
+              +${pkgs.coreutils}/bin/mkdir -p /var/db/nix-index/
+              +${pkgs.coreutils}/bin/chown nobody:nobody /var/db/nix-index/
+            '';
+            ExecStart = toString nix-index-db-update;
+            User = nobody;
+            Group = nobody;
+          };
+        };
+
+        timers.nix-index-db-update = {
+          description = "nix-index database periodic update";
+
+          timerConfig = {
+            Unit = "nix-index-db-update.service";
+            OnCalendar = "daily";
+            Persistent = true;
+          };
+
+          wantedBy = [ "timers.target" ];
+        };
+      };
+
+      home-manager.users = mapAllUsers (_:
+        {
+          home.file.".cache/nix-index" = "/var/db/nix-index/";
+        }
+      );
+    };
+}