From a802953744ee142fb948b75a742037f2821121ee Mon Sep 17 00:00:00 2001 From: Kyle Brown Date: Mon, 29 May 2023 17:37:28 -0700 Subject: [PATCH] small updates --- .config/home-manager/modules/devel.nix | 2 + .config/htop/htoprc | 12 +- .config/iterm2/com.googlecode.iterm2.plist | 776 ++++++++++++++++++++ .config/worldedit/farnsworth | 9 +- .local/share/fonts/._AnonymousPro-1.002.001 | Bin 70 -> 0 bytes .local/share/fonts/.uuid | 1 - .zsh_aliases | 4 + 7 files changed, 791 insertions(+), 13 deletions(-) delete mode 100755 .local/share/fonts/._AnonymousPro-1.002.001 delete mode 100644 .local/share/fonts/.uuid diff --git a/.config/home-manager/modules/devel.nix b/.config/home-manager/modules/devel.nix index 9085981..7f85985 100644 --- a/.config/home-manager/modules/devel.nix +++ b/.config/home-manager/modules/devel.nix @@ -13,6 +13,8 @@ picocom gnumake + # Useful utils + grex ]; } diff --git a/.config/htop/htoprc b/.config/htop/htoprc index 834784d..141b457 100644 --- a/.config/htop/htoprc +++ b/.config/htop/htoprc @@ -1,30 +1,30 @@ # Beware! This file is rewritten by htop when settings are changed in the interface. # The parser is also very primitive, and not human-friendly. -htop_version=3.2.1 +htop_version=3.2.2 config_reader_min_version=3 fields=0 48 46 47 49 1 hide_kernel_threads=1 hide_userland_threads=0 +hide_running_in_container=0 shadow_other_users=0 show_thread_names=0 show_program_path=1 highlight_base_name=0 highlight_deleted_exe=1 +shadow_distribution_path_prefix=0 highlight_megabytes=1 highlight_threads=1 highlight_changes=0 highlight_changes_delay_secs=5 find_comm_in_cmdline=1 strip_exe_from_cmdline=1 -show_merged_command=0 +show_merged_command=1 header_margin=1 screen_tabs=1 detailed_cpu_time=0 cpu_count_from_one=0 show_cpu_usage=1 show_cpu_frequency=1 -show_cpu_temperature=0 -degree_fahrenheit=0 update_process_names=0 account_guest_in_cpu_meter=0 color_scheme=6 @@ -51,8 +51,8 @@ screen:Main=PID USER PERCENT_CPU PERCENT_MEM TIME Command .sort_direction=-1 .tree_sort_direction=1 .all_branches_collapsed=0 -screen:I/O=PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE -.sort_key=IO_RATE +screen:I/O=PID USER +.sort_key=PID .tree_sort_key=PID .tree_view=0 .tree_view_always_by_pid=0 diff --git a/.config/iterm2/com.googlecode.iterm2.plist b/.config/iterm2/com.googlecode.iterm2.plist index ecdde57..31c850c 100644 --- a/.config/iterm2/com.googlecode.iterm2.plist +++ b/.config/iterm2/com.googlecode.iterm2.plist @@ -2021,6 +2021,782 @@ Working Directory /Users/kdb424 + + ASCII Anti Aliased + + ASCII Ligatures + + AWDS Pane Directory + + AWDS Pane Option + No + AWDS Tab Directory + + AWDS Tab Option + No + AWDS Window Directory + + AWDS Window Option + No + Allow Title Reporting + + Ambiguous Double Width + + Ansi 0 Color + + Alpha Component + 1 + Blue Component + 0.043137254901960791 + Color Space + sRGB + Green Component + 0.039215686274509803 + Red Component + 0.039215686274509803 + + Ansi 1 Color + + Alpha Component + 1 + Blue Component + 0.13333333333333333 + Color Space + sRGB + Green Component + 0.070588235294117646 + Red Component + 0.63921568627450975 + + Ansi 10 Color + + Alpha Component + 1 + Blue Component + 0.094117647058823528 + Color Space + sRGB + Green Component + 0.24705882352941178 + Red Component + 0.8666666666666667 + + Ansi 11 Color + + Alpha Component + 1 + Blue Component + 0.23921568627450981 + Color Space + sRGB + Green Component + 0.3411764705882353 + Red Component + 0.9137254901960784 + + Ansi 12 Color + + Alpha Component + 1 + Blue Component + 0.21568627450980393 + Color Space + sRGB + Green Component + 0.49019607843137253 + Red Component + 0.90980392156862744 + + Ansi 13 Color + + Alpha Component + 1 + Blue Component + 0.37254901960784315 + Color Space + sRGB + Green Component + 0.54117647058823526 + Red Component + 0.92941176470588238 + + Ansi 14 Color + + Alpha Component + 1 + Blue Component + 0.37647058823529411 + Color Space + sRGB + Green Component + 0.27450980392156865 + Red Component + 0.91764705882352937 + + Ansi 15 Color + + Alpha Component + 1 + Blue Component + 0.73725490196078436 + Color Space + sRGB + Green Component + 0.75686274509803919 + Red Component + 0.87058823529411766 + + Ansi 2 Color + + Alpha Component + 1 + Blue Component + 0.094117647058823528 + Color Space + sRGB + Green Component + 0.24705882352941178 + Red Component + 0.8666666666666667 + + Ansi 3 Color + + Alpha Component + 1 + Blue Component + 0.23921568627450981 + Color Space + sRGB + Green Component + 0.3411764705882353 + Red Component + 0.9137254901960784 + + Ansi 4 Color + + Alpha Component + 1 + Blue Component + 0.21568627450980393 + Color Space + sRGB + Green Component + 0.49019607843137253 + Red Component + 0.90980392156862744 + + Ansi 5 Color + + Alpha Component + 1 + Blue Component + 0.37254901960784315 + Color Space + sRGB + Green Component + 0.54117647058823526 + Red Component + 0.92941176470588238 + + Ansi 6 Color + + Alpha Component + 1 + Blue Component + 0.37647058823529411 + Color Space + sRGB + Green Component + 0.27450980392156865 + Red Component + 0.91764705882352937 + + Ansi 7 Color + + Alpha Component + 1 + Blue Component + 0.73725490196078436 + Color Space + sRGB + Green Component + 0.75686274509803919 + Red Component + 0.87058823529411766 + + Ansi 8 Color + + Alpha Component + 1 + Blue Component + 0.51372549019607838 + Color Space + sRGB + Green Component + 0.52941176470588236 + Red Component + 0.60784313725490191 + + Ansi 9 Color + + Alpha Component + 1 + Blue Component + 0.13333333333333333 + Color Space + sRGB + Green Component + 0.070588235294117646 + Red Component + 0.63921568627450975 + + BM Growl + + Background Color + + Alpha Component + 1 + Blue Component + 0.043137254901960791 + Color Space + sRGB + Green Component + 0.039215686274509803 + Red Component + 0.039215686274509803 + + Background Image Location + + Badge Color + + Alpha Component + 0.5 + Blue Component + 0.0 + Color Space + sRGB + Green Component + 0.14910027384757996 + Red Component + 1 + + Blend + 0.050000000000000003 + Blink Allowed + + Blinking Cursor + + Blur + + Blur Radius + 0.10000000000000001 + Bold Color + + Alpha Component + 1 + Blue Component + 0.73725490196078436 + Color Space + sRGB + Green Component + 0.75686274509803919 + Red Component + 0.87058823529411766 + + Bound Hosts + + Brighten Bold Text + + Character Encoding + 4 + Close Sessions On End + + Columns + 80 + Command + /bin/bash + Cursor Boost + 0.0 + Cursor Color + + Alpha Component + 1 + Blue Component + 0.13333333333333333 + Color Space + sRGB + Green Component + 0.070588235294117646 + Red Component + 0.63921568627450975 + + Cursor Guide Color + + Alpha Component + 0.25 + Blue Component + 1 + Color Space + sRGB + Green Component + 0.92681378126144409 + Red Component + 0.70214027166366577 + + Cursor Text Color + + Alpha Component + 1 + Blue Component + 0.043137254901960791 + Color Space + sRGB + Green Component + 0.039215686274509803 + Red Component + 0.039215686274509803 + + Cursor Type + 2 + Custom Command + Custom Shell + Custom Directory + No + Default Bookmark + No + Description + Default + Disable Window Resizing + + Draw Powerline Glyphs + + Dynamic Profile Filename + /Users/kdb424/Library/Application Support/iTerm2/DynamicProfiles/colors-wal-iterm.plist + Flashing Bell + + Foreground Color + + Alpha Component + 1 + Blue Component + 0.73725490196078436 + Color Space + sRGB + Green Component + 0.75686274509803919 + Red Component + 0.87058823529411766 + + Guid + E3DC04BE-25CC-4A17-BA45-BECB7286542B + Horizontal Spacing + 1 + Idle Code + 0 + Initial Use Transparency + + Jobs to Ignore + + rlogin + ssh + slogin + telnet + + Keyboard Map + + 0x2d-0x40000 + + Action + 11 + Text + 0x1f + + 0x32-0x40000 + + Action + 11 + Text + 0x00 + + 0x33-0x40000 + + Action + 11 + Text + 0x1b + + 0x34-0x40000 + + Action + 11 + Text + 0x1c + + 0x35-0x40000 + + Action + 11 + Text + 0x1d + + 0x36-0x40000 + + Action + 11 + Text + 0x1e + + 0x37-0x40000 + + Action + 11 + Text + 0x1f + + 0x38-0x40000 + + Action + 11 + Text + 0x7f + + 0xf700-0x220000 + + Action + 10 + Text + [1;2A + + 0xf700-0x240000 + + Action + 10 + Text + [1;5A + + 0xf700-0x260000 + + Action + 10 + Text + [1;6A + + 0xf700-0x280000 + + Action + 11 + Text + 0x1b 0x1b 0x5b 0x41 + + 0xf701-0x220000 + + Action + 10 + Text + [1;2B + + 0xf701-0x240000 + + Action + 10 + Text + [1;5B + + 0xf701-0x260000 + + Action + 10 + Text + [1;6B + + 0xf701-0x280000 + + Action + 11 + Text + 0x1b 0x1b 0x5b 0x42 + + 0xf702-0x220000 + + Action + 10 + Text + [1;2D + + 0xf702-0x240000 + + Action + 10 + Text + [1;5D + + 0xf702-0x260000 + + Action + 10 + Text + [1;6D + + 0xf702-0x280000 + + Action + 11 + Text + 0x1b 0x1b 0x5b 0x44 + + 0xf703-0x220000 + + Action + 10 + Text + [1;2C + + 0xf703-0x240000 + + Action + 10 + Text + [1;5C + + 0xf703-0x260000 + + Action + 10 + Text + [1;6C + + 0xf703-0x280000 + + Action + 11 + Text + 0x1b 0x1b 0x5b 0x43 + + 0xf704-0x20000 + + Action + 10 + Text + [1;2P + + 0xf705-0x20000 + + Action + 10 + Text + [1;2Q + + 0xf706-0x20000 + + Action + 10 + Text + [1;2R + + 0xf707-0x20000 + + Action + 10 + Text + [1;2S + + 0xf708-0x20000 + + Action + 10 + Text + [15;2~ + + 0xf709-0x20000 + + Action + 10 + Text + [17;2~ + + 0xf70a-0x20000 + + Action + 10 + Text + [18;2~ + + 0xf70b-0x20000 + + Action + 10 + Text + [19;2~ + + 0xf70c-0x20000 + + Action + 10 + Text + [20;2~ + + 0xf70d-0x20000 + + Action + 10 + Text + [21;2~ + + 0xf70e-0x20000 + + Action + 10 + Text + [23;2~ + + 0xf70f-0x20000 + + Action + 10 + Text + [24;2~ + + 0xf729-0x20000 + + Action + 10 + Text + [1;2H + + 0xf729-0x40000 + + Action + 10 + Text + [1;5H + + 0xf72b-0x20000 + + Action + 10 + Text + [1;2F + + 0xf72b-0x40000 + + Action + 10 + Text + [1;5F + + + Left Option Key Changeable + + Link Color + + Alpha Component + 1 + Blue Component + 0.73422712087631226 + Color Space + sRGB + Green Component + 0.35915297269821167 + Red Component + 0.0 + + Minimum Contrast + 0.0 + Mouse Reporting + + Name + bash + Non Ascii Font + MesloLGS-NF-Regular 11 + Non-ASCII Anti Aliased + + Non-ASCII Ligatures + + Normal Font + UbuntuMono-Regular 13 + Only The Default BG Color Uses Transparency + + Option Key Sends + 0 + Prompt Before Closing 2 + 2 + Right Option Key Sends + 0 + Rows + 25 + Screen + -1 + Scrollback Lines + 10000 + Scrollback With Status Bar + + Selected Text Color + + Alpha Component + 1 + Blue Component + 0.043137254901960791 + Color Space + sRGB + Green Component + 0.039215686274509803 + Red Component + 0.039215686274509803 + + Selection Color + + Alpha Component + 1 + Blue Component + 0.13333333333333333 + Color Space + sRGB + Green Component + 0.070588235294117646 + Red Component + 0.63921568627450975 + + Send Code When Idle + + Shortcut + + Silence Bell + + Sync Title + + Tags + + Terminal Type + xterm-256color + Thin Strokes + 4 + Transparency + 0.22552194148936175 + Unlimited Scrollback + + Use Bold Font + + Use Bright Bold + + Use Cursor Guide + + Use Italic Font + + Use Non-ASCII Font + + Use Tab Color + + Use Underline Color + + Vertical Spacing + 1 + Visual Bell + + Window Type + 0 + Working Directory + /Users/kdb424 + OnlyWhenMoreTabs diff --git a/.config/worldedit/farnsworth b/.config/worldedit/farnsworth index 605aa29..84d8ede 100644 --- a/.config/worldedit/farnsworth +++ b/.config/worldedit/farnsworth @@ -8,7 +8,6 @@ tap "homebrew/core" tap "homebrew/services" tap "kdb424/kdb424", "git@github.com:kdb424/homebrew-kdb424.git" tap "koekeishiya/formulae" -tap "lencx/chatgpt", "https://github.com/lencx/ChatGPT.git" tap "osx-cross/arm" tap "osx-cross/avr" tap "qmk/qmk" @@ -22,7 +21,7 @@ brew "openrct2", link: false brew "pipenv" brew "ranger" brew "winetricks" -brew "d12frosted/emacs-plus/emacs-plus@28", args: ["with-modern-doom3-icon", "with-native-comp"] +brew "d12frosted/emacs-plus/emacs-plus@28", args: ["with-modern-doom3-icon"] brew "kdb424/kdb424/pmm" brew "koekeishiya/formulae/skhd" brew "koekeishiya/formulae/yabai" @@ -30,12 +29,9 @@ brew "qmk/qmk/qmk" cask "android-platform-tools" cask "audacity" cask "autodesk-fusion360" -cask "balenaetcher" cask "betterdiscord-installer" -cask "chatgpt" cask "deadbeef-nightly" cask "discord" -cask "discord-canary" cask "disk-inventory-x" cask "eqmac" cask "firefox" @@ -49,8 +45,8 @@ cask "mpv" cask "multimc" cask "obs" cask "openrct2" +cask "orcaslicer" cask "portingkit" -cask "raspberry-pi-imager" cask "signal" cask "sonixd" cask "steam" @@ -58,3 +54,4 @@ cask "timemachineeditor" cask "wine-crossover" cask "zerotier-one" mas "Emby", id: 992180193 +mas "Xcode", id: 497799835 diff --git a/.local/share/fonts/._AnonymousPro-1.002.001 b/.local/share/fonts/._AnonymousPro-1.002.001 deleted file mode 100755 index 1f599bdbade56d16952e5b24e684104eb1d00735..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 70 gcmZQz6=P>$V!#B9Kp{>bRs&)MAcg<|7z33C02X=xg#Z8m diff --git a/.local/share/fonts/.uuid b/.local/share/fonts/.uuid deleted file mode 100644 index d074ffa..0000000 --- a/.local/share/fonts/.uuid +++ /dev/null @@ -1 +0,0 @@ -5bdd2a4d-9097-4c09-9720-57ccb4175627 \ No newline at end of file diff --git a/.zsh_aliases b/.zsh_aliases index 4f542fe..8806cce 100644 --- a/.zsh_aliases +++ b/.zsh_aliases @@ -123,6 +123,7 @@ if (( $+commands[nix-channel] )); then alias hms='home-manager switch' alias hmc='home-manager expire-generations -7days' alias hme='home-manager edit' + alias hm='home-manager ' fi # Docker shortcuts @@ -269,6 +270,9 @@ alias grf='git remote set-url origin ssh://git@kif.far:222/$(whoami)/$(basename alias grh='git remote set-url origin ssh://git@kif.home:222/$(whoami)/$(basename $(pwd))' alias grg='git remote set-url origin ssh://git@github.com:/$(whoami)/$(basename $(pwd))' alias gpa='git push && git push github' +alias gp='git pull' +alias gpu='git push' +alias gpf='git push --force' # Misc alieses I use often alias rmd='rm -rf'