diff --git a/common/fish/config.fish b/common/fish/config.fish index c149ec2..b9f885d 100755 --- a/common/fish/config.fish +++ b/common/fish/config.fish @@ -19,22 +19,8 @@ else if test -f /opt/asdf-vm/asdf.fish source /opt/asdf-vm/asdf.fish end -if test -f /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh - set nix_profiles /nix/var/nix/profiles/default $HOME/.nix-profile - set --export --universal NIX_PROFILES "$nix_profiles" - - if set -q NIX_SSL_CERT_FILE - : - elif test -e /etc/ssl/certs/ca-certificates.crt - set --export --universal NIX_SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt - else - for p in (string split $NIX_PROFILES) - test -e $p/etc/ssl/certs/ca-bundle.crt && \ - set --export --universal NIX_SSL_CERT_FILE=$p/etc/ssl/certs/ca-bundle.crt - end - end - - set --prepend --export --global fish_user_paths $HOME/.nix-profile/bin /nix/var/nix/profiles/default/bin +if test -f $HOME/.nix-profile/etc/profile.d/nix.fish + . $HOME/.nix-profile/etc/profile.d/nix.fish end if has_command nnn diff --git a/common/kitty/kitty.conf b/common/kitty/kitty.conf index f4a3d2e..f9c2d51 100644 --- a/common/kitty/kitty.conf +++ b/common/kitty/kitty.conf @@ -43,18 +43,18 @@ map ctrl+shift+q close_window # kill tab map ctrl+alt+shift+q close_tab -# map ctrl+shift+j launch --location=hsplit --cwd=current -# map ctrl+shift+l launch --location=vsplit --cwd=current -# -# map ctrl+alt+shift+k move_window up -# map ctrl+alt+shift+h move_window left -# map ctrl+alt+shift+l move_window right -# map ctrl+alt+shift+j move_window down -# -# map ctrl+h neighboring_window left -# map ctrl+l neighboring_window right -# map ctrl+k neighboring_window up -# map ctrl+j neighboring_window down +map ctrl+shift+j launch --location=hsplit --cwd=current +map ctrl+shift+l launch --location=vsplit --cwd=current + +map ctrl+alt+shift+k move_window up +map ctrl+alt+shift+h move_window left +map ctrl+alt+shift+l move_window right +map ctrl+alt+shift+j move_window down + +map ctrl+h neighboring_window left +map ctrl+l neighboring_window right +map ctrl+k neighboring_window up +map ctrl+j neighboring_window down map ctrl+shift+n nth_window -1 map ctrl+shift+space>u kitten hints --type=url --program @ diff --git a/common/wezterm/wezterm.lua b/common/wezterm/wezterm.lua index 3c77a81..1068a96 100644 --- a/common/wezterm/wezterm.lua +++ b/common/wezterm/wezterm.lua @@ -53,11 +53,11 @@ config.inactive_pane_hsb = { } config.keys = { - { - key = 'j', - mods = 'CTRL', - action = wezterm.action.ActivatePaneDirection'Down' - }, + -- { + -- key = 'j', + -- mods = 'CTRL', + -- action = wezterm.action.ActivatePaneDirection'Down' + -- }, { key = 'Insert', mods = 'SHIFT', @@ -83,16 +83,16 @@ config.keys = { mods = 'CTRL', action = wezterm.action.ActivatePaneDirection'Up' }, - { - key = 'j', - mods = 'CTRL|SHIFT', - action = wezterm.action.SplitVertical{domain='CurrentPaneDomain'} - }, - { - key = 'l', - mods = 'CTRL|SHIFT', - action = wezterm.action.SplitHorizontal{domain='CurrentPaneDomain'} - }, + -- { + -- key = 'j', + -- mods = 'CTRL|SHIFT', + -- action = wezterm.action.SplitVertical{domain='CurrentPaneDomain'} + -- }, + -- { + -- key = 'l', + -- mods = 'CTRL|SHIFT', + -- action = wezterm.action.SplitHorizontal{domain='CurrentPaneDomain'} + -- }, { key = 'l', mods = 'CTRL|SHIFT|ALT', diff --git a/common/zellij/config.kdl b/common/zellij/config.kdl index 9e5432b..21271a8 100644 --- a/common/zellij/config.kdl +++ b/common/zellij/config.kdl @@ -2,93 +2,17 @@ theme "catppuccin-mocha" pane_frames false -plugins { - tab-bar { path "tab-bar"; } - // status-bar { path "status-bar"; } - // strider { path "strider"; } - compact-bar { path "compact-bar"; } -} - -ui { - pane_frames { - rounded_corners true - hide_session_name true - } -} - -// scroll_buffer_size 10000 -simplified_ui true -default_layout "default" -default_mode "locked" -mouse_mode true -copy_clipboard "primary" -copy_on_select true -mirror_session false - -themes { - catppuccin-frappe { - fg 198 208 245 - bg 98 104 128 - black 41 44 60 - red 231 130 132 - green 166 209 137 - yellow 229 200 144 - blue 140 170 238 - magenta 244 184 228 - cyan 153 209 219 - white 198 208 245 - orange 239 159 118 - } - catppuccin-latte { - fg 172 176 190 - bg 172 176 190 - black 76 79 105 - red 210 15 57 - green 64 160 43 - yellow 223 142 29 - blue 30 102 245 - magenta 234 118 203 - cyan 4 165 229 - white 220 224 232 - orange 254 100 11 - } - catppuccin-macchiato { - fg 202 211 245 - bg 91 96 120 - black 30 32 48 - red 237 135 150 - green 166 218 149 - yellow 238 212 159 - blue 138 173 244 - magenta 245 189 230 - cyan 145 215 227 - white 202 211 245 - orange 245 169 127 - } - catppuccin-mocha { - fg 205 214 244 - bg 88 91 112 - black 24 24 37 - red 243 139 168 - green 166 227 161 - yellow 249 226 175 - blue 137 180 250 - magenta 245 194 231 - cyan 137 220 235 - white 205 214 244 - orange 250 179 135 - } -} - -// If you'd like to override the default keybindings completely, be sure to change "keybinds" to "keybinds clear-defaults=true" -keybinds { - clear-defaults true +keybinds clear-defaults=true { normal { - // uncomment this and adjust key if using copy_on_select=false - // bind "Alt c" { Copy; } } locked { bind "Ctrl g" { SwitchToMode "Normal"; } + bind "Ctrl L" { NewPane "Right"; } + bind "Ctrl J" { NewPane "Down"; } + bind "Ctrl h" { MoveFocus "Left"; } + bind "Ctrl l" { MoveFocus "Right"; } + bind "Ctrl j" { MoveFocus "Down"; } + bind "Ctrl k" { MoveFocus "Up"; } } resize { bind "Ctrl n" { SwitchToMode "Normal"; } @@ -254,4 +178,82 @@ keybinds { shared_except "tmux" "locked" { bind "Ctrl b" { SwitchToMode "Tmux"; } } +} + +plugins { + tab-bar { path "tab-bar"; } + // status-bar { path "status-bar"; } + // strider { path "strider"; } + compact-bar { path "compact-bar"; } +} + +ui { + pane_frames { + rounded_corners true + hide_session_name true + } +} + +// scroll_buffer_size 10000 +simplified_ui true +default_layout "default" +default_mode "locked" +mouse_mode true +copy_clipboard "primary" +copy_on_select true +mirror_session false + +themes { + catppuccin-frappe { + fg 198 208 245 + bg 98 104 128 + black 41 44 60 + red 231 130 132 + green 166 209 137 + yellow 229 200 144 + blue 140 170 238 + magenta 244 184 228 + cyan 153 209 219 + white 198 208 245 + orange 239 159 118 + } + catppuccin-latte { + fg 172 176 190 + bg 172 176 190 + black 76 79 105 + red 210 15 57 + green 64 160 43 + yellow 223 142 29 + blue 30 102 245 + magenta 234 118 203 + cyan 4 165 229 + white 220 224 232 + orange 254 100 11 + } + catppuccin-macchiato { + fg 202 211 245 + bg 91 96 120 + black 30 32 48 + red 237 135 150 + green 166 218 149 + yellow 238 212 159 + blue 138 173 244 + magenta 245 189 230 + cyan 145 215 227 + white 202 211 245 + orange 245 169 127 + } + catppuccin-mocha { + fg 205 214 244 + bg 88 91 112 + black 24 24 37 + red 243 139 168 + green 166 227 161 + yellow 249 226 175 + blue 137 180 250 + magenta 245 194 231 + cyan 137 220 235 + white 205 214 244 + orange 250 179 135 + } } \ No newline at end of file diff --git a/os/linux/arch/provision.d/20-install-packages.bash b/os/linux/arch/provision.d/20-install-packages.bash index e0eb618..ef96b72 100755 --- a/os/linux/arch/provision.d/20-install-packages.bash +++ b/os/linux/arch/provision.d/20-install-packages.bash @@ -15,6 +15,7 @@ pacman -Sy --needed --noconfirm \ ripgrep `# Code Search Utilities` \ git-delta `# Better Diff Viewer` \ fd `# File Search` \ + dtach `# Persistent Shell Sessions` \ exa `# Better ls` \ sd `# Better sed` \ bat `# Better Cat` \ @@ -26,7 +27,6 @@ pacman -Sy --needed --noconfirm \ rsync rclone `# File Transfer` \ helix `# Text Editors` \ unzip `# Simple Unzipping` \ - tmux zellij `# Terminal Multiplexer` \ dog bind nmap traceroute iputils `# Networking Utilities` \ curl wget xh `# HTTP Utilities` \ w3m `# Web Browser` \