home: nixified river config and added lavaridge outputs

This commit is contained in:
Aly Raffauf 2024-04-13 17:02:19 -04:00
parent a521544cda
commit 9f2de2ba5a
3 changed files with 136 additions and 132 deletions

View file

@ -7,5 +7,4 @@
imports = [./gnome ./hypr ./sway ./river]; imports = [./gnome ./hypr ./sway ./river];
desktopEnv.hyprland.enable = lib.mkDefault true; desktopEnv.hyprland.enable = lib.mkDefault true;
desktopEnv.river.enable = lib.mkDefault true;
} }

View file

@ -10,7 +10,7 @@
}; };
config = lib.mkIf config.desktopEnv.river.enable { config = lib.mkIf config.desktopEnv.river.enable {
# Basic apps needed to run a hyprland desktop. # Basic apps needed to run a riverwm desktop.
guiApps.waybar.enable = lib.mkDefault true; guiApps.waybar.enable = lib.mkDefault true;
guiApps.mako.enable = lib.mkDefault true; guiApps.mako.enable = lib.mkDefault true;
guiApps.fuzzel.enable = lib.mkDefault true; guiApps.fuzzel.enable = lib.mkDefault true;
@ -49,7 +49,7 @@
outputs = [ outputs = [
{ {
status = "enable"; status = "enable";
criteria = "BOE 0x095F"; criteria = "BOE 0x095F Unknown";
scale = 1.5; scale = 1.5;
} }
]; ];
@ -63,8 +63,8 @@
xdg.portal = { xdg.portal = {
enable = true; enable = true;
configPackages = [pkgs.xdg-desktop-portal-hyprland]; configPackages = [pkgs.xdg-desktop-portal-wlr];
extraPortals = [pkgs.xdg-desktop-portal-hyprland]; extraPortals = [pkgs.xdg-desktop-portal-wlr];
}; };
gtk.gtk3.extraCss = '' gtk.gtk3.extraCss = ''
@ -157,6 +157,12 @@
qt_platform_theme = "gtk2"; qt_platform_theme = "gtk2";
gdk_scale = "1.5"; gdk_scale = "1.5";
in '' in ''
pkill -f kanshi
pkill -f mako
pkill -f nm-applet
pkill -f swayosd-server
pkill -f waybar
touchpad=`riverctl list-inputs|grep -i touchpad` touchpad=`riverctl list-inputs|grep -i touchpad`
for t in ''${touchpad[@]}; do for t in ''${touchpad[@]}; do
riverctl input $t natural-scroll enabled riverctl input $t natural-scroll enabled
@ -285,7 +291,6 @@
# not have a modifier # not have a modifier
for mode in normal locked for mode in normal locked
do do
# Eject the optical drive (well if you still have one that is)
riverctl map $mode None XF86Eject spawn 'eject -T' riverctl map $mode None XF86Eject spawn 'eject -T'
# Control pulse audio volume with pamixer (https://github.com/cdemoulins/pamixer) # Control pulse audio volume with pamixer (https://github.com/cdemoulins/pamixer)
@ -293,13 +298,11 @@
riverctl map $mode None XF86AudioLowerVolume spawn '${volume_down}' riverctl map $mode None XF86AudioLowerVolume spawn '${volume_down}'
riverctl map $mode None XF86AudioMute spawn '${volume_mute}' riverctl map $mode None XF86AudioMute spawn '${volume_mute}'
# Control MPRIS aware media players with playerctl (https://github.com/altdesktop/playerctl)
riverctl map $mode None XF86AudioMedia spawn '${media_play}' riverctl map $mode None XF86AudioMedia spawn '${media_play}'
riverctl map $mode None XF86AudioPlay spawn '${media_play}' riverctl map $mode None XF86AudioPlay spawn '${media_play}'
riverctl map $mode None XF86AudioPrev spawn '${media_previous}' riverctl map $mode None XF86AudioPrev spawn '${media_previous}'
riverctl map $mode None XF86AudioNext spawn '${media_next}' riverctl map $mode None XF86AudioNext spawn '${media_next}'
# Control screen backlight brightness with brightnessctl (https://github.com/Hummer12007/brightnessctl)
riverctl map $mode None XF86MonBrightnessUp spawn '${brightness_up}' riverctl map $mode None XF86MonBrightnessUp spawn '${brightness_up}'
riverctl map $mode None XF86MonBrightnessDown spawn '${brightness_down}' riverctl map $mode None XF86MonBrightnessDown spawn '${brightness_down}'
done done
@ -317,12 +320,12 @@
riverctl default-layout rivertile riverctl default-layout rivertile
rivertile -view-padding 6 -outer-padding 6 & rivertile -view-padding 6 -outer-padding 6 &
pkill -f kanshi && kanshi & kanshi &
mako &
nm-applet &
swayosd-server &
thunar --daemon & thunar --daemon &
pkill -f waybar && waybar & waybar &
pkill -f nm-applet && nm-applet &
pkill -f mako && mako
pkill -f swayosd-server && swayosd-server &
''; '';
}; };
} }

View file

@ -17,5 +17,7 @@
enable = true; enable = true;
preset = "framework13.json"; preset = "framework13.json";
}; };
desktopEnv.river.enable = true;
}; };
} }