Myned/nixos
Myned/nixos
1
1
Fork 0
Code Issues Activity

niri: modify config

Browse source 
Signed-off-by: Myned <dev@bjork.tech>
This commit is contained in:
Myned 2024-12-31 12:44:17 -06:00
parent 6d3e618ed5
commit baca73c33e
Signed by: Myned
GPG key ID: C7224454F7881A34
6 changed files with 447 additions and 437 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
options/custom/desktops/niri/binds.nix
View file

@ -5,7 +5,10 @@
... ...
}: }:
with lib; let with lib; let
audio = "~/.local/bin/audio"; cfg = config.custom.desktops.niri.binds;
hm = config.home-manager.users.${config.custom.username};
audio = config.home-manager.users.${config.custom.username}.home.file.".local/bin/audio".source;
bash = "${pkgs.bash}/bin/bash"; bash = "${pkgs.bash}/bin/bash";
cat = "${pkgs.coreutils}/bin/cat"; cat = "${pkgs.coreutils}/bin/cat";
codium = "${config.home-manager.users.${config.custom.username}.programs.vscode.package}/bin/codium"; codium = "${config.home-manager.users.${config.custom.username}.programs.vscode.package}/bin/codium";
@ -32,15 +35,14 @@ with lib; let
waydroid = "${pkgs.waydroid}/bin/waydroid"; waydroid = "${pkgs.waydroid}/bin/waydroid";
_1password = "${config.programs._1password-gui.package}/bin/1password"; _1password = "${config.programs._1password-gui.package}/bin/1password";
youtube-music = "${pkgs.youtube-music}/bin/youtube-music"; youtube-music = "${pkgs.youtube-music}/bin/youtube-music";
cfg = config.custom.desktops.niri.binds;
in { in {
options.custom.desktops.niri.binds = { options.custom.desktops.niri.binds = {
enable = mkOption {default = false;}; enable = mkOption {default = false;};
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
home-manager.users.${config.custom.username} = { home-manager.sharedModules = [
{
# https://github.com/YaLTeR/niri/wiki/Configuration:-Key-Bindings # https://github.com/YaLTeR/niri/wiki/Configuration:-Key-Bindings
#?? Mod = Super/Win, Alt when nested; Mod5 = AltGr #?? Mod = Super/Win, Alt when nested; Mod5 = AltGr
#?? wev #?? wev
@ -63,7 +65,7 @@ in {
else "" else ""
} myndows''; } myndows'';
in in
listToAttrs (with config.home-manager.users.${config.custom.username}.lib.niri.actions; [ listToAttrs (with hm.lib.niri.actions; [
(key "0" "Mod" (spawn [swayosd-client "--output-volume" "mute-toggle"])) (key "0" "Mod" (spawn [swayosd-client "--output-volume" "mute-toggle"]))
(key "1" "Ctrl+Alt" (spawn ["lifx" "state" "--brightness" "0.01"])) (key "1" "Ctrl+Alt" (spawn ["lifx" "state" "--brightness" "0.01"]))
(key "1" "Mod" (focus-workspace "1")) (key "1" "Mod" (focus-workspace "1"))
@ -176,6 +178,7 @@ in {
(key "XF86MonBrightnessUp" null (spawn [swayosd-client "--brightness" "raise"])) # F8 (key "XF86MonBrightnessUp" null (spawn [swayosd-client "--brightness" "raise"])) # F8
(key "XF86AudioMedia" null (spawn [notify-send "test"])) # F12 (key "XF86AudioMedia" null (spawn [notify-send "test"])) # F12
]); ]);
}; }
];
}; };
} }

20
options/custom/desktops/niri/default.nix
View file

@ -18,7 +18,8 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
custom.desktops = mkIf config.custom.full { custom = {
desktops = mkIf config.custom.full {
niri = { niri = {
binds.enable = true; binds.enable = true;
input.enable = true; input.enable = true;
@ -34,6 +35,10 @@ in {
}; };
}; };
# Enable rootless Xwayland
services.xwayland-satellite.enable = cfg.xwayland;
};
# https://github.com/YaLTeR/niri # https://github.com/YaLTeR/niri
# https://github.com/sodiboo/niri-flake # https://github.com/sodiboo/niri-flake
# https://github.com/sodiboo/niri-flake/blob/main/docs.md # https://github.com/sodiboo/niri-flake/blob/main/docs.md
@ -45,14 +50,12 @@ in {
nixpkgs.overlays = [inputs.niri-flake.overlays.niri]; nixpkgs.overlays = [inputs.niri-flake.overlays.niri];
#!! Disabled bundled KDE polkit agent #!! Disable bundled KDE polkit agent by default
# https://github.com/sodiboo/niri-flake?tab=readme-ov-file#additional-notes # https://github.com/sodiboo/niri-flake?tab=readme-ov-file#additional-notes
systemd.user.services.niri-flake-polkit.enable = cfg.polkit; systemd.user.services.niri-flake-polkit.enable = cfg.polkit;
# Enable rootless Xwayland home-manager.sharedModules = [
custom.services.xwayland-satellite.enable = cfg.xwayland; {
home-manager.users.${config.custom.username} = {
programs.niri = { programs.niri = {
package = config.programs.niri.package; package = config.programs.niri.package;
@ -63,7 +66,7 @@ in {
(internal.settings-module {config = hm;}).options.programs.niri.config.default (internal.settings-module {config = hm;}).options.programs.niri.config.default
# https://github.com/sodiboo/niri-flake/blob/main/default-config.kdl.nix # https://github.com/sodiboo/niri-flake/blob/main/default-config.kdl.nix
++ (with kdl; [ ++ (with kdl; [
# TODO: Migrate to niri.settings when released # TODO: Migrate to window-rules when released
# https://github.com/YaLTeR/niri/pull/871 # https://github.com/YaLTeR/niri/pull/871
(plain "window-rule" [ (plain "window-rule" [
(leaf "match" {title = "^Picture.in.[Pp]icture$";}) (leaf "match" {title = "^Picture.in.[Pp]icture$";})
@ -77,6 +80,7 @@ in {
#// disable-direct-scanout = []; #// disable-direct-scanout = [];
}; };
}; };
}; }
];
}; };
} }

43
options/custom/desktops/niri/input.nix
View file

@ -11,14 +11,33 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
home-manager.users.${config.custom.username} = { home-manager.sharedModules = [
{
# https://github.com/YaLTeR/niri/wiki/Configuration:-Input # https://github.com/YaLTeR/niri/wiki/Configuration:-Input
programs.niri.settings.input = { programs.niri.settings.input = {
# https://github.com/YaLTeR/niri/wiki/Configuration:-Input#general-settings
focus-follows-mouse = {
enable = true;
max-scroll-amount = "100%";
};
power-key-handling.enable = false;
workspace-auto-back-and-forth = true;
# https://github.com/YaLTeR/niri/wiki/Configuration:-Input#keyboard
keyboard = { keyboard = {
repeat-delay = 300; repeat-delay = 300;
repeat-rate = 40; repeat-rate = 40;
}; };
# BUG: Applies to trackball device, switch to "flat" when per-device configuration is supported
# https://github.com/YaLTeR/niri/issues/371
# https://github.com/YaLTeR/niri/wiki/Configuration:-Input#pointing-devices
mouse = {
accel-profile = "adaptive";
accel-speed = -0.2;
};
touchpad = { touchpad = {
accel-profile = "adaptive"; accel-profile = "adaptive";
accel-speed = 0.3; accel-speed = 0.3;
@ -28,29 +47,13 @@ in {
scroll-factor = 0.4; scroll-factor = 0.4;
}; };
# BUG: Applies to trackball device, switch to "flat" when per-device configuration is supported
# https://github.com/YaLTeR/niri/issues/371
mouse = {
accel-profile = "adaptive";
accel-speed = -0.2;
};
trackball = { trackball = {
accel-profile = "adaptive"; accel-profile = "adaptive";
accel-speed = 0.5; accel-speed = 0.5;
middle-emulation = true; middle-emulation = true;
}; };
};
power-key-handling.enable = false; }
];
focus-follows-mouse = {
enable = true;
max-scroll-amount = "70%";
};
workspace-auto-back-and-forth = true;
};
};
}; };
} }

47
options/custom/desktops/niri/layout.nix
View file

@ -11,34 +11,14 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
home-manager.users.${config.custom.username} = { home-manager.sharedModules = [
{
# https://github.com/YaLTeR/niri/wiki/Configuration:-Layout # https://github.com/YaLTeR/niri/wiki/Configuration:-Layout
programs.niri.settings.layout = let programs.niri.settings.layout = let
gap = config.custom.gap / 2; gap = config.custom.gap / 2;
in { in {
gaps = gap;
#// center-focused-column = mkIf config.custom.ultrawide "always";
always-center-single-column = true; always-center-single-column = true;
# TODO: Uncomment after next release > v1.10.1
# https://github.com/YaLTeR/niri/wiki/Configuration:-Layout#empty-workspace-above-first
#// empty-workspace-above-first = true;
preset-column-widths = [
{proportion = 0.75;}
{proportion = 0.5;}
{proportion = 0.25;}
];
default-column-width = {}; # Window-defined
preset-window-heights = [
{proportion = 0.7;}
{proportion = 0.5;}
{proportion = 0.3;}
{proportion = 1.0;} # Default
];
border = { border = {
enable = true; enable = true;
width = config.custom.border; width = config.custom.border;
@ -46,13 +26,33 @@ in {
inactive.color = "#00000000"; inactive.color = "#00000000";
}; };
#/// center-focused-column = mkIf config.custom.ultrawide "always";
default-column-width.proportion = 1.0 / 3.0; # 33%
# TODO: Uncomment after next release > v1.10.1
# https://github.com/YaLTeR/niri/wiki/Configuration:-Layout#empty-workspace-above-first
#// empty-workspace-above-first = true;
focus-ring.enable = false; focus-ring.enable = false;
gaps = gap;
insert-hint = { insert-hint = {
enable = true; enable = true;
display.color = "#d3368280"; display.color = "#d3368280";
}; };
preset-column-widths = [
{proportion = 1.0 / 3.0;} # 33%, default
{proportion = 2.0 / 3.0;} # 66%
{proportion = 3.0 / 3.0;} # 100%
];
preset-window-heights = [
{proportion = 2.0 / 3.0;} # 66%
{proportion = 1.0 / 3.0;} # 33%
{proportion = 3.0 / 3.0;} # 100%, default
];
struts = { struts = {
left = gap; left = gap;
right = gap; right = gap;
@ -60,6 +60,7 @@ in {
bottom = gap; bottom = gap;
}; };
}; };
}; }
];
}; };
} }

56
options/custom/desktops/niri/misc.nix
View file

@ -5,28 +5,45 @@
... ...
}: }:
with lib; let with lib; let
cfg = config.custom.desktops.niri.misc;
hm = config.home-manager.users.${config.custom.username};
_1password = "${config.programs._1password-gui.package}/bin/1password"; _1password = "${config.programs._1password-gui.package}/bin/1password";
audio = config.home-manager.users.${config.custom.username}.home.file.".local/bin/audio".source; audio = config.home-manager.users.${config.custom.username}.home.file.".local/bin/audio".source;
niri = "${config.programs.niri.package}/bin/niri"; niri = "${config.programs.niri.package}/bin/niri";
rm = "${pkgs.coreutils}/bin/rm"; rm = "${pkgs.coreutils}/bin/rm";
sway-audio-idle-inhibit = "${pkgs.sway-audio-idle-inhibit}/bin/sway-audio-idle-inhibit"; sway-audio-idle-inhibit = "${pkgs.sway-audio-idle-inhibit}/bin/sway-audio-idle-inhibit";
wallpaper = "${config.home-manager.users.${config.custom.username}.home.file.".local/bin/wallpaper".source}"; wallpaper = "${config.home-manager.users.${config.custom.username}.home.file.".local/bin/wallpaper".source}";
cfg = config.custom.desktops.niri.misc;
in { in {
options.custom.desktops.niri.misc = { options.custom.desktops.niri.misc = {
enable = mkOption {default = false;}; enable = mkOption {default = false;};
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
home-manager.users.${config.custom.username} = { home-manager.sharedModules = [
{
programs.niri.settings = { programs.niri.settings = {
# https://github.com/YaLTeR/niri/wiki/Configuration:-Miscellaneous # https://github.com/YaLTeR/niri/wiki/Configuration:-Miscellaneous
cursor = with hm.gtk.cursorTheme; {
# Inherit home-manager GTK settings
inherit size;
theme = name;
# https://github.com/YaLTeR/niri/wiki/Configuration:-Miscellaneous#spawn-at-startup #// hide-after-inactive-ms = 1000 * 15; # Milliseconds
# https://github.com/YaLTeR/niri/wiki/Configuration:-Key-Bindings#actions hide-when-typing = true;
};
# HACK: Inherit home-manager environment variables in lieu of upstream fix
# https://github.com/nix-community/home-manager/issues/2659
environment = mapAttrs (name: value: toString value) hm.home.sessionVariables;
hotkey-overlay.skip-at-startup = true;
prefer-no-csd = true;
#!! Not executed in a shell
# https://github.com/YaLTeR/niri/wiki/Configuration:-Key-Bindings#spawn
spawn-at-startup = let spawn-at-startup = let
home = config.home-manager.users.${config.custom.username}.home.homeDirectory; home = hm.home.homeDirectory;
in in
[ [
{command = [_1password "--silent"];} # Launch password manager in background {command = [_1password "--silent"];} # Launch password manager in background
@ -38,36 +55,13 @@ in {
{command = [wallpaper];} {command = [wallpaper];}
]; ];
# HACK: Inherit home-manager environment variables in lieu of upstream fix
# https://github.com/nix-community/home-manager/issues/2659
# https://github.com/YaLTeR/niri/wiki/Configuration:-Miscellaneous#environment
environment =
mapAttrs (name: value: toString value)
config.home-manager.users.${config.custom.username}.home.sessionVariables;
# https://github.com/YaLTeR/niri/wiki/Configuration:-Miscellaneous#cursor
cursor = with config.home-manager.users.${config.custom.username}.gtk.cursorTheme; {
# Inherit home-manager GTK settings
inherit size;
theme = name;
hide-after-inactive-ms = 1000 * 15; # Milliseconds
hide-when-typing = true;
};
# https://github.com/YaLTeR/niri/wiki/Configuration:-Miscellaneous#hotkey-overlay
hotkey-overlay.skip-at-startup = true;
# https://github.com/YaLTeR/niri/wiki/Configuration:-Miscellaneous#prefer-no-csd
prefer-no-csd = true;
# https://github.com/YaLTeR/niri/wiki/Configuration:-Switch-Events
switch-events = { switch-events = {
# Turn display off while inhibiting suspend # Turn display off while inhibiting suspend
lid-close.action.spawn = [niri "msg" "action" "power-off-monitors"]; lid-close.action.spawn = [niri "msg" "action" "power-off-monitors"];
lid-open.action.spawn = [niri "msg" "action" "power-on-monitors"]; lid-open.action.spawn = [niri "msg" "action" "power-on-monitors"];
}; };
}; };
}; }
];
}; };
} }

31
options/custom/desktops/niri/rules.nix
View file

@ -11,16 +11,19 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
home-manager.users.${config.custom.username} = { home-manager.sharedModules = [
{
# https://github.com/YaLTeR/niri/wiki/Configuration:-Window-Rules # https://github.com/YaLTeR/niri/wiki/Configuration:-Window-Rules
programs.niri.settings = { programs.niri.settings = {
# HACK: Name workspaces after index to use open-on-workspace rule # HACK: Name workspaces after index to use open-on-workspace rule
workspaces = { #?? niri msg workspaces
"1" = {}; # workspaces = {
"2" = {}; # "1" = {};
"3" = {}; # "2" = {};
}; # "3" = {};
# };
#?? niri msg windows
window-rules = [ window-rules = [
### Defaults ### Defaults
@ -59,7 +62,7 @@ in {
{app-id = "^vivaldi.*$";} {app-id = "^vivaldi.*$";}
]; ];
open-on-workspace = "2"; #// open-on-workspace = "2";
} }
{ {
@ -84,7 +87,7 @@ in {
{app-id = "^obsidian$";} {app-id = "^obsidian$";}
]; ];
open-on-workspace = "2"; #// open-on-workspace = "2";
} }
{ {
@ -102,7 +105,8 @@ in {
{app-id = "^steam_app_.+$";} {app-id = "^steam_app_.+$";}
]; ];
open-on-workspace = "1"; default-column-width = {}; # Window-defined
#// open-on-workspace = "1";
variable-refresh-rate = true; variable-refresh-rate = true;
} }
@ -115,7 +119,7 @@ in {
{app-id = "^YouTube Music$";} {app-id = "^YouTube Music$";}
]; ];
open-on-workspace = "3"; #// open-on-workspace = "3";
} }
{ {
@ -126,7 +130,7 @@ in {
{app-id = "^ONLYOFFICE Desktop Editors$";} {app-id = "^ONLYOFFICE Desktop Editors$";}
]; ];
open-on-workspace = "2"; #// open-on-workspace = "2";
} }
{ {
@ -160,12 +164,13 @@ in {
{app-id = "^virt-manager$";} {app-id = "^virt-manager$";}
]; ];
open-on-workspace = "1"; #// open-on-workspace = "1";
} }
### Overrides ### Overrides
]; ];
}; };
}; }
];
}; };
} }