Feat(treewide): Add river window manager

Co-authored-by: sils <sils@sils.li>

9 files changed, 421 insertions, 7 deletions

diff --git a/flake.nix b/flake.nix
index b1a0696..d416b72 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,15 +6,69 @@
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    # inputs for following
+    systems = {
+      url = "github:nix-systems/x86_64-linux"; # only evaluate for this system
+    };
+    flake-compat = {
+      url = "github:edolstra/flake-compat";
+      flake = false;
+    };
+    crane = {
+      url = "github:ipetkov/crane";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-compat.follows = "flake-compat";
+        flake-utils.follows = "flake-utils";
+        rust-overlay.follows = "rust-overlay";
+      };
+    };
+    flake-utils = {
+      url = "github:numtide/flake-utils";
+      inputs = {
+        systems.follows = "systems";
+      };
+    };
+    rust-overlay = {
+      url = "github:oxalica/rust-overlay";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-utils.follows = "flake-utils";
+      };
+    };
+
+    shell_library = {
+      url = "git+https://codeberg.org/soispha/shell_library.git";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-utils.follows = "flake-utils";
+        systems.follows = "systems";
+      };
+    };
+    river_init_lesser = {
+      url = "git+https://codeberg.org/soispha/river_keymap_init.git";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        crane.follows = "crane";
+        flake-utils.follows = "flake-utils";
+        rust-overlay.follows = "rust-overlay";
+        flake-compat.follows = "flake-compat";
+      };
+    };
   };
   outputs = {
     self,
     nixpkgs,
     home-manager,
+    shell_library,
+    river_init_lesser,
     ...
   } @ attrs: let
     system = "x86_64-linux";
     pkgs = nixpkgs.legacyPackages."${system}";
+
+    sysLib = shell_library.lib.${system};
   in {
     nixosConfigurations.thinklappi = nixpkgs.lib.nixosSystem {
       inherit system;
@@ -26,7 +80,7 @@
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
           home-manager.users.sils = import ./users/sils;
-          home-manager.extraSpecialArgs = {inherit nixpkgs system;};
+          home-manager.extraSpecialArgs = {inherit nixpkgs system sysLib river_init_lesser;};
         }
       ];
     };
diff --git a/sys/default.nix b/sys/default.nix
index ef20d36..f1dfe31 100644
--- a/sys/default.nix
+++ b/sys/default.nix
@@ -1,6 +1,6 @@
 {...}: {
   imports = [
-    ./desktop/gnome
+    ./desktop/river
     ./environment
     ./nix
     ./packages
diff --git a/sys/desktop/river/default.nix b/sys/desktop/river/default.nix
new file mode 100644
index 0000000..fa2720b
--- /dev/null
+++ b/sys/desktop/river/default.nix
@@ -0,0 +1,20 @@
+{pkgs, ...}: {
+  services.xserver = {
+    enable = true;
+    displayManager = {
+      lightdm.enable = true;
+      defaultSession = "river";
+      session = [
+        {
+          manage = "desktop";
+          name = "river";
+          start = ''
+            ${pkgs.river}/bin/river;
+          '';
+        }
+      ];
+    };
+  };
+}
+# vim: ts=2
+
diff --git a/sys/services/flatpak/default.nix b/sys/services/flatpak/default.nix
index d1f4586..0cc6108 100644
--- a/sys/services/flatpak/default.nix
+++ b/sys/services/flatpak/default.nix
@@ -1,11 +1,11 @@
-{...}: {
+{pkgs, ...}: {
   services.flatpak.enable = true;
   fileSystems."/var/lib/flatpak" = {
     device = "/srv/flatpak";
     options = ["bind"];
   };
-  #  xdg.portal = {
-  #    enable = true;
-  #    extraPortals = [pkgs.xdg-desktop-portal-gtk];
-  #  };
+  xdg.portal = {
+    enable = true;
+    extraPortals = [pkgs.xdg-desktop-portal-gtk];
+  };
 }
diff --git a/users/sils/default.nix b/users/sils/default.nix
index 1d02cdb..92731cf 100644
--- a/users/sils/default.nix
+++ b/users/sils/default.nix
@@ -4,6 +4,7 @@
     ./git
     ./gpg
     ./packages
+    ./river
     ./zsh
   ];
 
diff --git a/users/sils/river/default.nix b/users/sils/river/default.nix
new file mode 100644
index 0000000..d05e16c
--- /dev/null
+++ b/users/sils/river/default.nix
@@ -0,0 +1,49 @@
+{
+  pkgs,
+  sysLib,
+  river_init_lesser,
+  nixosConfig,
+  system,
+  ...
+}: let
+  inherit (nixosConfig.networking) hostName;
+  mappings = ''
+    err_fail riverctl keyboard-layout 'de'
+    err_fail river_init_lesser ~/.config/river/res/keys.ron
+  '';
+
+  screen_setup = ''
+    #err_fail wlr-randr --output Virtual-1 --mode 1920x1080
+  '';
+  init_scr = pkgs.substituteAll {
+    src = ./init;
+    inherit mappings screen_setup;
+  };
+in {
+  xdg.configFile."river/init".source =
+    sysLib.makeShellScriptWithLibraryAndKeepPath {
+      name = "river_init";
+      script = init_scr;
+      dependencies = builtins.attrValues {
+        river_init_lesser = river_init_lesser.packages.${system}.default;
+        inherit
+          (pkgs)
+          dash
+          river
+          gammastep
+          wlr-randr
+          yambar
+          mako
+          swaybg
+          swayidle
+          swaylock
+          alacritty
+          ;
+      };
+    }
+    + /bin/river_init;
+
+  xdg.configFile."river/res".source = ./res;
+}
+# vim: ts=2
+
diff --git a/users/sils/river/init b/users/sils/river/init
new file mode 100755
index 0000000..c419ed7
--- /dev/null
+++ b/users/sils/river/init
@@ -0,0 +1,74 @@
+#!/usr/bin/env dash
+# shellcheck source=/dev/null
+. %SHELL_LIBRARY_PATH
+
+err_fail() {
+    if ! "$@";then
+        warning "\"$*\" failed!\n" >> ~/river_log
+        # msg "Executing the safe init!"
+        # exec ~/.config/river/res/safe_init
+    fi
+}
+err_fail rm ~/river_log
+exec 1>> "$HOME"/river_log
+exec 2>> "$HOME"/river_log
+
+#Setup of environment variables {{{
+err_fail riverctl spawn "exec dbus-update-activation-environment SEATD_SOCK DISPLAY WAYLAND_DISPLAY DESKTOP_SESSION=river XDG_CURRENT_DESKTOP=river"
+err_fail export XDG_CURRENT_DESKTOP=river
+#}}}
+
+# Setup of mappings {{{
+@mappings@
+# }}}
+
+# Setup of Rules {{{
+err_fail riverctl float-filter-add app-id float
+err_fail riverctl float-filter-add app-id mpv
+err_fail riverctl float-filter-add app-id ModernGL
+err_fail riverctl float-filter-add title "Manim Slides"
+
+err_fail riverctl csd-filter-add app-id firefox
+# }}}
+
+# Set riverctl settings {{{
+# background
+err_fail riverctl background-color 0x002b36
+err_fail riverctl border-color-focused 0x93a1a1
+err_fail riverctl border-color-unfocused 0x586e75
+
+# keyboard repeat rate
+err_fail riverctl set-repeat 50 300
+
+# Cursor
+err_fail riverctl focus-follows-cursor normal
+#riverctl hide-cursor timeout 2000
+err_fail riverctl hide-cursor when-typing enabled
+err_fail riverctl set-cursor-warp on-output-change
+err_fail riverctl xcursor-theme Nordzy-cursors 24
+
+err_fail riverctl input pointer-1133-49970-Logitech_Gaming_Mouse_G502 pointer-accel 0
+err_fail riverctl input pointer-1133-49970-Logitech_Gaming_Mouse_G502 accel-profile none
+# }}}
+
+# Setup of general apps {{{
+@screen_setup@
+
+err_fail yambar &
+
+err_fail mako &
+err_fail swaybg -i "$WALLPAPER" &
+err_fail swayidle &
+err_fail alacritty &
+# }}}
+
+
+
+# Setup of layout [acts as exec!] {{{
+err_fail riverctl default-layout rivertile
+err_fail rivertile -main-ratio 0.5 -view-padding 1 -outer-padding 0
+
+#riverctl default-layout luatile
+#river-luatile
+# }}}
+# vim: ft=sh
diff --git a/users/sils/river/res/keys.ron b/users/sils/river/res/keys.ron
new file mode 100644
index 0000000..0df6d77
--- /dev/null
+++ b/users/sils/river/res/keys.ron
@@ -0,0 +1,56 @@
+#![enable(implicit_some)]
+RiverctlCommandArray(
+    commands: [
+    // Focus change
+    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "H",                       mods: "Super",          command: "focus-view",          command_args: "next",),
+    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "L",                       mods: "Super",          command: "focus-view",          command_args: "previous",),
+    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "H",                       mods: "Super+Control",  command: "focus-output",        command_args: "next",),
+    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "L",                       mods: "Super+Control",  command: "focus-output",        command_args: "previous",),
+
+    // Standard program
+    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "Return",                  mods: "Super",          command: "spawn",               command_args: "alacritty",),
+    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "q",                       mods: "Super+Shift",    command: "exit",                command_args: None,),
+
+    // Screenshot
+    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "Print",                   mods: "None",           command: "spawn",               command_args: "~/repos/shell/scripts/screen_shot",),
+
+    // Audio
+    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "XF86AudioRaiseVolume",    mods: "None",           command: "spawn",               command_args: "pactl set-sink-volume 1 +5%",),
+    RiverctlCommand( map_mode: Map,         mode: ["normal", "locked"], key: "XF86AudioLowerVolume",    mods: "None",           command: "spawn",               command_args: "~/.local/bin/ytcs",),
+    RiverctlCommand( map_mode: Map,         mode: ["normal", "locked"], key: "XF86AudioMute",           mods: "None",           command: "spawn",               command_args: "~/repos/shell/scripts/mocs",),
+
+    // Launcher
+    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "R",                       mods: "Super",          command: "spawn",               command_args: "bemenu-run",),
+    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "F1",                      mods: "Super",          command: "spawn",               command_args: "firefox",),
+    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "F2",                      mods: "Super",          command: "spawn",               command_args: "keepassxc",),
+    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "F3",                      mods: "Super",          command: "spawn",               command_args: "element-desktop",),
+    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "L",                       mods: "Super",          command: "spawn",               command_args: "swaylock -f",),
+
+    // Client
+    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "f",                       mods: "Super",          command: "toggle-fullscreen",   command_args: None,),
+    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "c",                       mods: "Super+Shift",    command: "close",               command_args: None,),
+    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "space",                   mods: "Super+Control",  command: "toggle-float",        command_args: None,),
+    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "Return",                  mods: "Super+Control",  command: "zoom",                command_args: None,),
+    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "o",                       mods: "Super",          command: "send-to-output",      command_args: "next",),
+    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "H",                       mods: "Super+Shift",    command: "swap",                command_args: "next",),
+    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "L",                       mods: "Super+Shift",    command: "swap",                command_args: "previous",),
+
+    // Toggle all tags
+    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "0",                       mods: "Super",          command: "set-focused-tags",    command_args: "4294967295"),
+    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "0",                       mods: "Super+Shift",    command: "set-view-tags",       command_args: "4294967295"),
+
+    // Mouse
+    RiverctlCommand( map_mode: MapMouse,    mode: ["normal"],           key: "BTN_LEFT",                mods: "Super",          command: "move-view",           command_args: None,),
+    RiverctlCommand( map_mode: MapMouse,    mode: ["normal"],           key: "BTN_RIGHT",               mods: "Super",          command: "resize-view",         command_args: None,),
+
+    ],
+    // Set these mappings for the tags 0-8 with key [1-9]
+    tags_number: 9,
+    tag_commands: [
+    RiverctlTagCommand( map_mode: Map, mode: ["normal"], mods: "Super",                 command: "set-focused-tags",),
+    RiverctlTagCommand( map_mode: Map, mode: ["normal"], mods: "Super+Shift",           command: "set-view-tags",),
+    RiverctlTagCommand( map_mode: Map, mode: ["normal"], mods: "Super+Control",         command: "toggle-focused-tags",),
+    RiverctlTagCommand( map_mode: Map, mode: ["normal"], mods: "Super+Shift+Control",   command: "toggle-view-tags",),
+    ],
+)
+
diff --git a/users/sils/river/res/safe_init b/users/sils/river/res/safe_init
new file mode 100755
index 0000000..8e80026
--- /dev/null
+++ b/users/sils/river/res/safe_init
@@ -0,0 +1,160 @@
+#!/bin/sh
+
+# This is the example configuration file for river.
+#
+# If you wish to edit this, you will probably want to copy it to
+# $XDG_CONFIG_HOME/river/init or $HOME/.config/river/init first.
+#
+# See the river(1), riverctl(1), and rivertile(1) man pages for complete
+# documentation.
+
+# Note: the "Super" modifier is also known as Logo, GUI, Windows, Mod4, etc.
+
+# Super+Shift+Return to start an instance of foot (https://codeberg.org/dnkl/foot)
+riverctl map normal Super Return spawn alacritty
+
+# Super+Q to close the focused view
+riverctl map normal Super Q close
+
+# Super+Shift+E to exit river
+riverctl map normal Super+Shift Q 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+Period and Super+Comma to focus the next/previous output
+riverctl map normal Super Period focus-output next
+riverctl map normal Super Comma focus-output previous
+
+# Super+Shift+{Period,Comma} to send the focused view to the next/previous output
+riverctl map normal Super+Shift Period send-to-output next
+riverctl map normal Super+Shift Comma send-to-output previous
+
+# Super+Return to bump the focused view to the top of the layout stack
+riverctl map normal Super Return zoom
+
+# Super+H and Super+L to decrease/increase the main ratio of rivertile(1)
+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"
+
+# Super+Shift+H and Super+Shift+L to increment/decrement the main count of rivertile(1)
+riverctl map normal Super+Shift H send-layout-cmd rivertile "main-count +1"
+riverctl map normal Super+Shift L send-layout-cmd rivertile "main-count -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
+
+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+Space to toggle float
+riverctl map normal Super Space toggle-float
+
+# Super+F to toggle fullscreen
+riverctl map normal Super F 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"
+
+# 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 0x002b36
+riverctl border-color-focused 0x93a1a1
+riverctl border-color-unfocused 0x586e75
+
+# 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"
+
+# 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 6 -outer-padding 6