minor nix updates

neeasade · Mar 18, 2020 · d4bea40 · d4bea40
1 parent 1712e0e
commit d4bea40
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 19 deletions.
diff --git a/bin/bin/elisp b/bin/bin/elisp
@@ -31,7 +31,7 @@ add_stdin() {
 	if [ -d /dev/shm/ ]; then
 	    stdin_file=/dev/shm/elisp-${RANDOM}
 	else
-	    stdin_file=$(elisp -r '(~ "elisp-temp")')
+	    stdin_file=$(mktemp)
 	fi
 
 	cat - > "$stdin_file"

diff --git a/nixos/config/expr/default.nix b/nixos/config/expr/default.nix
@@ -78,7 +78,6 @@
       }));
 
 
-
       pfetch-neeasade = (edge.pfetch.overrideAttrs(old: {
         src = builtins.fetchGit {url = "https://github.com/neeasade/pfetch"; ref = "neeasade"; };
       }));

diff --git a/nixos/config/packages.nix b/nixos/config/packages.nix
@@ -171,7 +171,6 @@ let
     xorg.xwininfo
     xtitle
     youtube-dl
-    qutebrowser
     pinta
 
     polybar
@@ -198,6 +197,7 @@ let
     wmutils-opt-git
     xdo-git
   ]) ++ (with edge; [
+    qutebrowser
     # emacs
     # allow images to display
     # (emacs.override { imagemagick = pkgs.imagemagickBig; } )
@@ -247,7 +247,6 @@ let
   ]);
 
   games = (with stable; [
-    minecraft
     nethack
     # wesnoth
     # dolphinEmu
@@ -260,6 +259,7 @@ let
     # wineUnstable
     # (wine.override { wineBuild = "wineWow"; })
   ]) ++ (with unstable; [
+    minecraft
     openmw
     steam
     # openmw-tes3mp

diff --git a/nixos/machines/erasmus/configuration.nix b/nixos/machines/erasmus/configuration.nix
@@ -10,8 +10,6 @@
       ./hardware-configuration.nix
       ../../config/packages.nix
       ../../config/services.nix
-      # (import ./packages.nix {inherit config pkgs lib; })
-      # (import ./services.nix {inherit config pkgs; })
     ];
 
   # Use the systemd-boot EFI boot loader.

diff --git a/wm/.wm/panel/lemons/battery b/wm/.wm/panel/lemons/battery
@@ -1,18 +1,20 @@
 #!/bin/sh
 
-# icon battery
+icon battery
 
 BATC=/sys/class/power_supply/BAT0/capacity
 BATS=/sys/class/power_supply/BAT0/status
 
-if [ -f $BATC ]; then
+charge=100
+status=Charging
 
-    # compact:
-    # printf '%s%s\n' $(iif '[ "$(cat $BATS)" = "Charging" ]' \+ \-) $(cat $BATC)
+if [ -f $BATC ]; then
+    charge=$(cat $BATC)
+fi
 
-    printf '%s%s\n' $(iif '[ "$(cat $BATS)" = "Charging" ]' \+ '') $(mkb $(cat $BATC) 20)
-else
-    # no battery information found.
-    # TODO: plugged in icon if full
-    echo '+100'
+if [ -f $BATS ]; then
+    status=$(cat $BATS)
 fi
+
+# printf '%s%s\n' $(iif "[ '$status' = 'Charging' ]" \+ \-) $charge
+printf '%s%s\n' $(iif "[ '$status' = 'Charging' ]" \+ '') "$(mkb $charge 20)"
diff --git a/wm/.wm/panel/tools/mkb b/wm/.wm/panel/tools/mkb
@@ -17,6 +17,10 @@ size=${size:-32}
 passed=false
 content="${l_start}"
 
+if [ $progress -eq 100 ]; then
+    l_sep=$l_complete
+fi
+
 content="${content}${start}"
 for i in $(seq 1 $size); do
     if [ "$(echo "$i < $progress / 100 * $size" | bc -l)" = 1 ]; then

diff --git a/wm/.wm/themes/test b/wm/.wm/themes/test
@@ -41,11 +41,9 @@ settings() {
     # bspwm
     b_border_width=1
     b_normal_border_color=B0A8A6
-    b_window_gap=10
+    b_window_gap=15
 
-    b_bspwmrc_extend="
-xpad &
-"
+    b_bspwmrc_extend="xpad &"
 
     x_padding=6