alex/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small changes

Browse Source
This commit is contained in:
Alex
2022-06-25 15:25:52 +02:00
parent 018057b62d
commit ae83bc4655
7 changed files with 6 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.config/fish/fish_variables
+1 -1
View File
@@ -13,7 +13,7 @@ SETUVAR _tide_prompt_1131938:\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b38\x3b2\x3b52\x3b
SETUVAR _tide_prompt_1131989:\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b38\x3b2\x3b52\x3b101\x3b164m\x1b\x5b48\x3b2\x3b52\x3b101\x3b164m\x20\x40PWD\x40\x20\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b38\x3b2\x3b52\x3b101\x3b164m\ue0b0\x1e\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b38\x3b2\x3b46\x3b52\x3b54m\ue0b2\x1b\x5b38\x3b2\x3b78\x3b154\x3b6m\x1b\x5b48\x3b2\x3b46\x3b52\x3b54m\x20\u2714\x20\x1b\x5b38\x3b2\x3b211\x3b215\x3b207m\x1b\x5b48\x3b2\x3b46\x3b52\x3b54m\ue0b2\x1b\x5b38\x3b2\x3b0\x3b0\x3b0m\x1b\x5b48\x3b2\x3b211\x3b215\x3b207m\x2003\x3a23\x3a33\x20PM\x20\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b38\x3b2\x3b211\x3b215\x3b207m
SETUVAR _tide_prompt_1141137:\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b5\x3b61m\x1b\x5b48\x3b5\x3b61m\x20\x40PWD\x40\x20\x1b\x5b38\x3b5\x3b61m\x1b\x5b48\x3b5\x3b64m\ue0b0\x1b\x5b48\x3b5\x3b64m\x20\x1b\x5b37m\x1b\x5b38\x3b5\x3b16mdev\x1b\x5b38\x3b5\x3b16m\x1b\x5b38\x3b5\x3b16m\x1b\x5b38\x3b5\x3b16m\x1b\x5b38\x3b5\x3b16m\x1b\x5b38\x3b5\x3b16m\x1b\x5b38\x3b5\x3b16m\x1b\x5b38\x3b5\x3b16m\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b5\x3b64m\ue0b0\x1e\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b5\x3b236m\ue0b2\x1b\x5b38\x3b5\x3b64m\x1b\x5b48\x3b5\x3b236m\x20\u2714\x20\x1b\x5b38\x3b5\x3b238m\x1b\x5b48\x3b5\x3b236m\ue0b2\x1b\x5b38\x3b5\x3b37m\x1b\x5b48\x3b5\x3b238m\x20\ue73c\x20untitled_rent_analysis_project\x20\x1b\x5b38\x3b5\x3b252m\x1b\x5b48\x3b5\x3b238m\ue0b2\x1b\x5b38\x3b5\x3b16m\x1b\x5b48\x3b5\x3b252m\x2003\x3a13\x3a48\x20PM\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b5\x3b252m
SETUVAR _tide_prompt_1165496:\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b38\x3b2\x3b52\x3b101\x3b164m\x1b\x5b48\x3b2\x3b52\x3b101\x3b164m\x20\x40PWD\x40\x20\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b38\x3b2\x3b52\x3b101\x3b164m\ue0b0\x1e\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b38\x3b2\x3b46\x3b52\x3b54m\ue0b2\x1b\x5b38\x3b2\x3b78\x3b154\x3b6m\x1b\x5b48\x3b2\x3b46\x3b52\x3b54m\x20\u2714\x20\x1b\x5b38\x3b2\x3b196\x3b160\x3b0m\x1b\x5b48\x3b2\x3b46\x3b52\x3b54m\ue0b2\x1b\x5b38\x3b2\x3b0\x3b0\x3b0m\x1b\x5b48\x3b2\x3b196\x3b160\x3b0m\x202m\x2011s\x20\x1b\x5b38\x3b2\x3b211\x3b215\x3b207m\x1b\x5b48\x3b2\x3b196\x3b160\x3b0m\ue0b2\x1b\x5b38\x3b2\x3b0\x3b0\x3b0m\x1b\x5b48\x3b2\x3b211\x3b215\x3b207m\x2003\x3a23\x3a39\x20PM\x20\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b38\x3b2\x3b211\x3b215\x3b207m
SETUVAR _tide_prompt_1169475:\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b38\x3b2\x3b52\x3b101\x3b164m\x1b\x5b48\x3b2\x3b52\x3b101\x3b164m\x20\x40PWD\x40\x20\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b38\x3b2\x3b52\x3b101\x3b164m\ue0b0\x1e\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b38\x3b2\x3b204\x3b0\x3b0m\ue0b2\x1b\x5b38\x3b2\x3b255\x3b255\x3b0m\x1b\x5b48\x3b2\x3b204\x3b0\x3b0m\x20\u2718\x201\x20\x1b\x5b38\x3b2\x3b211\x3b215\x3b207m\x1b\x5b48\x3b2\x3b204\x3b0\x3b0m\ue0b2\x1b\x5b38\x3b2\x3b0\x3b0\x3b0m\x1b\x5b48\x3b2\x3b211\x3b215\x3b207m\x2003\x3a24\x3a14\x20PM\x20\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b38\x3b2\x3b211\x3b215\x3b207m
SETUVAR _tide_prompt_1169475:\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b38\x3b2\x3b52\x3b101\x3b164m\x1b\x5b48\x3b2\x3b52\x3b101\x3b164m\x20\x40PWD\x40\x20\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b38\x3b2\x3b52\x3b101\x3b164m\ue0b0\x1e\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b38\x3b2\x3b46\x3b52\x3b54m\ue0b2\x1b\x5b38\x3b2\x3b78\x3b154\x3b6m\x1b\x5b48\x3b2\x3b46\x3b52\x3b54m\x20\u2714\x20\x1b\x5b38\x3b2\x3b211\x3b215\x3b207m\x1b\x5b48\x3b2\x3b46\x3b52\x3b54m\ue0b2\x1b\x5b38\x3b2\x3b0\x3b0\x3b0m\x1b\x5b48\x3b2\x3b211\x3b215\x3b207m\x2003\x3a25\x3a41\x20PM\x20\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b38\x3b2\x3b211\x3b215\x3b207m
SETUVAR _tide_prompt_2015069:\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b38\x3b2\x3b52\x3b101\x3b164m\x1b\x5b48\x3b2\x3b52\x3b101\x3b164m\x20\x40PWD\x40\x20\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b38\x3b2\x3b52\x3b101\x3b164m\ue0b0\x1e\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b38\x3b2\x3b46\x3b52\x3b54m\ue0b2\x1b\x5b38\x3b2\x3b78\x3b154\x3b6m\x1b\x5b48\x3b2\x3b46\x3b52\x3b54m\x20\u2714\x20\x1b\x5b38\x3b2\x3b211\x3b215\x3b207m\x1b\x5b48\x3b2\x3b46\x3b52\x3b54m\ue0b2\x1b\x5b38\x3b2\x3b0\x3b0\x3b0m\x1b\x5b48\x3b2\x3b211\x3b215\x3b207m\x2006\x3a36\x3a55\x20PM\x20\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b38\x3b2\x3b211\x3b215\x3b207m
SETUVAR _tide_prompt_2492:\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b52\x3b101\x3b164m\x1b\x5b48\x3b2\x3b52\x3b101\x3b164m\x20\x40PWD\x40\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b52\x3b101\x3b164m\ue0b0\x1e\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b46\x3b52\x3b54m\ue0b2\x1b\x5b38\x3b2\x3b78\x3b154\x3b6m\x1b\x5b48\x3b2\x3b46\x3b52\x3b54m\x20\u2714\x20\x1b\x5b38\x3b2\x3b211\x3b215\x3b207m\x1b\x5b48\x3b2\x3b46\x3b52\x3b54m\ue0b2\x1b\x5b38\x3b2\x3b0\x3b0\x3b0m\x1b\x5b48\x3b2\x3b211\x3b215\x3b207m\x2011\x3a18\x3a48\x20AM\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b211\x3b215\x3b207m
SETUVAR _tide_prompt_3532:\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b38\x3b2\x3b52\x3b101\x3b164m\x1b\x5b48\x3b2\x3b52\x3b101\x3b164m\x20\x40PWD\x40\x20\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b38\x3b2\x3b52\x3b101\x3b164m\ue0b0\x1e\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b38\x3b2\x3b46\x3b52\x3b54m\ue0b2\x1b\x5b38\x3b2\x3b78\x3b154\x3b6m\x1b\x5b48\x3b2\x3b46\x3b52\x3b54m\x20\u2714\x20\x1b\x5b38\x3b2\x3b196\x3b160\x3b0m\x1b\x5b48\x3b2\x3b46\x3b52\x3b54m\ue0b2\x1b\x5b38\x3b2\x3b0\x3b0\x3b0m\x1b\x5b48\x3b2\x3b196\x3b160\x3b0m\x203s\x20\x1b\x5b38\x3b2\x3b211\x3b215\x3b207m\x1b\x5b48\x3b2\x3b196\x3b160\x3b0m\ue0b2\x1b\x5b38\x3b2\x3b0\x3b0\x3b0m\x1b\x5b48\x3b2\x3b211\x3b215\x3b207m\x2009\x3a22\x3a34\x20AM\x20\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b38\x3b2\x3b211\x3b215\x3b207m
.config/i3/config
+4 -4
View File
@@ -25,8 +25,8 @@ font xft:MesloLGS NF 11
floating_modifier $mod
# start a $myTerm
set $myTerm termite
bindsym $mod+Return exec $myTerm -e tmux
set $myTerm alacritty
bindsym $mod+Return exec $myTerm --command tmux
bindsym $mod+Ctrl+Return exec $myTerm
# kill focused window
@@ -307,7 +307,7 @@ bindsym $mod+Shift+r restart
# bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
# Lock screen
bindsym $mod+Shift+Ctrl+$alt+l exec --no-startup-id light-locker-command -l
bindsym $mod+Ctrl+Shift+$alt+l exec --no-startup-id light-locker-command -l
# Set shut down, restart and locking features
bindsym $mod+Shift+Ctrl+$alt+h exec --no-startup-id systemctl hibernate
@@ -371,7 +371,7 @@ exec --no-startup-id xfce4-power-manager
exec --no-startup-id flameshot
# autostart terminal and broswer
exec --no-startup-id i3-msg 'workspace 1; exec /usr/bin/alacritty'
exec --no-startup-id i3-msg 'workspace 1; exec /usr/bin/termite'
exec --no-startup-id i3-msg 'workspace 2; exec /usr/bin/firefox'
# set x background
.scripts/git_auto_save.sh
-154
View File
@@ -1,154 +0,0 @@
#!/bin/bash
function is_git {
# check if current folder is git repository
git_check_command=$(git -C $1 rev-parse > /dev/null 2>&1)
if [[ $? != 0 ]]; then
return 0
fi
return 1
}
function get_current_branch {
echo $(git branch | grep "*" | awk '{print $NF}')
}
function get_auto_save_branches {
auto_save_branches_raw=`git branch | grep "git_auto_save" | tail -1 | awk '{print $FN}'`
auto_save_branches=()
for i in "${$auto_save_branches_raw[@]}"
do
echo ${git_auto_save_branches_raw[i]}
#auto_save_branches+=${git_auto_save[i]}
done
echo $auto_save_branches
}
function git_auto_save {
if [[ $(is_git ".") -ne 0 ]]; then
echo "Current dir is not a git repository."
return 1
fi
current_branch_name=$(get_current_branch)
timestamp=`date +%Y_%m_%d_%H_%M_%S`
new_branch_name="git_auto_save/$HOST/$timestamp"
# check if there is unsaved work
changes=`git status --ignore-submodules=dirty | grep -E 'modified|deleted|new'`
if [[ ! $changes ]]; then
echo "No changes found."
return
fi
# stash changes
echo "Stashing changes..."
git stash > /dev/null 2>&1
# create new branch
echo "Creating new branch $new_branch_name..."
git checkout -b $new_branch_name > /dev/null 2>&1
git push origin $new_branch_name > /dev/null 2>&1
# apply stashed changes
echo "Applying stash to new branch..."
git stash apply > /dev/null 2>&1
# add changed files
echo "Adding new/changed files..."
git add -u > /dev/null 2>&1
# commit changes
echo "Commiting changes..."
git commit -m "git autosave from $timestamp" > /dev/null 2>&1
# push changes
echo "Pushing changes..."
git push --set-upstream origin $new_branch_name > /dev/null 2>&1
# move back to initial branch
echo "Moving back to previous branch..."
git checkout $current_branch_name > /dev/null 2>&1
echo "Done."
}
function remove_auto_save {
if [[ $(is_git ".") -ne 0 ]]; then
echo "Current dir is not a git repository."
return 1
fi
echo "Looking for auto-save branches..."
if [[ $1 ]]; then
auto_save_branch=$1
else
auto_save_branch=`git branch | grep "git_auto_save" | head -1 | awk '{print $FN}'`
fi
if [[ ! $auto_save_branch ]]; then
echo "No auto-save branch found."
return 1
fi
auto_save_branch=${auto_save_branch:2}
echo "Auto-save branch found: $auto_save_branch"
current_branch=$(get_current_branch)
# if on autosave branch, move to master
if [[ $current_branch == $auto_save_branch ]]; then
echo "Currently on autosave path, moving to Master"
git checkout master
fi
# remove local branch
echo "Deleting local branch..."
git branch -d $auto_save_branch > /dev/null 2>&1
# remove remote branch
echo "Deleting remote branch..."
git push origin --delete $auto_save_branch > /dev/null 2>&1
return 0
}
function remove_all_auto_saves {
if [[ $(is_git ".") -ne 0 ]]; then
echo "Current dir is not a git repository."
return 1
fi
if [[ $1 != "y" ]]; then
echo "Please confirm with 'y'"
return
fi
# remove all auto save branches
while [[ 1 ]]; do
if ! remove_auto_save; then
break
fi
echo "Auto-Save removed."
done
echo "All auto-saves removed."
}
function load_last_auto_save {
auto_save_branches=$(get_auto_save_branches)
echo $auto_save_branches
}
.scripts/server_connections
-8
View File
@@ -1,8 +0,0 @@
function connectToServer() {
ssh alex@65.21.140.171
}
function connectToWorkServer() {
ssh alex@192.168.74.29
}
.scripts/update_clock.sh
-3
View File
@@ -1,3 +0,0 @@
function update_time {
timedatectl set-timezone "$(curl --fail https://ipapi.co/timezone)"
}
.scripts/venv_activate
-6
View File
@@ -1,6 +0,0 @@
#!/bin/bash
function activate() {
source ./venv/bin/activate
}
.setup/packages/desktop_tools
+1 -1
View File
@@ -2,7 +2,7 @@ zsh
tmux
zsh-theme-powerline10k-git
i3-gaps
alacritty
termite
rofi
ranger