From 7c40848349654f32903ce11d14337b01e740ff89 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Thu, 4 Jul 2019 16:49:30 -0400 Subject: [PATCH] buster + fixes Timezone wasnt actually being set by fai it seems. Remove some old jessie stuff. Setup buster to use wayland and sway. --- brc | 17 +- conflink | 7 +- distro-begin | 512 +++++++++++++++---------------- distro-end | 45 ++- i3-sway/common.conf | 66 ++++ i3-sway/gen | 9 + i3-sway/i3.conf | 4 + i3-sway/sway.conf | 4 + input-setup | 80 ++--- maru-init | 2 +- pkgs | 4 +- subdir_files/.config/i3/config | 27 +- subdir_files/.config/sway/config | 67 ++++ 13 files changed, 498 insertions(+), 346 deletions(-) create mode 100644 i3-sway/common.conf create mode 100755 i3-sway/gen create mode 100644 i3-sway/i3.conf create mode 100644 i3-sway/sway.conf create mode 100644 subdir_files/.config/sway/config diff --git a/brc b/brc index 15799b8..00200fe 100644 --- a/brc +++ b/brc @@ -183,13 +183,18 @@ unset _x for x in /a/bin/bash_unpublished/source-!(.#*); do source $x; done source $(dirname $(readlink -f $BASH_SOURCE))/path_add-function source /a/bin/log-quiet/logq-function -if [[ -e /a/bin/errhandle/err ]]; then - source /a/bin/errhandle/err - err-allow -fi -# if someone exported $SOE (stop on error), catch errors +# if someone exported $SOE (stop on error), catch errors. +# +# Note, on debian this results in the following warning when in ssh, +# hich I haven't figured out how to fix. It doesn't happen if we source +# after the shell has started +# +# bash: /usr/share/bashdb/bashdb-main.inc: No such file or directory +# bash: warning: cannot start debugger; debugging mode disabled if [[ $SOE ]]; then - err-catch + if [[ -e /a/bin/errhandle/err ]]; then + source /a/bin/errhandle/err + fi fi path_add /a/exe diff --git a/conflink b/conflink index eb94ebe..f62de8b 100755 --- a/conflink +++ b/conflink @@ -11,7 +11,8 @@ lnf() { /a/exe/lnf "$@"; } shopt -s nullglob -shopt -s extglob # note, already set with bash -l +shopt -s extglob +shopt -s dotglob # If we make a link back to the root, we stop going deeper into subdir_files. # This makes it so we can do subdir directories. @@ -111,9 +112,9 @@ case $USER in sudo bash -c 'shopt -s nullglob; cd /etc/openvpn; for f in client/* server/*; do ln -sf $f .; done' - m sudo -H -u traci "$BASH_SOURCE" + m sudo -H -u user2 "$BASH_SOURCE" ;; - traci) + user2) m common-file-setup ${c_dirs[@]} ;; *) diff --git a/distro-begin b/distro-begin index 1da0579..690bf85 100755 --- a/distro-begin +++ b/distro-begin @@ -32,7 +32,7 @@ sudo bash -c 'source /a/c/.bashrc && source /a/exe/ssh-emacs-setup' interactive=true # set this to false to force set -x [[ $- == *i* ]] || interactive=false if ! $interactive; then - set -x + set -x fi source /a/bin/errhandle/err @@ -43,24 +43,24 @@ echo "$0: $(date): starting now)" ### sanity checking if [[ $EUID == 0 ]]; then - if getent passwd iank || getent passwd ian ; then - echo "$0: error: running as root. unprivileged user exists. use it." - exit 1 - else - echo "$0: warning: running as root. I will setup users then exit" - fi + if getent passwd iank || getent passwd ian ; then + echo "$0: error: running as root. unprivileged user exists. use it." + exit 1 + else + echo "$0: warning: running as root. I will setup users then exit" + fi fi ### arg parsing recompile=false while [[ $1 == -* ]]; do - case $1 in - -r) recompile=true; shift ;; - esac + case $1 in + -r) recompile=true; shift ;; + esac done if [[ $1 ]]; then - export HOSTNAME=$1 + export HOSTNAME=$1 fi @@ -71,10 +71,12 @@ set +x source /a/bin/distro-functions/src/identify-distros $interactive || set -x for f in iank-dev htpc kd x2 x3 frodo tp li lj demohost kw fz; do - eval "$f() { [[ $HOSTNAME == $f ]]; }" + eval "$f() { [[ $HOSTNAME == $f ]]; }" done -has_p() { ! linode; } # when tp is tracis, then not tp either -has_x() { ! linode; } +codename=$(debian-codename) +has_wayland() { [[ $codename == buster ]]; } +has_x() { [[ $codename != buster ]]; } +has_monitor() { ! linode ; } linode() { lj || li; } has_btrfs() { ! linode; } home_network() { ! linode; } @@ -92,9 +94,9 @@ sed="sed --follow-symlinks" ##### begin setup encryption scripts ###### if encrypted; then - # I tried making a service which was dependent on reboot.target, - # but it happened too late in the shutdown process. - sudo dd of=/etc/systemd/system/keyscripton.service <<'EOF' + # I tried making a service which was dependent on reboot.target, + # but it happened too late in the shutdown process. + sudo dd of=/etc/systemd/system/keyscripton.service <<'EOF' [Unit] Description=Turn on automatic decryption of drives on boot # tried using graphical.target, but it made my display manager restart before rebooting. @@ -115,12 +117,12 @@ ExecStop=/a/exe/keyscript-on [Install] WantedBy=keyscriptoff.service EOF - sudo systemctl daemon-reload # needed if the file was already there - sudo systemctl stop keyscripton.service - # sudo systemctl start keyscripton.service - sudo systemctl enable keyscripton.service + sudo systemctl daemon-reload # needed if the file was already there + sudo systemctl stop keyscripton.service + # sudo systemctl start keyscripton.service + sudo systemctl enable keyscripton.service - sudo dd of=/etc/systemd/system/keyscriptoff.service <<'EOF' + sudo dd of=/etc/systemd/system/keyscriptoff.service <<'EOF' [Unit] Description=Turn off automatic decryption of drives on boot @@ -131,18 +133,18 @@ ExecStart=/a/exe/keyscript-off [Install] WantedBy=multi-user.target EOF - sudo systemctl daemon-reload # needed if the file was already there - sudo systemctl enable keyscriptoff.service - sudo systemctl start keyscriptoff.service - - # from /usr/share/doc/dropbear-initramfs/README.initramfs.gz - while read m _; do /sbin/modinfo -F filename "$m"; done /lib/cryptsetup/passfifo + sudo systemctl daemon-reload # needed if the file was already there + sudo systemctl enable keyscriptoff.service + sudo systemctl start keyscriptoff.service + + # from /usr/share/doc/dropbear-initramfs/README.initramfs.gz + while read m _; do /sbin/modinfo -F filename "$m"; done /lib/cryptsetup/passfifo fi ##### end setup encryption scripts ###### @@ -154,15 +156,15 @@ fi ##### fedora prereq/fundamental settings if isfedora; then - # comment out line disallowing calling sudo in scripts - sudo $sed -i 's/^Defaults *requiretty/#\0 # ian commented/' /etc/sudoers - # turn on magic sysrq commands - echo 1 > sudo dd of=/proc/sys/kernel/sysrq - echo "kernel.sysrq = 1" > /etc/sysctl.d/90-sysrq.conf - # selinux is not user friendly. Like, you enable samba, but you haven't run the magic selinux commands so it doesn't work - # and you have no idea why. - sudo $sed -i 's/^\(SELINUX=\).*/\1disabled/' /etc/selinux/config - selinuxenabled && sudo setenforce 0 + # comment out line disallowing calling sudo in scripts + sudo $sed -i 's/^Defaults *requiretty/#\0 # ian commented/' /etc/sudoers + # turn on magic sysrq commands + echo 1 > sudo dd of=/proc/sys/kernel/sysrq + echo "kernel.sysrq = 1" > /etc/sysctl.d/90-sysrq.conf + # selinux is not user friendly. Like, you enable samba, but you haven't run the magic selinux commands so it doesn't work + # and you have no idea why. + sudo $sed -i 's/^\(SELINUX=\).*/\1disabled/' /etc/selinux/config + selinuxenabled && sudo setenforce 0 fi @@ -170,13 +172,13 @@ fi # already ran for pxe installs, but used for vps & updates distro=$(distro-name) case $distro in - ubuntu|debian|trisquel) - sudo bash -c ". /a/bin/fai/fai-wrapper && /a/bin/fai/fai/config/scripts/GRUB_PC/11-iank" - ;; - *) - sudo bash -c ". /a/bin/fai/fai-wrapper && + ubuntu|debian|trisquel) + sudo bash -c ". /a/bin/fai/fai-wrapper && /a/bin/fai/fai/config/scripts/GRUB_PC/11-iank" + ;; + *) + sudo bash -c ". /a/bin/fai/fai-wrapper && /a/bin/fai/fai/config/distro-install-common/end" - ;; + ;; esac ###### setup hostname @@ -186,14 +188,14 @@ echo "127.0.1.1 $HOSTNAME.b8.nz $HOSTNAME" | sudo tee -a /etc/hosts ##### exit first stage if running as root if [[ $EUID == 0 ]]; then - echo "$0: running as root. exiting now that users are setup" - exit 0 + echo "$0: running as root. exiting now that users are setup" + exit 0 fi #### setup bash for root for x in /a/c/{.bashrc,brc,.bash_profile,.profile,.inputrc,path_add_function}; do - sudo -i </dev/null || sudo groupadd -r bind + getent group bind &>/dev/null || sudo groupadd -r bind fi # this needs to be before installing pacserve so we have gpg conf. conflink @@ -250,29 +252,29 @@ EOF ###### arch aur wrapper setup if isarch; then - #https://wiki.archlinux.org/index.php/Arch_User_Repository#Installing_packages - sudo pacman -S --noconfirm --needed base-devel jq - # pacaur seems to be the best, although it + cower has a few minor bugs, - # its design goals seem good, so, going for it. - - aurpi() { - for p in "$@"; do - tempdir=$(mktemp -d) - pushd $tempdir - aurex "$p" - makepkg -sri --skippgpcheck --noconfirm - popd - rm -rf $tempdir - done - } - aurpi cower pacaur - - pi pacserve - - x=$(mktemp); /usr/bin/pacman.conf-insert_pacserve >$x - sudo dd of=/etc/pacman.conf if=$x; rm $x - sudo systemctl enable pacserve.service - sudo systemctl start pacserve.service + #https://wiki.archlinux.org/index.php/Arch_User_Repository#Installing_packages + sudo pacman -S --noconfirm --needed base-devel jq + # pacaur seems to be the best, although it + cower has a few minor bugs, + # its design goals seem good, so, going for it. + + aurpi() { + for p in "$@"; do + tempdir=$(mktemp -d) + pushd $tempdir + aurex "$p" + makepkg -sri --skippgpcheck --noconfirm + popd + rm -rf $tempdir + done + } + aurpi cower pacaur + + pi pacserve + + x=$(mktemp); /usr/bin/pacman.conf-insert_pacserve >$x + sudo dd of=/etc/pacman.conf if=$x; rm $x + sudo systemctl enable pacserve.service + sudo systemctl start pacserve.service fi @@ -282,33 +284,33 @@ pup ###### p1 packages install ###### if isarch; then - # requirement for trash-cli. - # background: strange error if just installing trash-cli: "pyalpm requires python", - # so I see that it requires python2, and installing that manually fixes it. - # I didn\'t see this on earlier installation, main thing which changed was - # pacserve, so not sure if it\'s related. - pi python2 + # requirement for trash-cli. + # background: strange error if just installing trash-cli: "pyalpm requires python", + # so I see that it requires python2, and installing that manually fixes it. + # I didn\'t see this on earlier installation, main thing which changed was + # pacserve, so not sure if it\'s related. + pi python2 fi pi ${p1[@]} ######## fix evbug bug ###### case $distro in - trisquel|ubuntu) - # noticed in flidas. - #https://bugs.launchpad.net/ubuntu/+source/module-init-tools/+bug/240553 - #https://wiki.debian.org/KernelModuleBlacklisting - #common advice when searching is to use /etc/modprobe.d/blacklist.conf, - #but that file won't work and will get automatically reverted - sudo rmmod evbug ||: # might not be loaded yet - file=/etc/modprobe.d/evbug.conf - line="blacklist evbug" - if ! grep -xFq "$line" $file; then - sudo dd of=$file 2>/dev/null <<<"$line" - sudo depmod -a - sudo update-initramfs -u - fi - ;; + trisquel|ubuntu) + # noticed in flidas. + #https://bugs.launchpad.net/ubuntu/+source/module-init-tools/+bug/240553 + #https://wiki.debian.org/KernelModuleBlacklisting + #common advice when searching is to use /etc/modprobe.d/blacklist.conf, + #but that file won't work and will get automatically reverted + sudo rmmod evbug ||: # might not be loaded yet + file=/etc/modprobe.d/evbug.conf + line="blacklist evbug" + if ! grep -xFq "$line" $file; then + sudo dd of=$file 2>/dev/null <<<"$line" + sudo depmod -a + sudo update-initramfs -u + fi + ;; esac @@ -317,7 +319,7 @@ esac s lnf -T /a/bin /b s lnf -T /nocow/t /t if has_p; then - lnf -T /p/News ~/News + lnf -T /p/News ~/News fi s lnf /q/root/.editor-backups /q/root/.undo-tree-history \ /a/opt /a/c/.emacs.d $HOME/mw_vars /k/backup /root @@ -326,72 +328,81 @@ pi rsync # needed for rootsshsync rootsshsync s lnf /a/c/.vim /a/c/.vimrc /a/c/.gvimrc /root if has_p; then - # for dovecot - lnf -T /i/k/mboxes ~/mail + # for dovecot + lnf -T /i/k/mboxes ~/mail fi - ##### install xinput if has_x; then - case $(distro-name) in - trisquel|ubuntu|debian) - pi xinput - ;; - fedora) - pi xinput_calibrator - ;; - arch) - pi xorg-xinput - ;; - esac - - #### install redshift - case $(distro-name) in - trisquel|ubuntu|debian) - # recommends gets us geoclue (for darkening automatically at night i assume), - # which recommends modemmanager, which is annoying to fix for the model01 keyboard. - pi --no-install-recommends gtk-redshift - ;;& - fedora) - pi redshift-gtk - ;;& - arch) - pi redshift - ;;& - esac + case $(distro-name) in + trisquel|ubuntu|debian) + pi xinput + ;; + fedora) + pi xinput_calibrator + ;; + arch) + pi xorg-xinput + ;; + esac + + #### install redshift + case $(distro-name) in + trisquel|ubuntu|debian) + # recommends gets us geoclue (for darkening automatically at night i assume), + # which recommends modemmanager, which is annoying to fix for the model01 keyboard. + pi --no-install-recommends gtk-redshift + ;;& + fedora) + pi redshift-gtk + ;;& + arch) + pi redshift + ;;& + esac fi +if has_wayland; then + pi sway xwayland + # originally used xkbcomp, documented in input-setup.sh, this doesnt + # work under wayland, but its still useful for creating the config, + # then modifying the system files. + s sed -i.orig '/key * *{/,/}/s/KP_Multiply/underscore/g' /usr/share/X11/xkb/symbols/keypad +fi + + #### arch specific early packages case $(distro-name) in - arch) - # pkgfile is like apt-cache - pi pkgfile - s pkgfile --update - ;; + arch) + # pkgfile is like apt-cache + pi pkgfile + s pkgfile --update + ;; esac #### fedora specific packages case $(distro-name) in - fedora) - # todo, this could probably come later - p -y groupinstall development-tools c-development books admin-tools - pi man-pages - ;; - # other distros unknown + fedora) + # todo, this could probably come later + p -y groupinstall development-tools c-development books admin-tools + pi man-pages + ;; + # other distros unknown esac #### enable trim # enable trim for volume delete, other rare commands sudo $sed -ri 's/( *issue_discards\b).*/\1 = 1/' /etc/lvm/lvm.conf if encrypted; then - if isdeb; then - sudo cp /usr/share/doc/util-linux/examples/fstrim.{service,timer} /etc/systemd/system - fi - # does weekly trim - sudo systemctl enable fstrim.timer + # flidas or so, these units arent built-in + if isdeb && ! systemctl list-unit-files | grep -xF fstrim.timer &>/dev/null ; then + sudo cp /usr/share/doc/util-linux/examples/fstrim.{service,timer} /etc/systemd/system + fi + # does weekly trim + sudo systemctl enable fstrim.timer fi ##### make extra dirs @@ -405,25 +416,25 @@ tu /etc/fstab <<'EOF' /i/k /k none bind,noauto 0 0 EOF if ! mountpoint /kr; then - s mkdir -p /kr - s chown $USER:traci /kr + s mkdir -p /kr + s chown $USER:user2 /kr fi if home_network; then - if [[ $HOSTNAME == frodo ]]; then - tu /etc/fstab <<'EOF' + if [[ $HOSTNAME == frodo ]]; then + tu /etc/fstab <<'EOF' /k /kr none bind,noauto 0 0 EOF - else - tu /etc/fstab <<'EOF' + else + tu /etc/fstab <<'EOF' frodo:/k /kr nfs noauto 0 0 EOF - fi + fi fi s mkdir -p /q /i/{w,k} for dir in /{i,w,k}; do - if mountpoint $dir; then continue; fi # already mounted - s mkdir -p $dir - s chown $USER:$USER $dir + if mountpoint $dir; then continue; fi # already mounted + s mkdir -p $dir + s chown $USER:$USER $dir done # not needed for all hosts, but rather just keep it uniform s mkdir -p /mnt/iroot @@ -434,8 +445,8 @@ s mkdir -p /mnt/iroot # have already been created and exist. todo: create a simple repro # for this in a vm and report it upstream. if has_btrfs || home_network; then - pi nfs-common - s dd of=/root/imount <<'EOF' + pi nfs-common + s dd of=/root/imount <<'EOF' #!/bin/bash [[ $EUID == 0 ]] || exec sudo -E "$BASH_SOURCE" "$@" set -eE -o pipefail @@ -451,9 +462,9 @@ for dir in /i /mnt/iroot /k /kr /w; do fi done EOF - s chmod +x /root/imount + s chmod +x /root/imount - s dd of=/etc/systemd/system/imount.service <$t <&2' ERR + +x="$(readlink -f -- "$BASH_SOURCE")"; cd ${x%/*} # directory of this file + +cat common.conf sway.conf > /a/bin/distro-setup/subdir_files/.config/sway/config +cat common.conf i3.conf > /a/bin/distro-setup/subdir_files/.config/i3/config diff --git a/i3-sway/i3.conf b/i3-sway/i3.conf new file mode 100644 index 0000000..35cf00b --- /dev/null +++ b/i3-sway/i3.conf @@ -0,0 +1,4 @@ +# exit i3 (logs you out of your X session) +bindsym $mod+Shift+q 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'" + +bindsym $mod+Shift+p restart diff --git a/i3-sway/sway.conf b/i3-sway/sway.conf new file mode 100644 index 0000000..930588a --- /dev/null +++ b/i3-sway/sway.conf @@ -0,0 +1,4 @@ +# exit sway (logs you out of your Wayland session) +bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit' + +bindsym $mod+Shift+p reload diff --git a/input-setup b/input-setup index d3388c6..ba390da 100755 --- a/input-setup +++ b/input-setup @@ -17,45 +17,45 @@ set -x # set to oppsite if the order is flipped. k2flip=true if $k2flip; then - k2inorder=false + k2inorder=false else - k2inorder=true + k2inorder=true fi type=model01 case $1 in - l) type=laptop ;; - k) type=kinesis ;; - m) type=model01 ;; + l) type=laptop ;; + k) type=kinesis ;; + m) type=model01 ;; esac #set -x mi() { - xinput --get-feedbacks "$1" | grep "threshold" - xinput --get-feedbacks "$1" | grep "accelNum\|accelDenom" - xinput --list-props "$1" | grep "Device Accel Profile\|Device Accel Constant Deceleration\|Device Accel Velocity Scaling" + xinput --get-feedbacks "$1" | grep "threshold" + xinput --get-feedbacks "$1" | grep "accelNum\|accelDenom" + xinput --list-props "$1" | grep "Device Accel Profile\|Device Accel Constant Deceleration\|Device Accel Velocity Scaling" } ms() { - xinput --set-ptr-feedback "$1" $2 ${3%/*} ${3#*/} - xinput --set-prop "$1" 'Device Accel Profile' $4 - xinput --set-prop "$1" 'Device Accel Constant Deceleration' $5 - xinput --set-prop "$1" 'Device Accel Velocity Scaling' $6 - mi "$1" + xinput --set-ptr-feedback "$1" $2 ${3%/*} ${3#*/} + xinput --set-prop "$1" 'Device Accel Profile' $4 + xinput --set-prop "$1" 'Device Accel Constant Deceleration' $5 + xinput --set-prop "$1" 'Device Accel Velocity Scaling' $6 + mi "$1" } set_device_id() { - if [[ $2 ]] && $2; then - cmd="tail -n1" - else - cmd="head -n1" - fi - if device_id=$(xinput --list | grep "$1" | $cmd); then - device_id=${device_id##*id=} - device_id=${device_id%%[[:space:]]*} - echo "2:$2 device_id=$device_id" - else - return 1 - fi + if [[ $2 ]] && $2; then + cmd="tail -n1" + else + cmd="head -n1" + fi + if device_id=$(xinput --list | grep "$1" | $cmd); then + device_id=${device_id##*id=} + device_id=${device_id%%[[:space:]]*} + echo "2:$2 device_id=$device_id" + else + return 1 + fi } # default via xset q is 660 25. (delay for autorepeat, repeat rate) @@ -63,32 +63,32 @@ set_device_id() { xset r rate 400 13 # decrease rate delay if set_device_id "SteelSeries World of Warcraft MMO Gaming Mouse"; then - ms "$device_id" 100 1000/1 7 4 1 + ms "$device_id" 100 1000/1 7 4 1 - # under the new "improved" libinput, the mouse speed/accel has - # changed all around and is much more limited. - # Other xinput commands will fail and this will succeed. - xinput --set-prop "$device_id" "libinput Accel Speed" '.8' + # under the new "improved" libinput, the mouse speed/accel has + # changed all around and is much more limited. + # Other xinput commands will fail and this will succeed. + xinput --set-prop "$device_id" "libinput Accel Speed" '.8' fi # todo, differentiate for work pc #/a/bin/radl case $type in - model01) - xkbcomp /a/c/model01.xkb $DISPLAY - . /a/bin/bash_unpublished/duplicity-gpg-agent-setup - ;; - laptop) - # original saved with: xkbcomp $DISPLAY /a/c/stretch-11-2016.xkb - xkbcomp /a/c/x2.xkb $DISPLAY - - ;; + model01) + # original saved with: xkbcomp $DISPLAY /a/c/flidas-2017-12.xkb + xkbcomp /a/c/model01.xkb $DISPLAY + . /a/bin/bash_unpublished/duplicity-gpg-agent-setup + ;; + laptop) + xkbcomp /a/c/x2.xkb $DISPLAY + + ;; esac # for desktop and htpc if set_device_id "Logitech Unifying Device"; then -xinput --set-prop "$device_id" 'Evdev Middle Button Emulation' 1 + xinput --set-prop "$device_id" 'Evdev Middle Button Emulation' 1 fi diff --git a/maru-init b/maru-init index 8f4ab55..017c6d1 100755 --- a/maru-init +++ b/maru-init @@ -50,7 +50,7 @@ hostname -F /etc/hostname kill $(pgrep -U maru) usermod -l ian -m -d /home/ian maru groupmod -n ian maru -useradd -m -s /bin/bash traci +useradd -m -s /bin/bash user2 EOF # then do myunison n5, diff --git a/pkgs b/pkgs index 0f11b2d..824d2fc 100644 --- a/pkgs +++ b/pkgs @@ -4,7 +4,6 @@ # packages with the same name across distros. p1=( - trash-cli cryptsetup lvm2 mbuffer @@ -14,8 +13,6 @@ p2=( # 2nd konsole suckless-tools - # prefer xmonad, but it doesnt exist for wayland - i3 ) p3=( at @@ -180,6 +177,7 @@ p4=( tcpdump telnet transmission-remote-gtk + trash-cli vlc w3m whois diff --git a/subdir_files/.config/i3/config b/subdir_files/.config/i3/config index d88dd34..0138a97 100644 --- a/subdir_files/.config/i3/config +++ b/subdir_files/.config/i3/config @@ -1,23 +1,8 @@ -# This file has been auto-generated by i3-config-wizard(1). -# It will not be overwritten, so edit it as you like. -# -# Should you change your keyboard layout some time, delete -# this file and re-run i3-config-wizard(1). -# - -# i3 config file (v4) -# -# Please see http://i3wm.org/docs/userguide.html for a complete reference! - set $mod Mod4 - - bindsym $mod+2 exec "pavucontrol" bindsym $mod+3 exec "abrowser" -bindsym $mod+4 exec "input-setup m" -# exit i3 (logs you out of your X session) -bindsym $mod+Shift+q 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'" +bindsym $mod+4 exec "abrowser -no-remote -P firefox-main-profile" bindsym $mod+w focus parent bindsym $mod+e fullscreen toggle @@ -63,8 +48,8 @@ bindsym $mod+Shift+a move container to workspace 4 bindsym $mod+Shift+7 move container to workspace 5 bindsym $mod+Shift+0 move container to workspace 6 - -bindsym $mod+k exec i3-sensible-terminal +bindsym $mod+j exec emacsclient -c +bindsym $mod+k exec konsole bindsym $mod+l exec dmenu_run bindsym $mod+Shift+p restart @@ -75,4 +60,8 @@ bindsym $mod+Shift+p restart font pango:monospace 8 # todo: only available in newer i3n -#hide_edge_borders smart \ No newline at end of file +#hide_edge_borders smart +# exit i3 (logs you out of your X session) +bindsym $mod+Shift+q 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'" + +bindsym $mod+Shift+p restart diff --git a/subdir_files/.config/sway/config b/subdir_files/.config/sway/config new file mode 100644 index 0000000..fd98ff2 --- /dev/null +++ b/subdir_files/.config/sway/config @@ -0,0 +1,67 @@ +set $mod Mod4 + +bindsym $mod+2 exec "pavucontrol" +bindsym $mod+3 exec "abrowser" +bindsym $mod+4 exec "abrowser -no-remote -P firefox-main-profile" + +bindsym $mod+w focus parent +bindsym $mod+e fullscreen toggle +bindsym $mod+r exec "/a/bin/redshift.sh" +# todo, in newer i3, make this toggle split tabbed +bindsym $mod+t layout toggle split +bindsym $mod+g layout tabbed + +# Use Mouse+$mod to drag floating windows to their wanted position +floating_modifier $mod + +bindsym $mod+u focus up +bindsym $mod+i focus down +bindsym $mod+o focus left +bindsym $mod+p focus right + +bindsym $mod+Left move left +bindsym $mod+Right move right +bindsym $mod+Up move up +bindsym $mod+Down move down + +# switch to workspace +bindsym $mod+a workspace 4 +bindsym $mod+s workspace 3 +bindsym $mod+d workspace 2 +bindsym $mod+f workspace 1 + +# todo, in newer i3, make this split toggle +bindsym $mod+v split vertical +bindsym $mod+b split horizontal + +bindsym $mod+c kill + + +bindsym $mod+7 workspace 5 +bindsym $mod+0 workspace 6 + +# move focused container to workspace +bindsym $mod+Shift+f move container to workspace 1 +bindsym $mod+Shift+d move container to workspace 2 +bindsym $mod+Shift+s move container to workspace 3 +bindsym $mod+Shift+a move container to workspace 4 +bindsym $mod+Shift+7 move container to workspace 5 +bindsym $mod+Shift+0 move container to workspace 6 + +bindsym $mod+j exec emacsclient -c +bindsym $mod+k exec konsole +bindsym $mod+l exec dmenu_run + +bindsym $mod+Shift+p restart + + +# Font for window titles. Will also be used by the bar unless a different font +# is used in the bar {} block below. +font pango:monospace 8 + +# todo: only available in newer i3n +#hide_edge_borders smart +# exit sway (logs you out of your Wayland session) +bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit' + +bindsym $mod+Shift+p reload -- 2.30.2