From 0a7800cd15392581fcdb36eca69e8e8497794e84 Mon Sep 17 00:00:00 2001
From: Varris <varris@posteo.net>
Date: Thu, 24 Aug 2023 08:48:30 +0200
Subject: [PATCH] update

---
 flake.nix                                                     | 2 +-
 pkgs/gruvbox-plus-icon-pack/default.nix                       | 4 ++--
 configuration.nix => system/configuration.nix                 | 0
 .../hardware-configuration.nix                                | 0
 user/configs/wayland/hyprland/default.nix                     | 2 +-
 user/configs/wayland/waybar/default.nix                       | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename configuration.nix => system/configuration.nix (100%)
 rename hardware-configuration.nix => system/hardware-configuration.nix (100%)

diff --git a/flake.nix b/flake.nix
index db94650..b98aa80 100755
--- a/flake.nix
+++ b/flake.nix
@@ -116,7 +116,7 @@
           inherit pkgs;
           specialArgs = { inherit inputs; };
           modules = [
-            ./configuration.nix
+            ./system/configuration.nix
             home-manager.nixosModules.home-manager {
               home-manager = {
                 useUserPackages = true;
diff --git a/pkgs/gruvbox-plus-icon-pack/default.nix b/pkgs/gruvbox-plus-icon-pack/default.nix
index 02f8c45..4a20556 100755
--- a/pkgs/gruvbox-plus-icon-pack/default.nix
+++ b/pkgs/gruvbox-plus-icon-pack/default.nix
@@ -2,13 +2,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "gruvbox-plus-icon-pack";
-  version = "3.1";
+  version = "4.0";
 
   src = fetchFromGitHub {
     owner = "SylEleuth";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-HOgH7BPb3wsgrFEotz9+RNTZL7mYnI9Y58L5vxd/F2Y=";
+    hash = "sha256-KefCHHFtuh2wAGBq6hZr9DpuJ0W99ueh8i1K3tohgG8=";
   };
 
   nativeBuildInputs = [ gtk3 ];
diff --git a/configuration.nix b/system/configuration.nix
similarity index 100%
rename from configuration.nix
rename to system/configuration.nix
diff --git a/hardware-configuration.nix b/system/hardware-configuration.nix
similarity index 100%
rename from hardware-configuration.nix
rename to system/hardware-configuration.nix
diff --git a/user/configs/wayland/hyprland/default.nix b/user/configs/wayland/hyprland/default.nix
index 71f67e7..e0478fe 100755
--- a/user/configs/wayland/hyprland/default.nix
+++ b/user/configs/wayland/hyprland/default.nix
@@ -146,7 +146,7 @@ in
 
       exec = ${pkgs.xorg.xrandr}/bin/xrandr --output ${rightMonitor.display} --primary
       exec = ${wob-voldaemon}/bin/wob-volumeindicator.sh;
-      # exec = pkill waybar; ${pkgs.waybar-hyprland}/bin/waybar
+      # exec = pkill waybar; ${pkgs.waybar}/bin/waybar
       exec = ${pkgs.eww-git}/bin/eww kill; ${pkgs.eww-git}/bin/eww open-many bar0 bar1
       exec = pkill swww; sleep 2 && ${pkgs.swww}/bin/swww init && ${pkgs.swww}/bin/swww img $(cat ~/.cache/swww/wallpaper.txt)
 
diff --git a/user/configs/wayland/waybar/default.nix b/user/configs/wayland/waybar/default.nix
index cecdb0a..dd14483 100755
--- a/user/configs/wayland/waybar/default.nix
+++ b/user/configs/wayland/waybar/default.nix
@@ -24,7 +24,7 @@ in
 {
   programs.waybar = {
     enable = true;
-    package = pkgs.waybar-hyprland;
+    package = pkgs.waybar;
 
     settings = [{
       layer = "top";