diff --git a/install b/install index 6da0bba..f504e28 100755 --- a/install +++ b/install @@ -101,6 +101,7 @@ PERMISSIONS=( # Groups the user should be added to ADD_GROUPS=( + "docker" "log" "wheel" ) @@ -318,28 +319,28 @@ sudo udevadm control --reload-rules print_section "Copying other files" print_log "Copying custom sudoers file to ${YELLOW}/etc/sudoers.d${RESET}" -sudo install -m 0440 "${SYSTEM_DIR}/etc/sudoers.d/severin" "/etc/sudoers.d" +sudo install -Dm 0440 "${SYSTEM_DIR}/etc/sudoers.d/severin" "/etc/sudoers.d" print_log "Copying docker configuration to ${YELLOW}/etc/docker${RESET}" -sudo install -m 644 "${SYSTEM_DIR}/etc/docker/daemon.json" "/etc/docker" +sudo install -Dm 644 "${SYSTEM_DIR}/etc/docker/daemon.json" "/etc/docker" print_log "Copying zshenv to ${YELLOW}/etc/zsh${RESET}" -sudo install -m 644 "${SYSTEM_DIR}/etc/zsh/zshenv" "/etc/zsh" +sudo install -Dm 644 "${SYSTEM_DIR}/etc/zsh/zshenv" "/etc/zsh" print_log "Copying pacman.conf to ${YELLOW}/etc/pacman.conf${RESET}" -sudo install -m 644 "${SYSTEM_DIR}/etc/pacman.conf" "/etc/pacman.conf" +sudo install -Dm 644 "${SYSTEM_DIR}/etc/pacman.conf" "/etc/pacman.conf" print_log "Copying 20-displaylink.conf to ${YELLOW}/etc/X11/xorg.conf.d${RESET}" -sudo install -m 644 "${SYSTEM_DIR}/etc/X11/xorg.conf.d/20-displaylink.conf" "/etc/X11/xorg.conf.d" +sudo install -Dm 644 "${SYSTEM_DIR}/etc/X11/xorg.conf.d/20-displaylink.conf" "/etc/X11/xorg.conf.d" print_log "Copying 20-displaylink.conf to ${YELLOW}/etc/X11/nvidia-xorg.conf.d${RESET}" -sudo install -m 644 "${SYSTEM_DIR}/etc/X11/xorg.conf.d/20-displaylink.conf" "/etc/X11/nvidia-xorg.conf.d" +sudo install -Dm 644 "${SYSTEM_DIR}/etc/X11/xorg.conf.d/20-displaylink.conf" "/etc/X11/nvidia-xorg.conf.d" print_log "Copying vconsole.conf to ${YELLOW}/etc/vconsole.conf${RESET}" -sudo install -m 644 "${SYSTEM_DIR}/etc/vconsole.conf" "/etc/vconsole.conf" +sudo install -Dm 644 "${SYSTEM_DIR}/etc/vconsole.conf" "/etc/vconsole.conf" print_log "Copying mkinitcpio.conf to ${YELLOW}/etc/mkinitcpio.conf${RESET}" -sudo install -m 644 "${SYSTEM_DIR}/etc/mkinitcpio.conf" "/etc/mkinitcpio.conf" +sudo install -Dm 644 "${SYSTEM_DIR}/etc/mkinitcpio.conf" "/etc/mkinitcpio.conf" ############################################################################### # Setting lockscreen image # diff --git a/system/.config/autokey/autokey.json b/system/.config/autokey/autokey.json index 3e2458b..3f49945 100644 --- a/system/.config/autokey/autokey.json +++ b/system/.config/autokey/autokey.json @@ -13,7 +13,7 @@ "undoUsingBackspace": true, "windowDefaultSize": [ 924, - 962 + 301 ], "hPanePosition": 233, "columnWidths": [ diff --git a/system/.config/autokey/data/Scripts/email.py b/system/.config/autokey/data/Scripts/email.py index 9f26e63..83f4f37 100644 --- a/system/.config/autokey/data/Scripts/email.py +++ b/system/.config/autokey/data/Scripts/email.py @@ -1,6 +1,6 @@ import socket private_email = "severin@kaderli.dev" -work_email = "severin@serious.com" +work_email = "severin@whatwedo.ch" if socket.gethostname() == "loki": keyboard.send_keys(work_email) diff --git a/system/.config/custom/aliases b/system/.config/custom/aliases index 5591047..49022f0 100644 --- a/system/.config/custom/aliases +++ b/system/.config/custom/aliases @@ -27,13 +27,27 @@ alias grep="rg -n" alias cat="bat" # Aliases to folders -alias pj="cd ~/projects" -alias dl="cd ~/downloads" -alias doc="cd ~/documents" +if [ -d "${HOME}/projects" ]; then + alias pj="cd ${HOME}/projects" +fi + +if [ -d "${HOME}/downloads" ]; then + alias dl="cd ${HOME}/downloads" +fi + +if [ -d "${HOME}/documents" ]; then + alias doc="cd ${HOME}/documents" +fi # Alias for opening my code editor alias e="code" +# Aliases for todo list management alias t='task todo' alias ta='task add' -alias td='task done' \ No newline at end of file +alias td='task done' + +# Work aliases +if [ -d "${HOME}/work/tools/dde" ]; then + alias dde='make -f "${HOME}/work/tools/dde/Makefile"' +fi \ No newline at end of file diff --git a/system/.config/custom/env b/system/.config/custom/env index 903b0e8..2ad560b 100644 --- a/system/.config/custom/env +++ b/system/.config/custom/env @@ -70,6 +70,8 @@ export PGSERVICEFILE="${XDG_CONFIG_HOME}/pg/pg_service.conf" export OCTAVE_HISTFILE="${XDG_CACHE_HOME}/octave-hist" export OCTAVE_SITE_INITFILE="${XDG_CONFIG_HOME}/octave/octaverc" mkdir -p "${XDG_CONFIG_HOME}/bazaar" +export VAGRANT_HOME="${XDG_DATA_HOME}/vagrant" +export VAGRANT_ALIAS_FILE="${XDG_DATA_HOME}/vagrant/aliases" # Python mkdir -p "${XDG_DATA_HOME}/python" @@ -110,6 +112,7 @@ export PATH="${PATH}:${CARGO_HOME}/bin" export PATH="${PATH}:${XDG_DATA_HOME}/npm/bin" export PATH="${PATH}:${GOPATH}/bin" export PATH="${PATH}:${GEM_HOME}/bin" +export PATH="${PATH}:${HOME}/.gem/ruby/2.6.0/bin" export PATH="${PATH}:${XDG_CONFIG_HOME}/composer/vendor/bin" export PATH="${HOME}/.local/bin:${PATH}" diff --git a/system/.config/git/config b/system/.config/git/config index 4ca31b2..402b8fc 100644 --- a/system/.config/git/config +++ b/system/.config/git/config @@ -9,6 +9,8 @@ # # USAGE: # This file is automatically used by Git. +[core] + ignoreCase = false [user] name = Severin Kaderli diff --git a/system/.config/git/config.work b/system/.config/git/config.work index 0692326..66a5b9f 100644 --- a/system/.config/git/config.work +++ b/system/.config/git/config.work @@ -11,8 +11,8 @@ # This file is automatically used by Git when inside a subfolder of ~/work. [user] - name = Worker Severin - email = severin@work.ch + name = Severin Kaderli + email = severin@whatwedo.ch signingkey = "" [alias] diff --git a/system/.config/gtk-3.0/bookmarks b/system/.config/gtk-3.0/bookmarks index 4ec2c56..d02ca34 100644 --- a/system/.config/gtk-3.0/bookmarks +++ b/system/.config/gtk-3.0/bookmarks @@ -2,4 +2,5 @@ file:///home/severin/documents Documents file:///home/severin/downloads Downloads file:///home/severin/videos Videos file:///home/severin/projects Projects -file:///home/severin/dotfiles dotfiles \ No newline at end of file +file:///home/severin/dotfiles dotfiles +file:///home/severin/work Work diff --git a/system/.config/i3/config.base b/system/.config/i3/config.base index 7bf6fb4..75dc18f 100644 --- a/system/.config/i3/config.base +++ b/system/.config/i3/config.base @@ -179,4 +179,4 @@ bindsym Return mode "default" bindsym Escape mode "default" } -bindsym $mod+x mode "resize" \ No newline at end of file +bindsym $mod+x mode "resize" diff --git a/system/.config/polybar/config b/system/.config/polybar/config index fef5116..3a081e4 100644 --- a/system/.config/polybar/config +++ b/system/.config/polybar/config @@ -56,7 +56,7 @@ monitor = eDP1 [bar/top3] inherit = bar/top -monitor = DVI-I-1 +monitor = DVI-I-1-1 [bar/top-nvidia] inherit = bar/top @@ -89,7 +89,7 @@ tray-position = left [bar/bottom3] inherit = bar/bottom -monitor = DVI-I-1 +monitor = DVI-I-1-1 tray-position = left [bar/bottom-nvidia] diff --git a/system/.local/bin/resolution b/system/.local/bin/resolution index 4d79654..240c581 100755 --- a/system/.local/bin/resolution +++ b/system/.local/bin/resolution @@ -20,5 +20,5 @@ xrandr --output HDMI1 --mode 1280x1024 --pos 0x56 --rotate normal xrandr --output HDMI-1-1 --mode 1280x1024 --pos 0x56 --rotate normal xrandr --output eDP1 --primary --mode 1920x1080 --pos 1280x0 --rotate normal xrandr --output eDP-1-1 --primary --mode 1920x1080 --pos 1280x0 --rotate normal -xrandr --output DVI-I-1-1 --mode 1920x1080 --pos 3200x0 --rotate normal -xrandr --output DVI-I-2-1 --mode 1920x1080 --pos 3200x0 --rotate normal +xrandr --output DVI-I-1-1 --mode 1920x1080 --pos -640x0 --rotate normal +xrandr --output DVI-I-2-1 --mode 1920x1080 --pos -640x0 --rotate normal