Merge branch 'master' of https://github.com/vleeuwenmenno/dotfiles
This commit is contained in:
commit
24b470efd8
@ -172,6 +172,13 @@ extensions() {
|
|||||||
printfe "%s\n" "cyan" "Ensuring VSCode extensions are installed..."
|
printfe "%s\n" "cyan" "Ensuring VSCode extensions are installed..."
|
||||||
source $HOME/dotfiles/bin/helpers/vscode-extensions.sh
|
source $HOME/dotfiles/bin/helpers/vscode-extensions.sh
|
||||||
ensure_vscode_extensions_installed
|
ensure_vscode_extensions_installed
|
||||||
|
|
||||||
|
if [ ! -f "$HOME/.local/share/nemo/actions/vscode.nemo_action" ]; then
|
||||||
|
printfe "%s\n" "cyan" "Ensuring nemo open with VSCode extension is installed..."
|
||||||
|
wget https://raw.githubusercontent.com/mhsattarian/nemo-open-in-vscode/master/vscode.nemo_action -O $HOME/.local/share/nemo/actions/vscode.nemo_action
|
||||||
|
else
|
||||||
|
printfe "%s\n" "green" " - nemo open with VSCode extension is already installed"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
####################################################################################################
|
####################################################################################################
|
||||||
|
@ -12,8 +12,6 @@ logo() {
|
|||||||
println " " "cyan"
|
println " " "cyan"
|
||||||
tput sgr0
|
tput sgr0
|
||||||
|
|
||||||
continue_eitherway=$1
|
|
||||||
|
|
||||||
# Print if repo is dirty and the count of untracked files, modified files and staged files
|
# Print if repo is dirty and the count of untracked files, modified files and staged files
|
||||||
if [[ $(git -C ~/dotfiles status --porcelain) ]]; then
|
if [[ $(git -C ~/dotfiles status --porcelain) ]]; then
|
||||||
printfe "%s" "yellow" "dotfiles repo is dirty "
|
printfe "%s" "yellow" "dotfiles repo is dirty "
|
||||||
@ -27,22 +25,6 @@ logo() {
|
|||||||
printfe "%s" "yellow" "[!] You have $(git -C ~/dotfiles log origin/master..HEAD --oneline | wc -l | tr -d ' ') commit(s) to push"
|
printfe "%s" "yellow" "[!] You have $(git -C ~/dotfiles log origin/master..HEAD --oneline | wc -l | tr -d ' ') commit(s) to push"
|
||||||
fi
|
fi
|
||||||
println "" "normal"
|
println "" "normal"
|
||||||
|
|
||||||
if [[ $continue_eitherway == "continue" ]]; then
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
if [[ $(git -C ~/dotfiles status --porcelain) ]]; then
|
|
||||||
# Continue?
|
|
||||||
printfe "%s" "red" "Continue anyway? [y/N] "
|
|
||||||
read -k 1
|
|
||||||
|
|
||||||
if [[ $REPLY != "y" ]]; then
|
|
||||||
println "" "normal"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
println "" "normal"
|
|
||||||
println "" "normal"
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# print colored with printf (args: format, color, message ...)
|
# print colored with printf (args: format, color, message ...)
|
||||||
|
@ -3,8 +3,15 @@
|
|||||||
source $HOME/dotfiles/bin/helpers/functions.sh
|
source $HOME/dotfiles/bin/helpers/functions.sh
|
||||||
|
|
||||||
ensure_gnome_extensions_installed() {
|
ensure_gnome_extensions_installed() {
|
||||||
if ! command -v gnome-extensions &> /dev/null; then
|
# In case gnome-extensions is installed but we don't use GNOME let's do a check
|
||||||
printfe "%s\n" "red" " - gnome-extensions command not found, likely not running GNOME."
|
if [ "$XDG_CURRENT_DESKTOP" != "GNOME" ]; then
|
||||||
|
printfe "%s\n" "red" " - XDG_CURRENT_DESKTOP is not GNOME, likely not running GNOME."
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Attempt to connect to GNOME shell, if it fails, we can stop here
|
||||||
|
if ! gnome-extensions &> /dev/null; then
|
||||||
|
printfe "%s\n" "red" " - gnome-extensions command not found, likely not running GNOME?!"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -74,6 +74,9 @@ config:
|
|||||||
resources:
|
resources:
|
||||||
shortcut: Alt + Shift + Escape
|
shortcut: Alt + Shift + Escape
|
||||||
command: flatpak run net.nokyan.Resources
|
command: flatpak run net.nokyan.Resources
|
||||||
|
gtile:
|
||||||
|
shortcut: Super + Tab
|
||||||
|
command: xdotool key super+g
|
||||||
|
|
||||||
# Commands to run after login
|
# Commands to run after login
|
||||||
startup:
|
startup:
|
||||||
@ -221,3 +224,5 @@ config:
|
|||||||
- oneko
|
- oneko
|
||||||
- libaa-bin
|
- libaa-bin
|
||||||
- libcurses-perl
|
- libcurses-perl
|
||||||
|
- clang
|
||||||
|
- libgtk-3-dev
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
|
[legacy/keybindings]
|
||||||
|
reset-and-clear='<Primary><Shift>k'
|
||||||
|
|
||||||
[legacy/profiles:/:b1dcc9dd-5262-4d8d-a863-c897e6d979b9]
|
[legacy/profiles:/:b1dcc9dd-5262-4d8d-a863-c897e6d979b9]
|
||||||
background-color='rgb(15,20,25)'
|
background-color='rgb(15,20,25)'
|
||||||
default-size-columns=120
|
default-size-columns=120
|
||||||
|
Loading…
x
Reference in New Issue
Block a user