Skip to content
This repository has been archived by the owner on Jul 15, 2024. It is now read-only.

Commit

Permalink
feat(fish): configure basic fish install
Browse files Browse the repository at this point in the history
  • Loading branch information
tversteeg committed Jan 29, 2024
1 parent 2921d6a commit 0bd184a
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 6 deletions.
5 changes: 4 additions & 1 deletion .dotter/global.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[helpers]

[default]
depends = ["bash", "starship", "alacritty", "git", "flavours", "dunst", "i3", "i3status", "sway", "pipewire", "scripts", "zellij", "helix", "systemd", "topgrade", "waybar", "qmk", "niri", "wayland", "lemurs", "fuzzel", "atuin", "desktop"]
depends = ["bash", "starship", "alacritty", "git", "flavours", "dunst", "i3", "i3status", "sway", "pipewire", "scripts", "zellij", "helix", "systemd", "topgrade", "waybar", "qmk", "niri", "wayland", "lemurs", "fuzzel", "atuin", "desktop", "fish"]

[scripts.files]
"k8.sh" = "~/.local/bin/k8"
Expand Down Expand Up @@ -118,3 +118,6 @@ owner = "root"

[desktop.files]
"desktop/helix.desktop" = "~/.local/share/applications/helix.desktop"

[fish.files]
"config.fish" = "~/.config/fish/config.fish"
25 changes: 25 additions & 0 deletions config.fish
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
if status is-interactive
# History access
atuin init fish | source

# PS1 prompt
starship init fish | source

# Aliases
alias ls='lsd'
alias tree='et'
alias cat='bat --theme=base16-256'
alias grep='grep --color=auto'
alias c='cemsdev run'
alias ga='git add -A'
alias gc='git commit -am'

# sudo !!
function sudo
if test "$argv" = !!
eval command sudo $history[1]
else
command sudo $argv
end
end
end
4 changes: 2 additions & 2 deletions niri.kdl
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ prefer-no-csd
screenshot-path "~/Pictures/Screenshots/%Y-%m-%d_%H-%M-%S.png"

binds {
Mod+Return { spawn "alacritty"; }
Mod+Shift+Return { spawn "alacritty" "-e" "ssh" "-t" "-Y" "cems.local"; }
Mod+Return { spawn "alacritty" "-e" "bash" "/home/thomas/.dotfiles/start-zellij-session.sh"; }
Mod+Shift+Return { spawn "alacritty" "-e" "ssh" "-t" "-Y" "cems.local" "bash" "/home/thomas/.dotfiles/start-zellij-session.sh"; }
Mod+D { spawn "fuzzel"; }
Mod+Shift+Q { close-window; }

Expand Down
1 change: 1 addition & 0 deletions start-zellij-session.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ fre_store_file="/home/thomas/.cache/zellij-session-fre"
fzf_opts='--layout=reverse'

ZELLIJ_LAYOUT_DIR="/home/thomas/.dotfiles/zellij-layouts"
PATH="$PATH:/home/thomas/.cargo/bin"

# Get all frequently accessed repos
freq=$(fre --sorted --store "$fre_store_file" | head -n 10 | sed "s/^/${freq_marker}/")
Expand Down
2 changes: 1 addition & 1 deletion zellij-layouts/default.kdl
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ layout {
pane command="bash" name="Helix" borderless=true {
args "-c" "hx"
}
pane command="bash" name="cli" size="30%" borderless=true {
pane command="fish" name="cli" size="30%" borderless=true {
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions zellij-layouts/dotfiles.kdl
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ layout {
pane split_direction="Horizontal" {
pane command="bash" name="Helix" borderless=true { args "-c" "cd ~/.dotfiles && hx"
}
pane command="bash" name="CLI" size="30%" borderless=true {
args "-c" "cd ~/.dotfiles && exec bash"
pane command="fish" name="CLI" size="30%" borderless=true {
args "-c" "cd ~/.dotfiles && exec fish"
}
}
}
Expand Down

0 comments on commit 0bd184a

Please sign in to comment.