From 33a4f18ac1588e08708627608e521faeb0ba74a3 Mon Sep 17 00:00:00 2001
From: elkowar <5300871+elkowar@users.noreply.github.com>
Date: Sun, 1 Nov 2020 13:51:00 +0100
Subject: [PATCH] asdf

---
 .../configstore/update-notifier-npm.json      |  8 +---
 files/.config/eww/eww.scss                    | 35 ++++++++++++------
 files/.config/eww/eww.xml                     | 37 ++++++++++++-------
 files/.config/eww/music.sh                    | 12 ++++--
 files/.config/eww/popup.sh                    |  8 ++--
 files/.config/picom.conf                      |  2 +
 files/.xmonad/lib/Config.hs                   |  7 +++-
 files/firefoxChrome/chrome/userChrome.css     |  3 --
 files/nix-stuff/nixpkgs/modules/base.nix      |  1 +
 9 files changed, 71 insertions(+), 42 deletions(-)

diff --git a/files/.config/configstore/update-notifier-npm.json b/files/.config/configstore/update-notifier-npm.json
index 5ff04a0..58d1400 100644
--- a/files/.config/configstore/update-notifier-npm.json
+++ b/files/.config/configstore/update-notifier-npm.json
@@ -1,10 +1,4 @@
 {
 	"optOut": false,
-	"lastUpdateCheck": 1603028923250,
-	"update": {
-		"latest": "6.14.8",
-		"current": "6.14.6",
-		"type": "patch",
-		"name": "npm"
-	}
+	"lastUpdateCheck": 1603626767242
 }
\ No newline at end of file
diff --git a/files/.config/eww/eww.scss b/files/.config/eww/eww.scss
index b9728e3..0106f4f 100644
--- a/files/.config/eww/eww.scss
+++ b/files/.config/eww/eww.scss
@@ -17,10 +17,17 @@ entry {
   border-radius: 50px;
 
   scale trough {
+    padding: 10px;
     border-radius: 50px;
     background-color: #ebdbb2;
+
+    slider {
+      background: red;
+    }
+
     highlight {
-      min-width: 30px;
+      padding: 10px;
+      min-height: 30px;
       border-bottom-left-radius: 50px;
       border-bottom-right-radius: 50px;
       background-color: #8ec07c;
@@ -49,16 +56,22 @@ entry {
 
   .buttons {
     min-height: 50px;
-  }
-
-  button, button * {
-    border: none;
-    margin: 0;
-    padding: 0;
-  }
-
-  .buttons {
     background: #1d2021;
-    //box-shadow: 0 0 10px -5px rgba(0,0,0, 0.5);
+    box-shadow: 0 0 10px -5px rgba(0, 0, 0, 0.5);
   }
 }
+
+
+  scale trough {
+    padding: 10px;
+    border-radius: 50px;
+    background-color: #ebdbb2;
+
+    highlight {
+      padding: 10px;
+      min-height: 30px;
+      border-bottom-left-radius: 50px;
+      border-bottom-right-radius: 50px;
+      background-color: #8ec07c;
+    }
+  }
diff --git a/files/.config/eww/eww.xml b/files/.config/eww/eww.xml
index a1ab5b5..583ec3c 100644
--- a/files/.config/eww/eww.xml
+++ b/files/.config/eww/eww.xml
@@ -4,7 +4,7 @@
     <def name="test">
       <box space-evenly="false" spacing="10">
         testing {{shit}}
-        <scale value="50" />
+        <scale value="50" orientation="v" min="0" max="100" flipped="true"/>
 
         <button onclick="notify-send 'ree' 'this is {{shit}}'">click me</button>
         <calendar show-heading="false" show-day-names="false" day="2" onclick="notify-send 'asdf' '{}'" />
@@ -20,6 +20,10 @@
         <box>{{text}}</box>
         <box>{{text}}</box>
         <box>{{text}}</box>
+
+        <label text="reeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" limit-width="5" wrap="true"/>
+        <input onchange="notify-send 'ree' '{}'"/>
+          {{date}}
       </box>
     </def>
 
@@ -31,22 +35,21 @@
 
     <def name="music">
       <box orientation="h" valign="start" space-evenly="false" hexpand="true">
-        <image path="{{song-image}}" width="150" height="150" />
+        <image visible="{{song-image-visible}}" path="{{song-image}}" width="150" height="150" />
         <box orientation="v" halign="fill" space-evenly="false" vexpand="true" hexpand="true">
           <box class="data" vexpand="true">
             <box orientation="v" halign="start">
               <label class="songname" halign="start" limit-width="30" text="{{song-name}}" />
               <box space-evenly="false" halign="start">
-                <label class="key" text="Album: "/>
+                <label class="key" text="Album: " />
                 <label halign="start" limit-width="30" text="{{song-album}}" />
               </box>
               <box space-evenly="false" halign="start">
-                <label class="key" text="By:    "/>
+                <label class="key" text="By:    " />
                 <label halign="start" limit-width="30" text="{{song-artist}}" />
               </box>
             </box>
           </box>
-          <scale visible="{{song-show-progress}}" min="0" max="1" value="{{song-position}}" />
           <box class="buttons" hexpand="true">
             <button onclick="playerctl previous"></button>
             <button onclick="playerctl play-pause">{{song-playpause}}</button>
@@ -60,25 +63,33 @@
 
 
   <variables>
-    <script-var name="volume">
-      amixer sget 'Master' | grep 'Front Left:' | sed 's/.*\[\(.*\)%\].*/\1/g';
-      LANG=C pactl subscribe | grep --line-buffered sink | while read -r _; do
-        amixer sget 'Master' | grep 'Front Left:' | sed 's/.*\[\(.*\)%\].*/\1/g'
-      done
-    </script-var>
+    <!--<script-var name="volume">-->
+      <!--amixer sget 'Master' | grep 'Front Left:' | sed 's/.*\[\(.*\)%\].*/\1/g';-->
+      <!--LANG=C pactl subscribe | grep REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE-line-buffered sink | while read -r _; do-->
+        <!--amixer sget 'Master' | grep 'Front Left:' | sed 's/.*\[\(.*\)%\].*/\1/g'-->
+      <!--done-->
+    <!--</script-var>-->
 
     <var name="shit">
       shit
     </var>
 
     <var name="song-image"></var>
+    <var name="song-image-visible">true</var>
     <var name="song-name"></var>
     <var name="song-album"></var>
     <var name="song-artist"></var>
     <var name="song-show-progress">false</var>
     <var name="song-playpause"></var>
-    <!--<script-var name="song-position" interval="5s">-->
-    <!--playerctl position-->
+    <script-var name="date" interval="1s">
+      date
+    </script-var>
+    <!--<script-var name="xyz">-->
+      <!--tail -F /home/leon/test | while read -r _; do notify-send "Hi"; done-->
+    <!--</script-var>-->
+
+    <!--<script-var name="foo">-->
+      <!--tail -F /home/leon/test-->
     <!--</script-var>-->
   </variables>
 
diff --git a/files/.config/eww/music.sh b/files/.config/eww/music.sh
index 4b79cd7..c7a609e 100755
--- a/files/.config/eww/music.sh
+++ b/files/.config/eww/music.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/usr/bin/env bash
 
 
 
@@ -10,6 +10,12 @@ getData() {
   eww update song-name "$(playerctl metadata --format "{{ xesam:title }}")"
   wget -O /tmp/music-file "$(playerctl metadata --format "{{ mpris:artUrl }}"| fixArtUrl)"
   eww update song-image /tmp/music-file
+  if [ -f /tmp/music-file ]; then
+    eww update song-image-visible true
+  else
+    eww update song-image-visible false
+  fi
+
   eww update song-album "$(playerctl metadata --format "{{ xesam:album }}")"
   eww update song-artist "$(playerctl metadata --format "{{ xesam:artist }}")"
   if [ "spotify" = "$(playerctl metadata | head -n1 | awk '{ print $1 }')" ]; then
@@ -28,5 +34,5 @@ getData() {
 
 }
 
-#getData
-cat <(playerctl metadata --format '{{ title }}' -F & playerctl status -F) | while read -r _; do getData; done;
+getData
+cat <(playerctl metadata --format '{{ title }}' -F & playerctl status -F) 2>&1 /dev/null
diff --git a/files/.config/eww/popup.sh b/files/.config/eww/popup.sh
index 9f07474..cb2e400 100755
--- a/files/.config/eww/popup.sh
+++ b/files/.config/eww/popup.sh
@@ -5,8 +5,8 @@ window_name="$2"
 
 
 
-kill -9 "$(cat /tmp/eww-popup.pid)" || \
-  eww -d open "$window_name"
+#kill -9 "$(cat /tmp/eww-popup.pid)" || \
+  #eww -d open "$window_name"
 
-{ sleep "$secs"; eww close "$window_name"; } &
-echo $! > /tmp/eww-popup.pid
+#{ sleep "$secs"; eww close "$window_name"; } &
+#echo $! > /tmp/eww-popup.pid
diff --git a/files/.config/picom.conf b/files/.config/picom.conf
index fd2ef5c..2cfba8a 100644
--- a/files/.config/picom.conf
+++ b/files/.config/picom.conf
@@ -36,6 +36,7 @@ shadow-opacity = 0.5;
 # shadow-blue = 0.0;
 
 shadow-exclude = [
+     "name = 'GLava'",
     "! name~=''",
     #"!focused && ! class_g ?='xfce4-notifyd'",
     #"name *= 'polybar'",
@@ -86,6 +87,7 @@ blur-size = 14;
 # Do not let blur radius adjust based on window opacity.
 blur-background-fixed = true;
 blur-background-exclude = [
+     "name = 'GLava'",
     "window_type = 'dock'",
     "window_type = 'desktop'",
 
diff --git a/files/.xmonad/lib/Config.hs b/files/.xmonad/lib/Config.hs
index 7059e0e..309e7bc 100644
--- a/files/.xmonad/lib/Config.hs
+++ b/files/.xmonad/lib/Config.hs
@@ -159,7 +159,7 @@ aqua      = "#8ec07c"
 -- Layout ---------------------------------------- {{{
 myTabTheme :: Theme
 myTabTheme = def -- defaultThemeWithButtons
-    { activeColor         = "#202020" --activeColor         = "#1d2021"
+    { activeColor         = "#1d2021" --activeColor         = "#1d2021"
     , inactiveColor       = "#1d2021" --inactiveColor       = "#282828"
     , activeBorderColor   = "#1d2021"
     , inactiveBorderColor = "#282828"
@@ -588,6 +588,11 @@ fullscreenFixEventHook (ClientMessageEvent _ _ _ dpy win typ (_:dats)) = do
     withWindowAttributes dpy win $ \attrs ->
       liftIO $ resizeWindow dpy win (fromIntegral $ wa_width attrs + 1) (fromIntegral $ wa_height attrs)
   return $ All True
+--fullscreenFixEventHook (ClientMessageEvent { ev_event_type, ev_window }) = do
+  --if ev_event_type == propertyNotify then
+    --spawn $ "notify-send 'hi'" ++ show ev_window
+    --else return ()
+  --return $ All True
 fullscreenFixEventHook _ = return $ All True
 
   
diff --git a/files/firefoxChrome/chrome/userChrome.css b/files/firefoxChrome/chrome/userChrome.css
index d5bb7d2..3d3b3d2 100644
--- a/files/firefoxChrome/chrome/userChrome.css
+++ b/files/firefoxChrome/chrome/userChrome.css
@@ -374,9 +374,6 @@ toolbarseparator {
   fill: #ebdbb2 !important;
 }
 
-.urlbarView-row[selected="true"] {
-  color: red;
-}
 
 /* }}} */
 
diff --git a/files/nix-stuff/nixpkgs/modules/base.nix b/files/nix-stuff/nixpkgs/modules/base.nix
index f13e844..beb3323 100644
--- a/files/nix-stuff/nixpkgs/modules/base.nix
+++ b/files/nix-stuff/nixpkgs/modules/base.nix
@@ -79,6 +79,7 @@ in
           cargo-expand
           gdbgui
           lldb
+          zola
         ]
       )
       (