chore: run nix fmt

This commit is contained in:
Youwen Wu 2024-08-08 02:59:45 -07:00
parent 5588373094
commit 42a823e70d
4 changed files with 18 additions and 25 deletions

View file

@ -110,7 +110,7 @@
darwinConfigurations.phobos = nix-darwin.lib.darwinSystem { darwinConfigurations.phobos = nix-darwin.lib.darwinSystem {
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
./hosts/phobos ./hosts/phobos
home-manager.darwinModules.home-manager home-manager.darwinModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
@ -127,7 +127,7 @@
nix-homebrew.darwinModules.nix-homebrew nix-homebrew.darwinModules.nix-homebrew
./modules/darwin/homebrew.nix ./modules/darwin/homebrew.nix
./modules/darwin/yabai.nix ./modules/darwin/yabai.nix
./modules/darwin/skhd.nix ./modules/darwin/skhd.nix
]; ];
}; };
}; };

View file

@ -4,19 +4,19 @@
skhdConfig = '' skhdConfig = ''
# opens iTerm2 # opens iTerm2
alt - return : kitty alt - return : kitty
# Navigation # Navigation
alt - y : yabai -m window --focus west alt - y : yabai -m window --focus west
alt - u : yabai -m window --focus south alt - u : yabai -m window --focus south
alt - i : yabai -m window --focus north alt - i : yabai -m window --focus north
alt - o : yabai -m window --focus east alt - o : yabai -m window --focus east
# Moving windows # Moving windows
shift + alt - y : yabai -m window --warp west shift + alt - y : yabai -m window --warp west
shift + alt - u : yabai -m window --warp south shift + alt - u : yabai -m window --warp south
shift + alt - i : yabai -m window --warp north shift + alt - i : yabai -m window --warp north
shift + alt - o : yabai -m window --warp east shift + alt - o : yabai -m window --warp east
# Move focus container to workspace # Move focus container to workspace
shift + alt - m : yabai -m window --space last; yabai -m space --focus last shift + alt - m : yabai -m window --space last; yabai -m space --focus last
shift + alt - p : yabai -m window --space prev; yabai -m space --focus prev shift + alt - p : yabai -m window --space prev; yabai -m space --focus prev
@ -25,7 +25,7 @@
shift + alt - 2 : yabai -m window --space 2; yabai -m space --focus 2 shift + alt - 2 : yabai -m window --space 2; yabai -m space --focus 2
shift + alt - 3 : yabai -m window --space 3; yabai -m space --focus 3 shift + alt - 3 : yabai -m window --space 3; yabai -m space --focus 3
shift + alt - 4 : yabai -m window --space 4; yabai -m space --focus 4 shift + alt - 4 : yabai -m window --space 4; yabai -m space --focus 4
# Resize windows # Resize windows
lctrl + alt - y : yabai -m window --resize left:-50:0; \ lctrl + alt - y : yabai -m window --resize left:-50:0; \
yabai -m window --resize right:-50:0 yabai -m window --resize right:-50:0
@ -35,32 +35,32 @@
yabai -m window --resize bottom:0:-50 yabai -m window --resize bottom:0:-50
lctrl + alt - o : yabai -m window --resize right:50:0; \ lctrl + alt - o : yabai -m window --resize right:50:0; \
yabai -m window --resize left:50:0 yabai -m window --resize left:50:0
# Equalize size of windows # Equalize size of windows
lctrl + alt - e : yabai -m space --balance lctrl + alt - e : yabai -m space --balance
# Enable / Disable gaps in current workspace # Enable / Disable gaps in current workspace
lctrl + alt - g : yabai -m space --toggle padding; yabai -m space --toggle gap lctrl + alt - g : yabai -m space --toggle padding; yabai -m space --toggle gap
# Rotate windows clockwise and anticlockwise # Rotate windows clockwise and anticlockwise
alt - r : yabai -m space --rotate 270 alt - r : yabai -m space --rotate 270
shift + alt - r : yabai -m space --rotate 90 shift + alt - r : yabai -m space --rotate 90
# Rotate on X and Y Axis # Rotate on X and Y Axis
shift + alt - x : yabai -m space --mirror x-axis shift + alt - x : yabai -m space --mirror x-axis
shift + alt - y : yabai -m space --mirror y-axis shift + alt - y : yabai -m space --mirror y-axis
# Set insertion point for focused container # Set insertion point for focused container
shift + lctrl + alt - h : yabai -m window --insert west shift + lctrl + alt - h : yabai -m window --insert west
shift + lctrl + alt - j : yabai -m window --insert south shift + lctrl + alt - j : yabai -m window --insert south
shift + lctrl + alt - k : yabai -m window --insert north shift + lctrl + alt - k : yabai -m window --insert north
shift + lctrl + alt - l : yabai -m window --insert east shift + lctrl + alt - l : yabai -m window --insert east
# Float / Unfloat window # Float / Unfloat window
shift + alt - space : \ shift + alt - space : \
yabai -m window --toggle float; \ yabai -m window --toggle float; \
yabai -m window --toggle border yabai -m window --toggle border
# Make window native fullscreen # Make window native fullscreen
alt - f : yabai -m window --toggle zoom-fullscreen alt - f : yabai -m window --toggle zoom-fullscreen
shift + alt - f : yabai -m window --toggle native-fullscreen shift + alt - f : yabai -m window --toggle native-fullscreen

View file

@ -1,6 +1,5 @@
{ lib, ... }: { lib, ... }: {
{ imports = [ ../common.nix ];
imports = [ ../common.nix ];
wayland.windowManager.hyprland.settings.input.touchpad = { wayland.windowManager.hyprland.settings.input.touchpad = {
natural_scroll = true; natural_scroll = true;
disable_while_typing = true; disable_while_typing = true;

View file

@ -1,12 +1,6 @@
{ pkgs, ... }: { pkgs, ... }: {
{ imports =
imports = [ [ ../theming ../home.nix ../programs ../hyprland/laptop ../waybar/laptop ];
../theming
../home.nix
../programs
../hyprland/laptop
../waybar/laptop
];
# some overrides for laptop specifically # some overrides for laptop specifically
programs.kitty.settings.font_size = pkgs.lib.mkForce 11; programs.kitty.settings.font_size = pkgs.lib.mkForce 11;