update: flake inputs

Ruixi-rebirth · May 10, 2023 · 45e3efd · 45e3efd
1 parent 9b72bd1
commit 45e3efd
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 63 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/modules/programs/wayland/waybar/hyprland_waybar.nix b/modules/programs/wayland/waybar/hyprland_waybar.nix
@@ -7,16 +7,11 @@
 
   nixpkgs.overlays = [
     (final: prev: {
-      waybar =
-        let
-          hyprctl = "${pkgs.hyprland}/bin/hyprctl";
-          waybarPatchFile = import ./workspace-patch.nix { inherit pkgs hyprctl; };
-        in
-        prev.waybar.overrideAttrs (oldAttrs: {
-          mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
-          postPatch = (oldAttrs.postPatch or "") + ''
-            sed -i 's/zext_workspace_handle_v1_activate(workspace_handle_);/const std::string command = "hyprctl dispatch workspace " + name_;\n\tsystem(command.c_str());/g' src/modules/wlr/workspace_manager.cpp'';
-        });
+      waybar = prev.waybar.overrideAttrs (oldAttrs: {
+        mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
+        postPatch = (oldAttrs.postPatch or "") + ''
+          sed -i 's/zext_workspace_handle_v1_activate(workspace_handle_);/const std::string command = "hyprctl dispatch workspace " + name_;\n\tsystem(command.c_str());/g' src/modules/wlr/workspace_manager.cpp'';
+      });
     })
   ];
 

diff --git a/scripts/disko.sh b/scripts/disko.sh
@@ -68,8 +68,3 @@ layout=.${partition_layout#$FLAKE_ROOT/hosts/laptop}
 sed -i "/imports\ =/cimports\ = [(import\ $layout\ {})]++" "$FLAKE_ROOT"/hosts/{laptop,laptop_minimal}/hardware-configuration.nix
 cp -r "$FLAKE_ROOT" /mnt/etc/nixos
 lsblk
-
-
-
-
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -68,8 +68,3 @@ layout=.${partition_layout#$FLAKE_ROOT/hosts/laptop}
		sed -i "/imports\ =/cimports\ = [(import\ $layout\ {})]++" "$FLAKE_ROOT"/hosts/{laptop,laptop_minimal}/hardware-configuration.nix
		cp -r "$FLAKE_ROOT" /mnt/etc/nixos
		lsblk