diff --git a/flake.lock b/flake.lock
index f5a95bc..b903ddf 100644
--- a/flake.lock
+++ b/flake.lock
@@ -80,11 +80,19 @@
     },
     "nixpkgs-stable": {
       "locked": {
+<<<<<<< HEAD
+        "lastModified": 1758070117,
+        "narHash": "sha256-uLwwHFCZnT1c3N3biVe/0hCkag2GSrf9+M56+Okf+WY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "e9b7f2ff62b35f711568b1f0866243c7c302028d",
+=======
         "lastModified": 1758346548,
         "narHash": "sha256-afXE7AJ7MY6wY1pg/Y6UPHNYPy5GtUKeBkrZZ/gC71E=",
         "owner": "NixOS",
         "repo": "nixpkgs",
         "rev": "b2a3852bd078e68dd2b3dfa8c00c67af1f0a7d20",
+>>>>>>> 7f80ed4 (ADD: various things ...)
         "type": "github"
       },
       "original": {
@@ -96,11 +104,19 @@
     },
     "nixpkgs-unstable": {
       "locked": {
+<<<<<<< HEAD
+        "lastModified": 1758098782,
+        "narHash": "sha256-sX+iNoZkgSQsnsCHO6aI7mYh2GqbYDLWMB0iN41i61k=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "5874893c92e656c85dc729e8b570fc38d3c85853",
+=======
         "lastModified": 1758395428,
         "narHash": "sha256-VPLAH58pBb+6qHXKy/RbJi0jedJ14atDh3r5VNB1uNk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
         "rev": "2e894638a7716cb1161a1084e04af88d98684855",
+>>>>>>> 7f80ed4 (ADD: various things ...)
         "type": "github"
       },
       "original": {
@@ -116,11 +132,19 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
+<<<<<<< HEAD
+        "lastModified": 1758144108,
+        "narHash": "sha256-fq/Fd89pUrdVcFmw8aNVQoF9UPq7L5gtS/0ioPTUNKg=",
+        "owner": "nix-community",
+        "repo": "NUR",
+        "rev": "47a4f8514d9aecd033d53a84f698a115b3074f2b",
+=======
         "lastModified": 1758450341,
         "narHash": "sha256-0kaTYX6B3c1oY1PmOnv4eJAEaKHA/tfK1ay/YNnX2cc=",
         "owner": "nix-community",
         "repo": "NUR",
         "rev": "b1fb458916c940a2a47e4f01f24129c719d53343",
+>>>>>>> 7f80ed4 (ADD: various things ...)
         "type": "github"
       },
       "original": {
diff --git a/hm/common/zsh.nix b/hm/common/zsh.nix
index 7f1a8f1..504140b 100644
--- a/hm/common/zsh.nix
+++ b/hm/common/zsh.nix
@@ -26,10 +26,6 @@ _: {
       M = "| more";
     };
     syntaxHighlighting.enable = true;
-
-    profileExtra = ''
-      ssh-add ~/.ssh/$(hostname)
-    '';
   };
 }
 # vim: set ts=2 sw=2 sts=2 et :
diff --git a/hm/desktop/bspwm.nix b/hm/desktop/bspwm.nix
index 8247da5..7039aff 100644
--- a/hm/desktop/bspwm.nix
+++ b/hm/desktop/bspwm.nix
@@ -23,11 +23,11 @@
       "sxhkd -m 1"
       "setxkbmap bepovim"
       "xrandr --output DisplayPort-1 --rate 60 --pos 0x0"
-      "polybar main"
+#      "while pgrep -x polybar >/dev/null; do sleep 1; done; polybar main"
       "bash ~/.fehbg"
     ];
 
-    extraConfigEarly = ''
+    extraConfig = ''
       bspc config borderless_monocle true
       bspc config gapless_monocle true
       bspc config single_monocle true