update inputs
This commit is contained in:
kiri committed
1 parent
cde67e4d75
commit
717c0435ee
7 files changed
+316
-461
No files matched your search
@@ -19,7 +19,7 @@
|
||||
posting
|
||||
resterm
|
||||
kubectl
|
||||
stablePkgs.mongodb-compass
|
||||
mongodb-compass
|
||||
scc
|
||||
nodejs
|
||||
mariadb
|
||||
|
||||
@@ -7,245 +7,245 @@
|
||||
{
|
||||
# Application and utility launchers
|
||||
"Mod+Return" = {
|
||||
action.spawn = terminal;
|
||||
hotkey-overlay.title = "Terminal";
|
||||
spawn = terminal;
|
||||
_props.hotkey-overlay-title = "Terminal";
|
||||
};
|
||||
"Mod+B" = {
|
||||
action.spawn = browser;
|
||||
hotkey-overlay.title = "Browser";
|
||||
spawn = browser;
|
||||
_props.hotkey-overlay-title = "Browser";
|
||||
};
|
||||
"Mod+Space" = {
|
||||
repeat = false;
|
||||
action.spawn = launcher;
|
||||
hotkey-overlay.title = "App Launcher";
|
||||
_props.repeat = false;
|
||||
spawn = launcher;
|
||||
_props.hotkey-overlay-title = "App Launcher";
|
||||
};
|
||||
"Mod+Ctrl+Return" = {
|
||||
repeat = false;
|
||||
action.spawn = shortcutCommands.nixosTerminal;
|
||||
hotkey-overlay.title = "NixOS Config Terminal";
|
||||
_props.repeat = false;
|
||||
spawn = shortcutCommands.nixosTerminal;
|
||||
_props.hotkey-overlay-title = "NixOS Config Terminal";
|
||||
};
|
||||
"Mod+Ctrl+Shift+Return" = {
|
||||
repeat = false;
|
||||
action.spawn = shortcutCommands.nixosSwitch;
|
||||
hotkey-overlay.title = "NixOS Switch";
|
||||
_props.repeat = false;
|
||||
spawn = shortcutCommands.nixosSwitch;
|
||||
_props.hotkey-overlay-title = "NixOS Switch";
|
||||
};
|
||||
"Mod+Ctrl+E" = {
|
||||
repeat = false;
|
||||
action.spawn = shortcutCommands.editSecrets;
|
||||
hotkey-overlay.title = "Edit Secrets";
|
||||
_props.repeat = false;
|
||||
spawn = shortcutCommands.editSecrets;
|
||||
_props.hotkey-overlay-title = "Edit Secrets";
|
||||
};
|
||||
"Mod+Ctrl+C" = {
|
||||
repeat = false;
|
||||
action.spawn = shortcutCommands.pickColor;
|
||||
hotkey-overlay.title = "Pick Color";
|
||||
_props.repeat = false;
|
||||
spawn = shortcutCommands.pickColor;
|
||||
_props.hotkey-overlay-title = "Pick Color";
|
||||
};
|
||||
|
||||
# Hardware media, volume, and brightness keys
|
||||
"XF86AudioPlay" = {
|
||||
action.spawn-sh = "playerctl play-pause";
|
||||
allow-when-locked = true;
|
||||
spawn-sh = "playerctl play-pause";
|
||||
_props.allow-when-locked = true;
|
||||
};
|
||||
"XF86AudioStop" = {
|
||||
action.spawn-sh = "playerctl stop";
|
||||
allow-when-locked = true;
|
||||
spawn-sh = "playerctl stop";
|
||||
_props.allow-when-locked = true;
|
||||
};
|
||||
"XF86AudioPrev" = {
|
||||
action.spawn-sh = "playerctl previous";
|
||||
allow-when-locked = true;
|
||||
spawn-sh = "playerctl previous";
|
||||
_props.allow-when-locked = true;
|
||||
};
|
||||
"XF86AudioNext" = {
|
||||
action.spawn-sh = "playerctl next";
|
||||
allow-when-locked = true;
|
||||
spawn-sh = "playerctl next";
|
||||
_props.allow-when-locked = true;
|
||||
};
|
||||
"XF86AudioRaiseVolume" = {
|
||||
action.spawn-sh = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+";
|
||||
allow-when-locked = true;
|
||||
spawn-sh = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+";
|
||||
_props.allow-when-locked = true;
|
||||
};
|
||||
"XF86AudioLowerVolume" = {
|
||||
action.spawn-sh = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-";
|
||||
allow-when-locked = true;
|
||||
spawn-sh = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-";
|
||||
_props.allow-when-locked = true;
|
||||
};
|
||||
"XF86AudioMute" = {
|
||||
action.spawn-sh = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
|
||||
allow-when-locked = true;
|
||||
spawn-sh = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
|
||||
_props.allow-when-locked = true;
|
||||
};
|
||||
"XF86AudioMicMute" = {
|
||||
action.spawn-sh = "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle";
|
||||
allow-when-locked = true;
|
||||
spawn-sh = "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle";
|
||||
_props.allow-when-locked = true;
|
||||
};
|
||||
"XF86MonBrightnessUp" = {
|
||||
action.spawn-sh = "brightnessctl s 5%+";
|
||||
allow-when-locked = true;
|
||||
spawn-sh = "brightnessctl s 5%+";
|
||||
_props.allow-when-locked = true;
|
||||
};
|
||||
"XF86MonBrightnessDown" = {
|
||||
action.spawn-sh = "brightnessctl s 5%-";
|
||||
allow-when-locked = true;
|
||||
spawn-sh = "brightnessctl s 5%-";
|
||||
_props.allow-when-locked = true;
|
||||
};
|
||||
|
||||
# Screenshots
|
||||
"Mod+S".action.screenshot = [ ];
|
||||
"Mod+Ctrl+S".action.screenshot-screen = [ ];
|
||||
"Mod+Alt+S".action.screenshot-window = [ ];
|
||||
"Mod+S".screenshot = { };
|
||||
"Mod+Ctrl+S".screenshot-screen = { };
|
||||
"Mod+Alt+S".screenshot-window = { };
|
||||
|
||||
# Session and compositor controls
|
||||
"Mod+Shift+Slash".action.show-hotkey-overlay = [ ];
|
||||
"Mod+Shift+Slash".show-hotkey-overlay = { };
|
||||
"Mod+Escape" = {
|
||||
action.toggle-keyboard-shortcuts-inhibit = [ ];
|
||||
allow-inhibiting = false;
|
||||
toggle-keyboard-shortcuts-inhibit = { };
|
||||
_props.allow-inhibiting = false;
|
||||
};
|
||||
"Mod+Ctrl+L" = {
|
||||
action.spawn-sh = "loginctl lock-session";
|
||||
hotkey-overlay.title = "Lock Screen";
|
||||
spawn-sh = "loginctl lock-session";
|
||||
_props.hotkey-overlay-title = "Lock Screen";
|
||||
};
|
||||
"Mod+Ctrl+Shift+Q".action.quit = [ ];
|
||||
"Ctrl+Alt+Delete".action.quit = [ ];
|
||||
"Mod+Shift+P".action.power-off-monitors = [ ];
|
||||
"Mod+Ctrl+Shift+Q".quit = { };
|
||||
"Ctrl+Alt+Delete".quit = { };
|
||||
"Mod+Shift+P".power-off-monitors = { };
|
||||
|
||||
# Overview and window close
|
||||
"Mod+O" = {
|
||||
action.toggle-overview = [ ];
|
||||
repeat = false;
|
||||
toggle-overview = { };
|
||||
_props.repeat = false;
|
||||
};
|
||||
"Mod+Q" = {
|
||||
action.close-window = [ ];
|
||||
repeat = false;
|
||||
close-window = { };
|
||||
_props.repeat = false;
|
||||
};
|
||||
|
||||
# Keyboard focus movement
|
||||
"Mod+Left".action.focus-column-or-monitor-left = [ ];
|
||||
"Mod+Down".action.focus-window-down = [ ];
|
||||
"Mod+Up".action.focus-window-up = [ ];
|
||||
"Mod+Right".action.focus-column-or-monitor-right = [ ];
|
||||
"Mod+H".action.focus-column-or-monitor-left = [ ];
|
||||
"Mod+J".action.focus-window-down = [ ];
|
||||
"Mod+K".action.focus-window-up = [ ];
|
||||
"Mod+L".action.focus-column-or-monitor-right = [ ];
|
||||
"Mod+Left".focus-column-or-monitor-left = { };
|
||||
"Mod+Down".focus-window-down = { };
|
||||
"Mod+Up".focus-window-up = { };
|
||||
"Mod+Right".focus-column-or-monitor-right = { };
|
||||
"Mod+H".focus-column-or-monitor-left = { };
|
||||
"Mod+J".focus-window-down = { };
|
||||
"Mod+K".focus-window-up = { };
|
||||
"Mod+L".focus-column-or-monitor-right = { };
|
||||
|
||||
# Keyboard window and column movement
|
||||
"Mod+Alt+Left".action.move-column-left-or-to-monitor-left = [ ];
|
||||
"Mod+Alt+Down".action.move-window-down-or-to-workspace-down = [ ];
|
||||
"Mod+Alt+Up".action.move-window-up-or-to-workspace-up = [ ];
|
||||
"Mod+Alt+Right".action.move-column-right-or-to-monitor-right = [ ];
|
||||
"Mod+Alt+H".action.move-column-left-or-to-monitor-left = [ ];
|
||||
"Mod+Alt+J".action.move-window-down-or-to-workspace-down = [ ];
|
||||
"Mod+Alt+K".action.move-window-up-or-to-workspace-up = [ ];
|
||||
"Mod+Alt+L".action.move-column-right-or-to-monitor-right = [ ];
|
||||
"Mod+Alt+Left".move-column-left-or-to-monitor-left = { };
|
||||
"Mod+Alt+Down".move-window-down-or-to-workspace-down = { };
|
||||
"Mod+Alt+Up".move-window-up-or-to-workspace-up = { };
|
||||
"Mod+Alt+Right".move-column-right-or-to-monitor-right = { };
|
||||
"Mod+Alt+H".move-column-left-or-to-monitor-left = { };
|
||||
"Mod+Alt+J".move-window-down-or-to-workspace-down = { };
|
||||
"Mod+Alt+K".move-window-up-or-to-workspace-up = { };
|
||||
"Mod+Alt+L".move-column-right-or-to-monitor-right = { };
|
||||
|
||||
# First and last column navigation
|
||||
"Mod+Home".action.focus-column-first = [ ];
|
||||
"Mod+End".action.focus-column-last = [ ];
|
||||
"Mod+Alt+Home".action.move-column-to-first = [ ];
|
||||
"Mod+Alt+End".action.move-column-to-last = [ ];
|
||||
"Mod+Home".focus-column-first = { };
|
||||
"Mod+End".focus-column-last = { };
|
||||
"Mod+Alt+Home".move-column-to-first = { };
|
||||
"Mod+Alt+End".move-column-to-last = { };
|
||||
|
||||
# Move focus, columns, and workspaces across monitors
|
||||
"Mod+Tab".action.focus-monitor-next = [ ];
|
||||
"Mod+Tab".focus-monitor-next = { };
|
||||
"Mod+A" = {
|
||||
repeat = false;
|
||||
action.spawn = shortcutCommands.swapMonitorWorkspaces;
|
||||
hotkey-overlay.title = "Swap Monitor Workspaces";
|
||||
_props.repeat = false;
|
||||
spawn = shortcutCommands.swapMonitorWorkspaces;
|
||||
_props.hotkey-overlay-title = "Swap Monitor Workspaces";
|
||||
};
|
||||
"Mod+Alt+Tab".action.move-column-to-monitor-next = [ ];
|
||||
"Mod+Shift+Tab".action.move-workspace-to-monitor-next = [ ];
|
||||
"Mod+Alt+Tab".move-column-to-monitor-next = { };
|
||||
"Mod+Shift+Tab".move-workspace-to-monitor-next = { };
|
||||
|
||||
"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+Left".focus-monitor-left = { };
|
||||
"Mod+Shift+Down".focus-monitor-down = { };
|
||||
"Mod+Shift+Up".focus-monitor-up = { };
|
||||
"Mod+Shift+Right".focus-monitor-right = { };
|
||||
|
||||
# Linear workspace navigation
|
||||
"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+Page_Down".focus-workspace-down = { };
|
||||
"Mod+Page_Up".focus-workspace-up = { };
|
||||
"Mod+U".focus-workspace-down = { };
|
||||
"Mod+I".focus-workspace-up = { };
|
||||
|
||||
# Move columns between adjacent workspaces
|
||||
"Mod+Alt+Page_Down".action.move-column-to-workspace-down = [ ];
|
||||
"Mod+Alt+Page_Up".action.move-column-to-workspace-up = [ ];
|
||||
"Mod+Alt+U".action.move-column-to-workspace-down = [ ];
|
||||
"Mod+Alt+I".action.move-column-to-workspace-up = [ ];
|
||||
"Mod+Alt+Page_Down".move-column-to-workspace-down = { };
|
||||
"Mod+Alt+Page_Up".move-column-to-workspace-up = { };
|
||||
"Mod+Alt+U".move-column-to-workspace-down = { };
|
||||
"Mod+Alt+I".move-column-to-workspace-up = { };
|
||||
|
||||
# Reorder workspaces
|
||||
"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+Shift+Page_Down".move-workspace-down = { };
|
||||
"Mod+Shift+Page_Up".move-workspace-up = { };
|
||||
"Mod+Shift+U".move-workspace-down = { };
|
||||
"Mod+Shift+I".move-workspace-up = { };
|
||||
|
||||
# Mouse workspace navigation
|
||||
"Mod+WheelScrollDown" = {
|
||||
action.focus-workspace-down = [ ];
|
||||
cooldown-ms = 150;
|
||||
focus-workspace-down = { };
|
||||
_props.cooldown-ms = 150;
|
||||
};
|
||||
"Mod+WheelScrollUp" = {
|
||||
action.focus-workspace-up = [ ];
|
||||
cooldown-ms = 150;
|
||||
focus-workspace-up = { };
|
||||
_props.cooldown-ms = 150;
|
||||
};
|
||||
"Mod+Alt+WheelScrollDown" = {
|
||||
action.move-column-to-workspace-down = [ ];
|
||||
cooldown-ms = 150;
|
||||
move-column-to-workspace-down = { };
|
||||
_props.cooldown-ms = 150;
|
||||
};
|
||||
"Mod+Alt+WheelScrollUp" = {
|
||||
action.move-column-to-workspace-up = [ ];
|
||||
cooldown-ms = 150;
|
||||
move-column-to-workspace-up = { };
|
||||
_props.cooldown-ms = 150;
|
||||
};
|
||||
|
||||
# Mouse column navigation and movement
|
||||
"Mod+WheelScrollRight".action.focus-column-or-monitor-right = [ ];
|
||||
"Mod+WheelScrollLeft".action.focus-column-or-monitor-left = [ ];
|
||||
"Mod+Alt+WheelScrollRight".action.move-column-right-or-to-monitor-right = [ ];
|
||||
"Mod+Alt+WheelScrollLeft".action.move-column-left-or-to-monitor-left = [ ];
|
||||
"Mod+Shift+WheelScrollDown".action.focus-column-or-monitor-right = [ ];
|
||||
"Mod+Shift+WheelScrollUp".action.focus-column-or-monitor-left = [ ];
|
||||
"Mod+WheelScrollRight".focus-column-or-monitor-right = { };
|
||||
"Mod+WheelScrollLeft".focus-column-or-monitor-left = { };
|
||||
"Mod+Alt+WheelScrollRight".move-column-right-or-to-monitor-right = { };
|
||||
"Mod+Alt+WheelScrollLeft".move-column-left-or-to-monitor-left = { };
|
||||
"Mod+Shift+WheelScrollDown".focus-column-or-monitor-right = { };
|
||||
"Mod+Shift+WheelScrollUp".focus-column-or-monitor-left = { };
|
||||
|
||||
# Direct workspace focus
|
||||
"Mod+1".action.focus-workspace = 1;
|
||||
"Mod+2".action.focus-workspace = 2;
|
||||
"Mod+3".action.focus-workspace = 3;
|
||||
"Mod+4".action.focus-workspace = 4;
|
||||
"Mod+5".action.focus-workspace = 5;
|
||||
"Mod+6".action.focus-workspace = 6;
|
||||
"Mod+7".action.focus-workspace = 7;
|
||||
"Mod+8".action.focus-workspace = 8;
|
||||
"Mod+9".action.focus-workspace = 9;
|
||||
"Mod+1".focus-workspace = 1;
|
||||
"Mod+2".focus-workspace = 2;
|
||||
"Mod+3".focus-workspace = 3;
|
||||
"Mod+4".focus-workspace = 4;
|
||||
"Mod+5".focus-workspace = 5;
|
||||
"Mod+6".focus-workspace = 6;
|
||||
"Mod+7".focus-workspace = 7;
|
||||
"Mod+8".focus-workspace = 8;
|
||||
"Mod+9".focus-workspace = 9;
|
||||
|
||||
# Move columns to numbered workspaces
|
||||
"Mod+Ctrl+1".action.move-column-to-workspace = 1;
|
||||
"Mod+Ctrl+2".action.move-column-to-workspace = 2;
|
||||
"Mod+Ctrl+3".action.move-column-to-workspace = 3;
|
||||
"Mod+Ctrl+4".action.move-column-to-workspace = 4;
|
||||
"Mod+Ctrl+5".action.move-column-to-workspace = 5;
|
||||
"Mod+Ctrl+6".action.move-column-to-workspace = 6;
|
||||
"Mod+Ctrl+7".action.move-column-to-workspace = 7;
|
||||
"Mod+Ctrl+8".action.move-column-to-workspace = 8;
|
||||
"Mod+Ctrl+9".action.move-column-to-workspace = 9;
|
||||
"Mod+Ctrl+1".move-column-to-workspace = 1;
|
||||
"Mod+Ctrl+2".move-column-to-workspace = 2;
|
||||
"Mod+Ctrl+3".move-column-to-workspace = 3;
|
||||
"Mod+Ctrl+4".move-column-to-workspace = 4;
|
||||
"Mod+Ctrl+5".move-column-to-workspace = 5;
|
||||
"Mod+Ctrl+6".move-column-to-workspace = 6;
|
||||
"Mod+Ctrl+7".move-column-to-workspace = 7;
|
||||
"Mod+Ctrl+8".move-column-to-workspace = 8;
|
||||
"Mod+Ctrl+9".move-column-to-workspace = 9;
|
||||
|
||||
# Add and remove windows from columns
|
||||
"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+BracketLeft".consume-or-expel-window-left = { };
|
||||
"Mod+BracketRight".consume-or-expel-window-right = { };
|
||||
"Mod+Comma".consume-window-into-column = { };
|
||||
"Mod+Period".expel-window-from-column = { };
|
||||
|
||||
# Column and window presentation modes
|
||||
"Mod+R".action.switch-preset-column-width = [ ];
|
||||
"Mod+Shift+R".action.switch-preset-column-width-back = [ ];
|
||||
"Mod+Ctrl+R".action.reset-window-height = [ ];
|
||||
"Mod+Ctrl+Shift+R".action.switch-preset-window-height = [ ];
|
||||
"Mod+F".action.maximize-column = [ ];
|
||||
"Mod+Shift+F".action.fullscreen-window = [ ];
|
||||
"Mod+M".action.maximize-window-to-edges = [ ];
|
||||
"Mod+C".action.center-column = [ ];
|
||||
"Mod+R".switch-preset-column-width = { };
|
||||
"Mod+Shift+R".switch-preset-column-width-back = { };
|
||||
"Mod+Ctrl+R".reset-window-height = { };
|
||||
"Mod+Ctrl+Shift+R".switch-preset-window-height = { };
|
||||
"Mod+F".maximize-column = { };
|
||||
"Mod+Shift+F".fullscreen-window = { };
|
||||
"Mod+M".maximize-window-to-edges = { };
|
||||
"Mod+C".center-column = { };
|
||||
|
||||
# Manual column width and window height adjustments
|
||||
"Mod+Shift+H".action.set-column-width = "-10%";
|
||||
"Mod+Shift+L".action.set-column-width = "+10%";
|
||||
"Mod+Shift+J".action.set-window-height = "+10%";
|
||||
"Mod+Shift+K".action.set-window-height = "-10%";
|
||||
"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+Shift+H".set-column-width = "-10%";
|
||||
"Mod+Shift+L".set-column-width = "+10%";
|
||||
"Mod+Shift+J".set-window-height = "+10%";
|
||||
"Mod+Shift+K".set-window-height = "-10%";
|
||||
"Mod+Minus".set-column-width = "-10%";
|
||||
"Mod+Equal".set-column-width = "+10%";
|
||||
"Mod+Shift+Minus".set-window-height = "-10%";
|
||||
"Mod+Shift+Equal".set-window-height = "+10%";
|
||||
|
||||
# Floating and tabbed layout toggles
|
||||
"Mod+Alt+V".action.toggle-window-floating = [ ];
|
||||
"Mod+Shift+V".action.switch-focus-between-floating-and-tiling = [ ];
|
||||
"Mod+W".action.toggle-column-tabbed-display = [ ];
|
||||
"Mod+Alt+V".toggle-window-floating = { };
|
||||
"Mod+Shift+V".switch-focus-between-floating-and-tiling = { };
|
||||
"Mod+W".toggle-column-tabbed-display = { };
|
||||
}
|
||||
@@ -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;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -94,27 +94,11 @@
|
||||
position = "bottom_right";
|
||||
};
|
||||
|
||||
plugins = {
|
||||
enabled = [ ];
|
||||
source = [
|
||||
{
|
||||
kind = "git";
|
||||
location = "https://github.com/noctalia-dev/official-plugins";
|
||||
name = "official";
|
||||
}
|
||||
{
|
||||
kind = "git";
|
||||
location = "https://github.com/noctalia-dev/community-plugins";
|
||||
name = "community";
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
shell = {
|
||||
font_family = "Lexend";
|
||||
polkit_agent = true;
|
||||
screen_time_enabled = true;
|
||||
settings_show_advanced = true;
|
||||
ui_scale = 1.1;
|
||||
animation.speed = 1.5;
|
||||
screen_corners = {
|
||||
enabled = true;
|
||||
@@ -143,10 +127,6 @@
|
||||
|
||||
widget = {
|
||||
bluetooth.hide_when_no_connected_device = true;
|
||||
cat = {
|
||||
audio_spectrum = true;
|
||||
type = "noctalia/bongocat:cat";
|
||||
};
|
||||
clock.format = "{:%H:%M}";
|
||||
media = {
|
||||
art_size = 90.0;
|
||||
@@ -161,7 +141,7 @@
|
||||
volume.show_label = false;
|
||||
network.show_label = false;
|
||||
battery.show_label = false;
|
||||
workspaces.display = "none";
|
||||
workspaces.show_labels = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -30,7 +30,26 @@ in
|
||||
rev = "55ca4ba249eba21f861b9866b71ab41bb8930318";
|
||||
hash = "sha256-UdMoMx2DoovcxSp/zBZ3PRv/Qpj+prd0uPm1gmdak2E=";
|
||||
};
|
||||
override = { inherit src version; };
|
||||
kanagawaGtkTheme = pkgs.stdenvNoCC.mkDerivation {
|
||||
pname = "kanagawa-gtk-theme";
|
||||
inherit src version;
|
||||
|
||||
nativeBuildInputs = [ pkgs.sassc ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out/share/themes"
|
||||
bash ./themes/install.sh \
|
||||
--dest "$out/share/themes" \
|
||||
--name Kanagawa \
|
||||
--color dark
|
||||
|
||||
rm -r "$out/share/themes/Kanagawa-Dark/gtk-2.0"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
in
|
||||
{
|
||||
home.pointerCursor = {
|
||||
@@ -47,13 +66,15 @@ in
|
||||
gtk = {
|
||||
enable = true;
|
||||
theme = {
|
||||
name = "Kanagawa-BL-LB";
|
||||
package = pkgs.kanagawa-gtk-theme.overrideAttrs (_: override);
|
||||
name = "Kanagawa-Dark";
|
||||
package = kanagawaGtkTheme;
|
||||
};
|
||||
gtk4.theme = null;
|
||||
iconTheme = {
|
||||
name = "Kanagawa";
|
||||
package = pkgs.kanagawa-icon-theme.overrideAttrs (_: override);
|
||||
package = pkgs.kanagawa-icon-theme.overrideAttrs (_: {
|
||||
inherit src version;
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
Reference in new issue
Block a user