From bd372d9346942894b81dd3f8bd279f80050f1508 Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@datarift.nl>
Date: Wed, 28 Sep 2022 08:11:25 +0200
Subject: [PATCH] Update flake.lock

---
 home-manager/modules/alacritty/default.nix | 2 +-
 modules/base/default.nix                   | 2 +-
 modules/gnome/default.nix                  | 2 +-
 modules/nix-common/default.nix             | 2 +-
 pkgs/rofi-wayland/default.nix              | 7 +++----
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/home-manager/modules/alacritty/default.nix b/home-manager/modules/alacritty/default.nix
index 2821261..52c55f4 100644
--- a/home-manager/modules/alacritty/default.nix
+++ b/home-manager/modules/alacritty/default.nix
@@ -5,7 +5,7 @@
 }:
 with lib; let
   cfg = config.eboskma.programs.alacritty;
-  importYAML = name: yamlFile: (lib.importJSON ((pkgs.runCommandNoCC name { } ''
+  importYAML = name: yamlFile: (lib.importJSON ((pkgs.runCommand name { } ''
     mkdir -p $out
     ${pkgs.yaml2json}/bin/yaml2json < ${yamlFile} | ${pkgs.jq}/bin/jq -a '.' > $out/tmp.json
   '').outPath
diff --git a/modules/base/default.nix b/modules/base/default.nix
index c97f676..9a1eace 100644
--- a/modules/base/default.nix
+++ b/modules/base/default.nix
@@ -68,12 +68,12 @@ in
       dogdns
       file
       hexyl
-      ht-rust
       jq
       lm_sensors
       nix-template
       nvd
       usbutils
+      xh
       zip
     ];
 
diff --git a/modules/gnome/default.nix b/modules/gnome/default.nix
index 643c732..bee41cf 100644
--- a/modules/gnome/default.nix
+++ b/modules/gnome/default.nix
@@ -15,7 +15,7 @@ in
       papirus-icon-theme
     ];
     services.udev.packages = with pkgs; [
-      gnome3.gnome-settings-daemon
+      gnome.gnome-settings-daemon
     ];
     services.gnome.gnome-keyring.enable = true;
 
diff --git a/modules/nix-common/default.nix b/modules/nix-common/default.nix
index 451a9eb..eec70a6 100644
--- a/modules/nix-common/default.nix
+++ b/modules/nix-common/default.nix
@@ -23,7 +23,7 @@ in
     };
 
     nix = {
-      package = pkgs.nixFlakes;
+      package = pkgs.nixVersions.stable;
       extraOptions = ''
         experimental-features = nix-command flakes
       '';
diff --git a/pkgs/rofi-wayland/default.nix b/pkgs/rofi-wayland/default.nix
index 4fe4fa9..7c99b3e 100644
--- a/pkgs/rofi-wayland/default.nix
+++ b/pkgs/rofi-wayland/default.nix
@@ -2,15 +2,14 @@
 with pkgs;
 stdenv.mkDerivation rec {
   pname = "rofi-wayland-unwrapped";
-  version = "1.7.3";
+  version = "1.7.5";
 
   src = fetchFromGitHub {
     owner = "lbonn";
     repo = "rofi";
     rev = "${version}+wayland1";
     fetchSubmodules = true;
-    # sha256 = "1h6lh4lrkxzs6iy2rzn5g71dnz6qck4j8cxpgy1ja179vrnj1sf7";
-    sha256 = "qvIxWxiQj42VgScSsrF1Yf6ifgEbZes0flNbbwc3O8I=";
+    sha256 = "ddKLV7NvqgTQl5YlAEyBK0oalcJsLASK4z3qArQPUDQ=";
   };
 
   preConfigure = ''
@@ -19,7 +18,7 @@ stdenv.mkDerivation rec {
     sed -i 's/~root/~nobody/g' test/helper-expand.c
   '';
 
-  nativeBuildInputs = [ meson ninja pkgconfig ];
+  nativeBuildInputs = [ meson ninja pkg-config ];
   buildInputs = with pkgs; [
     libxkbcommon
     pango