aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--common/.flake/home/programs/alacritty.nix.org55
-rw-r--r--common/.flake/system/skhd.nix.org48
-rw-r--r--common/.flake/system/yabai.nix.org32
l---------macos.local/.config/alacritty1
l---------macos.local/.config/sketchybar1
l---------macos.local/.config/skhd1
l---------macos.local/.config/yabai1
l---------macos.local/.flake/home/programs/alacritty.nix.org1
-rw-r--r--macos.local/.flake/home/programs/core.nix.org1
-rw-r--r--macos.local/.flake/system/core.nix.org5
l---------macos.local/.flake/system/skhd.nix.org1
l---------macos.local/.flake/system/yabai.nix.org1
12 files changed, 143 insertions, 5 deletions
diff --git a/common/.flake/home/programs/alacritty.nix.org b/common/.flake/home/programs/alacritty.nix.org
new file mode 100644
index 0000000..0c85e2b
--- /dev/null
+++ b/common/.flake/home/programs/alacritty.nix.org
@@ -0,0 +1,55 @@
+#+title: Alacritty Configuration
+
+#+begin_src nix
+ { config, pkgs, ... }:
+
+ {
+ programs.alacritty = {
+ enable = true;
+ settings = {
+ window = {
+ decorations = "None";
+ opacity = 0.9;
+ padding = {
+ x = 6;
+ y = 6;
+ };
+ option_as_alt = "Both";
+ };
+ font = {
+ normal = {
+ family = "SauceCodePro Nerd Font";
+ style = "Regular";
+ };
+ size = 14;
+ };
+ colors = {
+ primary = {
+ background = "#ece0c9";
+ foreground = "#191916";
+ };
+ normal = {
+ black = "#191916";
+ red = "#ac4438";
+ green = "#354d52";
+ yellow = "#ba9151";
+ blue = "#465b91";
+ magenta = "#5b5489";
+ cyan = "#4e6062";
+ white = "#c9ad7a";
+ };
+ bright = {
+ black = "#293c3c";
+ red = "#d8611c";
+ green = "#4b7b53";
+ yellow = "#d8974b";
+ blue = "#2f3d91";
+ magenta = "#735e82";
+ cyan = "#6b8f92";
+ white = "#ece0c9";
+ };
+ };
+ };
+ };
+ }
+#+end_src
diff --git a/common/.flake/system/skhd.nix.org b/common/.flake/system/skhd.nix.org
new file mode 100644
index 0000000..d58bb3a
--- /dev/null
+++ b/common/.flake/system/skhd.nix.org
@@ -0,0 +1,48 @@
+#+title: SKHD Configuration
+
+#+begin_src nix
+ { config, pkgs, ... }:
+
+ {
+ services.skhd = {
+ enable = true;
+ skhdConfig = ''
+ cmd - return : /opt/homebrew/bin/alacritty
+ cmd + shift - q : yabai -m window --close
+ cmd - d : ~/.local/bin/launcher
+ cmd + shift - c : yabai --restart-service && skhd --restart-service
+ cmd - h : yabai -m window --focus west || yabai -m display --focus west
+ cmd - j : yabai -m window --focus south || yabai -m display --focus south
+ cmd - k : yabai -m window --focus north || yabai -m display --focus north
+ cmd - l : yabai -m window --focus east || yabai -m display --focus east
+ shift + cmd - h : yabai -m window --warp west
+ shift + cmd - j : yabai -m window --warp south
+ shift + cmd - k : yabai -m window --warp north
+ shift + cmd - l : yabai -m window --warp east
+ 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
+ cmd - 0 : yabai -m space --focus 10
+ cmd + shift - 1 : yabai -m window --space 1
+ cmd + shift - 2 : yabai -m window --space 2
+ cmd + shift - 3 : yabai -m window --space 3
+ cmd + shift - 4 : yabai -m window --space 4
+ cmd + shift - 5 : yabai -m window --space 5
+ cmd + shift - 6 : yabai -m window --space 6
+ cmd + shift - 7 : yabai -m window --space 7
+ cmd + shift - 8 : yabai -m window --space 8
+ cmd + shift - 9 : yabai -m window --space 9
+ cmd + shift - 0 : yabai -m window --space 10
+ cmd + shift - f : yabai -m window --toggle zoom-fullscreen
+ cmd + shift - space : yabai -m window --toggle float
+ shift + ctrl - s : open /System/Applications/Utilities/Screenshot.app
+ '';
+ };
+ }
+#+end_src
diff --git a/common/.flake/system/yabai.nix.org b/common/.flake/system/yabai.nix.org
new file mode 100644
index 0000000..4cdbf5e
--- /dev/null
+++ b/common/.flake/system/yabai.nix.org
@@ -0,0 +1,32 @@
+#+title: Yabai Configuration
+
+#+begin_src nix
+ { config, pkgs, ... }:
+
+ {
+ services.yabai = {
+ enable = true;
+ enableScriptingAddition = true;
+ config = {
+ layout = "bsp";
+ auto_balance = "on";
+ top_padding = 10;
+ bottom_padding = 10;
+ left_padding = 10;
+ right_padding = 10;
+ window_gap = 10;
+ window_shadow = "float";
+ focus_follows_mouse = "autoraise";
+ mouse_follows_focus = "on";
+ mouse_modifier = "cmd";
+ mouse_action1 = "move";
+ mouse_action2 = "resize";
+ mouse_drop_action = "swap";
+ };
+ extraConfig = ''
+ yabai -m rule --add app="^System Settings$" manage=off
+ yabai -m rule --add app="^Calculator$" manage=off
+ '';
+ };
+ }
+#+end_src
diff --git a/macos.local/.config/alacritty b/macos.local/.config/alacritty
deleted file mode 120000
index bfce794..0000000
--- a/macos.local/.config/alacritty
+++ /dev/null
@@ -1 +0,0 @@
-../../common/.config/alacritty \ No newline at end of file
diff --git a/macos.local/.config/sketchybar b/macos.local/.config/sketchybar
deleted file mode 120000
index b808184..0000000
--- a/macos.local/.config/sketchybar
+++ /dev/null
@@ -1 +0,0 @@
-../../common/.config/sketchybar \ No newline at end of file
diff --git a/macos.local/.config/skhd b/macos.local/.config/skhd
deleted file mode 120000
index 3aa80d0..0000000
--- a/macos.local/.config/skhd
+++ /dev/null
@@ -1 +0,0 @@
-../../common/.config/skhd \ No newline at end of file
diff --git a/macos.local/.config/yabai b/macos.local/.config/yabai
deleted file mode 120000
index d2b69c5..0000000
--- a/macos.local/.config/yabai
+++ /dev/null
@@ -1 +0,0 @@
-../../common/.config/yabai \ No newline at end of file
diff --git a/macos.local/.flake/home/programs/alacritty.nix.org b/macos.local/.flake/home/programs/alacritty.nix.org
new file mode 120000
index 0000000..6f59701
--- /dev/null
+++ b/macos.local/.flake/home/programs/alacritty.nix.org
@@ -0,0 +1 @@
+../../../../common/.flake/home/programs/alacritty.nix.org \ No newline at end of file
diff --git a/macos.local/.flake/home/programs/core.nix.org b/macos.local/.flake/home/programs/core.nix.org
index ba6818f..1700521 100644
--- a/macos.local/.flake/home/programs/core.nix.org
+++ b/macos.local/.flake/home/programs/core.nix.org
@@ -5,6 +5,7 @@
{
imports = [
+ ./alacritty.nix
./emacs/core.nix
./fastfetch.nix
./git.nix
diff --git a/macos.local/.flake/system/core.nix.org b/macos.local/.flake/system/core.nix.org
index d38073f..d8e02dd 100644
--- a/macos.local/.flake/system/core.nix.org
+++ b/macos.local/.flake/system/core.nix.org
@@ -6,11 +6,14 @@ This file imports various system configuration components in addition to enablin
{ config, pkgs, ... }:
{
+ imports = [
+ ./skhd.nix
+ ./yabai.nix
+ ];
environment.systemPackages = with pkgs; [
emacs-macport
gnupg
neovim
- yabai
skhd
];
diff --git a/macos.local/.flake/system/skhd.nix.org b/macos.local/.flake/system/skhd.nix.org
new file mode 120000
index 0000000..2e81cc0
--- /dev/null
+++ b/macos.local/.flake/system/skhd.nix.org
@@ -0,0 +1 @@
+../../../common/.flake/system/skhd.nix.org \ No newline at end of file
diff --git a/macos.local/.flake/system/yabai.nix.org b/macos.local/.flake/system/yabai.nix.org
new file mode 120000
index 0000000..08a3a0b
--- /dev/null
+++ b/macos.local/.flake/system/yabai.nix.org
@@ -0,0 +1 @@
+../../../common/.flake/system/yabai.nix.org \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-16 00:31:35 +0000