From 376f9794528dc412bbe91acee72931cf5e4eb600 Mon Sep 17 00:00:00 2001 From: Kyle Brown Date: Mon, 30 Oct 2023 17:13:21 -0700 Subject: [PATCH] feat: Clean out cruft, update readme --- .config/yabai/scripts/open_iterm2.sh | 16 --- .doom.d/config.el | 3 - .doom.d/custom.el | 3 + .skhdrc | 86 ---------------- .yabairc | 99 ------------------- .../OrcaSlicer/OrcaSlicer.conf | 44 ++++----- .../SuperSlicer/SuperSlicer.ini | 2 +- README.md | 36 +++---- 8 files changed, 40 insertions(+), 249 deletions(-) delete mode 100755 .config/yabai/scripts/open_iterm2.sh delete mode 100755 .skhdrc delete mode 100755 .yabairc diff --git a/.config/yabai/scripts/open_iterm2.sh b/.config/yabai/scripts/open_iterm2.sh deleted file mode 100755 index 944b7e3..0000000 --- a/.config/yabai/scripts/open_iterm2.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -# Detects if iTerm2 is running -if ! pgrep -f "iTerm" > /dev/null 2>&1; then - open -a "/Applications/iTerm.app" -else - # Create a new window - script='tell application "iTerm2" to create window with default profile' - ! osascript -e "${script}" > /dev/null 2>&1 && { - # Get pids for any app with "iTerm" and kill - while IFS="" read -r pid; do - kill -15 "${pid}" - done < <(pgrep -f "iTerm") - open -a "/Applications/iTerm.app" - } -fi diff --git a/.doom.d/config.el b/.doom.d/config.el index 191892c..fb8f7de 100644 --- a/.doom.d/config.el +++ b/.doom.d/config.el @@ -88,6 +88,3 @@ (setq projectile-project-search-path '(("~/src/" . 1))) (setq magit-revision-show-gravatars '("^Author: " . "^Commit: ")) - -;; better nix code formatter -(set-formatter! 'alejandra "alejandra --quiet" :modes '(nix-mode)) diff --git a/.doom.d/custom.el b/.doom.d/custom.el index 4a32d1a..6805154 100644 --- a/.doom.d/custom.el +++ b/.doom.d/custom.el @@ -14,3 +14,6 @@ ;; If there is more than one, they won't work right. ) (add-to-list 'default-frame-alist '(undecorated-round . t)) + +;; better nix code formatter +(set-formatter! 'alejandra "alejandra --quiet" :modes '(nix-mode)) diff --git a/.skhdrc b/.skhdrc deleted file mode 100755 index 85c7677..0000000 --- a/.skhdrc +++ /dev/null @@ -1,86 +0,0 @@ -# Prevent hide -cmd - h : : -cmd - m : : -rcmd - w : : - -# Opens iTerm2 -ctrl - return : "${HOME}"/.config/yabai/scripts/open_iterm2.sh - -# Close window -ctrl + shift - c : osascript -e 'tell application "System Events" to perform action "AXPress" of (first button whose subrole is "AXCloseButton") of (first window whose subrole is "AXStandardWindow") of (first process whose frontmost is true)' - -# Restart yabai -ctrl + shift - r : yabai --restart-service - -# Toggle window split type -# ctrl - v : yabai -m window --toggle split - -# Changes insertion modes -ctrl - h : yabai -m window --insert east -ctrl - v : yabai -m window --insert south - -# Moves around windows -ctrl - left : yabai -m window --focus west -ctrl - down : yabai -m window --focus south -ctrl - up : yabai -m window --focus north -ctrl - right : yabai -m window --focus east - -# Moves windows -shift + ctrl - left : yabai -m window --warp west -shift + ctrl - down : yabai -m window --warp south -shift + ctrl - up : yabai -m window --warp north -shift + ctrl - right : yabai -m window --warp east - -# Warps window to space -shift + ctrl - 1 : yabai -m window --space 1 && yabai -m space --focus 1 -shift + ctrl - 2 : yabai -m window --space 2 && yabai -m space --focus 2 -shift + ctrl - 3 : yabai -m window --space 3 && yabai -m space --focus 3 -shift + ctrl - 4 : yabai -m window --space 4 && yabai -m space --focus 4 -shift + ctrl - 5 : yabai -m window --space 5 && yabai -m space --focus 5 -shift + ctrl - 6 : yabai -m window --space 6 && yabai -m space --focus 6 -shift + ctrl - 7 : yabai -m window --space 7 && yabai -m space --focus 7 -shift + ctrl - 8 : yabai -m window --space 8 && yabai -m space --focus 8 -shift + ctrl - 8 : yabai -m window --space 9 && yabai -m space --focus 9 -shift + ctrl - 0 : yabai -m window --space 10 && yabai -m space --focus 10 - -# Resize windows -alt - left : yabai -m window --resize left:-50:0; \ - yabai -m window --resize right:-50:0 -alt - down : yabai -m window --resize bottom:0:50; \ - yabai -m window --resize top:0:50 -alt - up : yabai -m window --resize top:0:-50; \ - yabai -m window --resize bottom:0:-50 -alt - right : yabai -m window --resize right:50:0; \ - yabai -m window --resize left:50:0 - -# Changes spaces -ctrl - 1 : yabai -m space --focus 1 -ctrl - 2 : yabai -m space --focus 2 -ctrl - 3 : yabai -m space --focus 3 -ctrl - 4 : yabai -m space --focus 4 -ctrl - 5 : yabai -m space --focus 5 -ctrl - 6 : yabai -m space --focus 6 -ctrl - 7 : yabai -m space --focus 7 -ctrl - 8 : yabai -m space --focus 8 -ctrl - 9 : yabai -m space --focus 9 -ctrl - 0 : yabai -m space --focus 10 - -# Make window native fullscreen -# ctrl - f : yabai -m window --toggle zoom-fullscreen -# shift + ctrl - f : yabai -m window --toggle native-fullscreen - -# Float / Unfloat window -ctrl + shift - space : \ - yabai -m window --toggle float; \ - yabai -m window --toggle border - -# Don't hide my term plz -cmd - h [ - "alacritty" : skhd -k "" - "iTerm2" : skhd -k "" -] - -# Open Emacs -cmd + shift - n : /opt/homebrew/bin/emacsclient -a "emacs" -cn -# Open Firefox window -cmd + shift - f : /Applications/Firefox.app/Contents/MacOS/firefox -new-window diff --git a/.yabairc b/.yabairc deleted file mode 100755 index b0abe0f..0000000 --- a/.yabairc +++ /dev/null @@ -1,99 +0,0 @@ -#!/usr/bin/env sh - -# the scripting-addition must be loaded manually if -# you are running yabai on macOS Big Sur. Uncomment -# the following line to have the injection performed -# when the config is executed during startup. -# -# for this to work you must configure sudo such that -# it will be able to run the command without password -# -# see this wiki page for information: -# - https://github.com/koekeishiya/yabai/wiki/Installing-yabai-(latest-release) -# -# sudo yabai --load-sa -# yabai -m signal --add event=dock_did_restart action="sudo yabai --load-sa" - -# See: https://github.com/koekeishiya/yabai/wiki/Installing-yabai-(latest-release)#macos-big-sur---automatically-load-scripting-addition-on-startup -yabai -m signal --add event=dock_did_restart action="sudo yabai --load-sa" -sudo yabai --load-sa - -source ~/.cache/wal/colors.sh # pywal scheme - update if needed - -# yabai template colours -# CBACK=$(echo $background | sed 's/#//') -# CFORE=$(echo $foreground | sed 's/#//') -CACTV=$(echo $color3 | sed 's/#//') -CNORM=$(echo $color1 | sed 's/#//') -CINSE=$(echo $foreground | sed 's/#//') - -# Status bar -# yabai -m config external_bar all:26:0 -# yabai -m config status_bar on -# yabai -m config status_bar_background_color 0xff$CBACK -# yabai -m config status_bar_foreground_color 0xff$CFORE - - -# Configure borders -yabai -m config window_border off -yabai -m config window_border_width 2 -yabai -m config active_window_border_color 0xff$CACTV -yabai -m config normal_window_border_color 0xff$CNORM -yabai -m config insert_window_border_color 0xff$CINSE - - -# global settings -yabai -m config mouse_follows_focus off -yabai -m config focus_follows_mouse autofocus -yabai -m config window_placement second_child -yabai -m config window_shadow on -yabai -m config window_opacity off -yabai -m config window_opacity_duration 0.0 -yabai -m config active_window_opacity 1.0 -yabai -m config normal_window_opacity 0.90 -yabai -m config split_ratio 0.50 -yabai -m config auto_balance off -yabai -m config mouse_modifier ctrl -yabai -m config mouse_action1 move -yabai -m config mouse_action2 resize -yabai -m config mouse_drop_action swap - -# Turning on breaks kodi -yabai -m config window_topmost off - -# general space settings -yabai -m config layout bsp -yabai -m config top_padding 10 -yabai -m config bottom_padding 10 -yabai -m config left_padding 10 -yabai -m config right_padding 10 -yabai -m config window_gap 10 - -# mission-control desktop labels -yabai -m space 1 --label main -yabai -m space 2 --label secondary -yabai -m space 3 --label random -yabai -m space 4 --label extra - -# ===== Rules ================================== - -yabai -m rule --add label="Finder" app="^Finder$" title="(Co(py|nnect)|Move|Info|Pref)" manage=off -yabai -m rule --add label="Safari" app="^Safari$" title="^(General|(Tab|Password|Website|Extension)s|AutoFill|Se(arch|curity)|Privacy|Advance)$" manage=off -yabai -m rule --add label="System Preferences" app="^System Preferences$" title=".*" manage=off -yabai -m rule --add label="App Store" app="^App Store$" manage=off -yabai -m rule --add label="Activity Monitor" app="^Activity Monitor$" manage=off -yabai -m rule --add label="KeePassXC" app="^KeePassXC$" manage=off -yabai -m rule --add label="Calculator" app="^Calculator$" manage=off -yabai -m rule --add label="Dictionary" app="^Dictionary$" manage=off -yabai -m rule --add label="mpv" app="^mpv$" manage=off -yabai -m rule --add app="^Kodi$" manage=off -yabai -m rule --add label="Software Update" title="Software Update" manage=off -yabai -m rule --add label="About This Mac" app="System Information" title="About This Mac" manage=off -yabai -m rule --add app="^iTerm$" title="Preferences" manage=off -yabai -m rule --add label="^System Settings" app="^System Settings$" manage=off - -set +x - -#YABAI_CERT=yabai-cert sh -c "$(curl -fsSL "https://git.io/update-yabai")" & - -echo "yabai configuration loaded.." diff --git a/Library/Application Support/OrcaSlicer/OrcaSlicer.conf b/Library/Application Support/OrcaSlicer/OrcaSlicer.conf index e244a8e..adefd3d 100644 --- a/Library/Application Support/OrcaSlicer/OrcaSlicer.conf +++ b/Library/Application Support/OrcaSlicer/OrcaSlicer.conf @@ -18,8 +18,8 @@ "iot_environment": "3", "keyboard_supported": "none/alt/control/shift", "language": "en_US", - "last_backup_path": "/var/folders/9x/mjvqdwwj2gb9j1jz_f_wn0k80000gn/T/orcaslicer_model/Sat_Oct_28/10_09_15#9453#4435", - "last_export_path": "/Users/kdb424/printers/Doom Micron 180", + "last_backup_path": "/var/folders/9x/mjvqdwwj2gb9j1jz_f_wn0k80000gn/T/orcaslicer_model/Sun_Oct_29/15_07_15#15844#270", + "last_export_path": "/Users/kdb424/Downloads/seeed-xiao-ble-case-model_files", "max_recent_count": "18", "mouse_supported": "mouse left/mouse middle/mouse right", "mouse_wheel": "0", @@ -63,7 +63,7 @@ "use_retina_opengl": true, "user_mode": "advanced", "version": "01.07.04.52", - "window_mainframe": "10; 35; 1705; 1395; 0", + "window_mainframe": "10; 35; 3420; 1395; 0", "zoom_to_mouse": false, "zoom_view": "none/mouse left" }, @@ -150,28 +150,28 @@ "timelapse": "1" }, "recent": { - "last_opened_folder": "/Users/kdb424/Downloads/seeed-xiao-ble-case-model_files", + "last_opened_folder": "/Applications/OrcaSlicer.app/Contents/Resources/calib/tolerance_test", "printhost_path": "", "settings_folder": "/Users/kdb424/printers/Doom Micron 180" }, "recent_projects": { - "01": "/Users/kdb424/Downloads/DooMicron180SkirtsLike90Percentcomplete-ish_v2.3mf", - "02": "/Users/kdb424/printers/Doom Micron 180/BedFan.3mf", - "03": "/Users/kdb424/printers/Doom Micron 180/BeaconMount.3mf", - "04": "/Users/kdb424/printers/Doom Micron 180/FrontMiddleSkirt.3mf", - "05": "/Users/kdb424/Downloads/SwagDoom180/Trim.3mf", - "06": "/Users/kdb424/Downloads/SwagDoom180/Bottom Skirts.3mf", - "07": "/Users/kdb424/Downloads/Skirt4.3mf", - "08": "/Users/kdb424/printers/Doom Micron 180/Chain_Custom.3mf", - "09": "/Users/kdb424/Downloads/DoorBottomTopPanel.3mf", - "10": "/Users/kdb424/Downloads/DoorRightLeftPanel.3mf", - "11": "/Users/kdb424/Downloads/VerticalSide.3mf", - "12": "/Users/kdb424/Downloads/Panels Split.3mf", - "13": "/Users/kdb424/Downloads/Panel Slot Right Top.3mf", - "14": "/Users/kdb424/Downloads/doom/BottomCorners_MicroDOOM v2_Rounded Top Corners v11 (1)(Mirror) (3)_1_Rounder Corner Top Cap v2 (1)(Mirror)_4_Body1.3mf", - "15": "/Users/kdb424/Downloads/TFT35 SPI 0.2 Mount remixed for big skirts v2.3mf", - "16": "/Users/kdb424/Downloads/doom/TopCorners_MicroDOOM v2_Rounded Top Corners v11 (1)_4_Rounder Corner Top Cap v2 (1)_1_Body1.3mf", - "17": "/Users/kdb424/Downloads/doom/PRINT_THIS.3mf", - "18": "/Users/kdb424/Downloads/doom/VZ_THIS.3mf" + "01": "/Applications/OrcaSlicer.app/Contents/Resources/calib/tolerance_test/OrcaToleranceTest.stl", + "02": "/Users/kdb424/Downloads/seeed-xiao-ble-case-model_files/xiao_dongle_top.3mf", + "03": "/Users/kdb424/Downloads/DooMicron180SkirtsLike90Percentcomplete-ish_v2.3mf", + "04": "/Users/kdb424/printers/Doom Micron 180/BedFan.3mf", + "05": "/Users/kdb424/printers/Doom Micron 180/BeaconMount.3mf", + "06": "/Users/kdb424/printers/Doom Micron 180/FrontMiddleSkirt.3mf", + "07": "/Users/kdb424/Downloads/SwagDoom180/Trim.3mf", + "08": "/Users/kdb424/Downloads/SwagDoom180/Bottom Skirts.3mf", + "09": "/Users/kdb424/Downloads/Skirt4.3mf", + "10": "/Users/kdb424/printers/Doom Micron 180/Chain_Custom.3mf", + "11": "/Users/kdb424/Downloads/DoorBottomTopPanel.3mf", + "12": "/Users/kdb424/Downloads/DoorRightLeftPanel.3mf", + "13": "/Users/kdb424/Downloads/VerticalSide.3mf", + "14": "/Users/kdb424/Downloads/Panels Split.3mf", + "15": "/Users/kdb424/Downloads/Panel Slot Right Top.3mf", + "16": "/Users/kdb424/Downloads/doom/BottomCorners_MicroDOOM v2_Rounded Top Corners v11 (1)(Mirror) (3)_1_Rounder Corner Top Cap v2 (1)(Mirror)_4_Body1.3mf", + "17": "/Users/kdb424/Downloads/TFT35 SPI 0.2 Mount remixed for big skirts v2.3mf", + "18": "/Users/kdb424/Downloads/doom/TopCorners_MicroDOOM v2_Rounded Top Corners v11 (1)_4_Rounder Corner Top Cap v2 (1)_1_Body1.3mf" } } diff --git a/Library/Application Support/SuperSlicer/SuperSlicer.ini b/Library/Application Support/SuperSlicer/SuperSlicer.ini index 312f52b..6badca2 100644 --- a/Library/Application Support/SuperSlicer/SuperSlicer.ini +++ b/Library/Application Support/SuperSlicer/SuperSlicer.ini @@ -1,4 +1,4 @@ -# generated by SuperSlicer 2.5.59 on 2023-10-25 at 06:50:49 UTC +# generated by SuperSlicer 2.5.59 on 2023-10-29 at 22:57:30 UTC allow_ip_resolve = 1 auto_switch_preview = 2 auto_toolbar_size = 100 diff --git a/README.md b/README.md index 833c0c4..83285b0 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ ## Install -I use [yadm](https://github.com/TheLocehiliosan/yadm) to manage the dotfiles. +I use [yadm](https://github.com/TheLocehiliosan/yadm) to manage some of the dotfiles. ```bash curl -L https://git.kdb424.xyz/kdb424/dotfiles-yadm/raw/branch/master/.scripts/movein | bash ``` @@ -16,10 +16,11 @@ curl -L https://git.kdb424.xyz/kdb424/dotfiles-yadm/raw/branch/master/.scripts/m chip was mostly to get the 16GB of RAM in a store. Crunches through all the things, and running nix on top as always. -- farnsworth (Gentoo): The beef of the server operations. Mac Mini M1 (9,1) that +- farnsworth (NixOS): The beef of the server operations. Mac Mini M1 (9,1) that is the primary machine in my server cluster in terms of hosting services that are public facing. Compiles from source like a champ, and sips power to do it - all. + all. Now powered by NixOS, because if I hate myself enough to use Nix, I may + as well get something for it. - planex (Alpine): The venerable Planet Express Ship is the heart of the Futurama team, keeping things moving forward, as does this machine. It acts as @@ -27,19 +28,15 @@ curl -L https://git.kdb424.xyz/kdb424/dotfiles-yadm/raw/branch/master/.scripts/m motherboard, 32GB of RAM, and all of the hot storage that my systems and services run off of. -- kif (Alpine): Kif is one of the essential, but underrated characters. With - only an i3-4170 and 8GB of RAM, this machine still has 10g SFP+ networking and - serves many of the services that I run without flaw. - - zapp (Alpine): Zapp, the man of little brains, but loveable despite that, is one of the most important characters, I mean... machines that I run. It's a base Linode instance with a massive 1GB of ram and shared CPU that acts as a bouncer between my docker swarm and the rest of the world. -- amy (PopOS): Running a basic PopOS install and generally a portable test bed - is getting a bit of a makeover lately trying to find itself. With 16GB of ram - and a R5 4500u, it gets things done, while having fold back, and a touch screen - with Wacom pen as well. +- amy (NixOS): With 16GB of ram and a R5 4500u, it gets things done, while + having fold back, and a touch screen with Wacom pen as well. Moved back to + NixOS because I want to be even more lazy as I'm stuck managing another NixOS + system, so this one comes for free. ### Window Manager (Mac) - yabai @@ -47,7 +44,7 @@ curl -L https://git.kdb424.xyz/kdb424/dotfiles-yadm/raw/branch/master/.scripts/m - iterm2 ### Window manager (Linux) -- sway +- hyprland - waybar - alacritty - mako @@ -66,7 +63,6 @@ curl -L https://git.kdb424.xyz/kdb424/dotfiles-yadm/raw/branch/master/.scripts/m - deadbeef - [doom](https://github.com/hlissner/doom-emacs) emacs - (better)discord -- schildichat - mpv - sonixd @@ -76,7 +72,7 @@ curl -L https://git.kdb424.xyz/kdb424/dotfiles-yadm/raw/branch/master/.scripts/m - thefuck - ncdu - hyperfine -- exa +- eza - youtube-dl - pacmixer @@ -91,14 +87,10 @@ curl -L https://git.kdb424.xyz/kdb424/dotfiles-yadm/raw/branch/master/.scripts/m ## Package managers and insanity -Managing things in one package manager is getting harder and harder on Linux. -I'm currently in flux with how I'm attempting to resolve it. `pmm` solves a lot -of these problems, but I'm looking at extending my look to tooling like -Distrobox and Nix as options to keep a lightweight coreOS that can even be -immutable, and all of my "personal tools" in portable containers. I won't allow -Nix to eat my configs for most things if I can avoid it as I want to be able to -migrate in/out as I desire, but it's on the frontline right now as an option -going forward +With [pmm](https://git.kdb424.xyz/kdb424/pmm) retired on my systems, they are +now all managed with Nix and home-manager on most of my servers. Alpine/Gentoo +systems don't need PMM at all as they have the functionality native, and Nix +has similar function, though absolutely more complex. ## Support [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/X8X15P45J)