From 3e796d62a5adf4cabf11e4bcd0ddc97d204cc895 Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Thu, 16 Feb 2023 08:17:30 +0100 Subject: [PATCH 1/3] Update flake.lock MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Updated input 'disko': 'github:nix-community/disko/072aa7879a537f2f1e8d44108dc6f30990f7297c' (2023-02-13) → 'github:nix-community/disko/9afae0ba3685656cbe1910b33fad758dd483137f' (2023-02-14) • Updated input 'emacs-overlay': 'github:nix-community/emacs-overlay/09ebba158540ba3171b5f319b71427b51db8794b' (2023-02-13) → 'github:nix-community/emacs-overlay/8e8c7ab6874c97b4d1c23a5a204b6743b40cee78' (2023-02-16) • Updated input 'flake-utils': 'github:numtide/flake-utils/5aed5285a952e0b949eb3ba02c12fa4fcfef535f' (2022-11-02) → 'github:numtide/flake-utils/3db36a8b464d0c4532ba1c7dda728f4576d6d073' (2023-02-13) • Updated input 'home-manager': 'github:nix-community/home-manager/2dce7f1a55e785a22d61668516df62899278c9e4' (2023-02-09) → 'github:nix-community/home-manager/da72e6fc6b7dc0c3f94edbd310aae7cd95c678b5' (2023-02-14) • Updated input 'hyprland': 'github:Hyprwm/Hyprland/6b7e409f05536e45baa3dabeab0df77d05c9a96f' (2023-02-12) → 'github:Hyprwm/Hyprland/ab6a092dbc99bfdb2cd40f46e2f34f74cce88c15' (2023-02-15) • Updated input 'nil': 'github:oxalica/nil/ce2e0b5d60fe497134050796f7d12ffb6b50eb28' (2023-02-11) → 'github:oxalica/nil/944d5c335531778a1d7b54a97bf7fb5ec0c3e976' (2023-02-14) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/e5530aba13caff5a4f41713f1265b754dc2abfd8' (2023-02-11) → 'github:nixos/nixpkgs/545c7a31e5dedea4a6d372712a18e00ce097d462' (2023-02-13) • Updated input 'pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/15f2da96967d4c828ae678af50f75214372fd3ce' (2023-02-12) → 'github:cachix/pre-commit-hooks.nix/5f0cba88ac4d6dd8cad5c6f6f1540b3d6a21a798' (2023-02-16) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/1bd5d7bb2f31cbc43fb8f722e3a39a45ee4dcec8' (2023-02-13) → 'github:oxalica/rust-overlay/3bab7ae4a80de02377005d611dc4b0a13082aa7c' (2023-02-16) --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index af090ca..c7ecb7b 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1676252588, - "narHash": "sha256-zlgRq5rkOGae6f3CY4Gm0PqmobDusm3wsXamckh5WE0=", + "lastModified": 1676351004, + "narHash": "sha256-vnjHRdKh+EcIUUS6l2Hpjl2v6SEio4gYlzvjtKwWvV4=", "owner": "nix-community", "repo": "disko", - "rev": "072aa7879a537f2f1e8d44108dc6f30990f7297c", + "rev": "9afae0ba3685656cbe1910b33fad758dd483137f", "type": "github" }, "original": { @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1676258056, - "narHash": "sha256-LhXVnPc+IPHupy7QexUrzYuloSGXvXEgvIkAlhFs+yY=", + "lastModified": 1676516909, + "narHash": "sha256-wcOs073lEtXZ0uXssoopIzjdFOPSyEvePz2vBjElNeE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "09ebba158540ba3171b5f319b71427b51db8794b", + "rev": "8e8c7ab6874c97b4d1c23a5a204b6743b40cee78", "type": "github" }, "original": { @@ -61,11 +61,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", "type": "github" }, "original": { @@ -136,11 +136,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1675935446, - "narHash": "sha256-WajulTn7QdwC7QuXRBavrANuIXE5z+08EdxdRw1qsNs=", + "lastModified": 1676367705, + "narHash": "sha256-un5UbRat9TwruyImtwUGcKF823rCEp4fQxnsaLFL7CM=", "owner": "nix-community", "repo": "home-manager", - "rev": "2dce7f1a55e785a22d61668516df62899278c9e4", + "rev": "da72e6fc6b7dc0c3f94edbd310aae7cd95c678b5", "type": "github" }, "original": { @@ -159,11 +159,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1676240687, - "narHash": "sha256-Qzgd87UF64k4Es8SFY/IOKDGKD1DlFT60+TAke8qV7Q=", + "lastModified": 1676486723, + "narHash": "sha256-QLinOK1H0hUA9sDj2Hx97OfUE6IcXf071yx9uchmRPA=", "owner": "Hyprwm", "repo": "Hyprland", - "rev": "6b7e409f05536e45baa3dabeab0df77d05c9a96f", + "rev": "ab6a092dbc99bfdb2cd40f46e2f34f74cce88c15", "type": "github" }, "original": { @@ -249,11 +249,11 @@ ] }, "locked": { - "lastModified": 1676110678, - "narHash": "sha256-hemg8rMKS2me2Wua9ZG/0aQ8fEOfytjyKB+WYcXfEKE=", + "lastModified": 1676390054, + "narHash": "sha256-w0KvrM+9WIEYr0juDh4Vs39ed2IaT0T696fp9pZ7i1I=", "owner": "oxalica", "repo": "nil", - "rev": "ce2e0b5d60fe497134050796f7d12ffb6b50eb28", + "rev": "944d5c335531778a1d7b54a97bf7fb5ec0c3e976", "type": "github" }, "original": { @@ -299,11 +299,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1676110339, - "narHash": "sha256-kOS/L8OOL2odpCOM11IevfHxcUeE0vnZUQ74EOiwXcs=", + "lastModified": 1676300157, + "narHash": "sha256-1HjRzfp6LOLfcj/HJHdVKWAkX9QRAouoh6AjzJiIerU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e5530aba13caff5a4f41713f1265b754dc2abfd8", + "rev": "545c7a31e5dedea4a6d372712a18e00ce097d462", "type": "github" }, "original": { @@ -401,11 +401,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1676233402, - "narHash": "sha256-43JNeMD1g4skb5xhq4w6atlIHe7Fb0UOgVNSsif1RVU=", + "lastModified": 1676513100, + "narHash": "sha256-MK39nQV86L2ag4TmcK5/+r1ULpzRLPbbfvWbPvIoYJE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "15f2da96967d4c828ae678af50f75214372fd3ce", + "rev": "5f0cba88ac4d6dd8cad5c6f6f1540b3d6a21a798", "type": "github" }, "original": { @@ -446,11 +446,11 @@ ] }, "locked": { - "lastModified": 1676255417, - "narHash": "sha256-YYOQgNNQOq4oBbkbM+rG4mDOms3ztjIqxWOrMWsZ+xg=", + "lastModified": 1676514619, + "narHash": "sha256-/zVNJdETe/7txiP8NVjAjrAPudLIvjKJWgztuTi75Qw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1bd5d7bb2f31cbc43fb8f722e3a39a45ee4dcec8", + "rev": "3bab7ae4a80de02377005d611dc4b0a13082aa7c", "type": "github" }, "original": { From 593b575ccb179f4cf0338353ab98f7bc937b0f7a Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Fri, 17 Feb 2023 11:53:15 +0100 Subject: [PATCH 2/3] Update flake.lock MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Updated input 'emacs-overlay': 'github:nix-community/emacs-overlay/8e8c7ab6874c97b4d1c23a5a204b6743b40cee78' (2023-02-16) → 'github:nix-community/emacs-overlay/cd34501a9bcec341533c7131af77572456c100d8' (2023-02-17) • Updated input 'hyprland': 'github:Hyprwm/Hyprland/ab6a092dbc99bfdb2cd40f46e2f34f74cce88c15' (2023-02-15) → 'github:Hyprwm/Hyprland/be2e4d9dd1e58991a4f54078a331cbcbd8265c7f' (2023-02-17) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/545c7a31e5dedea4a6d372712a18e00ce097d462' (2023-02-13) → 'github:nixos/nixpkgs/28319deb5ab05458d9cd5c7d99e1a24ec2e8fc4b' (2023-02-15) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/3bab7ae4a80de02377005d611dc4b0a13082aa7c' (2023-02-16) → 'github:oxalica/rust-overlay/d0dc81ffe8ea09dbf3c07db62a1a057f5319e3ce' (2023-02-17) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index c7ecb7b..309db6c 100644 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1676516909, - "narHash": "sha256-wcOs073lEtXZ0uXssoopIzjdFOPSyEvePz2vBjElNeE=", + "lastModified": 1676628719, + "narHash": "sha256-yZM1hLxPS3OuKNduQSWmiYLAjIZeJ7ExWbCL3A3bi0U=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "8e8c7ab6874c97b4d1c23a5a204b6743b40cee78", + "rev": "cd34501a9bcec341533c7131af77572456c100d8", "type": "github" }, "original": { @@ -159,11 +159,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1676486723, - "narHash": "sha256-QLinOK1H0hUA9sDj2Hx97OfUE6IcXf071yx9uchmRPA=", + "lastModified": 1676630258, + "narHash": "sha256-pc3aIr2LgmJFcTQwICpz3d4/u5/xHDI14qY/zEhGM3k=", "owner": "Hyprwm", "repo": "Hyprland", - "rev": "ab6a092dbc99bfdb2cd40f46e2f34f74cce88c15", + "rev": "be2e4d9dd1e58991a4f54078a331cbcbd8265c7f", "type": "github" }, "original": { @@ -299,11 +299,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1676300157, - "narHash": "sha256-1HjRzfp6LOLfcj/HJHdVKWAkX9QRAouoh6AjzJiIerU=", + "lastModified": 1676481215, + "narHash": "sha256-afma/1RU0EePRyrBPcjBdOt+dV8z1bJH9dtpTN/WXmY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "545c7a31e5dedea4a6d372712a18e00ce097d462", + "rev": "28319deb5ab05458d9cd5c7d99e1a24ec2e8fc4b", "type": "github" }, "original": { @@ -446,11 +446,11 @@ ] }, "locked": { - "lastModified": 1676514619, - "narHash": "sha256-/zVNJdETe/7txiP8NVjAjrAPudLIvjKJWgztuTi75Qw=", + "lastModified": 1676601131, + "narHash": "sha256-iwCg6NimjD4euquhicmSo0wuyP56xUVJUMe0yqUyQms=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3bab7ae4a80de02377005d611dc4b0a13082aa7c", + "rev": "d0dc81ffe8ea09dbf3c07db62a1a057f5319e3ce", "type": "github" }, "original": { From 9a1b3027121ceb99dcf34ded49f0d812bd4fb7b4 Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Fri, 17 Feb 2023 11:54:06 +0100 Subject: [PATCH 3/3] Tweak polybar start script so bar on primary screen starts first --- home-manager/modules/polybar/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/home-manager/modules/polybar/default.nix b/home-manager/modules/polybar/default.nix index 5265c1a..902ef76 100644 --- a/home-manager/modules/polybar/default.nix +++ b/home-manager/modules/polybar/default.nix @@ -83,9 +83,13 @@ in ${pkgs.polybar}/bin/polybar-msg cmd quit while ${pkgs.procps}/bin/pgrep -u ''${UID} -x polybar > /dev/null; do sleep 0.1; done - outputs=$(${pkgs.polybar}/bin/polybar -m | ${pkgs.coreutils}/bin/cut -d ':' -f 1) + outputs=$(${pkgs.polybar}/bin/polybar -m | ${pkgs.gnugrep}/bin/grep -v primary | ${pkgs.coreutils}/bin/cut -d ':' -f 1) primary=$(${pkgs.polybar}/bin/polybar -m | ${pkgs.gnugrep}/bin/grep primary | ${pkgs.coreutils}/bin/cut -d ':' -f 1) + MONITOR=''${primary} polybar -q main & disown + + sleep 0.5 # Make sure the primary bar is started so the tray appears here + for m in ''${outputs}; do MONITOR=''${m} polybar -q main & disown done