diff --git a/flake.lock b/flake.lock index 5835026..b124f77 100644 --- a/flake.lock +++ b/flake.lock @@ -203,11 +203,11 @@ ] }, "locked": { - "lastModified": 1687647343, - "narHash": "sha256-1/o/i9KEFOBdlF9Cs04kBcqDFbYMt6W4SMqGa+QnnaI=", + "lastModified": 1687856573, + "narHash": "sha256-rzC+5rRsy92Dhjb1q5e5tDjdhRfL1z4WFWwlcD3a+4Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "0ee5ab611dc1fbb5180bd7d88d2aeb7841a4d179", + "rev": "4c08f65ab5105a55eed3fc9003f3e6874b69fe13", "type": "github" }, "original": { @@ -333,11 +333,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1687681650, - "narHash": "sha256-M2If+gRcfpmaJy/XbfSsRzLlPpoU4nr0NHnKKl50fd8=", + "lastModified": 1687807295, + "narHash": "sha256-7TUD0p0m4mZpIi1O+Cyk5NCqpJUnhv/CJOAuHOndjao=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1c9db9710cb23d60570ad4d7ab829c2d34403de3", + "rev": "6b3d1b1cf13f407fef5e634b224d575eb7211975", "type": "github" }, "original": { diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix index 99ee927..acf4e25 100644 --- a/users/rouven/modules/packages.nix +++ b/users/rouven/modules/packages.nix @@ -1,4 +1,4 @@ -{ self, pkgs, ... }: +{ pkgs, ... }: { home.packages = with pkgs; [ diff --git a/users/rouven/modules/wayland/default.nix b/users/rouven/modules/wayland/default.nix index f36a460..2940871 100644 --- a/users/rouven/modules/wayland/default.nix +++ b/users/rouven/modules/wayland/default.nix @@ -25,8 +25,9 @@ timeouts = [ { timeout = 300; command = lib.getExe pkgs.swaylock-effects; } ]; - systemdTarget = "river-session.target"; + systemdTarget = "graphical-session.target"; }; + systemd.user.services.swaync = { Install.WantedBy = [ "graphical-session.target" ]; Service = { diff --git a/users/rouven/modules/wayland/river.nix b/users/rouven/modules/wayland/river.nix index 4d2e6bc..51aa915 100644 --- a/users/rouven/modules/wayland/river.nix +++ b/users/rouven/modules/wayland/river.nix @@ -16,6 +16,7 @@ source = pkgs.writeShellScript "river-init.sh" '' riverctl focus-follows-cursor always + riverctl attach-mode bottom riverctl spawn rivertile riverctl default-layout rivertile riverctl output-layout rivertile @@ -25,10 +26,9 @@ riverctl input pointer-2-7-SynPS/2_Synaptics_TouchPad middle-emulation enabled riverctl spawn "${lib.getExe pkgs.swaybg} -i ${../../../../images/wallpaper.png}" - systemctl --user start river-session.target - ${pkgs.dbus}/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL riverctl map normal Super Return spawn footclient + riverctl map normal Super+Shift Return zoom riverctl map normal Super+Shift Q close riverctl map normal Super F toggle-fullscreen @@ -49,6 +49,7 @@ # riverctl map-pointer normal Super BTN_RIGHT resize-view riverctl map normal Alt Space spawn ${lib.getExe pkgs.fuzzel} + riverctl map normal Super Space toggle-float for i in $(seq 1 9) do @@ -82,6 +83,9 @@ riverctl map normal None XF86Messenger spawn "${pkgs.swaynotificationcenter}/bin/swaync-client --toggle-panel" riverctl map normal None Cancel spawn "${pkgs.swaynotificationcenter}/bin/swaync-client --hide-latest" riverctl map normal Shift Cancel spawn "${pkgs.swaynotificationcenter}/bin/swaync-client --cloes-all" + + ${pkgs.dbus}/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL + systemctl --user start river-session.target ''; }; };