finner/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

trying to correct merges

Browse source
This commit is contained in:
Mike G 2024-04-28 14:39:55 +02:00
parent b386781ab5
commit 45878a6e7e
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.bash_aliases
View file

@ -4,4 +4,8 @@ alias mountns="sudo mount -t nfs manjarodesktop:/mnt/TerraBeef/NetShare /mnt/man
alias sshcloud="ssh -p 1919 emge@95.217.8.112" alias sshcloud="ssh -p 1919 emge@95.217.8.112"
alias config="/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME" alias config="/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME"
alias syncheavy="rsync -azP --no-perms --no-owner --no-group --no-times --delete /home/emge/Development/11ty-projects/heavy-rocks/_site/ emge@95.217.8.112:/var/www/heavy.rocks/" alias syncheavy="rsync -azP --no-perms --no-owner --no-group --no-times --delete /home/emge/Development/11ty-projects/heavy-rocks/_site/ emge@95.217.8.112:/var/www/heavy.rocks/"
<<<<<<< Updated upstream
alias s!="sudo systemctl" alias s!="sudo systemctl"
=======
alias portcheck="sudo lsof -i -P -n | grep LISTEN"
>>>>>>> Stashed changes

2
.config/fish/config.fish
View file

@ -15,3 +15,5 @@ starship init fish | source
source ~/.bash_aliases source ~/.bash_aliases
set -gx EDITOR nvim set -gx EDITOR nvim
set -gx DATABASE_URL user=miniflux password=Z5l3KVoEXY dbname=miniflux sslmode=disable