wip

Author: caarlos0

bin/nix-update-input

@@ -1,33 +1,26 @@
-# ~/.config/fish/config.fish: DO NOT EDIT -- this file has been generated
-# automatically by home-manager.
-
-# Only execute this file once per shell.
-set -q __fish_home_manager_config_sourced; and exit
-set -g __fish_home_manager_config_sourced 1
-
-if test -f ~/.localrc.fish
-    source ~/.localrc.fish
-end
-
-fish_add_path -a ~/Applications/Ghostty.app/Contents/MacOS/
-fish_add_path -a /Applications/Postgres.app/Contents/Versions/latest/bin/
+fish_add_path -p ~/Developer/Go/bin
+fish_add_path -p ~/.cargo/bin/
+fish_add_path -p ~/.bin/
 fish_add_path -a /opt/homebrew/bin/
+fish_add_path -a /Applications/Postgres.app/Contents/Versions/latest/bin/
+fish_add_path -a ~/Applications/Ghostty.app/Contents/MacOS/
 
 status is-interactive; and begin
-    # Aliases
+    # apps et al
     alias d docker
-    alias dp podman
     alias e nvim
-    alias egms 'e; git switch (git main-branch); and git sync'
-    alias fd 'fd --hidden'
+    alias v nvim
+    alias vimdiff 'nvim -d'
+    alias ta 'tmux new -A -s default'
     alias freeze 'freeze -c full'
+
+    # git
     alias g git
     alias ga 'git add'
     alias gaa 'git add -A'
     alias gb 'git branch -v'
     alias gc 'git commit -s'
     alias gca 'git commit -sa'
-    alias gcai 'git --no-pager diff | mods '\''write a commit message for this patch. also write the long commit message. use semantic commits. break the lines at 80 chars'\'' >.git/gcai; git commit -a -F .git/gcai -e'
     alias gcam 'git commit -sam'
     alias gcm 'git commit -sm'
     alias gco 'git checkout'
@@ -46,6 +39,8 @@ status is-interactive; and begin
     alias gs 'git status -sb'
     alias gw 'git switch'
     alias gwc 'git switch -c'
+
+    # kubectl
     alias k kubectl
     alias kd 'kubectl describe'
     alias kdebug 'kubectl run -i -t debug --rm --image=caarlos0/debug --restart=Never'
@@ -64,17 +59,16 @@ status is-interactive; and begin
     alias krm 'kubectl delete'
     alias kvs 'kubectl view-secret'
     alias kx kubectx
+    alias sk 'kubectl -n kube-system'
+
+    # files
+    alias fd 'fd --hidden'
     alias la 'lsd -A'
     alias ll 'lsd -l'
     alias lla '/sd -lA'
     alias llt 'lsd -l --tree'
     alias ls lsd
     alias lt 'lsd --tree'
-    alias sk 'kubectl -n kube-system'
-    alias ta 'tmux new -A -s default'
-    alias tf terraform
-    alias v nvim
-    alias vimdiff 'nvim -d'
 
     # Interactive shell initialisation
     fzf --fish | source
@@ -101,9 +95,9 @@ status is-interactive; and begin
         trap __trap_exit_tmux EXIT
     end
 
-    fish_add_path -p ~/.cargo/bin/
-
-    fish_add_path -p ~/Developer/Go/bin
-
     zoxide init fish | source
 end
+
+if test -f ~/.localrc.fish
+    source ~/.localrc.fish
+end

config.fish fish/config.fishconfig.fish renamed to fish/config.fish

@@ -1,4 +1,7 @@
 #!/bin/bash
+# bins
+mkdir -p ~/.bin
+ln -sf $PWD/bin/* ~/.bin/
 
 # tmux
 mkdir -p ~/.config/tmux/plugins
@@ -8,19 +11,18 @@ ln -sf $PWD/tmux.conf ~/.config/tmux/tmux.conf
 # shell
 mkdir -p ~/.config/fish/themes
 fisher install jorgebucaran/hydro
-ln -sf $PWD/gruvbox-dark.theme ~/.config/fish/themes/gruvbox.theme
-ln -sf $PWD/config.fish ~/.config/fish/config.fish
-ln -sf $PWD/functions/* ~/.config/fish/functions/
-fish_add_path -a $PWD/bin
+ln -sf $PWD/fish/* ~/.config/fish/
 
 # terms
 mkdir -p ~/.config/ghostty
 ln -sf $PWD/ghostty.config ~/.config/ghostty/config
 
+# ssh 
+mkdir -p ~/.ssh
+ln -sf $PWD/ssh/* ~/.ssh/
+
 # apps
 mkdir -p ~/.hammerspoon
 ln -sf $PWD/hammerspoon.lua /Users/carlos/.hammerspoon/init.lua
 ln -sf $PWD/nvim ~/.config/nvim
 ln -sf $PWD/gitconfig ~/.config/git/config
-
-ln -sf $PWD/bin/*

functions/c.fish fish/functions/c.fishfunctions/c.fish renamed to fish/functions/c.fish

@@ -0,0 +1 @@
+* ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILxWe2rXKoiO6W14LYPVfJKzRfJ1f3Jhzxrgjc/D4tU7