From 6998845f01a2881fb95328a0058e9bb1f50bcf46 Mon Sep 17 00:00:00 2001
From: Daniel Olsen <daniel.olsen99@gmail.com>
Date: Wed, 27 May 2020 00:05:17 +0200
Subject: [PATCH] wayland?

---
 config/xsession/xsession.nix | 167 +++++++++++++++++++----------------
 overlays/ffmpeg.nix          |   2 +-
 overlays/libaom.nix          |   6 +-
 3 files changed, 94 insertions(+), 81 deletions(-)

diff --git a/config/xsession/xsession.nix b/config/xsession/xsession.nix
index f1c0f49..7e94790 100644
--- a/config/xsession/xsession.nix
+++ b/config/xsession/xsession.nix
@@ -7,98 +7,111 @@
     layout = "no-latin1";
   };
 
-  xsession = {
-    enable = true;
+   wayland.windowManager.sway {
+     enable = true;
+     terminal = "kitty";
+     config = {
+       bars = [
+         {
+           command = "${pkgs.waybar}/bin/waybar";
+         }
+
+       ];
+     };
+   };
+
+#  xsession = {
+#    enable = true;
+#
+#
+#    initExtra = ''
+#      export PATH="$HOME/.config/nixpkgs/nix-dotfiles/bin:$PATH"
+#
+#      export XDG_CURRENT_DESKTOP=kde
+#      export DESKTOP_SESSION=kde
+#
+#      export QT_STYLE_OVERRIDE="breeze"
+#    '';
+#
+#    windowManager = {
+#      i3.enable = true;
+#      i3.config = {
+#        modifier = "Mod4";
+#        keybindings = let modifier = "Mod4"; #xsession.windowManager.i3.config.modifier;
+#        in lib.mkOptionDefault {
+#          "${modifier}+0" = "workspace 10";
+#          "${modifier}+Shift+0" = "move container to workspace 10";
+#
+#          "${modifier}+Tab" = "workspace next";
+#          "${modifier}+Shift+Tab" = "workspace prev";
+#
+#          "XF86AudioRaiseVolume" = "exec --no-startup-id pactl set-sink-volume 0 +5%";
+#          "XF86AudioLowerVolume" = "exec --no-startup-id pactl set-sink-volume 0 -5%";
+#          "XF86AudioMute" = "exec --no-startup-id pactl set-sink-mute 0 toggle";
+#          "XF86AudioMicMute" = "exec --no-startup-id pactl set-source-mute 1 toggle";
+#
+#          "XF86MonBrightnessUp" = "exec --no-startup-id brightnessctl set +5%";
+#          "XF86MonBrightnessDown" = "exec --no-startup-id brightnessctl set 5%-";
+#
+#          "XF86Display" = "exec arandr";
+#
+#          "Print" = "exec scrot %Y-%m-%d_$wx$h_scrot.png -z -e 'mv $f /home/daniel/Pictures/screenshots/'";
+#          "${modifier}+Print" = "exec scrot /home/daniel/Pictures/Screenshots/%Y-%m-%d_$wx$h_scrot.png -z";
+#          "${modifier}+Shift+U" = "exec $HOME/.config/nixpkgs/nix-dotfiles/scripts/dmenuunicode";
+#
+#          "${modifier}+n" = "exec dolphin";
+#          "${modifier}+b" = "exec firefox";
+#          "${modifier}+t" = "exec gedit";
+#
+#          "${modifier}+Return" = lib.mkForce "exec kitty";
+#          "${modifier}+Shift+Return" = "exec kitty -e ssh dandellion@lilith";
+#        };
+#      };
+#    };
+#  };
+
+#  services.picom = {
+#    enable = true;
+#    backend = "xrender";
+#  };
 
 
-    initExtra = ''
-      export PATH="$HOME/.config/nixpkgs/nix-dotfiles/bin:$PATH"
+#  gtk = {
+#    enable = true;
+#    theme = {
+#      package = pkgs.breeze-gtk;
+#      name = "Breeze";
+#    };
+#    iconTheme = {
+#      package = pkgs.breeze-icons;
+#      name = "breeze";
+#    };
+#  };
 
-      export XDG_CURRENT_DESKTOP=kde
-      export DESKTOP_SESSION=kde
-
-      export QT_STYLE_OVERRIDE="breeze"
-    '';
-
-    windowManager = {
-      i3.enable = true;
-      i3.config = {
-        modifier = "Mod4";
-        keybindings = let modifier = "Mod4"; #xsession.windowManager.i3.config.modifier;
-        in lib.mkOptionDefault {
-          "${modifier}+0" = "workspace 10";
-          "${modifier}+Shift+0" = "move container to workspace 10";
-
-          "${modifier}+Tab" = "workspace next";
-          "${modifier}+Shift+Tab" = "workspace prev";
-
-          "XF86AudioRaiseVolume" = "exec --no-startup-id pactl set-sink-volume 0 +5%";
-          "XF86AudioLowerVolume" = "exec --no-startup-id pactl set-sink-volume 0 -5%";
-          "XF86AudioMute" = "exec --no-startup-id pactl set-sink-mute 0 toggle";
-          "XF86AudioMicMute" = "exec --no-startup-id pactl set-source-mute 1 toggle";
-
-          "XF86MonBrightnessUp" = "exec --no-startup-id xbacklight -inc 5";
-          "XF86MonBrightnessDown" = "exec --no-startup-id xbacklight -dec 5";
-
-          "XF86Display" = "exec arandr";
-
-          "Print" = "exec scrot %Y-%m-%d_$wx$h_scrot.png -z -e 'mv $f /home/daniel/Pictures/screenshots/'";
-          "${modifier}+Print" = "exec scrot /home/daniel/Pictures/Screenshots/%Y-%m-%d_$wx$h_scrot.png -z";
-          "${modifier}+Shift+U" = "exec $HOME/.config/nixpkgs/nix-dotfiles/scripts/dmenuunicode";
-
-          "${modifier}+n" = "exec dolphin";
-          "${modifier}+b" = "exec firefox";
-          "${modifier}+t" = "exec gedit";
-
-          "${modifier}+Return" = lib.mkForce "exec kitty";
-          "${modifier}+Shift+Return" = "exec kitty -e ssh dandellion@lilith";
-        };
-      };
-    };
-  };
-
-  services.picom = {
-    enable = true;
-    backend = "xrender";
-  };
-
-
-  gtk = {
-    enable = true;
-    theme = {
-      package = pkgs.breeze-gtk;
-      name = "Breeze";
-    };
-    iconTheme = {
-      package = pkgs.breeze-icons;
-      name = "breeze";
-    };
-  };
-
-  qt = {
-    enable = true;
-    #useGtkTheme = true;
-    platformTheme = "gtk";
-  };
+#  qt = {
+#    enable = true;
+#    #useGtkTheme = true;
+#    platformTheme = "gtk";
+#  };
 
   home.packages = [
-    pkgs.acpilight
+    pkgs.brightnessctl
     pkgs.pavucontrol
-    pkgs.xorg.xkill
-    pkgs.arandr
+#    pkgs.xorg.xkill
+#    pkgs.arandr
 
     pkgs.dunst
     pkgs.libnotify
 
     pkgs.dmenu
 
-    pkgs.scrot
-    pkgs.xclip
+#    pkgs.scrot
+#    pkgs.xclip
 
     pkgs.dejavu_fonts
 
-    pkgs.breeze-qt5
-    pkgs.breeze-icons
+#    pkgs.breeze-qt5
+#    pkgs.breeze-icons
   ];
 }
 
diff --git a/overlays/ffmpeg.nix b/overlays/ffmpeg.nix
index 4b1aecd..128e5ce 100644
--- a/overlays/ffmpeg.nix
+++ b/overlays/ffmpeg.nix
@@ -4,7 +4,7 @@ self: super:
     version = "4.2.2-04pkq2y2";
     src = super.fetchurl {
       url = "http://www.ffmpeg.org/releases/ffmpeg-snapshot-git.tar.bz2";
-      sha256 = "04pkq2y245l09kyd1hb9b4qb9l2liq8k4q6yr613wy6b1bj8pb81";
+      sha256 = "14pjy4w7a9g5dn5mssd5lzfl6pz5g8wgqz9fd4cb26dbrfb97i1b";
     };
     configureFlags = [
       "--enable-gpl"
diff --git a/overlays/libaom.nix b/overlays/libaom.nix
index 3f64210..1e69911 100644
--- a/overlays/libaom.nix
+++ b/overlays/libaom.nix
@@ -1,11 +1,11 @@
 self: super:
 {
   mylibaom = super.libaom.overrideAttrs (old: rec {
-    version = "1.0.0-fdca7c6440";
+    version = "1.0.0-a5e3f02b186";
     src = super.fetchgit {
       url = "https://aomedia.googlesource.com/aom";
-      rev = "fdca7c64406efeb3a5f9012801bf122b06d2045a";
-      sha256 = "00f7cvmcj094sdw0i35633yn1ng9w38wl761k1fx6ns8w0byirv1";
+      rev = "a5e3f02b18668957bbd054a1058cb190f298ca6f";
+      sha256 = "1i7lk91rdwviqnmxc6k2ihjqx5glf6siirnlhyi50vbqwgpjiyv4";
     };