treewide: alejandra -> nixfmt-rfc-style
This commit is contained in:
parent
d64c02e3da
commit
6558fdb739
51 changed files with 1108 additions and 928 deletions
|
@ -1,54 +1,56 @@
|
|||
{
|
||||
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
|
||||
qemu
|
||||
anki-bin
|
||||
configurations.darwin.hijiri =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
imports = [
|
||||
./skhd.nix
|
||||
./yabai.nix
|
||||
];
|
||||
programs.alacritty.settings.font.size = 14;
|
||||
};
|
||||
|
||||
system.defaults = {
|
||||
".GlobalPreferences" = {
|
||||
"com.apple.mouse.scaling" = -1.0;
|
||||
nixpkgs.system = "aarch64-darwin";
|
||||
|
||||
settei.user.config = {
|
||||
common.desktop.enable = true;
|
||||
home.packages = with pkgs; [
|
||||
utm
|
||||
qemu
|
||||
anki-bin
|
||||
];
|
||||
programs.alacritty.settings.font.size = 14;
|
||||
};
|
||||
dock = {
|
||||
autohide = true;
|
||||
largesize = 64;
|
||||
minimize-to-application = true;
|
||||
orientation = "right";
|
||||
show-process-indicators = false;
|
||||
show-recents = false;
|
||||
|
||||
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";
|
||||
};
|
||||
};
|
||||
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;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
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;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,29 +1,38 @@
|
|||
{lib, ...}: {
|
||||
{ lib, ... }:
|
||||
{
|
||||
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 : wezterm
|
||||
cmd + shift - return : qutebrowser
|
||||
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 : wezterm
|
||||
cmd + shift - return : 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 - 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 - 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
|
||||
cmd + shift - space : yabai -m window --toggle float
|
||||
|
||||
${lib.concatStringsSep "\n" spaceBindings}
|
||||
'';
|
||||
${lib.concatStringsSep "\n" spaceBindings}
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,8 +1,5 @@
|
|||
{ lib, pkgs, ... }:
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
services.yabai = {
|
||||
enable = true;
|
||||
enableScriptingAddition = true;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue