luca/dotfiles
1
0
Fork 0
Code Activity

big dotfile handling update

Browse source
This commit is contained in:
Luca Bilke 2023-06-04 11:31:11 +02:00
parent 6174764bd4
commit 3611e7f9af
13 changed files with 38 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.config/X11/xprofile
View file

@ -7,3 +7,4 @@ export QT_QPA_PLATFORMTHEME="gtk2" # Have QT use gtk2 theme.
export SUDO_ASKPASS="$dmenupasspath" export SUDO_ASKPASS="$dmenupasspath"
export MOZ_USE_XINPUT2="1" # Mozilla smooth scrolling/touchpads. export MOZ_USE_XINPUT2="1" # Mozilla smooth scrolling/touchpads.
export AWT_TOOLKIT="MToolkit wmname LG3D" #May have to install wmname export AWT_TOOLKIT="MToolkit wmname LG3D" #May have to install wmname
export ERRFILE="$XDG_CACHE_HOME/X11/xsession-errors"

2
.config/lf/shortcutrc
View file

@ -11,7 +11,7 @@ map gdm cd "/home/luca/Documents"
map gms cd "/home/luca/Music" map gms cd "/home/luca/Music"
map gpc cd "/home/luca/Pictures" map gpc cd "/home/luca/Pictures"
map gvd cd "/home/luca/Videos" map gvd cd "/home/luca/Videos"
map gdot cd "/home/luca/.dotfiles" map gdot cd "/home/luca/.local/share/stow/dots"
map Ebf $$EDITOR "/home/luca/.config/shell/bm-files" map Ebf $$EDITOR "/home/luca/.config/shell/bm-files"
map Ebd $$EDITOR "/home/luca/.config/shell/bm-dirs" map Ebd $$EDITOR "/home/luca/.config/shell/bm-dirs"
map Ecfx $$EDITOR "/home/luca/.config/x11/xresources" map Ecfx $$EDITOR "/home/luca/.config/x11/xresources"

3
.config/shell/bm-dirs → .config/shell/dir-bookmarks
View file

@ -12,5 +12,4 @@ dm ${XDG_DOCUMENTS_DIR:-$HOME/Documents}
ms ${XDG_MUSIC_DIR:-$HOME/Music} ms ${XDG_MUSIC_DIR:-$HOME/Music}
pc ${XDG_PICTURES_DIR:-$HOME/Pictures} pc ${XDG_PICTURES_DIR:-$HOME/Pictures}
vd ${XDG_VIDEOS_DIR:-$HOME/Videos} vd ${XDG_VIDEOS_DIR:-$HOME/Videos}
dot $STOW_DIR/dots
dot $HOME/.dotfiles

0
.config/shell/bm-files → .config/shell/file-bookmarks
View file

8
.config/zsh/profile → .config/zsh/.zprofile
View file

@ -1,6 +1,9 @@
#!/bin/zsh #!/bin/zsh
# profile file. Runs on login. Environmental variables are set here. # profile file. Runs on login. Environmental variables are set here.
# If you don't want this in your home directory, execute this command and move this file
# echo 'export ZDOTDIR="$HOME/.config/zsh"' | sudo tee -a /etc/zsh/zshenv
export EDITOR="nvim" export EDITOR="nvim"
export TERMINAL="kitty" export TERMINAL="kitty"
export BROWSER="firefox" export BROWSER="firefox"
@ -59,7 +62,8 @@ export XDG_CONFIG_HOME="$HOME/.config"
export XDG_DATA_HOME="$HOME/.local/share" export XDG_DATA_HOME="$HOME/.local/share"
export XDG_CACHE_HOME="$HOME/.cache" export XDG_CACHE_HOME="$HOME/.cache"
export XINITRC="$XDG_CONFIG_HOME/X11/xinitrc" export XINITRC="$XDG_CONFIG_HOME/X11/xinitrc"
export DOTFILES_DIR="$HOME/.dotfiles" export STOW_DIR="$XDG_DATA_HOME/stow"
export DOTS_DIR="$STOW_DIR/dots"
export ZSH_COMPDUMP="$XDG_CACHE_HOME/zcompdump" export ZSH_COMPDUMP="$XDG_CACHE_HOME/zcompdump"
export NOTMUCH_CONFIG="$XDG_CONFIG_HOME/notmuch-config" export NOTMUCH_CONFIG="$XDG_CONFIG_HOME/notmuch-config"
@ -67,7 +71,6 @@ export GTK2_RC_FILES="$XDG_CONFIG_HOME/.config}/gtk-2.0/gtkrc-2.0"
export LESSHISTFILE="-" export LESSHISTFILE="-"
export WGETRC="$XDG_CONFIG_HOME/wget/wgetrc" export WGETRC="$XDG_CONFIG_HOME/wget/wgetrc"
export INPUTRC="$XDG_CONFIG_HOME/shell/inputrc" export INPUTRC="$XDG_CONFIG_HOME/shell/inputrc"
export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
export GNUPGHOME="$XDG_DATA_HOME/gnupg" export GNUPGHOME="$XDG_DATA_HOME/gnupg"
export WINEPREFIX="$XDG_DATA_HOME/wineprefixes/default" export WINEPREFIX="$XDG_DATA_HOME/wineprefixes/default"
export TMUX_TMPDIR="$XDG_RUNTIME_DIR" export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
@ -85,6 +88,7 @@ export NODE_REPL_HISTORY="$XDG_DATA_HOME/node_repl_history"
export CUDA_CACHE_PATH="$XDG_CACHE_HOME/nv" export CUDA_CACHE_PATH="$XDG_CACHE_HOME/nv"
export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME/java" export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME/java"
export MOZBUILD_STATE_PATH="$XDG_DATA_HOME/mozbuild" export MOZBUILD_STATE_PATH="$XDG_DATA_HOME/mozbuild"
export W3M_DIR="$XDG_DATA_HOME"/w3m
localpath="$(find -L ~/.local/bin -type d -printf %p: | sed 's/.$//')" localpath="$(find -L ~/.local/bin -type d -printf %p: | sed 's/.$//')"
export PATH="$PATH:$HOME/.local/share/npm-global/bin:$localpath" export PATH="$PATH:$HOME/.local/share/npm-global/bin:$localpath"

3
.config/zsh/configs/autogenerated/hashes
View file

@ -1,4 +1,3 @@
# vim: filetype=zsh
hash -d h=/home/luca hash -d h=/home/luca
hash -d ch=/home/luca/.cache hash -d ch=/home/luca/.cache
hash -d cf=/home/luca/.config hash -d cf=/home/luca/.config
@ -12,7 +11,7 @@ hash -d dm=/home/luca/Documents
hash -d ms=/home/luca/Music hash -d ms=/home/luca/Music
hash -d pc=/home/luca/Pictures hash -d pc=/home/luca/Pictures
hash -d vd=/home/luca/Videos hash -d vd=/home/luca/Videos
hash -d dot=/home/luca/.dotfiles hash -d dot=/home/luca/.local/share/stow/dots
hash -d bf=/home/luca/.config/shell/bm-files hash -d bf=/home/luca/.config/shell/bm-files
hash -d bd=/home/luca/.config/shell/bm-dirs hash -d bd=/home/luca/.config/shell/bm-dirs
hash -d cfx=/home/luca/.config/x11/xresources hash -d cfx=/home/luca/.config/x11/xresources

30
.config/zsh/configs/autogenerated/shortcuts
View file

@ -1,18 +1,18 @@
# vim: filetype=zsh # vim: filetype=sh
alias h="cd /home/luca && tput cuu1;tput el" \ alias h="cd /home/luca" \
ch="cd /home/luca/.cache && tput cuu1;tput el" \ ch="cd /home/luca/.cache" \
cf="cd /home/luca/.config && tput cuu1;tput el" \ cf="cd /home/luca/.config" \
dt="cd /home/luca/.local/share && tput cuu1;tput el" \ dt="cd /home/luca/.local/share" \
sr="cd /home/luca/.local/src && tput cuu1;tput el" \ sr="cd /home/luca/.local/src" \
it="cd /home/luca/.local/src/git && tput cuu1;tput el" \ it="cd /home/luca/.local/src/git" \
sc="cd /home/luca/.local/bin && tput cuu1;tput el" \ sc="cd /home/luca/.local/bin" \
mn="cd /mnt && tput cuu1;tput el" \ mn="cd /mnt" \
dl="cd /home/luca/Downloads && tput cuu1;tput el" \ dl="cd /home/luca/Downloads" \
dm="cd /home/luca/Documents && tput cuu1;tput el" \ dm="cd /home/luca/Documents" \
ms="cd /home/luca/Music && tput cuu1;tput el" \ ms="cd /home/luca/Music" \
pc="cd /home/luca/Pictures && tput cuu1;tput el" \ pc="cd /home/luca/Pictures" \
vd="cd /home/luca/Videos && tput cuu1;tput el" \ vd="cd /home/luca/Videos" \
dot="cd /home/luca/.dotfiles && tput cuu1;tput el" \ dot="cd /home/luca/.local/share/stow/dots" \
bf="$EDITOR /home/luca/.config/shell/bm-files" \ bf="$EDITOR /home/luca/.config/shell/bm-files" \
bd="$EDITOR /home/luca/.config/shell/bm-dirs" \ bd="$EDITOR /home/luca/.config/shell/bm-dirs" \
cfx="$EDITOR /home/luca/.config/x11/xresources" \ cfx="$EDITOR /home/luca/.config/x11/xresources" \

2
.gitignore vendored
View file

@ -4,3 +4,5 @@
.config/gtk-2.0/gtkfilechooser.ini .config/gtk-2.0/gtkfilechooser.ini
.local/share/firefox/user.js .local/share/firefox/user.js
.local/share/firefox/userjs_backups .local/share/firefox/userjs_backups
.local/share/fonts/.uuid

18
.local/bin/dotsync
View file

@ -6,9 +6,9 @@ BLUE='\033[34m'
RED='\033[31m' RED='\033[31m'
NC='\033[0m' NC='\033[0m'
printf "%b" "$BOLD${BLUE}Changing directory to $DOTFILES_DIR$NC\n" printf "%b" "$BOLD${BLUE}Changing directory to $DOTS_DIR$NC\n"
if ! cd "$DOTFILES_DIR"; then if ! cd "$DOTS_DIR"; then
printf "%b" "${RED}Could not CD into $DOTFILES_DIR$NC\n" printf "%b" "${RED}Could not CD into $DOTS_DIR$NC\n"
exit exit
fi fi
printf "\n" printf "\n"
@ -35,18 +35,18 @@ unmerged_files=$(git diff --name-only --diff-filter=U)
if [ -n "$unmerged_files" ]; then if [ -n "$unmerged_files" ]; then
printf "%b" "${RED}The following files have merge conflicts after popping the stash:$NC\n" printf "%b" "${RED}The following files have merge conflicts after popping the stash:$NC\n"
printf "\n" printf "\n"
printf "$unmerged_files\n" printf "%s" "$unmerged_files\n"
else else
stow --dotfiles -t "$HOME" . || printf "%b" "${RED}Failed to run stow!$NC\n" stow -R -t "$HOME" dots || printf "%b" "${RED}Failed to run stow!$NC\n"
fi fi
printf "%b" "$BOLD${BLUE}Generating firefox profiles...$NC\n\n" printf "%b" "$BOLD${BLUE}Generating firefox profiles...$NC\n\n"
"$DOTFILES_DIR/.mozilla/firefox/generate.sh" "$DOTS_DIR/.mozilla/firefox/generate.sh"
printf "\n" printf "\n"
printf "${BOLD}Recompile/Install src files? ${GREEN}Y/N?$NC\n" printf "%b" "${BOLD}Recompile/Install src files? ${GREEN}Y/N?$NC\n"
read ans read -r ans
[ "$ans" = "y" ] && for f in "$DOTFILES_DIR"/.local/src/*; do [ "$ans" = "y" ] && for f in "$DOTS_DIR"/.local/src/*; do
if ! cd "$f"; then if ! cd "$f"; then
printf "%b" "${RED}Could not CD into $f$NC\n" printf "%b" "${RED}Could not CD into $f$NC\n"
exit exit

4
.local/bin/shortcuts
View file

@ -1,8 +1,8 @@
#!/bin/sh #!/bin/sh
# Inputs # Inputs
bmdirs="$XDG_DATA_HOME/bookmarks/dirs" bmdirs="$XDG_CONFIG_HOME/shell/dir-bookmarks"
bmfiles="$XDG_DATA_HOME/bookmarks/files" bmfiles="$XDG_CONFIG_HOME/shell/file-bookmarks"
# Outputs # Outputs
shell_shortcuts="$ZDOTDIR/configs/autogenerated/shortcuts" shell_shortcuts="$ZDOTDIR/configs/autogenerated/shortcuts"

14
.local/share/bookmarks/dirs
View file

@ -1,14 +0,0 @@
h $HOME
ch $XDG_CACHE_HOME
cf $XDG_CONFIG_HOME
dt $XDG_DATA_HOME
sr $HOME/.local/src
it $HOME/.local/src/git
sc $HOME/.local/bin
mn /mnt
dl $XDG_DOWNLOAD_DIR
dm $XDG_DOCUMENTS_DIR
ms $XDG_MUSIC_DIR
pc $XDG_PICTURES_DIR
vd $XDG_VIDEOS_DIR
dot $HOME/.dotfiles

13
.local/share/bookmarks/files
View file

@ -1,13 +0,0 @@
bf $XDG_CONFIG_HOME/shell/bm-files
bd $XDG_CONFIG_HOME/shell/bm-dirs
cfx $XDG_CONFIG_HOME/x11/xresources
cfX $XDG_CONFIG_HOME/x11/xprofile
cfb $HOME/.local/src/dwmblocks/config.h
cfk $XDG_CONFIG_HOME/kitty/kitty.conf
cfK $XDG_CONFIG_HOME/kitty/kittyfullscreen.conf
cfv $XDG_CONFIG_HOME/lvim/config.lua
cfz $ZDOTDIR/.zshrc
cfa $XDG_CONFIG_HOME/shell/aliasrc
cfp $XDG_CONFIG_HOME/shell/profile
cfl $XDG_CONFIG_HOME/lf/lfrc
cfL $XDG_CONFIG_HOME/lf/preview

1
.zprofile
View file

@ -1 +0,0 @@
.config/zsh/profile