From 9d3f4bc4a34871c15aecf807b3cae8d91cdec67b Mon Sep 17 00:00:00 2001 From: Ricard Illa Date: Mon, 6 Feb 2023 16:38:52 +0100 Subject: [PATCH] misc updated to river session --- home/desktop-river/default.nix | 28 +++-- home/desktop-river/foot.nix | 2 + home/desktop-river/init | 210 --------------------------------- home/desktop-river/init.nix | 182 ++++++++++++++++++++++++++++ home/desktop-river/kanshi.nix | 1 + home/desktop-river/kile.nix | 62 ++++++++++ home/desktop-river/swaybg.nix | 26 ++++ home/desktop-river/waybar.nix | 5 +- 8 files changed, 294 insertions(+), 222 deletions(-) delete mode 100644 home/desktop-river/init create mode 100644 home/desktop-river/init.nix create mode 100644 home/desktop-river/kile.nix create mode 100644 home/desktop-river/swaybg.nix diff --git a/home/desktop-river/default.nix b/home/desktop-river/default.nix index c7f5c48..9098f00 100644 --- a/home/desktop-river/default.nix +++ b/home/desktop-river/default.nix @@ -17,11 +17,14 @@ let in { imports = [ ./bemenu.nix - ./waybar.nix ./foot.nix - ./mako.nix - ./swaylock.nix + ./init.nix ./kanshi.nix + ./kile.nix + ./mako.nix + ./swaybg.nix + ./swaylock.nix + ./waybar.nix ]; home.packages = with pkgs; [ @@ -30,7 +33,6 @@ in { gsettings-desktop-schemas kile-wl light - mpdris2 pamixer playerctl river @@ -42,16 +44,20 @@ in { programs.zsh.loginExtra = '' if [[ -z "''${DISPLAY}" ]] && [[ "''${XDG_VTNR}" -eq 1 ]]; then - export XKB_DEFAULT_LAYOUT="us" - export XKB_DEFAULT_VARIANT="altgr-intl" - export XKB_DEFAULT_OPTIONS="caps:escape" exec ${pkgs.river}/bin/river fi ''; - home.file.river_init = { - executable = true; - target = "${config.xdg.configHome}/river/init"; - source = ./init; + home.sessionVariables.XKB_DEFAULT_LAYOUT = "us"; + home.sessionVariables.XKB_DEFAULT_VARIANT = "altgr-intl"; + home.sessionVariables.XKB_DEFAULT_OPTIONS = "caps:escape"; + + systemd.user.targets.river-session = { + Unit = { + Description = "river window manager session"; + BindsTo = "graphical-session.target"; + Wants = "graphical-session-pre.target"; + After = "graphical-session-pre.target"; + }; }; } diff --git a/home/desktop-river/foot.nix b/home/desktop-river/foot.nix index 1604907..8faf412 100644 --- a/home/desktop-river/foot.nix +++ b/home/desktop-river/foot.nix @@ -6,6 +6,7 @@ let in { programs.foot = { enable = true; + server.enable = true; settings = { main = { shell = "${pkgs.tmux}/bin/tmux -u"; @@ -40,4 +41,5 @@ in { }; }; }; + } diff --git a/home/desktop-river/init b/home/desktop-river/init deleted file mode 100644 index a5fc2dc..0000000 --- a/home/desktop-river/init +++ /dev/null @@ -1,210 +0,0 @@ -#!/bin/sh - -WALLPAPERS="$HOME/Images/wallpapers/enabled" - -DEFAULT_MASTER_RATIO="0.6" -UP_LAYOUT="Up ((h: v v) 1 $DEFAULT_MASTER_RATIO 0)" -DOWN_LAYOUT="Down ((h: v v) 1 $DEFAULT_MASTER_RATIO 1)" -LEFT_LAYOUT="Left ((v: h h) 1 $DEFAULT_MASTER_RATIO 0)" -RIGHT_LAYOUT="Right ((v: h h) 1 $DEFAULT_MASTER_RATIO 1)" -DECK_LAYOUT="Deck deck" -FULL_LAYOUT="Full full" -WIDE_LAYOUT="Wide ((v: h h h) 1 0.5 1)" - -DEFAULT_LAYOUT=$LEFT_LAYOUT - -# Super+Return to start an instance of foot (https://codeberg.org/dnkl/foot) -riverctl map normal Super Return spawn foot - -riverctl map normal Super R spawn bemenu-run -riverctl map normal Super P spawn tessen - -# Super+Shift+C to close the focused view -riverctl map normal Super+Shift C close - -# Super+Shift+Esc to exit river -riverctl map normal Super+Shift Escape exit - -riverctl map normal Super Escape spawn swaylock - -# Super+J and Super+K to focus the next/previous view in the layout stack -riverctl map normal Super J focus-view next -riverctl map normal Super K focus-view previous - -# Super+Shift+J and Super+Shift+K to swap the focused view with the next/previous -# view in the layout stack -riverctl map normal Super+Shift J swap next -riverctl map normal Super+Shift K swap previous - -# Super+E and Super+W to focus the next/previous output -riverctl map normal Super E focus-output next -riverctl map normal Super W focus-output previous - -# Super+Shift+{W,E} to send the focused view to the next/previous output -riverctl map normal Super+Shift W send-to-output next -riverctl map normal Super+Shift W send-to-output previous - -# Super+Shift+Return to bump the focused view to the top of the layout stack -riverctl map normal Super+Shift Return zoom - -# Super+H and Super+L to decrease/increase the main ratio -# riverctl map normal Super H send-layout-cmd rivertile "main-ratio -0.05" -# riverctl map normal Super L send-layout-cmd rivertile "main-ratio +0.05" -riverctl map -repeat normal Super H send-layout-cmd kile "mod_main_ratio +0.01" -riverctl map -repeat normal Super L send-layout-cmd kile "mod_main_ratio -0.01" - -# Super+Comma and Super+Period. to increment/decrement the main count -# riverctl map normal Super Comma send-layout-cmd rivertile "main-count +1" -# riverctl map normal Super Period send-layout-cmd rivertile "main-count -1" -riverctl map normal Super+Shift H send-layout-cmd kile "mod_main_amount +1" -riverctl map normal Super+Shift L send-layout-cmd kile "mod_main_amount -1" - -# Super+Alt+{H,J,K,L} to move views -riverctl map normal Super+Alt H move left 100 -riverctl map normal Super+Alt J move down 100 -riverctl map normal Super+Alt K move up 100 -riverctl map normal Super+Alt L move right 100 - -# Super+Alt+Control+{H,J,K,L} to snap views to screen edges -riverctl map normal Super+Alt+Control H snap left -riverctl map normal Super+Alt+Control J snap down -riverctl map normal Super+Alt+Control K snap up -riverctl map normal Super+Alt+Control L snap right - -# Super+Alt+Shift+{H,J,K,L} to resize views -riverctl map normal Super+Alt+Shift H resize horizontal -100 -riverctl map normal Super+Alt+Shift J resize vertical 100 -riverctl map normal Super+Alt+Shift K resize vertical -100 -riverctl map normal Super+Alt+Shift L resize horizontal 100 - -# Super + Left Mouse Button to move views -riverctl map-pointer normal Super BTN_LEFT move-view - -# Super + Right Mouse Button to resize views -riverctl map-pointer normal Super BTN_RIGHT resize-view - -# Super + Middle Mouse Button to toggle float -riverctl map-pointer normal Super BTN_MIDDLE toggle-float - -for i in $(seq 1 9) -do - tags=$((1 << (i - 1))) - - # Super+[1-9] to focus tag [0-8] - riverctl map normal Super "$i" set-focused-tags "$tags" - - # Super+Shift+[1-9] to tag focused view with tag [0-8] - riverctl map normal Super+Shift "$i" set-view-tags "$tags" - - # Super+Ctrl+[1-9] to toggle focus of tag [0-8] - riverctl map normal Super+Control "$i" toggle-focused-tags "$tags" - - # Super+Shift+Ctrl+[1-9] to toggle tag [0-8] of focused view - riverctl map normal Super+Shift+Control "$i" toggle-view-tags "$tags" -done - -# Super+0 to focus all tags -# Super+Shift+0 to tag focused view with all tags -all_tags=$(((1 << 32) - 1)) -riverctl map normal Super 0 set-focused-tags "$all_tags" -riverctl map normal Super+Shift 0 set-view-tags "$all_tags" - -# Super+T to toggle float -riverctl map normal Super T toggle-float - -# Super+M to toggle fullscreen -riverctl map normal Super M toggle-fullscreen - -# Super+{Up,Right,Down,Left} to change layout orientation -# riverctl map normal Super Up send-layout-cmd rivertile "main-location top" -# riverctl map normal Super Right send-layout-cmd rivertile "main-location right" -# riverctl map normal Super Down send-layout-cmd rivertile "main-location bottom" -# riverctl map normal Super Left send-layout-cmd rivertile "main-location left" -# -riverctl map normal Super+Control K send-layout-cmd kile "focused $UP_LAYOUT" -riverctl map normal Super+Control J send-layout-cmd kile "focused $DOWN_LAYOUT" -riverctl map normal Super+Control H send-layout-cmd kile "focused $LEFT_LAYOUT" -riverctl map normal Super+Control L send-layout-cmd kile "focused $RIGHT_LAYOUT" -riverctl map normal Super+Control D send-layout-cmd kile "focused $DECK_LAYOUT" -riverctl map normal Super+Control F send-layout-cmd kile "focused $FULL_LAYOUT" -riverctl map normal Super+Control W send-layout-cmd kile "focused $WIDE_LAYOUT" -riverctl map normal Super+Shift Space send-layout-cmd kile "focused $DEFAULT_LAYOUT" - -# Declare a passthrough mode. This mode has only a single mapping to return to -# normal mode. This makes it useful for testing a nested wayland compositor -riverctl declare-mode passthrough - -# Super+F11 to enter passthrough mode -riverctl map normal Super F11 enter-mode passthrough - -# Super+F11 to return to normal mode -riverctl map passthrough Super F11 enter-mode normal - -# Various media key mapping examples for both normal and locked mode which do -# not have a modifier -for mode in normal locked -do - # Eject the optical drive (well if you still have one that is) - riverctl map $mode None XF86Eject spawn 'eject -T' - - # Control pulse audio volume with pamixer (https://github.com/cdemoulins/pamixer) - riverctl map $mode None XF86AudioRaiseVolume spawn 'pamixer -i 5' - riverctl map $mode None XF86AudioLowerVolume spawn 'pamixer -d 5' - riverctl map $mode None XF86AudioMute spawn 'pamixer --toggle-mute' - - # Control MPRIS aware media players with playerctl (https://github.com/altdesktop/playerctl) - riverctl map $mode None XF86AudioMedia spawn 'playerctl play-pause' - riverctl map $mode None XF86AudioPlay spawn 'playerctl play-pause' - riverctl map $mode None XF86AudioPrev spawn 'playerctl previous' - riverctl map $mode None XF86AudioNext spawn 'playerctl next' - - # Control screen backlight brightness with light (https://github.com/haikarainen/light) - riverctl map $mode None XF86MonBrightnessUp spawn 'light -A 5' - riverctl map $mode None XF86MonBrightnessDown spawn 'light -U 5' -done - -# Set background and border color -riverctl background-color 0x282828 -riverctl border-color-focused 0x458588 -riverctl border-color-unfocused 0x504945 -riverctl border-width 3 - -riverctl focus-follows-cursor normal - -# Set keyboard repeat rate -riverctl set-repeat 50 300 - -# Make certain views start floating -riverctl float-filter-add app-id float -riverctl float-filter-add title "popup title with spaces" - -# Set app-ids and titles of views which should use client side decorations -riverctl csd-filter-add app-id "gedit" - -riverctl spawn "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=river" -riverctl spawn "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=river" -riverctl spawn "waybar" -riverctl spawn "configure-gtk" - -BG="$(find "$WALLPAPERS" -type f | shuf -n 1)" -riverctl spawn "swaybg --image $BG --mode fill" - -trackball_names="pointer-21298-5120-Clearly_Superior_Technologies._CST_Laser_Trackball 21298:5120:Clearly_Superior_Technologies._CST_Laser_Trackball" -for name in $trackball_names; do - echo "$name" - riverctl input "$name" left-handed enabled - riverctl input "$name" pointer-accel -0.8 -done - -# Set the default layout generator to be rivertile and start it. -# River will send the process group of the init executable SIGTERM on exit. -# riverctl default-layout rivertile -# rivertile -view-padding 0 -outer-padding 0 & - -riverctl default-layout kile -kile --namespace kile --layout "$DEFAULT_LAYOUT" & - -kanshi & -gotify-desktop & -nm-applet --indicator & -mpDris2 & diff --git a/home/desktop-river/init.nix b/home/desktop-river/init.nix new file mode 100644 index 0000000..bfc2ac6 --- /dev/null +++ b/home/desktop-river/init.nix @@ -0,0 +1,182 @@ +{ config, pkgs, ... }: + +let + shell = "${pkgs.dash}/bin/dash"; + + riverctl = "${pkgs.river}/bin/riverctl"; + + foot = "${pkgs.foot}/bin/footclient"; + bemenu-run = "${pkgs.bemenu}/bin/bemenu-run"; + tessen = "${pkgs.tessen}/bin/tessen"; + swaylock = "${pkgs.swaylock}/bin/swaylock"; + eject = "${pkgs.util-linux}/bin/eject"; + pamixer = "${pkgs.pamixer}/bin/pamixer"; + playerctl = "${pkgs.playerctl}/bin/playerctl"; + light = "${pkgs.light}/bin/light"; + + seq = "${pkgs.coreutils}/bin/seq"; + + dbus-update-activation-environment = + "${pkgs.dbus}/bin/dbus-update-activation-environment"; + +in { + xdg.dataFile.river_init = { + executable = true; + target = "${config.xdg.configHome}/river/init"; + text = '' + #!${shell} + + ${riverctl} map normal Super Return spawn ${foot} + ${riverctl} map normal Super R spawn ${bemenu-run} + ${riverctl} map normal Super P spawn ${tessen} + ${riverctl} map normal Super Escape spawn ${swaylock} + + # Super+Shift+C to close the focused view + ${riverctl} map normal Super+Shift C close + + # Super+Shift+Esc to exit river + ${riverctl} map normal Super+Shift Escape exit + + + # Super+J and Super+K to focus the next/previous view in the layout stack + ${riverctl} map normal Super J focus-view next + ${riverctl} map normal Super K focus-view previous + + # Super+Shift+J and Super+Shift+K to swap the focused view with the next/previous + # view in the layout stack + ${riverctl} map normal Super+Shift J swap next + ${riverctl} map normal Super+Shift K swap previous + + # Super+E and Super+W to focus the next/previous output + ${riverctl} map normal Super E focus-output next + ${riverctl} map normal Super W focus-output previous + + # Super+Shift+{W,E} to send the focused view to the next/previous output + ${riverctl} map normal Super+Shift W send-to-output next + ${riverctl} map normal Super+Shift W send-to-output previous + + # Super+Shift+Return to bump the focused view to the top of the layout stack + ${riverctl} map normal Super+Shift Return zoom + + + ${riverctl} map normal Super+Alt H move left 100 + ${riverctl} map normal Super+Alt J move down 100 + ${riverctl} map normal Super+Alt K move up 100 + ${riverctl} map normal Super+Alt L move right 100 + + # Super+Alt+Control+{H,J,K,L} to snap views to screen edges + ${riverctl} map normal Super+Alt+Control H snap left + ${riverctl} map normal Super+Alt+Control J snap down + ${riverctl} map normal Super+Alt+Control K snap up + ${riverctl} map normal Super+Alt+Control L snap right + + # Super+Alt+Shift+{H,J,K,L} to resize views + ${riverctl} map normal Super+Alt+Shift H resize horizontal -100 + ${riverctl} map normal Super+Alt+Shift J resize vertical 100 + ${riverctl} map normal Super+Alt+Shift K resize vertical -100 + ${riverctl} map normal Super+Alt+Shift L resize horizontal 100 + + # Super + Left Mouse Button to move views + ${riverctl} map-pointer normal Super BTN_LEFT move-view + + # Super + Right Mouse Button to resize views + ${riverctl} map-pointer normal Super BTN_RIGHT resize-view + + # Super + Middle Mouse Button to toggle float + ${riverctl} map-pointer normal Super BTN_MIDDLE toggle-float + + for i in $(${seq} 1 9) + do + tags=$((1 << (i - 1))) + + # Super+[1-9] to focus tag [0-8] + ${riverctl} map normal Super "$i" set-focused-tags "$tags" + + # Super+Shift+[1-9] to tag focused view with tag [0-8] + ${riverctl} map normal Super+Shift "$i" set-view-tags "$tags" + + # Super+Ctrl+[1-9] to toggle focus of tag [0-8] + ${riverctl} map normal Super+Control "$i" toggle-focused-tags "$tags" + + # Super+Shift+Ctrl+[1-9] to toggle tag [0-8] of focused view + ${riverctl} map normal Super+Shift+Control "$i" toggle-view-tags "$tags" + done + + # Super+0 to focus all tags + # Super+Shift+0 to tag focused view with all tags + all_tags=$(((1 << 32) - 1)) + ${riverctl} map normal Super 0 set-focused-tags "$all_tags" + ${riverctl} map normal Super+Shift 0 set-view-tags "$all_tags" + + # Super+T to toggle float + ${riverctl} map normal Super T toggle-float + + # Super+M to toggle fullscreen + ${riverctl} map normal Super M toggle-fullscreen + + # Declare a passthrough mode. This mode has only a single mapping to return to + # normal mode. This makes it useful for testing a nested wayland compositor + ${riverctl} declare-mode passthrough + + # Super+F11 to enter passthrough mode + ${riverctl} map normal Super F11 enter-mode passthrough + + # Super+F11 to return to normal mode + ${riverctl} map passthrough Super F11 enter-mode normal + + # Various media key mapping examples for both normal and locked mode which do + # not have a modifier + for mode in normal locked + do + # Eject the optical drive (well if you still have one that is) + ${riverctl} map $mode None XF86Eject spawn '${eject} -T' + + # Control pulse audio volume with pamixer (https://github.com/cdemoulins/pamixer) + ${riverctl} map $mode None XF86AudioRaiseVolume spawn '${pamixer} -i 5' + ${riverctl} map $mode None XF86AudioLowerVolume spawn '${pamixer} -d 5' + ${riverctl} map $mode None XF86AudioMute spawn '${pamixer} --toggle-mute' + + # Control MPRIS aware media players with playerctl (https://github.com/altdesktop/playerctl) + ${riverctl} map $mode None XF86AudioMedia spawn '${playerctl} play-pause' + ${riverctl} map $mode None XF86AudioPlay spawn '${playerctl} play-pause' + ${riverctl} map $mode None XF86AudioPrev spawn '${playerctl} previous' + ${riverctl} map $mode None XF86AudioNext spawn '${playerctl} next' + + # Control screen backlight brightness with light (https://github.com/haikarainen/light) + ${riverctl} map $mode None XF86MonBrightnessUp spawn '${light} -A 5' + ${riverctl} map $mode None XF86MonBrightnessDown spawn '${light} -U 5' + done + + # Set background and border color + ${riverctl} background-color 0x282828 + ${riverctl} border-color-focused 0x458588 + ${riverctl} border-color-unfocused 0x504945 + ${riverctl} border-width 3 + + ${riverctl} focus-follows-cursor normal + + # Set keyboard repeat rate + ${riverctl} set-repeat 50 300 + + # Make certain views start floating + ${riverctl} float-filter-add app-id float + ${riverctl} float-filter-add title "popup title with spaces" + + # Set app-ids and titles of views which should use client side decorations + ${riverctl} csd-filter-add app-id "gedit" + + ${riverctl} spawn "${dbus-update-activation-environment} --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=river" + ${riverctl} spawn "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=river" + + trackball_names="pointer-21298-5120-Clearly_Superior_Technologies._CST_Laser_Trackball 21298:5120:Clearly_Superior_Technologies._CST_Laser_Trackball" + for name in $trackball_names; do + ${riverctl} input "$name" left-handed enabled + ${riverctl} input "$name" pointer-accel -0.8 + done + + ${config.xdg.configHome}/river/init-kile + + systemctl --user start river-session.target + ''; + }; +} diff --git a/home/desktop-river/kanshi.nix b/home/desktop-river/kanshi.nix index 6546aaf..c156c5c 100644 --- a/home/desktop-river/kanshi.nix +++ b/home/desktop-river/kanshi.nix @@ -5,6 +5,7 @@ services.kanshi = { enable = true; + systemdTarget = "river-session.target"; profiles = { standalone = { outputs = [{ diff --git a/home/desktop-river/kile.nix b/home/desktop-river/kile.nix new file mode 100644 index 0000000..bcee1f1 --- /dev/null +++ b/home/desktop-river/kile.nix @@ -0,0 +1,62 @@ +{ config, pkgs, ... }: + +let + shell = "${pkgs.dash}/bin/dash"; + + default_master_ratio = "0.6"; + up_layout = "Up ((h: v v) 1 ${default_master_ratio} 0)"; + down_layout = "Down ((h: v v) 1 ${default_master_ratio} 1)"; + left_layout = "Left ((v: h h) 1 ${default_master_ratio} 0)"; + right_layout = "Right ((v: h h) 1 ${default_master_ratio} 1)"; + deck_layout = "Deck deck"; + full_layout = "Full full"; + wide_layout = "Wide ((v: h h h) 1 0.5 1)"; + default_layout = left_layout; + + riverctl = "${pkgs.river}/bin/riverctl"; + kile = "${pkgs.kile-wl}/bin/kile"; + kile_namespace = "kile"; + +in { + + systemd.user.services.kile-wl = { + Unit = { + Description = "kile layout generator"; + BindsTo = [ "river-session.target" ]; + }; + Service = { + Type = "simple"; + ExecStart = + "${kile} --namespace ${kile_namespace} --layout '${default_layout}'"; + }; + Install = { WantedBy = [ "river-session.target" ]; }; + }; + + xdg.dataFile.init-kile = { + executable = true; + target = "${config.xdg.configHome}/river/init-kile"; + text = '' + #!${shell} + + # Super+H and Super+L to decrease/increase the main ratio + ${riverctl} map -repeat normal Super Equal send-layout-cmd ${kile_namespace} "mod_main_ratio +0.01" + ${riverctl} map -repeat normal Super Minus send-layout-cmd ${kile_namespace} "mod_main_ratio -0.01" + + # Super+Comma and Super+Period. to increment/decrement the main count + ${riverctl} map normal Super Comma send-layout-cmd ${kile_namespace} "mod_main_amount +1" + ${riverctl} map normal Super Period send-layout-cmd ${kile_namespace} "mod_main_amount -1" + + # Super+{Up,Right,Down,Left} to change layout orientation + ${riverctl} map normal Super+Control K send-layout-cmd ${kile_namespace} "focused ${up_layout}" + ${riverctl} map normal Super+Control J send-layout-cmd ${kile_namespace} "focused ${down_layout}" + ${riverctl} map normal Super+Control H send-layout-cmd ${kile_namespace} "focused ${left_layout}" + ${riverctl} map normal Super+Control L send-layout-cmd ${kile_namespace} "focused ${right_layout}" + ${riverctl} map normal Super+Control D send-layout-cmd ${kile_namespace} "focused ${deck_layout}" + ${riverctl} map normal Super+Control F send-layout-cmd ${kile_namespace} "focused ${full_layout}" + ${riverctl} map normal Super+Control W send-layout-cmd ${kile_namespace} "focused ${wide_layout}" + ${riverctl} map normal Super+Shift Space send-layout-cmd ${kile_namespace} "focused ${default_layout}" + + ${riverctl} default-layout ${kile_namespace} + ''; + }; +} diff --git a/home/desktop-river/swaybg.nix b/home/desktop-river/swaybg.nix new file mode 100644 index 0000000..6bdc76b --- /dev/null +++ b/home/desktop-river/swaybg.nix @@ -0,0 +1,26 @@ +{ config, pkgs, ... }: + +let + shell = "${pkgs.dash}/bin/dash"; + wallpapers = "${config.home.homeDirectory}/Images/wallpapers/enabled"; + find = "${pkgs.findutils}/bin/find"; + shuf = "${pkgs.coreutils}/bin/shuf"; + swaybg = "${pkgs.swaybg}/bin/swaybg"; + setbg = pkgs.writeScriptBin "setbg" '' + #!/${shell} + BG="$(${find} "${wallpapers}" -type f | ${shuf} -n 1)" + ${swaybg} --image $BG --mode fill + ''; +in { + systemd.user.services.setbg = { + Unit = { + Description = "set background using swaybg"; + BindsTo = [ "river-session.target" ]; + }; + Service = { + Type = "simple"; + ExecStart = "${setbg}/bin/setbg"; + }; + Install = { WantedBy = [ "river-session.target" ]; }; + }; +} diff --git a/home/desktop-river/waybar.nix b/home/desktop-river/waybar.nix index 6774bff..019e142 100644 --- a/home/desktop-river/waybar.nix +++ b/home/desktop-river/waybar.nix @@ -153,6 +153,9 @@ } ''; - systemd.enable = false; + systemd = { + enable = true; + target = "river-session.target"; + }; }; }