feat(homix): update configuration
Extract `river` configuration into a `home-manager` module
Fix `xkb` configuration
Unpin `neovim-nightly-overlay`:
- https://github.com/nix-community/neovim-nightly-overlay/pull/166
- https://github.com/nix-community/neovim-nightly-overlay/pull/167
This commit is contained in:
parent
e122d8ba94
commit
e86d916ae8
GPG key ID:
675AA7EF13964ACB
10 changed files with 122 additions and 67 deletions
|
|
@ -5,5 +5,6 @@
|
|||
# List your module files here
|
||||
# my-module = import ./my-module.nix;
|
||||
reo101-shell = import ./reo101-shell.nix;
|
||||
reo101-river = import ./reo101-river;
|
||||
reo101-wezterm = import ./reo101-wezterm;
|
||||
}
|
||||
|
|
|
|||
83
modules/home-manager/reo101-river/default.nix
Normal file
83
modules/home-manager/reo101-river/default.nix
Normal file
|
|
@ -0,0 +1,83 @@
|
|||
{ lib, pkgs, config, ... }:
|
||||
|
||||
with lib;
|
||||
let
|
||||
cfg = config.reo101.river;
|
||||
in
|
||||
{
|
||||
imports =
|
||||
[
|
||||
];
|
||||
|
||||
options =
|
||||
{
|
||||
reo101.river = {
|
||||
enable = mkEnableOption "reo101 river setup";
|
||||
# swww = mkOption {
|
||||
# type = types.boolean;
|
||||
# description = "Enable swww (wallpaper daemon)";
|
||||
# default = false;
|
||||
# };
|
||||
};
|
||||
};
|
||||
|
||||
config =
|
||||
mkIf cfg.enable {
|
||||
home.packages = with pkgs;
|
||||
builtins.concatLists [
|
||||
[
|
||||
river
|
||||
swww # wallpaper deamon
|
||||
waybar # status bar
|
||||
xwayland
|
||||
wl-clipboard
|
||||
slurp # select regions from wayland
|
||||
grim # grap images from regions
|
||||
playerctl # music control
|
||||
]
|
||||
# (optionals cfg.swww [
|
||||
# swww
|
||||
# ])
|
||||
];
|
||||
|
||||
home.file.".config/river/init" = {
|
||||
executable = true;
|
||||
source = ./river;
|
||||
};
|
||||
|
||||
systemd.user.services."swww" = {
|
||||
Unit = {
|
||||
Description = "swww Daemon";
|
||||
PartOf = "graphical-session.target";
|
||||
};
|
||||
Service = {
|
||||
ExecStart = "${pkgs.swww}/bin/swww init --no-daemon";
|
||||
ExecStop = "${pkgs.swww}/bin/swww kill";
|
||||
Type = "simple";
|
||||
Restart = "always";
|
||||
RestartSec = 5;
|
||||
};
|
||||
Install = {
|
||||
WantedBy = [ "graphical-session.target" ];
|
||||
};
|
||||
# description = "Swww Deamon";
|
||||
# wantedBy = [ "graphical-session.target" ];
|
||||
# partOf = [ "graphical-session.target" ];
|
||||
# script = "${pkgs.swww}/bin/swww init --no-daemon";
|
||||
};
|
||||
|
||||
# services.swww = {
|
||||
# enabled = true;
|
||||
# };
|
||||
|
||||
# dunst on wayland
|
||||
services.wired = {
|
||||
enable = true;
|
||||
config = ./wired.ron;
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ reo101 ];
|
||||
};
|
||||
}
|
||||
169
modules/home-manager/reo101-river/river
Normal file
169
modules/home-manager/reo101-river/river
Normal file
|
|
@ -0,0 +1,169 @@
|
|||
#!/usr/bin/env sh
|
||||
|
||||
# Super+Return to start an instance of foot (https://codeberg.org/dnkl/foot)
|
||||
riverctl map normal Super Return spawn foot
|
||||
|
||||
# # Super+Return to start an instance of wezterm
|
||||
# riverctl map normal Super Return spawn wezterm
|
||||
|
||||
# Super+Q to close the focused view
|
||||
riverctl map normal Super Q close
|
||||
|
||||
# Super+Shift+Q to exit river
|
||||
riverctl map normal Super+Shift Q exit
|
||||
|
||||
# Super+F11 to screenshot
|
||||
riverctl map normal Super F11 spawn 'grim -g "$(slurp)" - | wl-copy'
|
||||
|
||||
# export PATH="${HOME}/.local/bin:${PATH}"
|
||||
riverctl map normal Super D PATH="${HOME}/.local/bin:${PATH}" dmenu_run
|
||||
|
||||
# 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+Space to bump the focused view to the top of the layout stack
|
||||
riverctl map normal Super Space 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+Shif+{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+Shift+Space to toggle float
|
||||
riverctl map normal Super+Shift 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 brighness 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 "tapy"
|
||||
|
||||
# Set and exec into the default layout generator, rivertile.
|
||||
# River will send the process group of the init executable SIGTERM on exit.
|
||||
riverctl default-layout rivertile
|
||||
|
||||
riverctl float-filter-add "flameshot"
|
||||
|
||||
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"
|
||||
|
||||
pipewire &
|
||||
wireplumber &
|
||||
waybar &
|
||||
|
||||
exec rivertile -view-padding 6 -outer-padding 6
|
||||
# exec dbus-update-activation-environment WAYLAND_DISPLAY
|
||||
239
modules/home-manager/reo101-river/wired.ron
Normal file
239
modules/home-manager/reo101-river/wired.ron
Normal file
|
|
@ -0,0 +1,239 @@
|
|||
(
|
||||
shortcuts: (
|
||||
notification_interact: 1,
|
||||
notification_close: 2,
|
||||
notification_closeall: 3,
|
||||
),
|
||||
|
||||
poll_interval: 16,
|
||||
max_notifications: 8,
|
||||
history_length: 100,
|
||||
replacing_enabled: true,
|
||||
replacing_resets_timeout: true,
|
||||
|
||||
timeout: 5000, // 3 sec timeout
|
||||
idle_threshold: 600, // 600 sec = 10 min
|
||||
unpause_on_input: true,
|
||||
|
||||
// min_window_width: 0,
|
||||
// min_window_height: 0,
|
||||
|
||||
debug: false,
|
||||
debug_color: Color(r: 0.0, g: 1.0, b: 0.0, a: 1.0),
|
||||
debug_color_alt: Color(r: 1.0, g: 0.0, b: 0.0, a: 1.0),
|
||||
|
||||
layout_blocks: [
|
||||
(
|
||||
name: "notif_root",
|
||||
parent: "",
|
||||
hook: (parent_anchor: TR, self_anchor: TR),
|
||||
offset: (x: -10, y: 39),
|
||||
params: NotificationBlock((
|
||||
monitor: 0,
|
||||
border_width: 2.0,
|
||||
border_rounding: 0.0,
|
||||
gap: (x: 0.0, y: 10.0),
|
||||
background_color: (hex: "#0E1013"),
|
||||
border_color: (hex: "#61AFEF"),
|
||||
border_color_low: (hex: "#A0A8B7"),
|
||||
border_color_critical: (hex: "#E55561"),
|
||||
notification_hook: (parent_anchor: BL, self_anchor: TL),
|
||||
)),
|
||||
),
|
||||
|
||||
(
|
||||
name: "notif_summary",
|
||||
parent: "notif_root",
|
||||
offset: (x: 0, y: 0),
|
||||
hook: (parent_anchor: TL, self_anchor: TR),
|
||||
params: TextBlock((
|
||||
text: "%s",
|
||||
padding: (left: 12.0, right: 12.0, top: 12.0, bottom: 7.0),
|
||||
font: "JetBrainsMono Nerd Font 11",
|
||||
color: (hex: "#A0A8B7"),
|
||||
dimensions: (
|
||||
width: (min: 300, max: 300),
|
||||
height: (min: 0, max: 0),
|
||||
),
|
||||
dimensions_image_hint: (
|
||||
width: (min: 233, max: 238),
|
||||
height: (min: 0, max: 0)
|
||||
),
|
||||
dimensions_image_app: (
|
||||
width: (min: 233, max: 238),
|
||||
height: (min: 0, max: 0)
|
||||
),
|
||||
)),
|
||||
),
|
||||
|
||||
(
|
||||
name: "notif_body",
|
||||
parent: "notif_summary",
|
||||
offset: (x: 0, y: 0),
|
||||
hook: (parent_anchor: BL, self_anchor: TL),
|
||||
render_criteria: [ Body ],
|
||||
render_anti_criteria: [ AppName("progress") ],
|
||||
params: TextBlock((
|
||||
text: "%b",
|
||||
padding: (left: 12.0, right: 5.0, top: 5.0, bottom: 12.0),
|
||||
font: "JetBrainsMono Nerd Font 10",
|
||||
color: (hex: "#A0A8B7"),
|
||||
dimensions: (
|
||||
width: (min: 300, max: 300),
|
||||
height: (min: 0, max: 100),
|
||||
),
|
||||
dimensions_image_hint: (
|
||||
width: (min: 240, max: 240),
|
||||
height: (min: 0, max: 100)
|
||||
),
|
||||
dimensions_image_app: (
|
||||
width: (min: 240, max: 240),
|
||||
height: (min: 0, max: 100)
|
||||
),
|
||||
)),
|
||||
),
|
||||
|
||||
(
|
||||
name: "notif_image",
|
||||
parent: "notif_summary",
|
||||
hook: (parent_anchor: TL, self_anchor: TR),
|
||||
offset: (x: 0, y: 0),
|
||||
render_criteria: [ AppImage, HintImage ],
|
||||
params: ImageBlock((
|
||||
image_type: HintThenApp,
|
||||
padding: (left: 12.0, right: 5.0, top: 12.0, bottom: 10.0),
|
||||
rounding: 5.0,
|
||||
scale_width: 50,
|
||||
scale_height: 50,
|
||||
filter_mode: Lanczos3,
|
||||
)),
|
||||
),
|
||||
|
||||
(
|
||||
name: "notif_progress",
|
||||
parent: "notif_summary",
|
||||
offset: (x: 0, y: 0),
|
||||
hook: (parent_anchor: BL, self_anchor: TL),
|
||||
render_criteria: [ Progress ],
|
||||
render_anti_criteria: [ Body ],
|
||||
params: ProgressBlock((
|
||||
padding: (left: 12.0, right: 12.0, top: 8.5, bottom: 12.5),
|
||||
border_width: 2.0,
|
||||
border_rounding: 5.0,
|
||||
fill_rounding: 5.0,
|
||||
border_color: (hex: "#30363F"),
|
||||
background_color: (hex: "#0E1013"),
|
||||
fill_color: (hex: "#BF68D9"),
|
||||
width: -1.0,
|
||||
height: 14.0,
|
||||
)),
|
||||
),
|
||||
|
||||
(
|
||||
name: "notif_buttonbox",
|
||||
parent: "notif_body",
|
||||
offset: (x: 12, y: 0),
|
||||
hook: (parent_anchor: BL, self_anchor: TL),
|
||||
render_criteria: [ ActionOther(0) ],
|
||||
params: TextBlock((
|
||||
text: "",
|
||||
padding: (left: 0.0, right: 0.0, top: 0.0, bottom: 0.0),
|
||||
font: "JetBrainsMono Nerd Font 11",
|
||||
color: (hex: "#A0A8B7"),
|
||||
dimensions: (
|
||||
width: (min: 288, max: 288),
|
||||
height: (min: 38, max: 38),
|
||||
),
|
||||
dimensions_image_hint: (
|
||||
width: (min: 221, max: 221),
|
||||
height: (min: 38, max: 38),
|
||||
),
|
||||
dimensions_image_app: (
|
||||
width: (min: 221, max: 221),
|
||||
height: (min: 38, max: 38),
|
||||
),
|
||||
)),
|
||||
),
|
||||
|
||||
(
|
||||
name: "notif_button1",
|
||||
parent: "notif_buttonbox",
|
||||
offset: (x: 0, y: 0),
|
||||
hook: (parent_anchor: TL, self_anchor: TL),
|
||||
render_criteria: [ ActionOther(0) ],
|
||||
params: ButtonBlock((
|
||||
text: "%a",
|
||||
font: "JetBrainsMono Nerd Font 10",
|
||||
action: OtherAction(0),
|
||||
padding: (left: 8.0, right: 8.0, top: 4.0, bottom: 4.0),
|
||||
border_width: 2.0,
|
||||
border_rounding: 0.0,
|
||||
fill_rounding: 0.0,
|
||||
text_color: (hex: "#A0A8B7"),
|
||||
text_color_hovered: (hex: "#FFFFFF"),
|
||||
border_color: (hex: "#30363F"),
|
||||
border_color_hovered: (hex: "#585b70"),
|
||||
background_color: (hex: "#282C34"),
|
||||
fill_color: (hex: "#FFFFFF"),
|
||||
dimensions: (
|
||||
width: (min: -1, max: -1),
|
||||
height: (min: 0, max: 0)
|
||||
),
|
||||
)),
|
||||
),
|
||||
|
||||
(
|
||||
name: "notif_button2",
|
||||
parent: "notif_button1",
|
||||
offset: (x: 10, y: 0),
|
||||
hook: (parent_anchor: TR, self_anchor: TL),
|
||||
render_criteria: [ ActionOther(1) ],
|
||||
params: ButtonBlock((
|
||||
text: "%a",
|
||||
font: "JetBrainsMono Nerd Font 10",
|
||||
action: OtherAction(1),
|
||||
padding: (left: 8.0, right: 8.0, top: 4.0, bottom: 4.0),
|
||||
border_width: 2.0,
|
||||
border_rounding: 0.0,
|
||||
fill_rounding: 0.0,
|
||||
text_color: (hex: "#A0A8B7"),
|
||||
text_color_hovered: (hex: "#FFFFFF"),
|
||||
border_color: (hex: "#30363F"),
|
||||
border_color_hovered: (hex: "#585b70"),
|
||||
background_color: (hex: "#282C34"),
|
||||
fill_color: (hex: "#FFFFFF"),
|
||||
dimensions: (
|
||||
width: (min: -1, max: -1),
|
||||
height: (min: 0, max: 0)
|
||||
),
|
||||
)),
|
||||
),
|
||||
|
||||
(
|
||||
name: "notif_button3",
|
||||
parent: "notif_button2",
|
||||
offset: (x: 10, y: 0),
|
||||
hook: (parent_anchor: TR, self_anchor: TL),
|
||||
render_criteria: [ ActionOther(2) ],
|
||||
params: ButtonBlock((
|
||||
text: "%a",
|
||||
font: "JetBrainsMono Nerd Font 10",
|
||||
action: OtherAction(2),
|
||||
padding: (left: 8.0, right: 8.0, top: 4.0, bottom: 4.0),
|
||||
border_width: 2.0,
|
||||
border_rounding: 0.0,
|
||||
fill_rounding: 0.0,
|
||||
text_color: (hex: "#A0A8B7"),
|
||||
text_color_hovered: (hex: "#FFFFFF"),
|
||||
border_color: (hex: "#30363F"),
|
||||
border_color_hovered: (hex: "#585b70"),
|
||||
background_color: (hex: "#282C34"),
|
||||
fill_color: (hex: "#FFFFFF"),
|
||||
dimensions: (
|
||||
width: (min: -1, max: -1),
|
||||
height: (min: 0, max: 0)
|
||||
),
|
||||
)),
|
||||
),
|
||||
],
|
||||
)
|
||||
|
|
@ -17,7 +17,7 @@ in
|
|||
type = types.str;
|
||||
description = "Extra zsh config";
|
||||
default = ''
|
||||
'';
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue