rouven.seifert/nixos-config
1
1
Fork 0
mirror of https://git.sr.ht/~rouven/nixos-config synced 2024-11-15 05:13:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

river fixes and nixpkgs updates

Browse source
This commit is contained in:
Rouven Seifert 2023-06-27 16:01:12 +02:00
parent ca8ac0f517
commit 4ad4a74059
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
4 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
flake.lock
View file

@ -203,11 +203,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1687647343, "lastModified": 1687856573,
"narHash": "sha256-1/o/i9KEFOBdlF9Cs04kBcqDFbYMt6W4SMqGa+QnnaI=", "narHash": "sha256-rzC+5rRsy92Dhjb1q5e5tDjdhRfL1z4WFWwlcD3a+4Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0ee5ab611dc1fbb5180bd7d88d2aeb7841a4d179", "rev": "4c08f65ab5105a55eed3fc9003f3e6874b69fe13",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -333,11 +333,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1687681650, "lastModified": 1687807295,
"narHash": "sha256-M2If+gRcfpmaJy/XbfSsRzLlPpoU4nr0NHnKKl50fd8=", "narHash": "sha256-7TUD0p0m4mZpIi1O+Cyk5NCqpJUnhv/CJOAuHOndjao=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1c9db9710cb23d60570ad4d7ab829c2d34403de3", "rev": "6b3d1b1cf13f407fef5e634b224d575eb7211975",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
users/rouven/modules/packages.nix
View file

@ -1,4 +1,4 @@
{ self, pkgs, ... }: { pkgs, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [

3
users/rouven/modules/wayland/default.nix
View file

@ -25,8 +25,9 @@
timeouts = [ timeouts = [
{ timeout = 300; command = lib.getExe pkgs.swaylock-effects; } { timeout = 300; command = lib.getExe pkgs.swaylock-effects; }
]; ];
systemdTarget = "river-session.target"; systemdTarget = "graphical-session.target";
}; };
systemd.user.services.swaync = { systemd.user.services.swaync = {
Install.WantedBy = [ "graphical-session.target" ]; Install.WantedBy = [ "graphical-session.target" ];
Service = { Service = {

8
users/rouven/modules/wayland/river.nix
View file

@ -16,6 +16,7 @@
source = source =
pkgs.writeShellScript "river-init.sh" '' pkgs.writeShellScript "river-init.sh" ''
riverctl focus-follows-cursor always riverctl focus-follows-cursor always
riverctl attach-mode bottom
riverctl spawn rivertile riverctl spawn rivertile
riverctl default-layout rivertile riverctl default-layout rivertile
riverctl output-layout rivertile riverctl output-layout rivertile
@ -25,10 +26,9 @@
riverctl input pointer-2-7-SynPS/2_Synaptics_TouchPad middle-emulation enabled riverctl input pointer-2-7-SynPS/2_Synaptics_TouchPad middle-emulation enabled
riverctl spawn "${lib.getExe pkgs.swaybg} -i ${../../../../images/wallpaper.png}" 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 Return spawn footclient
riverctl map normal Super+Shift Return zoom
riverctl map normal Super+Shift Q close riverctl map normal Super+Shift Q close
riverctl map normal Super F toggle-fullscreen riverctl map normal Super F toggle-fullscreen
@ -49,6 +49,7 @@
# riverctl map-pointer normal Super BTN_RIGHT resize-view # riverctl map-pointer normal Super BTN_RIGHT resize-view
riverctl map normal Alt Space spawn ${lib.getExe pkgs.fuzzel} riverctl map normal Alt Space spawn ${lib.getExe pkgs.fuzzel}
riverctl map normal Super Space toggle-float
for i in $(seq 1 9) for i in $(seq 1 9)
do do
@ -82,6 +83,9 @@
riverctl map normal None XF86Messenger spawn "${pkgs.swaynotificationcenter}/bin/swaync-client --toggle-panel" 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 None Cancel spawn "${pkgs.swaynotificationcenter}/bin/swaync-client --hide-latest"
riverctl map normal Shift Cancel spawn "${pkgs.swaynotificationcenter}/bin/swaync-client --cloes-all" 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
''; '';
}; };
}; };