From 306a2628cac24c934559e42891c15141d2ccb13a Mon Sep 17 00:00:00 2001
From: coolneng <akasroua@gmail.com>
Date: Mon, 21 Sep 2020 14:23:35 +0200
Subject: [PATCH] Revert "Downgrade waybar to version 0.9.2"

This reverts commit fba79883f50b79da277a12c4fff0974dccf9ceae.
---
 modules/gui.nix | 43 ++++++++++++++++---------------------------
 1 file changed, 16 insertions(+), 27 deletions(-)

diff --git a/modules/gui.nix b/modules/gui.nix
index 8839aef..fafd37a 100644
--- a/modules/gui.nix
+++ b/modules/gui.nix
@@ -1,17 +1,6 @@
 { config, lib, pkgs, ... }:
 
-let
-  tmux_config = builtins.readFile /home/coolneng/.tmux.conf;
-
-  # Fetch old version of waybar
-  pinnedpkgs = import (builtins.fetchGit {
-    name = "my-old-revision";
-    url = "https://github.com/nixos/nixpkgs-channels/";
-    ref = "refs/heads/nixpkgs-unstable";
-    rev = "c83e13315caadef275a5d074243c67503c558b3b";
-  }) { };
-
-  old-waybar = pinnedpkgs.waybar;
+let tmux_config = builtins.readFile /home/coolneng/.tmux.conf;
 
 in {
   # Display manager
@@ -31,21 +20,21 @@ in {
   # Window manager
   programs.sway = {
     enable = true;
-    extraPackages = [
-      pkgs.xwayland
-      pkgs.swaylock
-      pkgs.swayidle
-      pkgs.swaybg
-      pkgs.rofi
-      old-waybar
-      pkgs.clipman
-      pkgs.wl-clipboard
-      pkgs.grim
-      pkgs.slurp
-      pkgs.light
-      pkgs.imv
-      pkgs.kanshi
-      pkgs.kitty
+    extraPackages = with pkgs; [
+      xwayland
+      swaylock
+      swayidle
+      swaybg
+      rofi
+      waybar
+      clipman
+      wl-clipboard
+      grim
+      slurp
+      light
+      imv
+      kanshi
+      kitty
     ];
     extraSessionCommands = ''
       export MOZ_ENABLE_WAYLAND=1