rm old crap

master
Elias Almqvist 3 weeks ago
parent 8f8fe28a28
commit a3c8c59dd9
No known key found for this signature in database
GPG Key ID: E31A99CE3E75A158
  1. 62
      nix-darwin/home.nix
  2. 59
      nix-darwin/modules/skhd.nix
  3. 41
      nix-darwin/modules/yabai.nix

@ -39,7 +39,6 @@
imports = [ imports = [
# Modules # Modules
./modules/yabai.nix
./modules/skhd.nix ./modules/skhd.nix
]; ];
@ -178,12 +177,6 @@
# DE/WM/Ricing # DE/WM/Ricing
# yabai # wm # yabai # wm
skhd # key mngr skhd # key mngr
# terminal
# iterm2
# Fonts
nerdfonts
]; ];
# Home Manager is pretty good at managing dotfiles. The primary way to manage # Home Manager is pretty good at managing dotfiles. The primary way to manage
@ -288,61 +281,6 @@
}; };
}; };
programs.alacritty = {
enable = true;
settings = {
font = {
normal = {
family = "FiraCode Nerd Font Mono";
style = "Regular";
};
bold = {
family = "FiraCode Nerd Font Mono";
style = "Bold";
};
italic = {
family = "FiraCode Nerd Font Mono";
style = "Italic";
};
size = 12;
};
window = {
padding = {
x = 8;
y = 8;
};
opacity = 0.8;
blur = true;
};
colors = {
primary = {
background = "0x000000";
foreground = "0xB3B1AD";
};
normal = {
black = "0x01060E";
red = "0xEA6C73";
green = "0x91B362";
yellow = "0xF9AF4F";
blue = "0x53BDFA";
magenta = "0xFAE994";
cyan = "0x90E1C6";
white = "0xC7C7C7";
};
bright = {
black = "0x686868";
red = "0xF07178";
green = "0xC2D94C";
yellow = "0xFFB454";
blue = "0x59C2FF";
magenta = "0xFFEE99";
cyan = "0x95E6CB";
white = "0xFFFFFF";
};
};
};
};
programs.neovim = { programs.neovim = {
enable = true; enable = true;
viAlias = true; viAlias = true;

@ -1,7 +1,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let let
termPath = "/Applications/Alacritty.app"; termPath = "/Applications/Ghostty.app";
browserPath = "/Applications/Firefox.app"; browserPath = "/Applications/Firefox.app";
in in
{ {
@ -14,62 +14,7 @@ in
cmd - return : open -n ${termPath} cmd - return : open -n ${termPath}
# dmenu equivalent (you may want to install choose-gui or another launcher) # dmenu equivalent (you may want to install choose-gui or another launcher)
cmd - p : open -n /Applications/choose-gui.app # cmd - p : open -n /Applications/choose-gui.app
# Close window
cmd + shift - q : yabai -m window --close
# Focus window
cmd - j : yabai -m window --focus south
cmd - k : yabai -m window --focus north
cmd - h : yabai -m window --focus west
cmd - l : yabai -m window --focus east
# Move window
shift + cmd - j : yabai -m window --swap south
shift + cmd - k : yabai -m window --swap north
shift + cmd - h : yabai -m window --swap west
shift + cmd - l : yabai -m window --swap east
# Resize window
shift + alt - h : yabai -m window --resize left:-50:0 ; yabai -m window --resize right:-50:0
shift + alt - j : yabai -m window --resize bottom:0:50 ; yabai -m window --resize top:0:50
shift + alt - k : yabai -m window --resize top:0:-50 ; yabai -m window --resize bottom:0:-50
shift + alt - l : yabai -m window --resize right:50:0 ; yabai -m window --resize left:50:0
# Toggle floating
shift + alt - space : yabai -m window --toggle float
# Make window fullscreen
alt - f : yabai -m window --toggle zoom-fullscreen
# Toggle between layouts
alt - space : yabai -m space --layout $(yabai -m query --spaces --space | jq -r 'if .type == "bsp" then "float" else "bsp" end')
# Focus workspace
cmd - 1 : yabai -m space --focus 1
cmd - 2 : yabai -m space --focus 2
cmd - 3 : yabai -m space --focus 3
cmd - 4 : yabai -m space --focus 4
cmd - 5 : yabai -m space --focus 5
cmd - 6 : yabai -m space --focus 6
cmd - 7 : yabai -m space --focus 7
cmd - 8 : yabai -m space --focus 8
cmd - 9 : yabai -m space --focus 9
# Move window to workspace
shift + cmd - 1 : yabai -m window --space 1
shift + cmd - 2 : yabai -m window --space 2
shift + cmd - 3 : yabai -m window --space 3
shift + cmd - 4 : yabai -m window --space 4
shift + cmd - 5 : yabai -m window --space 5
shift + cmd - 6 : yabai -m window --space 6
shift + cmd - 7 : yabai -m window --space 7
shift + cmd - 8 : yabai -m window --space 8
shift + cmd - 9 : yabai -m window --space 9
# Restart yabai
shift + cmd - c : yabai --restart-service
# Start browser # Start browser
shift + cmd - b : open -n ${browserPath} shift + cmd - b : open -n ${browserPath}

@ -1,41 +0,0 @@
{ config, pkgs, ... }:
let
split_ratio = "0.50";
gap_padding = "0";
in
{
# Create configuration files for yabai and skhd
home.file.".yabairc" = {
executable = true;
text = ''
#!/usr/bin/env sh
# load scripting addition
sudo yabai --load-sa
yabai -m signal --add event=dock_did_restart action="sudo yabai --load-sa"
# global settings
yabai -m config layout bsp
yabai -m config window_placement second_child
yabai -m config split_ratio ${split_ratio}
yabai -m config auto_balance on
# Set all padding and gaps
yabai -m config top_padding ${gap_padding}
yabai -m config bottom_padding ${gap_padding}
yabai -m config left_padding ${gap_padding}
yabai -m config right_padding ${gap_padding}
yabai -m config window_gap ${gap_padding}
# mouse stuff
# yabai -m config mouse_follows_focus on
yabai -m config focus_follows_mouse autofocus
# Move window with mouse
yabai -m config mouse_modifier cmd
yabai -m config mouse_action1 move
yabai -m config mouse_action2 resize
'';
};
}
Loading…
Cancel
Save