From 49e6587d3c910c70d20dbded0f19f3d1eb752c56 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sat, 17 Aug 2024 21:16:57 +0200
Subject: ...

---
 accounts/gkleen@sif/default.nix  |  5 ++++-
 accounts/gkleen@sif/hyprland.nix |  3 ++-
 flake.lock                       | 27 ++++++++++++++++++++++++++-
 flake.nix                        | 10 ++++++++++
 overlays/waybar.nix              |  3 +++
 5 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 overlays/waybar.nix

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index e6cbd77d..e224289b 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -366,7 +366,10 @@ in {
                 icon-size = iconSize;
                 modules = [
                   { type = "screenshare"; }
-                  # { type = "audio-in"; }
+                  { type = "audio-in"; }
+                ];
+                ignore = [
+                  { type = "audio-in"; name = "pwvucontrol-peak-detect"; }
                 ];
               };
               idle_inhibitor = {
diff --git a/accounts/gkleen@sif/hyprland.nix b/accounts/gkleen@sif/hyprland.nix
index 15491c6f..a365ea19 100644
--- a/accounts/gkleen@sif/hyprland.nix
+++ b/accounts/gkleen@sif/hyprland.nix
@@ -71,7 +71,7 @@ in {
   misc = {
     disable_hyprland_logo = true;
     disable_splash_rendering = true;
-    focus_on_activate = true;
+    # focus_on_activate = true;
     mouse_move_enables_dpms = true;
     key_press_enables_dpms = true;
   };
@@ -150,6 +150,7 @@ in {
 
     "$mainMod, F, fullscreen, 1"
     "$mainMod SHIFT, F, fullscreen, 0"
+    "$mainMod CTRL SHIFT, F, fullscreenstate, 1, 2"
 
     "$mainMod, code:14, workspace, 1"
     "$mainMod, code:17, workspace, 2"
diff --git a/flake.lock b/flake.lock
index a8746d7d..f051b27c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -820,7 +820,8 @@
         "nvfetcher": "nvfetcher",
         "poetry2nix": "poetry2nix",
         "prometheus-borg-exporter": "prometheus-borg-exporter",
-        "sops-nix": "sops-nix"
+        "sops-nix": "sops-nix",
+        "waybar": "waybar"
       }
     },
     "sops-nix": {
@@ -926,6 +927,30 @@
         "repo": "treefmt-nix",
         "type": "github"
       }
+    },
+    "waybar": {
+      "inputs": {
+        "flake-compat": [
+          "flake-compat"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1723921867,
+        "narHash": "sha256-MOy+5WIqQTrttCPSrvdiRhfOr8VuSvH/Sip1K5AWEFM=",
+        "owner": "gkleen",
+        "repo": "Waybar",
+        "rev": "8a0d2c2dbe0910ac4d414d2a7a60cf6b97a21211",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gkleen",
+        "ref": "feat/privacy-ignore",
+        "repo": "Waybar",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 83da2203..909d9da3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -169,6 +169,16 @@
       repo = "impermanence";
       ref = "master";
     };
+    waybar = {
+      type = "github";
+      owner = "gkleen";
+      repo = "Waybar";
+      ref = "feat/privacy-ignore";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-compat.follows = "flake-compat";
+      };
+    };
   };
 
   outputs = { self, nixpkgs, home-manager, sops-nix, deploy-rs, nvfetcher, ... }@inputs:
diff --git a/overlays/waybar.nix b/overlays/waybar.nix
new file mode 100644
index 00000000..20f37255
--- /dev/null
+++ b/overlays/waybar.nix
@@ -0,0 +1,3 @@
+{ final, prev, flakeInputs, ... }:
+
+flakeInputs.waybar.overlays.default final prev
-- 
cgit v1.2.3