diff --git a/flake.lock b/flake.lock index 63c2125..f3342f2 100644 --- a/flake.lock +++ b/flake.lock @@ -47,11 +47,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1674507403, - "narHash": "sha256-OpBVvPcoZqHy5hmbks7W9WAXb4HzfpSy0wFrD5F56Q4=", + "lastModified": 1674604320, + "narHash": "sha256-yhSiPmT3fmOaV2dLBNCsGGpN4t2Ucs6Q3dGygBH34sc=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "70b5c1b119bd1c350b0bdc9058298146827d669f", + "rev": "12e293e3092b03dbb9d82e7a749f482ef2b7ea6e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ef95da5..980de3f 100644 --- a/flake.nix +++ b/flake.nix @@ -26,18 +26,15 @@ home-manager.nixosModules.home-manager sops-nix.nixosModules.sops { - nix.settings = { - substituters = [ "https://hyprland.cachix.org" ]; - trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ]; - }; - home-manager.extraSpecialArgs = attrs; home-manager.users.rouven = { imports = [ nix-colors.homeManagerModule hyprland.homeManagerModules.default ]; - config.colorScheme = nix-colors.colorSchemes.dracula; + config = { + colorScheme = nix-colors.colorSchemes.dracula; + }; }; } ]; diff --git a/users/rouven/modules/hyprland/hyprland.conf b/users/rouven/modules/hyprland/hyprland.conf index db314bc..3b2511c 100644 --- a/users/rouven/modules/hyprland/hyprland.conf +++ b/users/rouven/modules/hyprland/hyprland.conf @@ -150,12 +150,14 @@ bindm = $mainMod, mouse:273, resizewindow # All the fancy XF86 Keys bind = ,Print, exec, grim -g "$(slurp)" - | wl-copy -t image/png bind = ,XF86Launch2, exec, grim -g "$(slurp)" - | swappy -f - -bind = ,XF86MonBrightnessUp, exec, light -A 10 -bind = ,XF86MonBrightnessDown, exec, light -U 10 +binde = ,XF86MonBrightnessUp, exec, light -A 10 +binde = ,XF86MonBrightnessDown, exec, light -U 10 bind = ,XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle bind = ,XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle -bind = ,XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5% -bind = ,XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5% +binde = ,XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5% +binde = ,XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5% +binde = SHIFT, XF86AudioRaiseVolume, exec, pactl set-source-volume @DEFAULT_SOURCE@ +5% +binde = SHIFT, XF86AudioLowerVolume, exec, pactl set-source-volume @DEFAULT_SOURCE@ -5% # even more fancy stuff (aka abusing XF86 keys) bind = ,XF86Messenger, exec, makoctl dismiss @@ -164,3 +166,6 @@ bind = ,XF86Go, exec, makoctl invoke bind = ,Cancel, exec, sh ~/.config/mako/do-not-disturb.sh bind = ,XF86Display, exec, hyprpaper bind = ,XF86Favorites, exec, swaylock + +# lock on lid +bindl = ,switch:Lid Switch, exec, swaylock