From 6aeea49dba3be8ef631b3925bfbb9a9188880789 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Wed, 6 May 2020 11:01:08 +0200
Subject: [PATCH] Install select-mode

---
 home/desktop/status-monitoring.toml | 57 -----------------------------
 home/desktop/sway.nix               | 26 -------------
 home/laptop.nix                     |  4 ++
 home/zsh/default.nix                |  2 +-
 4 files changed, 5 insertions(+), 84 deletions(-)
 delete mode 100644 home/desktop/status-monitoring.toml

diff --git a/home/desktop/status-monitoring.toml b/home/desktop/status-monitoring.toml
deleted file mode 100644
index 6467d3ab..00000000
--- a/home/desktop/status-monitoring.toml
+++ /dev/null
@@ -1,57 +0,0 @@
-theme = "plain"
-icons = "awesome"
-
-[[block]]
-block = "speedtest"
-bytes = false
-interval = 1800
-
-[[block]]
-block = "temperature"
-collapsed = false
-interval = 10
-format = "{min}° min, {max}° max, {average}° avg"
-chip = "*-isa-*"
-
-[[block]]
-block = "net"
-device = "wlp61s0"
-ssid = true
-ip = true
-speed_up = true
-speed_down = true
-graph_up = true
-graph_down = true
-interval = 5
-
-[[block]]
-block = "net"
-device = "enp0s31f6"
-ssid = true
-ip = true
-speed_up = true
-speed_down = true
-graph_up = true
-graph_down = true
-interval = 5
-
-[[block]]
-block = "disk_space"
-path = "/"
-alias = "/"
-info_type = "available"
-unit = "GB"
-interval = 60
-warning = 20.0
-alert = 10.0
-
-[[block]]
-block = "memory"
-display_type = "memory"
-format_mem = "{Mup}%"
-format_swap = "{SUp}%"
-
-[[block]]
-block = "load"
-interval = 5
-format = "{1m}"
diff --git a/home/desktop/sway.nix b/home/desktop/sway.nix
index e69a745e..a7403aae 100644
--- a/home/desktop/sway.nix
+++ b/home/desktop/sway.nix
@@ -174,32 +174,6 @@ in {
               }
           }
       }
-      bar {
-          id monitoring
-          status_command ${pkgs.i3status-rust}/bin/i3status-rs ${
-            ./status-monitoring.toml
-          };
-          status_padding 0
-          status_edge_padding 0
-          font monospace 9.5
-          height 17
-          workspace_buttons no
-          position top
-          modifier none
-
-          mode invisible
-
-          colors {
-              statusline ${colors.foreground}
-              background ${colors.background}
-              ${
-                lib.concatStringsSep "\n" (lib.mapAttrsToList (category:
-                  { background, border, text }: ''
-                    ${category} ${background} ${border} ${text}
-                  '') barColors)
-              }
-          }
-      }
 
       exec random-wallpaper
       exec ${pkgs.mako}/bin/mako --background-color "${colors.background}cc" --text-color "${colors.foreground}" --border-size 0
diff --git a/home/laptop.nix b/home/laptop.nix
index 63a4a8f2..2b208ce3 100644
--- a/home/laptop.nix
+++ b/home/laptop.nix
@@ -11,6 +11,10 @@ in {
     updateHome = pkgs.writeShellScriptBin "update-home-mode" ''
       update-home -A apollo-`cat ~/tmp/mode`
     '';
+    selectMode = pkgs.writeShellScriptBin "select-mode" ''
+      ${pkgs.dialog}/bin/dialog --menu "Select Mode" 20 80 5 research "" orga "" tinkering "" leisure "" 2> ~/tmp/mode
+    '';
+
     inherit (unfreePkgs) zoom-us skypeforlinux google-chrome;
     inherit (pkgs.gnome3) nautilus;
     inherit (pkgs.xorg) xbacklight;
diff --git a/home/zsh/default.nix b/home/zsh/default.nix
index ca966b73..d0d2476a 100644
--- a/home/zsh/default.nix
+++ b/home/zsh/default.nix
@@ -15,7 +15,7 @@
         if [ "$(tty)" = "/dev/tty1" ]; then
            . ${my-pkgs.start-ssh-agent}/bin/start-ssh-agent
            while true; do
-             ${pkgs.dialog}/bin/dialog --menu "Select Mode" 20 80 5 research "" orga "" tinkering "" leisure "" --stderr 2> ~/tmp/mode
+             select-mode
              update-home-mode
              echo Launching sway at $(date) >> ~/tmp/sway.log
              ${pkgs.sway}/bin/sway >> ~/tmp/sway.log