From e6b215cefd190e1d7cc052a880cf392db41bfef7 Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Sat, 6 Mar 2021 17:40:23 +0000
Subject: [PATCH] oh god what have i done

---
 config/profiles/common/nixos/nix.nix         |  4 ++--
 config/profiles/sway/home/sway.nix           |  4 ++--
 config/profiles/sway/home/waybar/default.nix | 18 +++++++-----------
 todo.org                                     |  2 ++
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/config/profiles/common/nixos/nix.nix b/config/profiles/common/nixos/nix.nix
index 67bdcea3..0fc808e7 100644
--- a/config/profiles/common/nixos/nix.nix
+++ b/config/profiles/common/nixos/nix.nix
@@ -7,13 +7,13 @@
   nixpkgs.config = { allowUnfree = true; };
   nix = {
     nixPath = [
-      "nixpkgs=${sources.nixpkgs}"
+      "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos"
       "nixpkgs-unstable=${sources.nixpkgs-unstable}"
       "nixpkgs-mozilla=${sources.nixpkgs-mozilla}"
       "NUR=${sources.NUR}"
       "arc=${sources.arc-nixexprs}"
     ];
-    binaryCaches = [ "https://arc.cachix.org" ];
+    binaryCaches = [ "https://cache.nixos.org" "https://arc.cachix.org" ];
     binaryCachePublicKeys =
       [ "arc.cachix.org-1:DZmhclLkB6UO0rc0rBzNpwFbbaeLfyn+fYccuAy7YVY=" ];
     gc.automatic = lib.mkDefault true;
diff --git a/config/profiles/sway/home/sway.nix b/config/profiles/sway/home/sway.nix
index 3ed8a8fc..c300567b 100644
--- a/config/profiles/sway/home/sway.nix
+++ b/config/profiles/sway/home/sway.nix
@@ -43,8 +43,8 @@
           };
         in {
           "DP-1" = left;
-          "DVI-D-1" = middle;
-          "HDMI-A-1" = right;
+          "DVI-D-1" = right;
+          "HDMI-A-1" = middle;
           "eDP-1" = laptop;
         };
 
diff --git a/config/profiles/sway/home/waybar/default.nix b/config/profiles/sway/home/waybar/default.nix
index d823eebd..bd9f560e 100644
--- a/config/profiles/sway/home/waybar/default.nix
+++ b/config/profiles/sway/home/waybar/default.nix
@@ -10,7 +10,7 @@
       };
       settings = [{
         modules-left = [ "sway/workspaces" "sway/mode" "sway/window" ];
-        modules-center = [ "clock" "custom/weather" ];
+        modules-center = [ "clock" ]; # "custom/weather"
         modules-right = [
           "pulseaudio"
           "network"
@@ -23,16 +23,12 @@
         ];
 
         modules = {
-          "custom/weather" = {
-            format = "{}";
-            interval = 3600;
-            on-click = "xdg-open 'https://google.com/search?q=weather'";
-            exec = "nix-shell --command 'python ${
-                ../../../../../scripts/weather/weather.py
-              } ${witch.secrets.profiles.sway.city} ${witch.secrets.profiles.sway.api_key}' ${
-                ../../../../../scripts/weather
-              }";
-          };
+          #"custom/weather" = {
+          #  format = "{}";
+          #  interval = 3600;
+          #  on-click = "xdg-open 'https://google.com/search?q=weather'";
+          #  exec = "nix-shell --command 'python ${../../../../../scripts/weather/weather.py} ${witch.secrets.profiles.sway.city} ${witch.secrets.profiles.sway.api_key}' ${../../../../../scripts/weather}";
+          #};
           cpu = { format = "  {usage}%"; };
           memory = { format = "  {percentage}%"; };
           temperature = { format = "﨎 {temperatureC}°C"; };
diff --git a/todo.org b/todo.org
index 8bfb5c0e..ad89d12c 100644
--- a/todo.org
+++ b/todo.org
@@ -6,6 +6,8 @@ https://nixos.wiki/wiki/Virtualization_in_NixOS#Okay.2C_Okay.2C_I.27ll_Do_It_Mys
 ** TODO Add dork.dev to mailserver
 Don't want to pay for fastmail.
 
+** TODO MPV home-manager module rebind scrollwheel
+
 ** TODO Migrate non-PGSQL services to PGSQL
 bitwarden-rs, Gitea, ...