hijiri: finish migration

This commit is contained in:
Nikodem Rabuliński 2024-01-22 20:41:58 +01:00
parent cb199bb55b
commit 78bcb2b753
5 changed files with 191 additions and 2 deletions

View file

@ -1,5 +1,55 @@
{
configurations.darwin.hijiri = {
configurations.darwin.hijiri = {pkgs, ...}: {
imports = [
./skhd.nix
./yabai.nix
];
nixpkgs.system = "aarch64-darwin";
settei.user.config = {
common.desktop.enable = true;
home.packages = with pkgs; [
utm
podman
podman-compose
qemu
anki-bin
];
};
system.defaults = {
".GlobalPreferences" = {
"com.apple.mouse.scaling" = -1.0;
};
dock = {
autohide = true;
largesize = 64;
minimize-to-application = true;
orientation = "right";
show-process-indicators = false;
show-recents = false;
};
CustomUserPreferences.".GlobalPreferences" = {
"com.apple.scrollwheel.scaling" = "-1";
};
};
system.keyboard = {
enableKeyMapping = true;
remapCapsLockToEscape = true;
nonUS.remapTilde = true;
swapLeftCommandAndLeftAlt = true;
# swap right command and right alt too
userKeyMapping = [
{
HIDKeyboardModifierMappingSrc = 30064771302;
HIDKeyboardModifierMappingDst = 30064771303;
}
{
HIDKeyboardModifierMappingSrc = 30064771303;
HIDKeyboardModifierMappingDst = 30064771302;
}
];
};
};
}

34
hosts/hijiri/skhd.nix Normal file
View file

@ -0,0 +1,34 @@
{
pkgs,
lib,
inputs',
...
}: {
services.skhd = {
enable = true;
skhdConfig = let
spaceCount = 6;
spaceBindings =
lib.genList
(i: let num = toString (i + 1); in "cmd - ${num} : yabai -m space --focus ${num}")
spaceCount;
in ''
cmd - return : ${pkgs.alacritty}/Applications/Alacritty.app/Contents/MacOS/alacritty
cmd + shift - return : ${inputs'.niko-nur.packages.qutebrowser-bin}/Applications/qutebrowser.app/Contents/MacOS/qutebrowser
cmd - h : yabai -m window --focus west
cmd - j : yabai -m window --focus south
cmd - k : yabai -m window --focus north
cmd - l : yabai -m window --focus east
cmd + shift - h : yabai -m window --swap west
cmd + shift - j : yabai -m window --swap south
cmd + shift - k : yabai -m window --swap north
cmd + shift - l : yabai -m window --swap east
cmd + shift - space : yabai -m window --toggle float
${lib.concatStringsSep "\n" spaceBindings}
'';
};
}

30
hosts/hijiri/yabai.nix Normal file
View file

@ -0,0 +1,30 @@
{
lib,
pkgs,
...
}: {
services.yabai = {
enable = true;
enableScriptingAddition = true;
config = {
layout = "bsp";
top_padding = 10;
bottom_padding = 10;
left_padding = 10;
right_padding = 10;
window_gap = 10;
mouse_modifier = "cmd";
window_topmost = "off";
window_shadow = "float";
mouse_follows_focus = "on";
};
extraConfig = ''
yabai -m rule --add app="^Alacritty$" border=on
yabai -m rule --add app="^System Settings$" manage=off
yabai -m signal --add event=window_created action='yabai -m query --windows --window $YABAI_WINDOW_ID \
| ${lib.getExe pkgs.jq} -er ".\"can-resize\" or .\"is-floating\"" \
|| yabai -m window $YABAI_WINDOW_ID --toggle float'
'';
};
}