emenel/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

niri updates, some bluetoth

Browse source
This commit is contained in:
Matt Nish-Lapidus 2025-03-05 10:32:45 -05:00
parent 3a9fea436d
commit e17e8fd886
5 changed files with 339 additions and 264 deletions
Download patch file Download diff file Expand all files Collapse all files

465
modules/home/niri.nix
View file

@ -1,33 +1,52 @@
{ config, nix-config, pkgs, ... }:
{
config,
nix-config,
pkgs,
...
}:
with pkgs.lib.nix-rice;
let strPalette = palette.toRGBHex pkgs.rice.colorPalette;
in {
let
strPalette = palette.toRGBHex pkgs.rice.colorPalette;
in
{
programs = {
niri = {
settings = {
hotkey-overlay.skip-at-startup = true;
# hotkey-overlay.skip-at-startup = true;
screenshot-path = "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png";
prefer-no-csd = true;
spawn-at-startup = [
{ command = ["clipse" "-listen"]; }
{ command = [ "systemctl" "--user" "restart" "xwayland-satellite.service" ]; }
{
command = [
"clipse"
"-listen"
];
}
{
command = [
"systemctl"
"--user"
"restart"
"xwayland-satellite.service"
];
}
{ command = [ "sleep5; ${nix-config.packages.x86_64-linux.filen-desktop}/bin/filen-desktop" ]; }
];
workspaces = {
"main" = {};
"scratchpad" = {};
"main" = { };
"scratchpad" = { };
};
input = {
input = {
keyboard.xkb = {
layout = "us";
options = "compose:ralt";
};
touchpad = {
touchpad = {
natural-scroll = true;
scroll-method = "two-finger";
dwt = false;
@ -93,9 +112,9 @@ in {
always-center-single-column = true;
preset-column-widths = [
{ proportion = 0.33333; }
{ proportion = 0.5; }
{ proportion = 0.66667; }
{ proportion = 0.33333; }
{ proportion = 0.5; }
{ proportion = 0.66667; }
];
preset-window-heights = [
@ -104,11 +123,14 @@ in {
{ proportion = 2. / 3.; }
];
default-column-width = { proportion = 0.5; };
default-column-width = {
proportion = 0.5;
};
focus-ring = {
enable = true;
active.color = with pkgs.rice.colorPalette.normal.border;
active.color =
with pkgs.rice.colorPalette.normal.border;
"rgba(${toString r} ${toString g} ${toString b} ${toString a})";
width = 2;
};
@ -142,25 +164,25 @@ in {
{
matches = [
{app-id="Calculator";}
{app-id="Color Picker";}
{app-id="Volume Control";}
{app-id="processing-core-PApplet";}
{ app-id = "Calculator"; }
{ app-id = "Color Picker"; }
{ app-id = "Volume Control"; }
{ app-id = "processing-core-PApplet"; }
];
open-floating = true;
}
{
matches = [
{app-id="Plexamp";}
{app-id="scratchpad";}
{ app-id = "Plexamp"; }
{ app-id = "scratchpad"; }
];
open-on-workspace = "scratchpad";
open-floating = true;
}
{
matches = [{app-id="launcher";}];
matches = [ { app-id = "launcher"; } ];
open-floating = true;
focus-ring = {
enable = true;
@ -174,17 +196,21 @@ in {
};
}
{ # Open the Firefox picture-in-picture player as floating by default.
{
# Open the Firefox picture-in-picture player as floating by default.
# This app-id regular expression will work for both:
# host Firefox (app-id is "firefox")
# Flatpak Firefox (app-id is "org.mozilla.firefox")
matches = [ { app-id= "r#\"librewolf$\"# title=\"^Picture-in-Picture$\""; } ];
matches = [ { app-id = "r#\"librewolf$\"# title=\"^Picture-in-Picture$\""; } ];
open-floating = true;
}
{ matches = [ { app-id="Renoise"; }
{ app-id="Bitwig"; }
{ app-id="labwc"; }];
{
matches = [
{ app-id = "Renoise"; }
{ app-id = "Bitwig"; }
{ app-id = "labwc"; }
];
open-maximized = true;
}
];
@ -194,176 +220,233 @@ in {
lid-open.action = spawn "niri msg output eDP-1 on && shikanectl reload";
};
binds = with config.lib.niri.actions; let
wez = spawn "wezterm" "--config-file" "/home/emenel/.config/wezterm/launcher.lua" "start" "--always-new-process";
wezlaunch = wez "--class" "launcher";
in {
# shows a list of important hotkeys.
"Mod+Shift+Slash".action = show-hotkey-overlay;
binds =
with config.lib.niri.actions;
let
wez =
spawn "wezterm" "--config-file" "/home/emenel/.config/wezterm/launcher.lua" "start"
"--always-new-process";
wezlaunch = wez "--class" "launcher";
in
{
# shows a list of important hotkeys.
"Mod+Shift+Slash".action = show-hotkey-overlay;
"Mod+Space".action = wezlaunch "sway-launcher-desktop";
"Print".action = wezlaunch "sway-launcher-desktop";
"Mod+Space" = {
hotkey-overlay.title = "Launcher";
action = wezlaunch "sway-launcher-desktop";
};
"Mod+Ctrl+T".action = spawn "wezterm";
"Mod+Ctrl+E".action = spawn "emacsclient" "-r" "-n";
"Mod+Ctrl+B".action = spawn "librewolf";
"Mod+Ctrl+V".action = wezlaunch "clipse";
"Mod+Ctrl+F".action = wez "yazi";
"Mod+Ctrl+N".action = spawn "swaync-client" "-t";
"Print" = {
hotkey-overlay.title = "Launcher (alternative key)";
action = wezlaunch "sway-launcher-desktop";
};
"Mod+Shift+A".action = spawn "hyprlock";
"Mod+Ctrl+T" = {
hotkey-overlay.title = "Wezterm";
action = spawn "wezterm";
};
"Mod+Ctrl+E" = {
hotkey-overlay.title = "Emacs (client)";
action = spawn "emacsclient" "-r" "-n";
};
"Mod+Ctrl+B" = {
hotkey-overlay.title = "Librewolf Browser";
action = spawn "librewolf";
};
"Mod+Ctrl+V" = {
hotkey-overlay.title = "Clipboard History";
action = wezlaunch "clipse";
};
"Mod+Ctrl+F" = {
hotkey-overlay.title = "Yazi";
action = wez "yazi";
};
"Mod+Ctrl+N" = {
hotkey-overlay.title = "Notifications";
action = spawn "swaync-client" "-t";
};
"Mod+Ctrl+O" = {
hotkey-overlay.title = "Obsidian";
action = spawn "obsidian";
};
"Mod+Ctrl+S" = {
hotkey-overlay.title = "Signal";
action = spawn "signal";
};
"Mod+Ctrl+C" = {
hotkey-overlay.title = "Calendar";
action = spawn "gnome-calendar";
};
"XF86AudioPlay" = { allow-when-locked = true; action = spawn "playerctl" "play-pause"; };
"XF86AudioNext" = { allow-when-locked = true; action = spawn "playerctl" "next"; };
"XF86AudioPrev" = { allow-when-locked = true; action = spawn "playerctl" "previous"; };
"Mod+Shift+A" = {
hotkey-overlay.title = "Lock Session";
action = spawn "hyprlock";
};
"XF86AudioRaiseVolume" = {
allow-when-locked = true;
action = spawn "swayosd-client" "--output-volume" "raise";
"XF86AudioPlay" = {
allow-when-locked = true;
action = spawn "playerctl" "play-pause";
};
"XF86AudioNext" = {
allow-when-locked = true;
action = spawn "playerctl" "next";
};
"XF86AudioPrev" = {
allow-when-locked = true;
action = spawn "playerctl" "previous";
};
"XF86AudioRaiseVolume" = {
allow-when-locked = true;
action = spawn "swayosd-client" "--output-volume" "raise";
};
"XF86AudioLowerVolume" = {
allow-when-locked = true;
action = spawn "swayosd-client" "--output-volume" "lower";
};
"XF86AudioMute" = {
allow-when-locked = true;
action = spawn "swayosd-client" "--output-volume" "mute-toggle";
};
"XF86AudioMicMute" = {
allow-when-locked = true;
action = spawn "swayosd-client" "--input-volume" "mute-toggle";
};
"XF86MonBrightnessUp" = {
allow-when-locked = true;
action = spawn "swayosd-client" "--brightness" "raise";
};
"XF86MonBrightnessDown" = {
allow-when-locked = true;
action = spawn "swayosd-client" "--brightness" "lower";
};
"Mod+Q".action = close-window;
"Mod+Left".action = focus-column-left;
"Mod+Down".action = focus-window-down;
"Mod+Up".action = focus-window-up;
"Mod+Right".action = focus-column-right;
"Mod+H".action = focus-column-left;
"Mod+J".action = focus-window-down;
"Mod+K".action = focus-window-up;
"Mod+L".action = focus-column-right;
"Mod+Ctrl+Left".action = move-column-left;
"Mod+Ctrl+Down".action = move-window-down;
"Mod+Ctrl+Up".action = move-window-up;
"Mod+Ctrl+Right".action = move-column-right;
"Mod+Ctrl+H".action = move-column-left;
"Mod+Ctrl+J".action = move-window-down;
"Mod+Ctrl+K".action = move-window-up;
"Mod+Ctrl+L".action = move-column-right;
"Mod+Home".action = focus-column-first;
"Mod+End".action = focus-column-last;
"Mod+Ctrl+Home".action = move-column-to-first;
"Mod+Ctrl+End".action = move-column-to-last;
"Mod+Shift+Left".action = focus-monitor-left;
"Mod+Shift+Down".action = focus-monitor-down;
"Mod+Shift+Up".action = focus-monitor-up;
"Mod+Shift+Right".action = focus-monitor-right;
"Mod+Shift+H".action = focus-monitor-left;
"Mod+Shift+J".action = focus-monitor-down;
"Mod+Shift+K".action = focus-monitor-up;
"Mod+Shift+L".action = focus-monitor-right;
"Mod+Shift+Ctrl+Left".action = move-column-to-monitor-left;
"Mod+Shift+Ctrl+Down".action = move-column-to-monitor-down;
"Mod+Shift+Ctrl+Up".action = move-column-to-monitor-up;
"Mod+Shift+Ctrl+Right".action = move-column-to-monitor-right;
"Mod+Shift+Ctrl+H".action = move-column-to-monitor-left;
"Mod+Shift+Ctrl+J".action = move-column-to-monitor-down;
"Mod+Shift+Ctrl+K".action = move-column-to-monitor-up;
"Mod+Shift+Ctrl+L".action = move-column-to-monitor-right;
"Mod+Page_Down".action = focus-workspace-down;
"Mod+Page_Up".action = focus-workspace-up;
"Mod+U".action = focus-workspace-down;
"Mod+I".action = focus-workspace-up;
"Mod+Ctrl+Page_Down".action = move-column-to-workspace-down;
"Mod+Ctrl+Page_Up".action = move-column-to-workspace-up;
"Mod+Ctrl+U".action = move-column-to-workspace-down;
"Mod+Ctrl+I".action = move-column-to-workspace-up;
"Mod+Shift+Page_Down".action = move-workspace-down;
"Mod+Shift+Page_Up".action = move-workspace-up;
"Mod+Shift+U".action = move-workspace-down;
"Mod+Shift+I".action = move-workspace-up;
"Mod+WheelScrollDown" = {
action = focus-workspace-down;
cooldown-ms = 150;
};
"Mod+WheelScrollUp" = {
action = focus-workspace-up;
cooldown-ms = 150;
};
"Mod+Ctrl+WheelScrollDown" = {
action = move-column-to-workspace-down;
cooldown-ms = 150;
};
"Mod+Ctrl+WheelScrollUp" = {
action = move-column-to-workspace-up;
cooldown-ms = 150;
};
"Mod+WheelScrollRight".action = focus-column-right;
"Mod+WheelScrollLeft".action = focus-column-left;
"Mod+Ctrl+WheelScrollRight".action = move-column-right;
"Mod+Ctrl+WheelScrollLeft".action = move-column-left;
"Mod+Shift+WheelScrollDown".action = focus-column-right;
"Mod+Shift+WheelScrollUp".action = focus-column-left;
"Mod+Ctrl+Shift+WheelScrollDown".action = move-column-right;
"Mod+Ctrl+Shift+WheelScrollUp".action = move-column-left;
"Mod+BracketLeft".action = consume-or-expel-window-left;
"Mod+BracketRight".action = consume-or-expel-window-right;
"Mod+Comma".action = consume-window-into-column;
"Mod+Period".action = expel-window-from-column;
"Mod+R".action = switch-preset-column-width;
"Mod+Shift+R".action = switch-preset-window-height;
"Mod+Ctrl+R".action = reset-window-height;
"Mod+F".action = maximize-column;
"Mod+Shift+F".action = fullscreen-window;
"Mod+C".action = center-column;
"Mod+Minus".action = set-column-width "-10%";
"Mod+Equal".action = set-column-width "+10%";
"Mod+Shift+Minus".action = set-window-height "-10%";
"Mod+Shift+Equal".action = set-window-height "+10%";
"Mod+Ctrl+X".action = toggle-window-floating;
"Mod+X".action = switch-focus-between-floating-and-tiling;
"Mod+S".action = focus-workspace "scratchpad";
"Mod+Print".action = screenshot;
"Mod+Ctrl+Print".action = screenshot-screen;
"Mod+Alt+Print".action = screenshot-window;
# The quit action will show a confirmation dialog to avoid accidental exits.
"Mod+Shift+E".action = quit;
# Powers off the monitors. To turn them back on, do any input like
# moving the mouse or pressing any other key.
"Mod+Shift+P".action = power-off-monitors;
"Mod+Shift+Alt+P" = {
hotkey-overlay.title = "Turn Laptop Display On";
action = spawn "niri msg output eDP-1 on";
};
};
"XF86AudioLowerVolume" = {
allow-when-locked=true;
action = spawn "swayosd-client" "--output-volume" "lower";
};
"XF86AudioMute" = {
allow-when-locked=true;
action = spawn "swayosd-client" "--output-volume" "mute-toggle";
};
"XF86AudioMicMute" = {
allow-when-locked=true;
action = spawn "swayosd-client" "--input-volume" "mute-toggle";
};
"XF86MonBrightnessUp" = {
allow-when-locked=true;
action = spawn "swayosd-client" "--brightness" "raise";
};
"XF86MonBrightnessDown" = {
allow-when-locked=true;
action = spawn "swayosd-client" "--brightness" "lower";
};
"Mod+Q".action = close-window;
"Mod+Left".action = focus-column-left;
"Mod+Down".action = focus-window-down;
"Mod+Up".action = focus-window-up;
"Mod+Right".action = focus-column-right;
"Mod+H".action = focus-column-left;
"Mod+J".action = focus-window-down;
"Mod+K".action = focus-window-up;
"Mod+L".action = focus-column-right;
"Mod+Ctrl+Left".action = move-column-left;
"Mod+Ctrl+Down".action = move-window-down;
"Mod+Ctrl+Up".action = move-window-up;
"Mod+Ctrl+Right".action = move-column-right;
"Mod+Ctrl+H".action = move-column-left;
"Mod+Ctrl+J".action = move-window-down;
"Mod+Ctrl+K".action = move-window-up;
"Mod+Ctrl+L".action = move-column-right;
"Mod+Home".action = focus-column-first;
"Mod+End".action = focus-column-last;
"Mod+Ctrl+Home".action = move-column-to-first;
"Mod+Ctrl+End".action = move-column-to-last;
"Mod+Shift+Left".action = focus-monitor-left;
"Mod+Shift+Down".action = focus-monitor-down;
"Mod+Shift+Up".action = focus-monitor-up;
"Mod+Shift+Right".action = focus-monitor-right;
"Mod+Shift+H".action = focus-monitor-left;
"Mod+Shift+J".action = focus-monitor-down;
"Mod+Shift+K".action = focus-monitor-up;
"Mod+Shift+L".action = focus-monitor-right;
"Mod+Shift+Ctrl+Left".action = move-column-to-monitor-left;
"Mod+Shift+Ctrl+Down".action = move-column-to-monitor-down;
"Mod+Shift+Ctrl+Up".action = move-column-to-monitor-up;
"Mod+Shift+Ctrl+Right".action = move-column-to-monitor-right;
"Mod+Shift+Ctrl+H".action = move-column-to-monitor-left;
"Mod+Shift+Ctrl+J".action = move-column-to-monitor-down;
"Mod+Shift+Ctrl+K".action = move-column-to-monitor-up;
"Mod+Shift+Ctrl+L".action = move-column-to-monitor-right;
"Mod+Page_Down".action = focus-workspace-down;
"Mod+Page_Up".action = focus-workspace-up;
"Mod+U".action = focus-workspace-down;
"Mod+I".action = focus-workspace-up;
"Mod+Ctrl+Page_Down".action = move-column-to-workspace-down;
"Mod+Ctrl+Page_Up".action = move-column-to-workspace-up;
"Mod+Ctrl+U".action = move-column-to-workspace-down;
"Mod+Ctrl+I".action = move-column-to-workspace-up;
"Mod+Shift+Page_Down".action = move-workspace-down;
"Mod+Shift+Page_Up".action = move-workspace-up;
"Mod+Shift+U".action = move-workspace-down;
"Mod+Shift+I".action = move-workspace-up;
"Mod+WheelScrollDown" = {
action = focus-workspace-down;
cooldown-ms = 150;
};
"Mod+WheelScrollUp" = {
action = focus-workspace-up;
cooldown-ms = 150;
};
"Mod+Ctrl+WheelScrollDown" = {
action = move-column-to-workspace-down;
cooldown-ms = 150;
};
"Mod+Ctrl+WheelScrollUp" = {
action = move-column-to-workspace-up;
cooldown-ms = 150;
};
"Mod+WheelScrollRight".action = focus-column-right;
"Mod+WheelScrollLeft".action = focus-column-left;
"Mod+Ctrl+WheelScrollRight".action = move-column-right;
"Mod+Ctrl+WheelScrollLeft".action = move-column-left;
"Mod+Shift+WheelScrollDown".action = focus-column-right;
"Mod+Shift+WheelScrollUp".action = focus-column-left;
"Mod+Ctrl+Shift+WheelScrollDown".action = move-column-right;
"Mod+Ctrl+Shift+WheelScrollUp".action = move-column-left;
"Mod+BracketLeft".action = consume-or-expel-window-left;
"Mod+BracketRight".action = consume-or-expel-window-right;
"Mod+Comma".action = consume-window-into-column;
"Mod+Period".action = expel-window-from-column;
"Mod+R".action = switch-preset-column-width;
"Mod+Shift+R".action = switch-preset-window-height;
"Mod+Ctrl+R".action = reset-window-height;
"Mod+F".action = maximize-column;
"Mod+Shift+F".action = fullscreen-window;
"Mod+C".action = center-column;
"Mod+Minus".action = set-column-width "-10%";
"Mod+Equal".action = set-column-width "+10%";
"Mod+Shift+Minus".action = set-window-height "-10%";
"Mod+Shift+Equal".action = set-window-height "+10%";
"Mod+Ctrl+X".action = toggle-window-floating;
"Mod+X".action = switch-focus-between-floating-and-tiling;
"Mod+S".action = focus-workspace "scratchpad";
"Mod+Print".action = screenshot;
"Mod+Ctrl+Print".action = screenshot-screen;
"Mod+Alt+Print".action = screenshot-window;
# The quit action will show a confirmation dialog to avoid accidental exits.
"Mod+Shift+E".action = quit;
# Powers off the monitors. To turn them back on, do any input like
# moving the mouse or pressing any other key.
"Mod+Shift+P".action = power-off-monitors;
"Mod+Shift+Alt+P".action = spawn "niri msg output eDP-1 on";
};
};
};
};

2
modules/home/waybar.nix
View file

@ -38,7 +38,7 @@ in {
"format" = "";
"format-off" = "";
"format-disabled" = "!";
"on-click" = "$HOME/.local/bin/wezlauncher bluetui";
"on-click" = "$HOME/.local/bin/wezapp bluetuith";
"tooltip-format" = "{status}";
};