From 8573c4508de892bde6fac1e58e81888bdf4911b2 Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Tue, 25 Apr 2023 16:38:45 -0700 Subject: [PATCH] [CLEANUP] Unused packages / files. --- darwin/wm/skhd.nix | 89 ---------------------------------------- darwin/wm/spacebar.nix | 35 ---------------- darwin/wm/stackline.nix | 10 ----- darwin/wm/yabai.nix | 91 ----------------------------------------- packages/dart-sass.nix | 19 --------- packages/stackline.nix | 20 --------- 6 files changed, 264 deletions(-) delete mode 100644 darwin/wm/skhd.nix delete mode 100644 darwin/wm/spacebar.nix delete mode 100644 darwin/wm/stackline.nix delete mode 100644 darwin/wm/yabai.nix delete mode 100644 packages/dart-sass.nix delete mode 100644 packages/stackline.nix diff --git a/darwin/wm/skhd.nix b/darwin/wm/skhd.nix deleted file mode 100644 index ae6783ad..00000000 --- a/darwin/wm/skhd.nix +++ /dev/null @@ -1,89 +0,0 @@ -{std, ...}: let - inherit (std) string list; -in { - services.skhd = { - enable = true; - skhdConfig = let - bindWorkspace = key: workspace: '' - ctrl + alt - ${key} : yabai -m space --focus ${workspace} - shift + alt - ${key} : yabai -m window --space ${workspace} - ''; - workspaceBindings = string.concat (list.map (v: bindWorkspace v "${v}") (list.map builtins.toString (list.range 1 9)) - ++ [ - ( - bindWorkspace "0" "10" - ) - ] - ++ list.imap (i: v: bindWorkspace v "${toString (10 + i + 1)}") (list.map (n: "f${builtins.toString n}") (std.list.range 1 12))); - in - workspaceBindings - + '' - # focus windows - ESDF - alt - s : yabai -m window --focus west - alt - d : yabai -m window --focus south - alt - e : yabai -m window --focus north - alt - f : yabai -m window --focus east - - # focus windows - arrows - alt - left : yabai -m window --focus west - alt - down : yabai -m window --focus south - alt - up : yabai -m window --focus north - alt - right : yabai -m window --focus east - - # move windows - ESDF - shift + alt - s : yabai -m window --swap west - shift + alt - d : yabai -m window --swap south - shift + alt - e : yabai -m window --swap north - shift + alt - f : yabai -m window --swap east - - # move windows - arrows - shift + alt - left : yabai -m window --swap west - shift + alt - down : yabai -m window --swap south - shift + alt - up : yabai -m window --swap north - shift + alt - right : yabai -m window --swap east - - # warp windows - ESDF - ctrl + alt - s : yabai -m window --warp west - ctrl + alt - d : yabai -m window --warp south - ctrl + alt - e : yabai -m window --warp north - ctrl + alt - f : yabai -m window --warp east - - # warp windows - arrows - ctrl + alt - left : yabai -m window --warp west - ctrl + alt - down : yabai -m window --warp south - ctrl + alt - up : yabai -m window --warp north - ctrl + alt - right : yabai -m window --warp east - - # process management - q - # unused base -> spotlight exists (cmd+space) - alt + shift - q : yabai -m window --close - alt + ctrl - q : wezterm - - # workspace prev/next - w - alt - w : yabai -m space --focus prev - alt + shift - w : yabai -m space --focus next - alt + ctrl - w : yabai -m window --output next - ctrl + shift - w : yabai -m window --output prev - alt - p : yabai -m window --focus stack.prev || yabai -m window --focus prev || yabai -m window --focus last - alt - n : yabai -m window --focus stack.next || yabai -m window --focus next || yabai -m window --focus first - - # split managent - a - alt - a : yabai -m window --toggle split - - # resizing, reloading - r - alt - r : yabai -m space --balance - - # layout handling (spaces) - t - alt - t : yabai -m space --layout stack - alt + shift - t : yabai -m space --layout bsp - alt + ctrl - t : yabai -m space --layout float - - # layout handling (windows) - p - alt - p : yabai -m window --toggle float - alt + shift - p : yabai -m window --toggle stack - - # workspace history switching - tab - alt + ctrl - tab: yabai -m space --focus recent - ''; - }; -} diff --git a/darwin/wm/spacebar.nix b/darwin/wm/spacebar.nix deleted file mode 100644 index 30d4191b..00000000 --- a/darwin/wm/spacebar.nix +++ /dev/null @@ -1,35 +0,0 @@ -{pkgs, ...}: { - services.spacebar = { - enable = true; - package = pkgs.spacebar; - config = { - # bar characteristics - position = "top"; - display = "main"; - height = "26"; - - # modules - spaces = "on"; - space_icon_strip = "         ? 11 12 13 14 15 16 17 18 19 20 21 22"; - spaces_for_all_displays = "on"; - title = "off"; - clock = "on"; - clock_icon = ""; - clock_format = ''"%F %R %Z"''; - power = "on"; - dnd = "on"; - dnd_icon = ""; - power_icon_strip = " "; - - # display - padding_left = 20; - padding_right = 20; - spacing_left = 15; - spacing_right = 15; - - # text - text_font = ''"Iosevka:Regular:12.0"''; - icon_font = ''"Font Awesome 6 Free:Solid:12.0"''; - }; - }; -} diff --git a/darwin/wm/stackline.nix b/darwin/wm/stackline.nix deleted file mode 100644 index fbc7e0bd..00000000 --- a/darwin/wm/stackline.nix +++ /dev/null @@ -1,10 +0,0 @@ -{pkgs, ...}: { - homebrew.casks = [ - "hammerspoon" - ]; - system.defaults.CustomUserPreferences = { - "org.hammerspoon.Hammerspoon" = { - MJConfigFile = "${pkgs.stackline}/init.lua"; - }; - }; -} diff --git a/darwin/wm/yabai.nix b/darwin/wm/yabai.nix deleted file mode 100644 index cca9b976..00000000 --- a/darwin/wm/yabai.nix +++ /dev/null @@ -1,91 +0,0 @@ -_: { - services.yabai = { - enable = true; - enableScriptingAddition = true; - config = { - # layout - layout = "bsp"; - window_origin_display = "focused"; - split_ratio = "0.50"; - mouse_modifier = "alt"; - mouse_action1 = "move"; - mouse_action2 = "resize"; - mouse_drop_action = "stack"; - external_bar = "main:26:0"; - - # window border - window_border = "on"; - window_border_width = 3; - window_border_hidpi = "on"; - - # focus - focus_follows_mouse = "off"; - mouse_follows_focus = "off"; - - # window - window_placement = "second_child"; - window_border_blur = "on"; - - # paddings - top_padding = 10; - bottom_padding = 10; - left_padding = 10; - right_padding = 10; - window_gap = 10; - }; - - extraConfig = '' - # spaces - function setup_space { - local idx="$1" - local name="$2" - local space= - echo "setup space $idx : $name" - space=$(yabai -m query --spaces --space "$idx") - if [ -z "$space" ]; then - yabai -m space --create - fi - yabai -m space "$idx" --label "$name" - } - - setup_space 1 work - setup_space 2 chat - setup_space 3 www - setup_space 4 code - setup_space 5 term - setup_space 6 music - setup_space 7 brain - setup_space 8 office - setup_space 9 email - setup_space 10 misc - - # rules - yabai -m rule --add app='System Preferences' manage=off - yabai -m rule --add app='Yubico Authenticator' manage=off - yabai -m rule --add app='YubiKey Manager' manage=off - yabai -m rule --add app='YubiKey Personalization Tool' manage=off - yabai -m rule --add app="^Slack$" space=1 - yabai -m rule --add app="^Microsoft Teams$" space=1 - yabai -m rule --add app="^Discord$" space=2 - yabai -m rule --add app="^Element$" space=2 - yabai -m rule --add app="^Telegram Desktop$" space=2 - yabai -m rule --add app="^Brave Browser$" space=^3 - yabai -m rule --add app="^Orion$" space=^3 - yabai -m rule --add app="^VSCodium$" space=^4 - yabai -m rule --add app="^Spotify$" space=6 - yabai -m rule --add app="^Obsidian$" space=7 - yabai -m rule --add app="^Microsoft Word$" space=8 - yabai -m rule --add app="^Microsoft Powerpoint$" space=8 - yabai -m rule --add app="^Microsoft Excel$" space=8 - yabai -m rule --add app="^Microsoft Outlook$" space=9 - yabai -m rule --add app="^Calendar$" space=9 - yabai -m rule --add app="^Mail$" space=9 - - - # signals - yabai -m signal --add event=window_focused action="sketchybar --trigger window_focus" - yabai -m signal --add event=window_created action="sketchybar --trigger windows_on_spaces" - yabai -m signal --add event=window_destroyed action="sketchybar --trigger windows_on_spaces" - ''; - }; -} diff --git a/packages/dart-sass.nix b/packages/dart-sass.nix deleted file mode 100644 index 84c9efc3..00000000 --- a/packages/dart-sass.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, autoPatchelfHook }: - -stdenv.mkDerivation rec { - pname = "dart-sass"; - version = "1.58.1"; - - src = fetchurl { - url = - "https://github.com/sass/${pname}/releases/download/${version}/${pname}-${version}-linux-x64.tar.gz"; - sha256 = "sha256-5/mEeshCakp/eju9MhFZ8VXvHEuXGiDVtUI2UhI0XPU="; - }; - - nativeBuildInputs = [ autoPatchelfHook ]; - - installPhase = '' - mkdir -p $out/bin - mv sass $out/bin - ''; -} diff --git a/packages/stackline.nix b/packages/stackline.nix deleted file mode 100644 index 2818a623..00000000 --- a/packages/stackline.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - stdenv, - fetchFromGitHub, -}: -stdenv.mkDerivation rec { - pname = "stackline"; - version = "2022-11-29"; - - src = fetchFromGitHub { - owner = "AdamWagner"; - repo = "stackline"; - rev = "2aa0bd9a27f93bad24b0fd4da38f3c0356414098"; - sha256 = "sha256-x7SIgKR6rwkoVVbaAvjFr1N7wTF3atni/d6xGLBBRN4="; - }; - - installPhase = '' - mkdir -p $out - mv ./* $out/ - ''; -}