diff --git a/de/sway-init b/de/sway-init new file mode 100755 index 0000000..e9eb301 --- /dev/null +++ b/de/sway-init @@ -0,0 +1,18 @@ +#!/usr/bin/env sh + +killall -9 urxvtd +urxvtd & + +# key repeat +export WLC_REPEAT_DELAY=200 +export WLC_REPEAT_RATE=60 + +# caps lock -> escape key mapping +export XKB_DEFAULT_OPTIONS=caps:escape + +# enable wayland support +export QT_QPA_PLATFORM=wayland-egl +export CLUTTER_BACKEND=wayland +export SDL_VIDEODRIVER=wayland + +sway diff --git a/de/sway_config b/de/sway_config new file mode 100644 index 0000000..35fbd09 --- /dev/null +++ b/de/sway_config @@ -0,0 +1,126 @@ +set $mod Mod4 + +set $left h +set $down j +set $up k +set $right l + +set $term termite +set $menu app-launcher + +output * bg /home/daniel/usr/.wallpaper fill + +output eDP-1 res 3200x1800 pos 0 0 scale 2 +output DP-3 res 3440x1440 pos 1600 0 + +### Input configuration +# +# Example configuration: +# +# input "2:14:SynPS/2_Synaptics_TouchPad" { +# dwt enabled +# tap enabled +# natural_scroll enabled +# middle_emulation enabled +# } +# +# You can get the names of your inputs by running: swaymsg -t get_inputs +# Read `man 5 sway-input` for more information about this section. + +bindsym $mod+Return exec $term +bindsym $mod+c kill +bindsym $mod+Space exec $menu +bindsym $mod+Shift+r reload +bindsym $mod+Control+Escape exit +bindsym $mod+Shift+e exit + +bindsym $mod+$left focus left +bindsym $mod+$down focus down +bindsym $mod+$up focus up +bindsym $mod+$right focus right + +# TODO: this should nudge if floating? +bindsym $mod+Left focus left +bindsym $mod+Down focus down +bindsym $mod+Up focus up +bindsym $mod+Right focus right + +bindsym $mod+Shift+$left move left +bindsym $mod+Shift+$down move down +bindsym $mod+Shift+$up move up +bindsym $mod+Shift+$right move right + +bindsym $mod+Shift+Left move left +bindsym $mod+Shift+Down move down +bindsym $mod+Shift+Up move up +bindsym $mod+Shift+Right move right + +floating_modifier $mod normal + +bindsym $mod+1 workspace 1 +bindsym $mod+2 workspace 2 +bindsym $mod+3 workspace 3 +bindsym $mod+4 workspace 4 +bindsym $mod+5 workspace 5 +bindsym $mod+6 workspace 6 +bindsym $mod+7 workspace 7 +bindsym $mod+8 workspace 8 +bindsym $mod+9 workspace 9 +bindsym $mod+0 workspace 10 + +bindsym $mod+Shift+1 move container to workspace 1 +bindsym $mod+Shift+2 move container to workspace 2 +bindsym $mod+Shift+3 move container to workspace 3 +bindsym $mod+Shift+4 move container to workspace 4 +bindsym $mod+Shift+5 move container to workspace 5 +bindsym $mod+Shift+6 move container to workspace 6 +bindsym $mod+Shift+7 move container to workspace 7 +bindsym $mod+Shift+8 move container to workspace 8 +bindsym $mod+Shift+9 move container to workspace 9 +bindsym $mod+Shift+0 move container to workspace 10 + +bindsym $mod+b splith +bindsym $mod+v splitv + +bindsym $mod+s layout stacking +bindsym $mod+w layout tabbed +bindsym $mod+e layout toggle split + +bindsym $mod+Shift+f fullscreen +bindsym $mod+Shift+space floating toggle +bindsym $mod+space focus mode_toggle +bindsym $mod+p focus parent + +bindsym $mod+Shift+minus move scratchpad +bindsym $mod+minus scratchpad show + +mode "resize" { + bindsym $left resize shrink width 10 px or 10 ppt + bindsym $down resize grow height 10 px or 10 ppt + bindsym $up resize shrink height 10 px or 10 ppt + bindsym $right resize grow width 10 px or 10 ppt + + bindsym Left resize shrink width 10 px or 10 ppt + bindsym Down resize grow height 10 px or 10 ppt + bindsym Up resize shrink height 10 px or 10 ppt + bindsym Right resize grow width 10 px or 10 ppt + + bindsym Return mode "default" + bindsym Escape mode "default" +} + +default_border none + +bindsym $mod+r mode "resize" + +# man 5 sway-bar +bar { + position bottom + colors { + statusline #ffffff + background #111111 + inactive_workspace #11111100 #11111100 #5c5c5c + } +} + +include /etc/sway/config.d/* diff --git a/scripts/colors/generator/gen.bash b/scripts/colors/generator/gen.bash index 72fc9db..dadf4de 100755 --- a/scripts/colors/generator/gen.bash +++ b/scripts/colors/generator/gen.bash @@ -25,17 +25,21 @@ if [[ $? -eq 0 ]]; then fi "$DIR/vendor/base16-builder/base16" -t vim -s "$DIR/schemes/$SCHEME.yml" + "$DIR/vendor/base16-builder/base16" -t vconsole -s "$DIR/schemes/$SCHEME.yml" "$DIR/vendor/base16-builder/base16" -t xresources -s "$DIR/schemes/$SCHEME.yml" "$DIR/vendor/base16-builder/base16" -t shell -s "$DIR/schemes/$SCHEME.yml" # replace existing color files rm -f "$DIR/../shell" + rm -f "$DIR/../vconsole" rm -f "$DIR/../vim" rm -f "$DIR/../xresources" cp "$COLORS_PATH/xresources/base16-$SCHEME.dark.xresources" "$DIR/../xresources" + cp "$COLORS_PATH/vconsole/base16-$SCHEME.dark.sh" "$DIR/../vconsole" cp "$COLORS_PATH/vim/base16-$SCHEME.vim" "$DIR/../vim" cp "$COLORS_PATH/shell/base16-$SCHEME.dark.sh" "$DIR/../shell" chmod +x "$DIR/../shell" + chmod +x "$DIR/../vconsole" echo "Colors have been regenerated. You will need to re-link them." else diff --git a/scripts/colors/vconsole b/scripts/colors/vconsole new file mode 100644 index 0000000..873f239 --- /dev/null +++ b/scripts/colors/vconsole @@ -0,0 +1,62 @@ +#!/bin/sh +# Base16 Donokai - Virtual console color setup script +# Wimer Hazenberg (http://www.monokai.nl) + +color00="111111" # Base 00 - Black +color01="f92672" # Base 08 - Red +color02="a6e22e" # Base 0B - Green +color03="f4bf75" # Base 0A - Yellow +color04="66d9ef" # Base 0D - Blue +color05="ae81ff" # Base 0E - Magenta +color06="a1efe4" # Base 0C - Cyan +color07="f8f8f2" # Base 05 - White +color08="75715e" # Base 03 - Bright Black +color09=$color01 # Base 08 - Bright Red +color10=$color02 # Base 0B - Bright Green +color11=$color03 # Base 0A - Bright Yellow +color12=$color04 # Base 0D - Bright Blue +color13=$color05 # Base 0E - Bright Magenta +color14=$color06 # Base 0C - Bright Cyan +color15="f9f8f5" # Base 07 - Bright White + +# 16 color space +echo -e "\e]P0$color00" +echo -e "\e]P1$color01" +echo -e "\e]P2$color02" +echo -e "\e]P3$color03" +echo -e "\e]P4$color04" +echo -e "\e]P5$color05" +echo -e "\e]P6$color06" +echo -e "\e]P7$color07" +echo -e "\e]P8$color08" +echo -e "\e]P9$color09" +echo -e "\e]PA$color10" +echo -e "\e]PB$color11" +echo -e "\e]PC$color12" +echo -e "\e]PD$color13" +echo -e "\e]PE$color14" +echo -e "\e]PF$color15" +if [ -x /sbin/clear ]; then + /sbin/clear +else + echo -e "\e[H" + echo -e "\e[2J" +fi + +# clean up +unset color00 +unset color01 +unset color02 +unset color03 +unset color04 +unset color05 +unset color06 +unset color07 +unset color08 +unset color09 +unset color10 +unset color11 +unset color12 +unset color13 +unset color14 +unset color15 diff --git a/setup b/setup index 958f7b6..98515c0 100755 --- a/setup +++ b/setup @@ -31,6 +31,7 @@ fi # TODO: make sure we have an even number, here links=( # desktop environment files + "$dfp/de/sway_config" "$XDG_CONFIG_HOME/sway/config" "$dfp/de/bspwmrc" "$XDG_CONFIG_HOME/bspwm/bspwmrc" "$dfp/de/sxhkdrc" "$XDG_CONFIG_HOME/sxhkd/sxhkdrc" "$dfp/de/xresources" "$HOME/.Xresources" diff --git a/shell/aliases b/shell/aliases index 497fa54..03ec612 100644 --- a/shell/aliases +++ b/shell/aliases @@ -96,6 +96,7 @@ alias C="clear && clear" alias keyrepeat="xset r rate 250 80" alias r="ranger" alias sctl="sudo systemctl" +alias btctl="sudo bluetoothctl" alias pt="htop -t" # experimental htop tree-view-by-default alias resrc="source \$HOME/.bashrc" alias redshift="redshift -l 39.0997:-94.5786" diff --git a/shell/bashrc b/shell/bashrc index 2b833b8..bdea78c 100644 --- a/shell/bashrc +++ b/shell/bashrc @@ -34,8 +34,13 @@ LESS="-x2" # stop parsing on a non-interactive shell [ -z "$PS1" ] && return +# load our vconsole colors +if [ "${TERM%%-*}" = 'linux' ]; then + BASE16_SHELL="$DOTFILES_PATH/scripts/colors/vconsole" + [[ -s "$BASE16_SHELL" ]] && source "$BASE16_SHELL" +fi + # load our terminal colors -# TODO: update with new system BASE16_SHELL="$DOTFILES_PATH/scripts/colors/shell" [[ -s "$BASE16_SHELL" ]] && source "$BASE16_SHELL"