summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2024-08-17 21:16:57 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2024-08-17 21:16:57 +0200
commit49e6587d3c910c70d20dbded0f19f3d1eb752c56 (patch)
tree0325c5e086a03820f7e6cf967ead8c661a3daf6c
parent01e8a4dd21c98dadc2ddc698412c2ea51566b43e (diff)
downloadnixos-49e6587d3c910c70d20dbded0f19f3d1eb752c56.tar
nixos-49e6587d3c910c70d20dbded0f19f3d1eb752c56.tar.gz
nixos-49e6587d3c910c70d20dbded0f19f3d1eb752c56.tar.bz2
nixos-49e6587d3c910c70d20dbded0f19f3d1eb752c56.tar.xz
nixos-49e6587d3c910c70d20dbded0f19f3d1eb752c56.zip
...
-rw-r--r--accounts/gkleen@sif/default.nix5
-rw-r--r--accounts/gkleen@sif/hyprland.nix3
-rw-r--r--flake.lock27
-rw-r--r--flake.nix10
-rw-r--r--overlays/waybar.nix3
5 files changed, 45 insertions, 3 deletions
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 {
366 icon-size = iconSize; 366 icon-size = iconSize;
367 modules = [ 367 modules = [
368 { type = "screenshare"; } 368 { type = "screenshare"; }
369 # { type = "audio-in"; } 369 { type = "audio-in"; }
370 ];
371 ignore = [
372 { type = "audio-in"; name = "pwvucontrol-peak-detect"; }
370 ]; 373 ];
371 }; 374 };
372 idle_inhibitor = { 375 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 {
71 misc = { 71 misc = {
72 disable_hyprland_logo = true; 72 disable_hyprland_logo = true;
73 disable_splash_rendering = true; 73 disable_splash_rendering = true;
74 focus_on_activate = true; 74 # focus_on_activate = true;
75 mouse_move_enables_dpms = true; 75 mouse_move_enables_dpms = true;
76 key_press_enables_dpms = true; 76 key_press_enables_dpms = true;
77 }; 77 };
@@ -150,6 +150,7 @@ in {
150 150
151 "$mainMod, F, fullscreen, 1" 151 "$mainMod, F, fullscreen, 1"
152 "$mainMod SHIFT, F, fullscreen, 0" 152 "$mainMod SHIFT, F, fullscreen, 0"
153 "$mainMod CTRL SHIFT, F, fullscreenstate, 1, 2"
153 154
154 "$mainMod, code:14, workspace, 1" 155 "$mainMod, code:14, workspace, 1"
155 "$mainMod, code:17, workspace, 2" 156 "$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 @@
820 "nvfetcher": "nvfetcher", 820 "nvfetcher": "nvfetcher",
821 "poetry2nix": "poetry2nix", 821 "poetry2nix": "poetry2nix",
822 "prometheus-borg-exporter": "prometheus-borg-exporter", 822 "prometheus-borg-exporter": "prometheus-borg-exporter",
823 "sops-nix": "sops-nix" 823 "sops-nix": "sops-nix",
824 "waybar": "waybar"
824 } 825 }
825 }, 826 },
826 "sops-nix": { 827 "sops-nix": {
@@ -926,6 +927,30 @@
926 "repo": "treefmt-nix", 927 "repo": "treefmt-nix",
927 "type": "github" 928 "type": "github"
928 } 929 }
930 },
931 "waybar": {
932 "inputs": {
933 "flake-compat": [
934 "flake-compat"
935 ],
936 "nixpkgs": [
937 "nixpkgs"
938 ]
939 },
940 "locked": {
941 "lastModified": 1723921867,
942 "narHash": "sha256-MOy+5WIqQTrttCPSrvdiRhfOr8VuSvH/Sip1K5AWEFM=",
943 "owner": "gkleen",
944 "repo": "Waybar",
945 "rev": "8a0d2c2dbe0910ac4d414d2a7a60cf6b97a21211",
946 "type": "github"
947 },
948 "original": {
949 "owner": "gkleen",
950 "ref": "feat/privacy-ignore",
951 "repo": "Waybar",
952 "type": "github"
953 }
929 } 954 }
930 }, 955 },
931 "root": "root", 956 "root": "root",
diff --git a/flake.nix b/flake.nix
index 83da2203..909d9da3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -169,6 +169,16 @@
169 repo = "impermanence"; 169 repo = "impermanence";
170 ref = "master"; 170 ref = "master";
171 }; 171 };
172 waybar = {
173 type = "github";
174 owner = "gkleen";
175 repo = "Waybar";
176 ref = "feat/privacy-ignore";
177 inputs = {
178 nixpkgs.follows = "nixpkgs";
179 flake-compat.follows = "flake-compat";
180 };
181 };
172 }; 182 };
173 183
174 outputs = { self, nixpkgs, home-manager, sops-nix, deploy-rs, nvfetcher, ... }@inputs: 184 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 @@
1{ final, prev, flakeInputs, ... }:
2
3flakeInputs.waybar.overlays.default final prev