update inputs
This commit is contained in:
kiri committed
1 parent
cde67e4d75
commit
717c0435ee
7 files changed
+316
-461
No files matched your search
@@ -1,5 +1,4 @@
|
||||
{
|
||||
inputs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
@@ -9,28 +8,16 @@ let
|
||||
in
|
||||
{
|
||||
flake.modules.nixos.niri =
|
||||
{ pkgs, ... }:
|
||||
{ ... }:
|
||||
{
|
||||
imports = [ inputs.niri.nixosModules.niri ];
|
||||
|
||||
home-manager.sharedModules = [ hmModules.niri ];
|
||||
|
||||
nixpkgs.overlays = [ inputs.niri.overlays.niri ];
|
||||
|
||||
programs = {
|
||||
dconf.enable = true;
|
||||
niri = {
|
||||
enable = true;
|
||||
package = pkgs.niri-unstable;
|
||||
};
|
||||
};
|
||||
programs.niri.enable = true;
|
||||
|
||||
services = {
|
||||
gvfs.enable = true;
|
||||
udisks2.enable = true;
|
||||
};
|
||||
|
||||
xdg.portal.enable = true;
|
||||
};
|
||||
|
||||
flake.modules.homeManager.niri =
|
||||
@@ -60,108 +47,98 @@ in
|
||||
playerctl
|
||||
brightnessctl
|
||||
wireplumber
|
||||
xwayland-satellite
|
||||
]
|
||||
++ lib.attrValues shortcuts.scripts;
|
||||
};
|
||||
|
||||
dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
|
||||
|
||||
programs.niri.settings = {
|
||||
outputs = lib.mapAttrs (
|
||||
_: display:
|
||||
{
|
||||
position = {
|
||||
inherit (display) x y;
|
||||
};
|
||||
}
|
||||
// lib.optionalAttrs display.primary {
|
||||
"focus-at-startup" = true;
|
||||
}
|
||||
// lib.optionalAttrs (display.scale != null) {
|
||||
inherit (display) scale;
|
||||
}
|
||||
// lib.optionalAttrs (display.width != null) {
|
||||
mode = {
|
||||
inherit (display)
|
||||
height
|
||||
refresh
|
||||
width
|
||||
;
|
||||
};
|
||||
}
|
||||
) machine.displays;
|
||||
|
||||
environment.DISPLAY = ":0";
|
||||
spawn-at-startup = [
|
||||
{ command = [ (lib.getExe pkgs.xwayland-satellite) ]; }
|
||||
]
|
||||
++ map (command: { inherit command; }) config.desktop.autostart;
|
||||
prefer-no-csd = true;
|
||||
hotkey-overlay.skip-at-startup = true;
|
||||
screenshot-path = "${config.xdg.userDirs.pictures}/screenshots/%Y-%m-%dT%H:%M:%S.png";
|
||||
|
||||
animations.slowdown = 0.6;
|
||||
|
||||
cursor = lib.mkIf config.home.pointerCursor.enable {
|
||||
inherit (config.home.pointerCursor) size;
|
||||
theme = config.home.pointerCursor.name;
|
||||
hide-after-inactive-ms = 3000;
|
||||
hide-when-typing = true;
|
||||
};
|
||||
|
||||
layout = {
|
||||
always-center-single-column = true;
|
||||
gaps = 14;
|
||||
focus-ring.enable = false;
|
||||
default-column-width.proportion = 1. / 2.;
|
||||
|
||||
border = {
|
||||
enable = true;
|
||||
width = 3;
|
||||
active.color = palette.accents.blue;
|
||||
inactive.color = palette.subtleBorder;
|
||||
urgent.color = palette.accents.red;
|
||||
};
|
||||
};
|
||||
|
||||
window-rules = [
|
||||
{
|
||||
geometry-corner-radius =
|
||||
let
|
||||
radius = 10.0;
|
||||
in
|
||||
{
|
||||
bottom-left = radius;
|
||||
bottom-right = radius;
|
||||
top-left = radius;
|
||||
top-right = radius;
|
||||
wayland.windowManager.niri = {
|
||||
enable = true;
|
||||
settings = {
|
||||
_children =
|
||||
lib.mapAttrsToList (name: display: {
|
||||
output = {
|
||||
_args = [ name ];
|
||||
position._props = {
|
||||
inherit (display) x y;
|
||||
};
|
||||
}
|
||||
// lib.optionalAttrs display.primary {
|
||||
"focus-at-startup" = { };
|
||||
}
|
||||
// lib.optionalAttrs (display.scale != null) {
|
||||
inherit (display) scale;
|
||||
}
|
||||
// lib.optionalAttrs (display.width != null) {
|
||||
mode = "${toString display.width}x${toString display.height}@${toString display.refresh}";
|
||||
};
|
||||
clip-to-geometry = true;
|
||||
}
|
||||
];
|
||||
}) machine.displays
|
||||
++ map (command: { spawn-at-startup = command; }) config.desktop.autostart
|
||||
++ [
|
||||
{
|
||||
window-rule = {
|
||||
geometry-corner-radius = [
|
||||
10.0
|
||||
10.0
|
||||
10.0
|
||||
10.0
|
||||
];
|
||||
clip-to-geometry = true;
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
debug.honor-xdg-activation-with-invalid-serial = true;
|
||||
gestures.hot-corners.enable = false;
|
||||
environment.DISPLAY = ":0";
|
||||
prefer-no-csd = { };
|
||||
hotkey-overlay.skip-at-startup = { };
|
||||
screenshot-path = "${config.xdg.userDirs.pictures}/screenshots/%Y-%m-%dT%H:%M:%S.png";
|
||||
|
||||
input = {
|
||||
focus-follows-mouse.enable = true;
|
||||
mouse."accel-speed" = 0.4;
|
||||
keyboard = {
|
||||
repeat-delay = 300;
|
||||
repeat-rate = 50;
|
||||
xkb.options = "caps:escape";
|
||||
animations.slowdown = 0.6;
|
||||
|
||||
cursor = lib.mkIf config.home.pointerCursor.enable {
|
||||
xcursor-size = config.home.pointerCursor.size;
|
||||
xcursor-theme = config.home.pointerCursor.name;
|
||||
hide-after-inactive-ms = 3000;
|
||||
hide-when-typing = { };
|
||||
};
|
||||
touchpad.dwt = true;
|
||||
};
|
||||
|
||||
binds = import ./_bindings.nix {
|
||||
inherit (config.desktop.commands)
|
||||
browser
|
||||
launcher
|
||||
terminal
|
||||
;
|
||||
shortcutCommands = shortcuts.commands;
|
||||
layout = {
|
||||
always-center-single-column = { };
|
||||
gaps = 14;
|
||||
focus-ring.off = { };
|
||||
default-column-width.proportion = 1. / 2.;
|
||||
|
||||
border = {
|
||||
width = 3;
|
||||
active-color = palette.accents.blue;
|
||||
inactive-color = palette.subtleBorder;
|
||||
urgent-color = palette.accents.red;
|
||||
};
|
||||
};
|
||||
|
||||
debug.honor-xdg-activation-with-invalid-serial = true;
|
||||
gestures.hot-corners.off = { };
|
||||
|
||||
input = {
|
||||
focus-follows-mouse = { };
|
||||
mouse."accel-speed" = 0.4;
|
||||
keyboard = {
|
||||
repeat-delay = 300;
|
||||
repeat-rate = 50;
|
||||
xkb.options = "caps:escape";
|
||||
};
|
||||
touchpad.dwt = { };
|
||||
};
|
||||
|
||||
binds = import ./_bindings.nix {
|
||||
inherit (config.desktop.commands)
|
||||
browser
|
||||
launcher
|
||||
terminal
|
||||
;
|
||||
shortcutCommands = shortcuts.commands;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user