diff options
21 files changed, 0 insertions, 731 deletions
diff --git a/common/.clang-format.org b/common/.clang-format.org deleted file mode 100644 index 6c38b3b..0000000 --- a/common/.clang-format.org +++ /dev/null @@ -1,9 +0,0 @@ -#+title: Clang-Format Settings -Use a style similar to Linux kernel style (but with 4-wide indents and spaces over tabs). -#+begin_src yaml :tangle ~/.clang-format -BasedOnStyle: LLVM -IndentWidth: 4 -BreakBeforeBraces: Linux -AllowShortIfStatementsOnASingleLine: false -IndentCaseLabels: false -#+end_src diff --git a/common/.config/alacritty/alacritty.toml.org b/common/.config/alacritty/alacritty.toml.org deleted file mode 100644 index 992ed63..0000000 --- a/common/.config/alacritty/alacritty.toml.org +++ /dev/null @@ -1,55 +0,0 @@ -#+title: Alacritty Configuration - -Remove window decorations. -#+begin_src conf :tangle ~/.config/alacritty/alacritty.toml :mkdirp yes - [window] - decorations = "None" -#+end_src - -Make the window slightly transparent. -#+begin_src conf :tangle ~/.config/alacritty/alacritty.toml :mkdirp yes - opacity = 0.9 -#+end_src - -Add slight padding around the text. -#+begin_src conf :tangle ~/.config/alacritty/alacritty.toml :mkdirp yes - padding = { x = 6, y = 6 } -#+end_src - -Allow use of option as an alt key on Mac OS. -#+begin_src conf :tangle ~/.config/alacritty/alacritty.toml :mkdirp yes - option_as_alt = "Both" -#+end_src - -Use the same font as normal. -#+begin_src conf :tangle ~/.config/alacritty/alacritty.toml :mkdirp yes - [font] - normal = { family = "SauceCodePro Nerd Font", style = "Regular" } - size = 14 -#+end_src - -#+begin_src conf :tangle ~/.config/alacritty/alacritty.toml :mkdirp yes - [colors.primary] - background = '#ece0c9' - foreground = '#191916' - - [colors.normal] - black = '#191916' - red = '#ac4438' - green = '#354d52' - yellow = '#ba9151' - blue = '#465b91' - magenta = '#5b5489' - cyan = '#4e6062' - white = '#c9ad7a' - - [colors.bright] - black = '#293c3c' - red = '#d8611c' - green = '#4b7b53' - yellow = '#d8974b' - blue = '#2f3d91' - magenta = '#735e82' - cyan = '#6b8f92' - white = '#ece0c9' -#+end_src diff --git a/common/.config/fastfetch/config.jsonc.org b/common/.config/fastfetch/config.jsonc.org deleted file mode 100644 index 7a2d099..0000000 --- a/common/.config/fastfetch/config.jsonc.org +++ /dev/null @@ -1,92 +0,0 @@ -#+title: Fastfetch Settings -Open a JSON object. -#+begin_src js :tangle ~/.config/fastfetch/config.jsonc :mkdirp yes - { -#+end_src - -Use a =sixel= image for the logo. -#+begin_src js :tangle ~/.config/fastfetch/config.jsonc :mkdirp yes - "logo": { - "type": "raw", - "source": "~/.config/fastfetch/logo.sixel", - "width": 40, - "height": 19 - }, -#+end_src - -Two spaces between an item and its key. -#+begin_src js :tangle ~/.config/fastfetch/config.jsonc :mkdirp yes - "display": { - "separator": " " - }, -#+end_src - -Define the modules in the =fastfetch= display. -#+begin_src js :tangle ~/.config/fastfetch/config.jsonc :mkdirp yes - "modules": [ - "title", - { - "type": "custom", - "format": "──────────────────────────────────" - }, - { - "type": "os", - "key": "" - }, - { - "type": "kernel", - "key": "" - }, - { - "type": "uptime", - "key": "" - }, - { - "type": "packages", - "key": "" - }, - { - "type": "shell", - "key": "" - }, - { - "type": "display", - "key": "" - }, - { - "type": "wm", - "key": "" - }, - { - "type": "terminal", - "key": "" - }, - { - "type": "cpu", - "key": "" - }, - { - "type": "gpu", - "key": "" - }, - { - "type": "memory", - "key": "" - }, - { - "type": "disk", - "key": "" - }, - { - "type": "locale", - "key": "" - }, - "break", - "colors" - ] -#+end_src - -Close the JSON object. -#+begin_src js :tangle ~/.config/fastfetch/config.jsonc :mkdirp yes -} -#+end_src diff --git a/common/.config/nvim/init.lua.org b/common/.config/nvim/init.lua.org deleted file mode 100644 index 0f7dffa..0000000 --- a/common/.config/nvim/init.lua.org +++ /dev/null @@ -1,27 +0,0 @@ -#+title: Neovim Settings -This is the entry point for my Neovim configuration. I don't use Neovim much these days, so it is very stripped back from what it once was. Emacs is much comfier for most uses, so Neovim is mostly relegated to editing system configuration files. - -Disable timeout to speed things up. -#+begin_src lua :tangle ~/.config/nvim/init.lua :mkdirp yes - vim.cmd([[set notimeout]]) -#+end_src - -Fix unable to open swap file issue. -#+begin_src lua :tangle ~/.config/nvim/init.lua :mkdirp yes - vim.cmd([[set directory=~/.local/share/nvim/swap//]]) -#+end_src - -Install plugins in the [[./lua/plugins.org][plugins.lua]] file. -#+begin_src lua :tangle ~/.config/nvim/init.lua :mkdirp yes - require('plugins') -#+end_src - -Set up behaviour in the [[./lua/behaviour.org][behaviour.lua]] file. -#+begin_src lua :tangle ~/.config/nvim/init.lua :mkdirp yes - require('behaviour') -#+end_src - -Set up appearance in the [[./lua/appearance.org][appearance.lua]] file. -#+begin_src lua :tangle ~/.config/nvim/init.lua :mkdirp yes - require('appearance') -#+end_src diff --git a/common/.config/nvim/lua/appearance.lua.org b/common/.config/nvim/lua/appearance.lua.org deleted file mode 100644 index 1f1d534..0000000 --- a/common/.config/nvim/lua/appearance.lua.org +++ /dev/null @@ -1,15 +0,0 @@ -#+title: Neovim Appearance Settings -Use line numbers. -#+begin_src lua :tangle ~/.config/nvim/lua/appearance.lua :mkdirp yes - vim.opt.number = true -#+end_src - -Turn on syntax highlighting. -#+begin_src lua :tangle ~/.config/nvim/lua/appearance.lua :mkdirp yes - vim.cmd([[ - set notermguicolors - syntax on - colorscheme default - set background=light - ]]) -#+end_src diff --git a/common/.config/nvim/lua/behaviour.lua.org b/common/.config/nvim/lua/behaviour.lua.org deleted file mode 100644 index 871b65e..0000000 --- a/common/.config/nvim/lua/behaviour.lua.org +++ /dev/null @@ -1,19 +0,0 @@ -#+title: Neovim Behaviour Settings - -Use tabs with width 4. -#+begin_src lua :tangle ~/.config/nvim/lua/behaviour.lua :mkdirp yes - vim.opt.tabstop = 4 - vim.opt.expandtab = true - vim.opt.shiftwidth = 4 - vim.opt.autoindent = true -#+end_src - -Better command line completion. -#+begin_src lua :tangle ~/.config/nvim/lua/behaviour.lua :mkdirp yes - vim.opt.wildmode = 'longest,list' -#+end_src - -Better management of file types. -#+begin_src lua :tangle ~/.config/nvim/lua/behaviour.lua :mkdirp yes - vim.cmd('filetype plugin indent on') -#+end_src diff --git a/common/.config/nvim/lua/plugins.lua.org b/common/.config/nvim/lua/plugins.lua.org deleted file mode 100644 index f3027f9..0000000 --- a/common/.config/nvim/lua/plugins.lua.org +++ /dev/null @@ -1,27 +0,0 @@ -#+title: Neovim Plugins -* Setup -Use =lazy= to manage plugins. This block activates =lazy=. -#+begin_src lua :tangle ~/.config/nvim/lua/plugins.lua :mkdirp yes - local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" - if not vim.loop.fs_stat(lazypath) then - vim.fn.system({ - "git", - "clone", - "--filter=blob:none", - "https://github.com/folke/lazy.nvim.git", - "--branch=stable", - lazypath, - }) - end - vim.opt.rtp:prepend(lazypath) -#+end_src - -* Plugins -I use =lightline= for a nice status bar. The Ayu theme matches my overall colour scheme. =delimitmate= provides better delimiter handling. Trailing whitespace is highlighted with =vim-trailing-whitespace=. -#+begin_src lua :tangle ~/.config/nvim/lua/plugins.lua :mkdirp yes - require('lazy').setup({ - 'itchyny/lightline.vim', - 'Raimondi/delimitMate', - 'bronson/vim-trailing-whitespace', - }) -#+end_src diff --git a/common/.config/sketchybar/plugins/battery.sh.org b/common/.config/sketchybar/plugins/battery.sh.org deleted file mode 100755 index d3918e2..0000000 --- a/common/.config/sketchybar/plugins/battery.sh.org +++ /dev/null @@ -1,46 +0,0 @@ -#+title: SketchyBar Battery Plugin - -Get the percentage and charging status. -#+begin_src sh :tangle ~/.config/sketchybar/plugins/battery.sh :mkdirp yes :tangle-mode o755 - #!/bin/sh - PERCENTAGE="$(pmset -g batt | grep -Eo "\d+%" | cut -d% -f1)" - CHARGING="$(pmset -g batt | grep 'AC Power')" -#+end_src - -Exit if no percentage was reported. -#+begin_src sh :tangle ~/.config/sketchybar/plugins/battery.sh :mkdirp yes :tangle-mode o755 - if [ "$PERCENTAGE" = "" ]; then - exit 0 - fi -#+end_src - -Choose the icon based on the percentage. -#+begin_src sh :tangle ~/.config/sketchybar/plugins/battery.sh :mkdirp yes :tangle-mode o755 - if [[ "$CHARGING" != "" ]]; then - case "${PERCENTAGE}" in - 9[0-9]|100) ICON="" - ;; - [6-8][0-9]) ICON="" - ;; - [3-5][0-9]) ICON="" - ;; - [1-2][0-9]) ICON="" - ;; - ,*) ICON="" - esac - else - case "${PERCENTAGE}" in - 9[0-9]|100) ICON="" - ;; - [6-8][0-9]) ICON="" - ;; - [3-5][0-9]) ICON="" - ;; - [1-2][0-9]) ICON="" - ;; - ,*) ICON="" - esac - fi - - sketchybar --set "$NAME" icon="$ICON" label="${PERCENTAGE}%" -#+end_src diff --git a/common/.config/sketchybar/plugins/clock.sh.org b/common/.config/sketchybar/plugins/clock.sh.org deleted file mode 100755 index 1ab5ec3..0000000 --- a/common/.config/sketchybar/plugins/clock.sh.org +++ /dev/null @@ -1,7 +0,0 @@ -#+title: SketchyBar Clock Plugin - -Get the date and set it as the label. -#+begin_src sh :tangle ~/.config/sketchybar/plugins/clock.sh :mkdirp yes :tangle-mode o755 - #!/bin/sh - sketchybar --set "$NAME" label="$(date '+%Y-%m-%d %H:%M')" -#+end_src diff --git a/common/.config/sketchybar/plugins/cpu.sh.org b/common/.config/sketchybar/plugins/cpu.sh.org deleted file mode 100755 index 199d89b..0000000 --- a/common/.config/sketchybar/plugins/cpu.sh.org +++ /dev/null @@ -1,7 +0,0 @@ -#+title: SketchyBar CPU Plugin - -Get the CPU percentage and display it. -#+begin_src sh :tangle ~/.config/sketchybar/plugins/cpu.sh :mkdirp yes :tangle-mode o755 - #!/bin/sh - sketchybar --set "$NAME" icon='' label="$(top -l 2 | grep -E "^CPU" | tail -1 | awk '{ print $3 + $5"%" }')" -#+end_src diff --git a/common/.config/sketchybar/plugins/front_app.sh.org b/common/.config/sketchybar/plugins/front_app.sh.org deleted file mode 100755 index 44917e4..0000000 --- a/common/.config/sketchybar/plugins/front_app.sh.org +++ /dev/null @@ -1,9 +0,0 @@ -#+title: SketchyBar Front App Plugin - -Get the name of the focused application. -#+begin_src sh :tangle ~/.config/sketchybar/plugins/front_app.sh :mkdirp yes :tangle-mode o755 - #!/bin/sh - if [ "$SENDER" = "front_app_switched" ]; then - sketchybar --set "$NAME" label="$INFO" - fi -#+end_src diff --git a/common/.config/sketchybar/plugins/mem.sh.org b/common/.config/sketchybar/plugins/mem.sh.org deleted file mode 100755 index ef3feef..0000000 --- a/common/.config/sketchybar/plugins/mem.sh.org +++ /dev/null @@ -1,16 +0,0 @@ -#+title: SketchyBar Memory Plugin - -Get the memory in use and return that as a percent. -#+begin_src sh :tangle ~/.config/sketchybar/plugins/mem.sh :mkdirp yes :tangle-mode o755 - #!/bin/sh - hw_pagesize="$(sysctl -n hw.pagesize)" - mem_total="$(($(sysctl -n hw.memsize) / 1024))" - pages_app="$(($(sysctl -n vm.page_pageable_internal_count) - $(sysctl -n vm.page_purgeable_count)))" - pages_wired="$(vm_stat | awk '/ wired/ { print $4 }')" - pages_compressed="$(vm_stat | awk '/ occupied/ { printf $5 }')" - pages_compressed="${pages_compressed:-0}" - mem_used="$(((pages_app + ${pages_wired//.} + ${pages_compressed//.}) * hw_pagesize / 1024))" - - mem_percent=$((mem_perc=$mem_used * 100 / $mem_total)) - sketchybar --set "$NAME" icon="" label="$mem_percent%" -#+end_src diff --git a/common/.config/sketchybar/plugins/space.sh.org b/common/.config/sketchybar/plugins/space.sh.org deleted file mode 100755 index 97581aa..0000000 --- a/common/.config/sketchybar/plugins/space.sh.org +++ /dev/null @@ -1,7 +0,0 @@ -#+title: SketchyBar Space Plugin - -Get the current space. -#+begin_src sh :tangle ~/.config/sketchybar/plugins/space.sh :mkdirp yes :tangle-mode o755 - #!/bin/sh - sketchybar --set "$NAME" background.drawing="$SELECTED" -#+end_src diff --git a/common/.config/sketchybar/plugins/volume.sh.org b/common/.config/sketchybar/plugins/volume.sh.org deleted file mode 100755 index c53b2a1..0000000 --- a/common/.config/sketchybar/plugins/volume.sh.org +++ /dev/null @@ -1,21 +0,0 @@ -#+title: SketchyBar Volume Plugin - -Set an icon based on the current volume and return the volume and the icon. -#+begin_src sh :tangle ~/.config/sketchybar/plugins/volume.sh :mkdirp yes :tangle-mode o755 - #!/bin/sh - if [ "$SENDER" = "volume_change" ]; then - VOLUME="$INFO" - - case "$VOLUME" in - [6-9][0-9]|100) ICON="" - ;; - [3-5][0-9]) ICON="" - ;; - [1-9]|[1-2][0-9]) ICON="" - ;; - ,*) ICON="" - esac - - sketchybar --set "$NAME" icon="$ICON" label="$VOLUME%" - fi -#+end_src diff --git a/common/.config/sketchybar/sketchybarrc.org b/common/.config/sketchybar/sketchybarrc.org deleted file mode 100755 index 316eaf3..0000000 --- a/common/.config/sketchybar/sketchybarrc.org +++ /dev/null @@ -1,77 +0,0 @@ -#+title: SketchyBar Configuration - -Set the plugin directory. -#+begin_src sh :tangle ~/.config/sketchybar/sketchybarrc :mkdirp yes :tangle-mode o755 - PLUGIN_DIR="$CONFIG_DIR/plugins" -#+end_src - -Place the bar at the of the screen with full transparency. -#+begin_src sh :tangle ~/.config/sketchybar/sketchybarrc :mkdirp yes :tangle-mode o755 - sketchybar --bar position=top height=40 blur_radius=30 color=0x00000000 -#+end_src - -Add small padding to left and right, use Symbols font for icons and Source Code Pro for text. Make all text white and add padding on left and right for labels and icons. -#+begin_src sh :tangle ~/.config/sketchybar/sketchybarrc :mkdirp yes :tangle-mode o755 - default=( - padding_left=5 - padding_right=5 - icon.font="Symbols Nerd Font:Bold:17.0" - label.font="Sauce Code Pro Nerd Font:Bold:14.0" - icon.color=0xffffffff - label.color=0xffffffff - icon.padding_left=4 - icon.padding_right=4 - label.padding_left=4 - label.padding_right=4 - ) - sketchybar --default "${default[@]}" -#+end_src - -Add clickable space icons for 10 spaces. -#+begin_src sh :tangle ~/.config/sketchybar/sketchybarrc :mkdirp yes :tangle-mode o755 - SPACE_ICONS=("1" "2" "3" "4" "5" "6" "7" "8" "9" "10") - for i in "${!SPACE_ICONS[@]}" - do - sid="$(($i+1))" - space=( - space="$sid" - icon="${SPACE_ICONS[i]}" - icon.padding_left=7 - icon.padding_right=7 - background.color=0x40ffffff - background.corner_radius=5 - background.height=25 - label.drawing=off - script="$PLUGIN_DIR/space.sh" - click_script="yabai -m space --focus $sid" - ) - sketchybar --add space space."$sid" left --set space."$sid" "${space[@]}" - done -#+end_src - -Add a chevron before listing the open application. -#+begin_src sh :tangle ~/.config/sketchybar/sketchybarrc :mkdirp yes :tangle-mode o755 - sketchybar --add item chevron left \ - --set chevron icon= label.drawing=off \ - --add item front_app left \ - --set front_app icon.drawing=off script="$PLUGIN_DIR/front_app.sh" \ - --subscribe front_app front_app_switched -#+end_src - -Display a clock, volume, battery, CPU usage, and memory usage on the right. -#+begin_src sh :tangle ~/.config/sketchybar/sketchybarrc :mkdirp yes :tangle-mode o755 - sketchybar --add item clock right \ - --set clock update_freq=10 icon= script="$PLUGIN_DIR/clock.sh" \ - --add item volume right \ - --set volume script="$PLUGIN_DIR/volume.sh" \ - --subscribe volume volume_change \ - --add item battery right \ - --set battery update_freq=120 script="$PLUGIN_DIR/battery.sh" \ - --subscribe battery system_woke power_source_change \ - --add item cpu right \ - --set cpu update_freq=10 script="$PLUGIN_DIR/cpu.sh" \ - --add item mem right \ - --set mem update_freq=10 script="$PLUGIN_DIR/mem.sh" - - sketchybar --update -#+end_src diff --git a/common/.config/skhd/skhdrc.org b/common/.config/skhd/skhdrc.org deleted file mode 100644 index e628cd4..0000000 --- a/common/.config/skhd/skhdrc.org +++ /dev/null @@ -1,80 +0,0 @@ -#+title: =skhd= Configuration - -Add keybinding to open a terminal emulator. -#+begin_src conf :tangle ~/.config/skhd/skhdrc :mkdirp yes - cmd - return : /opt/homebrew/bin/alacritty -#+end_src - -Add keybinding for killing a window. -#+begin_src conf :tangle ~/.config/skhd/skhdrc :mkdirp yes - cmd + shift - q : yabai -m window --close -#+end_src - -Add keybinding for opening an app launcher. -#+begin_src conf :tangle ~/.config/skhd/skhdrc :mkdirp yes - cmd - d : ~/.local/bin/launcher -#+end_src - -Add keybinding for reloading the configuration. -#+begin_src conf :tangle ~/.config/skhd/skhdrc :mkdirp yes - cmd + shift - c : yabai --restart-service && skhd --restart-service && brew services restart sketchybar -#+end_src - -Change focus keybindings. -#+begin_src conf :tangle ~/.config/skhd/skhdrc :mkdirp yes - 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 -#+end_src - -Move window keybindings. -#+begin_src conf :tangle ~/.config/skhd/skhdrc :mkdirp yes - 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 -#+end_src - -Change workspace keybindings. -#+begin_src conf :tangle ~/.config/skhd/skhdrc :mkdirp yes - 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 -#+end_src - -Move window to workspace keybindings. -#+begin_src conf :tangle ~/.config/skhd/skhdrc :mkdirp yes - 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 -#+end_src - -Define full screen keybinding. -#+begin_src conf :tangle ~/.config/skhd/skhdrc :mkdirp yes - cmd + shift - f : yabai -m window --toggle zoom-fullscreen -#+end_src - -Define toggle floating keybinding. -#+begin_src conf :tangle ~/.config/skhd/skhdrc :mkdirp yes - cmd + shift - space : yabai -m window --toggle float -#+end_src - -Add screenshot keybinding. -#+begin_src conf :tangle ~/.config/skhd/skhdrc :mkdirp yes - shift + ctrl - s : open /System/Applications/Utilities/Screenshot.app -#+end_src diff --git a/common/.config/yabai/yabairc.org b/common/.config/yabai/yabairc.org deleted file mode 100644 index 4307c1f..0000000 --- a/common/.config/yabai/yabairc.org +++ /dev/null @@ -1,68 +0,0 @@ -#+title: Yabai Configuration - -Load script additions automatically. -#+begin_src sh :tangle ~/.config/yabai/yabairc :mkdirp yes - yabai -m signal --add event=dock_did_restart action="sudo /opt/homebrew/bin/yabai --load-sa" - sudo /opt/homebrew/bin/yabai --load-sa -#+end_src - -Tile the windows. -#+begin_src sh :tangle ~/.config/yabai/yabairc :mkdirp yes - yabai -m config layout bsp -#+end_src - -Automatically balance window sizes. -#+begin_src sh :tangle ~/.config/yabai/yabairc :mkdirp yes - yabai -m config auto_balance on -#+end_src - -Use 10 pixel gaps. -#+begin_src sh :tangle ~/.config/yabai/yabairc :mkdirp yes - 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 -#+end_src - -Remove window shadows unless the window is floating. -#+begin_src sh :tangle ~/.config/yabai/yabairc :mkdirp yes - yabai -m config window_shadow float -#+end_src - -Move mouse to focused window anad focus on the window that the mouse is on. -#+begin_src sh :tangle ~/.config/yabai/yabairc :mkdirp yes - yabai -m config focus_follows_mouse autoraise - yabai -m config mouse_follows_focus on -#+end_src - -Control windows if =cmd= is held. -#+begin_src sh :tangle ~/.config/yabai/yabairc :mkdirp yes - yabai -m config mouse_modifier cmd -#+end_src - -Move windows with left click. -#+begin_src sh :tangle ~/.config/yabai/yabairc :mkdirp yes - yabai -m config mouse_action1 move -#+end_src - -Resize windows with right click. -#+begin_src sh :tangle ~/.config/yabai/yabairc :mkdirp yes - yabai -m config mouse_action2 resize -#+end_src - -Update Positions when the window is dropped. -#+begin_src sh :tangle ~/.config/yabai/yabairc :mkdirp yes - yabai -m mouse_drop_action swap -#+end_src - -Don't manage some apps. -#+begin_src sh :tangle ~/.config/yabai/yabairc :mkdirp yes - yabai -m rule --add app="^System Settings$" manage=off - yabai -m rule --add app="^Calculator$" manage=off -#+end_src - -Make windows management aware of SketchyBar. -#+begin_src sh :tangle ~/.config/yabai/yabairc :mkdirp yes - yabai -m config external_bar all:$(sketchybar --query bar | jq .height):0 -#+end_src diff --git a/common/.local/share/fonts/ComputerModern.tar.gz b/common/.local/share/fonts/ComputerModern.tar.gz Binary files differdeleted file mode 100644 index f84d106..0000000 --- a/common/.local/share/fonts/ComputerModern.tar.gz +++ /dev/null diff --git a/common/.local/share/fonts/SauceCodePro.tar.gz b/common/.local/share/fonts/SauceCodePro.tar.gz Binary files differdeleted file mode 100644 index d3451f3..0000000 --- a/common/.local/share/fonts/SauceCodePro.tar.gz +++ /dev/null diff --git a/common/.profile.org b/common/.profile.org deleted file mode 100644 index 99c0908..0000000 --- a/common/.profile.org +++ /dev/null @@ -1,19 +0,0 @@ -#+TITLE: =.profile= Settings -Add items to the path. -#+begin_src sh :tangle ~/.profile -export PATH="$HOME/.local/share/fzf-zsh-plugin/bin:$HOME/node_modules/.bin:$HOME/.emacs.d/bin:$HOME/bin:$HOME/gems/bin:$HOME/.local/bin:$HOME/go/bin:/usr/local/bin:/Library/TeX/texbin/:$PATH" -#+end_src - -Set =GPG_TTY= on Mac OS. -#+begin_src sh :tangle ~/.profile - if [ "$(uname)" = 'Darwin' ] && ps -e | grep -q 'emacs --daemon'; then - export GPG_TTY=$(tty) - fi -#+end_src - -Fix =pipx= path on Mac OS. -#+begin_src sh :tangle ~/.profile - if [ "$(uname)" = 'Darwin' ]; then - PIPX_HOME="$HOME/.local/pipx" - fi -#+end_src diff --git a/common/.zshrc.org b/common/.zshrc.org deleted file mode 100644 index 02601e5..0000000 --- a/common/.zshrc.org +++ /dev/null @@ -1,130 +0,0 @@ -#+title: ZSH Configuration -Set up completions. -#+begin_src sh :tangle ~/.zshrc :mkdirp yes - zstyle ':completion:*' completer _expand _complete _ignored _approximate - zstyle ':completion:*' matcher-list '' 'm:{[:lower:]}={[:upper:]}' 'r:|[._-]=** r:|=**' 'l:|=* r:|=*' - zstyle :compinstall filename '/home/jjanzen/.zshrc' - autoload -U compinit promptinit - compinit - promptinit -#+end_src - -Enable Gentoo completions on my Gentoo system. -#+begin_src sh :tangle ~/.zshrc :mkdirp yes - if [ "$(uname)" = 'Linux' ] && grep -q 'ID=gentoo' /etc/os-release; then - prompt gentoo - fi -#+end_src - -Set up the history with 1000 entries and ignored duplicate commands. -#+begin_src sh :tangle ~/.zshrc :mkdirp yes - HISTFILE=~/.histfile - HISTSIZE=1000 - SAVEHIST=1000 - setopt hist_ignore_all_dups -#+end_src - -Enable automatic =cd=. -#+begin_src sh :tangle ~/.zshrc :mkdirp yes - setopt autocd -#+end_src - -Enable extended glob. -#+begin_src sh :tangle ~/.zshrc :mkdirp yes - setopt extendedglob -#+end_src - -If a glob returns nothing, don't keep the =*=. -#+begin_src sh :tangle ~/.zshrc :mkdirp yes - setopt nullglob -#+end_src - -Report the status of background jobs immediately. -#+begin_src sh :tangle ~/.zshrc :mkdirp yes - setopt notify -#+end_src - -Disable the beep. -#+begin_src sh :tangle ~/.zshrc :mkdirp yes - unsetopt beep -#+end_src - -Use =vi= keybindings. -#+begin_src sh :tangle ~/.zshrc :mkdirp yes - bindkey -v -#+end_src - -Use =lesspipe= back end for =less= if it is installed. -#+begin_src sh :tangle ~/.zshrc :mkdirp yes - which lesspipe.sh &> /dev/null && export LESSOPEN="|lesspipe.sh %s" -#+end_src - -Use =eza= as my =ls= command if it is installed. -#+begin_src sh :tangle ~/.zshrc :mkdirp yes - which eza &> /dev/null && alias ls=eza -#+end_src - -Use Neovim as my =vi= and =vim= application if it is installed. -#+begin_src sh :tangle ~/.zshrc :mkdirp yes - which nvim &> /dev/null && alias vi=nvim && alias vim=nvim -#+end_src - -If the Firefox binary is called =firefox-bin=, let =firefox= also run =firefox-bin=. -#+begin_src sh :tangle ~/.zshrc :mkdirp yes - which firefox-bin &> /dev/null && alias firefox=firefox-bin -#+end_src - -Lazy =ls= shortcuts. -#+begin_src sh :tangle ~/.zshrc :mkdirp yes - alias ll='ls -alF' - alias la='ls -a' - alias l='ls -F' - alias sl='ls' -#+end_src - -*** Prompt -Define function to write out icons for the git status. -#+begin_src sh :tangle ~/.zshrc :mkdirp yes - parse_git_dirty() { - git_status="$(git status 2> /dev/null)" - [[ "$git_status" =~ "use \"git push\" to publish your local commits" ]] && echo -n " %F{green}%f" - [[ "$git_status" =~ "Changes to be committed:" ]] && echo -n " %F{magenta}%f" - [[ "$git_status" =~ "Changes not staged for commit:" ]] && echo -n " %F{yellow}%f" - [[ "$git_status" =~ "Untracked files:" ]] && echo -n " %F{red}%f" - } -#+end_src - -Enable git status in the prompt. -#+begin_src sh :tangle ~/.zshrc :mkdirp yes - setopt prompt_subst - autoload -Uz vcs_info - precmd () { vcs_info } - zstyle ':vcs_info:*' formats ' %F{blue}%b%f' # git(main) -#+end_src - -Define the prompt as follows: -- Error code (if applicable) -- Path using =~= for the home directory and truncating if too long -- Git branch -- Git status -- =$= to mark the start of the prompt -#+begin_src sh :tangle ~/.zshrc :mkdirp yes - PS1='%(?..%B%F{red}[%?%\]%f%b )%F{green}%20<...<%~%<<%f$vcs_info_msg_0_$(parse_git_dirty) $ ' -#+end_src - -Enable VPN shortcut. -#+begin_src sh :tangle ~/.zshrc :mkdirp yes - if [ "$(uname)" = 'Linux' ] && grep -q 'ID=gentoo' /etc/os-release; then - vpn () { - if test -f /tmp/vpn.lock; then - echo turning off vpn... - doas /usr/bin/wg-quick down gentoo-CA-340 - rm /tmp/vpn.lock - else - echo turning on vpn... - doas /usr/bin/wg-quick up gentoo-CA-340 - touch /tmp/vpn.lock - fi - } - fi -#+end_src |