From c7fbab90deb9f908767c75513bd2568c6bae1032 Mon Sep 17 00:00:00 2001
From: elkowar <5300871+elkowar@users.noreply.github.com>
Date: Sat, 7 Nov 2020 14:05:49 +0100
Subject: [PATCH] asdf

---
 .../configstore/update-notifier-npm.json      |  2 +-
 files/.config/eww/eww.xml                     | 32 ++++++++-----------
 files/nix-stuff/nixpkgs/modules/base.nix      |  1 +
 files/nix-stuff/nixpkgs/modules/desktop.nix   |  1 +
 .../nixpkgs/modules/term/zsh/default.nix      |  4 +++
 .../nixpkgs/packages/alacritty-overlay.nix    | 20 ++++++++++--
 files/nix-stuff/nixpkgs/result                |  2 +-
 7 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/files/.config/configstore/update-notifier-npm.json b/files/.config/configstore/update-notifier-npm.json
index 58d1400..dc039ab 100644
--- a/files/.config/configstore/update-notifier-npm.json
+++ b/files/.config/configstore/update-notifier-npm.json
@@ -1,4 +1,4 @@
 {
 	"optOut": false,
-	"lastUpdateCheck": 1603626767242
+	"lastUpdateCheck": 1604693331097
 }
\ No newline at end of file
diff --git a/files/.config/eww/eww.xml b/files/.config/eww/eww.xml
index 583ec3c..6d64c67 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" orientation="v" min="0" max="100" flipped="true"/>
+        <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' '{}'" />
@@ -21,9 +21,9 @@
         <box>{{text}}</box>
         <box>{{text}}</box>
 
-        <label text="reeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" limit-width="5" wrap="true"/>
-        <input onchange="notify-send 'ree' '{}'"/>
-          {{date}}
+        <label text="reeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" limit-width="5" wrap="true" />
+        <input onchange="notify-send 'ree' '{}'" />
+        {{date}}
       </box>
     </def>
 
@@ -63,12 +63,12 @@
 
 
   <variables>
-    <!--<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>-->
+    <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
@@ -85,33 +85,29 @@
       date
     </script-var>
     <!--<script-var name="xyz">-->
-      <!--tail -F /home/leon/test | while read -r _; do notify-send "Hi"; done-->
+    <!--tail -F /home/leon/test | while read -r _; do notify-send "Hi"; done-->
     <!--</script-var>-->
 
     <!--<script-var name="foo">-->
-      <!--tail -F /home/leon/test-->
+    <!--tail -F /home/leon/test-->
     <!--</script-var>-->
   </variables>
 
 
   <windows>
     <window screen="0" name="main_window" stacking="fg">
-      <pos x="50px" y="0px" />
-      <size x="30%" y="20%" />
+      <geometry anchor="top center"/>
       <widget>
         <test ree="test" />
       </widget>
     </window>
     <window screen="0" name="volume_popup">
-      <size x="20" y="300" />
-      <pos x="2500" y="720" />
+      <geometry />
       <widget>
         <volume_popup />
       </widget>
     </window>
     <window screen="0" name="music">
-      <pos x="80%" y="6%" />
-      <size x="18%" y="10%" />
       <widget>
         <music />
       </widget>
diff --git a/files/nix-stuff/nixpkgs/modules/base.nix b/files/nix-stuff/nixpkgs/modules/base.nix
index beb3323..011682e 100644
--- a/files/nix-stuff/nixpkgs/modules/base.nix
+++ b/files/nix-stuff/nixpkgs/modules/base.nix
@@ -80,6 +80,7 @@ in
           gdbgui
           lldb
           zola
+          python38Packages.pylint
         ]
       )
       (
diff --git a/files/nix-stuff/nixpkgs/modules/desktop.nix b/files/nix-stuff/nixpkgs/modules/desktop.nix
index 3174e16..1893319 100644
--- a/files/nix-stuff/nixpkgs/modules/desktop.nix
+++ b/files/nix-stuff/nixpkgs/modules/desktop.nix
@@ -24,6 +24,7 @@ in
       polybarFull
       discord
       pinta
+      espanso
       #hyper-haskell
     ];
 
diff --git a/files/nix-stuff/nixpkgs/modules/term/zsh/default.nix b/files/nix-stuff/nixpkgs/modules/term/zsh/default.nix
index a7449f1..360d84b 100644
--- a/files/nix-stuff/nixpkgs/modules/term/zsh/default.nix
+++ b/files/nix-stuff/nixpkgs/modules/term/zsh/default.nix
@@ -152,6 +152,10 @@ in
         autoload -Uz promptinit && promptinit
 
 
+        # control-backspace
+        bindkey '^H' backward-kill-word
+
+
         #_comp_options+=(globdots)
 
         # enable cdr command
diff --git a/files/nix-stuff/nixpkgs/packages/alacritty-overlay.nix b/files/nix-stuff/nixpkgs/packages/alacritty-overlay.nix
index 7f5d7eb..281a044 100644
--- a/files/nix-stuff/nixpkgs/packages/alacritty-overlay.nix
+++ b/files/nix-stuff/nixpkgs/packages/alacritty-overlay.nix
@@ -1,4 +1,4 @@
-{ nixGL, symlinkJoin, makeWrapper, writeScriptBin, alacritty }:
+{ nixGL, symlinkJoin, makeWrapper, writeScriptBin, alacritty, fetchFromGitHub, lib }:
 let
   wrapped =
     writeScriptBin "alacritty" ''
@@ -10,5 +10,21 @@ in
 symlinkJoin {
   name = "alacritty";
   nativeBuildInputs = [ makeWrapper ];
-  paths = [ wrapped alacritty ];
+  paths = [
+    wrapped
+    alacritty
+    #(alacritty.overrideAttrs (oldAttrs: rec {
+      #src = fetchFromGitHub {
+        #owner = "zenixls2";
+        #repo = "alacritty";
+        #rev = "ligature";
+        #sha256 = "00jyhq7wrb2jpzmif4mimbh6p3wwa7rd1chsdwcdi0j9i9w2jpkx";
+      #};
+      #cargoDeps = oldAttrs.cargoDeps.overrideAttrs (lib.const {
+        #name = "alacritty-vendor.tar.gz";
+        #inherit src;
+        #outputHash = "1sg1ay31x8n60j76vg7lg4a24vilv5wd9pgpwphzgf6arbyx7wpn";
+      #});
+    #}))
+  ];
 }
diff --git a/files/nix-stuff/nixpkgs/result b/files/nix-stuff/nixpkgs/result
index 8a8bedc..487a42b 120000
--- a/files/nix-stuff/nixpkgs/result
+++ b/files/nix-stuff/nixpkgs/result
@@ -1 +1 @@
-/nix/store/sxyn1651vx2vznd3f35484qm5qf8in8x-options.json
\ No newline at end of file
+/nix/store/qyshbwsnbiiwbjanxk6yfsqa8pcbkbyq-options.json
\ No newline at end of file