Do some changes, switch to alacritty, etc

15 files changed, 170 insertions, 98 deletions

diff --git a/Common/alacritty/alacritty.yml b/Common/alacritty/alacritty.yml
new file mode 100644
index 0000000..7423485
--- /dev/null
+++ b/Common/alacritty/alacritty.yml
@@ -0,0 +1,25 @@
+live_config_reload: true
+
+import:
+  - ~/.config/alacritty/papercolor-light.yaml
+  #- ~/.config/alacritty/atom_one_light.yaml
+  #- ~/.config/alacritty/papertheme.yaml
+  #- ~/.config/alacritty/solarized_light.yaml
+
+env:
+  TERM: xterm-256color
+
+font:
+  normal:
+    family: RobotoMono Nerd Font Mono
+
+  size: 10
+
+window:
+  padding:
+    x: 0
+    y: 0
+
+key_bindings:
+  - { key: V, mods: Alt, action: Paste }
+  - { key: C, mods: Alt, action: Copy }
diff --git a/Common/alacritty/atom_one_light.yaml b/Common/alacritty/atom_one_light.yaml
new file mode 100644
index 0000000..07e3ea3
--- /dev/null
+++ b/Common/alacritty/atom_one_light.yaml
@@ -0,0 +1,25 @@
+colors:
+  primary:
+    background: '0xf8f8f8'
+    foreground: '0x2a2b33'
+
+  normal:
+    black:   '0x000000'
+    red:     '0xde3d35'
+    green:   '0x3e953a'
+    yellow:  '0xd2b67b'
+    blue:    '0x2f5af3'
+    magenta: '0xa00095'
+    cyan:    '0x3e953a'
+    white:   '0xbbbbbb'
+
+  bright:
+    black:   '0x000000'
+    red:     '0xde3d35'
+    green:   '0x3e953a'
+    yellow:  '0xd2b67b'
+    blue:    '0x2f5af3'
+    magenta: '0xa00095'
+    cyan:    '0x3e953a'
+    white:   '0xffffff'
+
diff --git a/Common/alacritty/papercolor-light.yaml b/Common/alacritty/papercolor-light.yaml
new file mode 100644
index 0000000..2959411
--- /dev/null
+++ b/Common/alacritty/papercolor-light.yaml
@@ -0,0 +1,33 @@
+# Colors (PaperColor - Light)
+colors:
+  # Default colors
+  primary:
+    background: '0xeeeeee'
+    foreground: '0x444444'
+
+  cursor:
+    text: '0xeeeeee'
+    cursor: '0x444444'
+
+  # Normal colors
+  normal:
+    black:   '0xeeeeee'
+    red:     '0xaf0000'
+    green:   '0x008700'
+    yellow:  '0x5f8700'
+    blue:    '0x0087af'
+    magenta: '0x878787'
+    cyan:    '0x005f87'
+    white:   '0x444444'
+
+  # Bright colors
+  bright:
+    black:   '0xbcbcbc'
+    red:     '0xd70000'
+    green:   '0xd70087'
+    yellow:  '0x8700af'
+    blue:    '0xd75f00'
+    magenta: '0xd75f00'
+    cyan:    '0x005faf'
+    white:   '0x005f87'
+
diff --git a/Common/alacritty/papertheme.yaml b/Common/alacritty/papertheme.yaml
new file mode 100644
index 0000000..13117e1
--- /dev/null
+++ b/Common/alacritty/papertheme.yaml
@@ -0,0 +1,28 @@
+# Colors (Paper Theme)
+colors:
+  # Default colors
+  primary:
+    background: '#F2EEDE'
+    foreground: '#000000'
+
+  # Normal colors
+  normal:
+    black:   '#000000'
+    red:     '#CC3E28'
+    green:   '#216609'
+    yellow:  '#B58900'
+    blue:    '#1E6FCC'
+    magenta: '#5C21A5'
+    cyan:    '#158C86'
+    white:   '#AAAAAA'
+
+  # Bright colors
+  bright:
+    black:   '#555555'
+    red:     '#CC3E28'
+    green:   '#216609'
+    yellow:  '#B58900'
+    blue:    '#1E6FCC'
+    magenta: '#5C21A5'
+    cyan:    '#158C86'
+    white:   '#AAAAAA'
diff --git a/Common/alacritty/solarized_light.yaml b/Common/alacritty/solarized_light.yaml
new file mode 100644
index 0000000..6a5acd9
--- /dev/null
+++ b/Common/alacritty/solarized_light.yaml
@@ -0,0 +1,28 @@
+# Colors (Solarized Light)
+colors:
+  # Default colors
+  primary:
+    background: '0xfdf6e3'
+    foreground: '0x586e75'
+
+  # Normal colors
+  normal:
+    black:   '0x073642'
+    red:     '0xdc322f'
+    green:   '0x859900'
+    yellow:  '0xb58900'
+    blue:    '0x268bd2'
+    magenta: '0xd33682'
+    cyan:    '0x2aa198'
+    white:   '0xeee8d5'
+
+  # Bright colors
+  bright:
+    black:   '0x002b36'
+    red:     '0xcb4b16'
+    green:   '0x586e75'
+    yellow:  '0x657b83'
+    blue:    '0x839496'
+    magenta: '0x6c71c4'
+    cyan:    '0x93a1a1'
+    white:   '0xfdf6e3'
\ No newline at end of file
diff --git a/Common/nvim/lua/basic.lua b/Common/nvim/lua/basic.lua
index 57088dc..7baa151 100755
--- a/Common/nvim/lua/basic.lua
+++ b/Common/nvim/lua/basic.lua
@@ -96,7 +96,8 @@ vim.cmd [[ highlight ColorColumn ctermbg=16 ]]
 
 -- Colorscheme
 -- default
-vim.cmd [[ colorscheme morning ]]
+vim.cmd [[ colorscheme default ]]
+vim.cmd [[ set background=light ]]
 
 -- Workaround for gutter color
 vim.cmd [[
diff --git a/Common/sway/autostart b/Common/sway/autostart
index 5b8710e..9adfafc 100644
--- a/Common/sway/autostart
+++ b/Common/sway/autostart
@@ -1,5 +1,5 @@
-exec rm /tmp/nwg-shell-check-update.lock
-exec wlsunset -l 59.9614 -L 10.925 -t 4500 -T 6500 -g 1.0
+#exec rm /tmp/nwg-shell-check-update.lock
+#exec wlsunset -l 59.9614 -L 10.925 -t 4500 -T 6500 -g 1.0
 #exec swaync -s /home/jakob/.config/swaync/preset-1.css
 exec nm-applet --indicator
 #exec_always nwg-autotiling
diff --git a/Common/sway/config b/Common/sway/config
index c5c59b9..3e0fc33 100644
--- a/Common/sway/config
+++ b/Common/sway/config
@@ -49,9 +49,9 @@ exec blueman-applet
 exec udiskie
 
 ### Turn off screen on lid closed
-set $laptop eDP-1
-bindswitch lid:on output $laptop disable
-bindswitch lid:off output $laptop enable
+# set $laptop eDP-1
+# bindswitch lid:on output $laptop disable
+# bindswitch lid:off output $laptop enable
 
 #############         Bindings           ##################
 
@@ -160,6 +160,8 @@ bindsym $Mod+Shift+Mod2+KP_Up    move container to workspace number 8; workspace
 bindsym $Mod+space floating toggle
 floating_modifier $Mod normal
 
+bindsym $Mod+Shift+t sticky toggle
+
 # Sway has a "scratchpad", which is a bag of holding for windows.
 # You can send windows there and get them back later.
 
@@ -230,9 +232,10 @@ focus_on_window_activation   focus
 # container layout
 bindsym $Mod+h split h
 bindsym $Mod+v split v
-bindsym $Mod+Shift+t layout tabbed
-bindsym $Mod+Shift+s layout stacking
-bindsym $Mod+Shift+h layout toggle split
+#bindsym $Mod+Shift+t layout tabbed
+#bindsym $Mod+Shift+s layout stacking
+#bindsym $Mod+Shift+h layout toggle split
+
 
 default_orientation horizontal
 
@@ -264,8 +267,11 @@ bar {
 
 # focus, floating, & sticky
 for_window [app_id="(?i)(?:blueman-manager|azote|gnome-disks|Thunar|wdisplays)"] floating enable
-for_window [app_id="(?i)(?:pavucontrol|nm-connection-editor|gsimplecal|galculator)"] floating enable
+for_window [app_id="(?i)(?:pavucontrol|nm-connection-editor|gsimplecal|galculator|gnome-calculator|calculator)"] floating enable
 for_window [app_id="(?i)(?:firefox|chromium)"] border none
 for_window [title="(?i)(?:copying|deleting|moving)"] floating enable
+for_window [title="(?i)(?:Cssh|cssh)"] border none floating enable
+for_window [app_id="(?i)(?:Cssh|cssh)"] floating enable
+for_window [title="CSSH"] floating enable
 
 popup_during_fullscreen smart
diff --git a/Common/sway/sway b/Common/sway/sway
new file mode 120000
index 0000000..f217ee1
--- /dev/null
+++ b/Common/sway/sway
@@ -0,0 +1 @@
+/home/jakob/_code/dotfiles/Common/sway
\ No newline at end of file
diff --git a/Common/sway/variables b/Common/sway/variables
index a0d521b..934265d 100644
--- a/Common/sway/variables
+++ b/Common/sway/variables
@@ -1,4 +1,4 @@
-set $term foot
+set $term alacritty
 set $browser google-chrome-stable --enable-features=UseOzonePlatform --ozone-platform=wayland
 set $filemanager thunar
 set $editor emacs
diff --git a/Common/waybar/waybar b/Common/waybar/waybar
new file mode 120000
index 0000000..b0bda03
--- /dev/null
+++ b/Common/waybar/waybar
@@ -0,0 +1 @@
+/home/jakob/_code/dotfiles/Common/waybar
\ No newline at end of file
diff --git a/bin/devcontainer b/bin/devcontainer
deleted file mode 100755
index 6a48b6f..0000000
--- a/bin/devcontainer
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/bash
-
-if ! [ -x "$(command -v jq)" ]; then
-    printf "\x1B[31m[ERROR] jq is not installed.\x1B[0m\n"
-    exit 1
-fi
-OPTIND=1
-VERBOSE=0
-
-while getopts "v" opt; do
-    case ${opt} in
-        v ) VERBOSE=1 ;;
-    esac
-done
-
-debug() {
-    if [ $VERBOSE == 1 ]; then
-        printf "\x1B[33m[DEBUG] ${1}\x1B[0m\n"
-    fi
-}
-
-WORKSPACE=${1:-`pwd`}
-CURRENT_DIR=${PWD##*/}
-echo "Using workspace ${WORKSPACE}"
-
-CONFIG_DIR=./.devcontainer
-debug "CONFIG_DIR: ${CONFIG_DIR}"
-CONFIG_FILE=devcontainer.json
-debug "CONFIG_FILE: ${CONFIG_FILE}"
-if ! [ -e "$CONFIG_DIR/$CONFIG_FILE" ]; then
-    echo "Folder contains no devcontainer configuration"
-    exit
-fi
-
-CONFIG=$(cat $CONFIG_DIR/$CONFIG_FILE | grep -v //)
-debug "CONFIG: \n${CONFIG}"
-
-cd $CONFIG_DIR
-
-DOCKER_FILE=$(echo $CONFIG | jq -r .dockerFile)
-if [ "$DOCKER_FILE" == "null" ]; then 
-    DOCKER_FILE=$(echo $CONFIG | jq -r .build.dockerfile)
-fi
-DOCKER_FILE=$(readlink -f $DOCKER_FILE)
-debug "DOCKER_FILE: ${DOCKER_FILE}"
-if ! [ -e $DOCKER_FILE ]; then
-    echo "Can not find dockerfile ${DOCKER_FILE}"
-    exit
-fi
-
-NAME=$(echo $CONFIG | jq -r .name)
-debug "NAME: ${NAME}"
-
-REMOTE_USER=$(echo $CONFIG | jq -r .remoteUser)
-debug "REMOTE_USER: ${REMOTE_USER}"
-if ! [ "$REMOTE_USER" == "null" ]; then
-    REMOTE_USER="-u ${REMOTE_USER}"
-fi
-
-ARGS=$(echo $CONFIG | jq -r '.build.args | to_entries? | map("--build-arg \(.key)=\"\(.value)\"")? | join(" ")')
-debug "ARGS: ${ARGS}"
-
-SHELL=$(echo $CONFIG | jq -r '.settings."terminal.integrated.shell.linux"')
-debug "SHELL: ${SHELL}"
-
-PORTS=$(echo $CONFIG | jq -r '.forwardPorts | map("-p \(.):\(.)")? | join(" ")')
-debug "PORTS: ${PORTS}"
-
-ENVS=$(echo $CONFIG | jq -r '.remoteEnv | to_entries? | map("-e \(.key)=\(.value)")? | join(" ")')
-debug "ENVS: ${ENVS}"
-
-WORK_DIR="/workspace"
-debug "WORK_DIR: ${WORK_DIR}"
-
-MOUNT="${MOUNT} --mount type=bind,source=${WORKSPACE},target=${WORK_DIR}"
-debug "MOUNT: ${MOUNT}"
-
-echo "Building and starting container"
-set -x
-DOCKER_IMAGE_HASH=$(docker build -t devcontainer -f $DOCKER_FILE $ARGS .)
-debug "DOCKER_IMAGE_HASH: ${DOCKER_IMAGE_HASH}"
-
-#docker run -it $REMOTE_USER $PORTS $ENVS $MOUNT -w $WORK_DIR $DOCKER_IMAGE_HASH $SHELL
-docker run -it $PORTS $ENVS $MOUNT -w $WORK_DIR devcontainer $SHELL
diff --git a/bin/mount_dev b/bin/mount_dev
index 5255a18..cba8c82 100755
--- a/bin/mount_dev
+++ b/bin/mount_dev
@@ -31,7 +31,7 @@ if [ "$(ls -A $DIR)" ]; then
   exit 1
 fi
 
-sshfs "$1":"$DIR" "$DIR"
+sshfs -C -o cache_timeout=80000,auto_cache,reconnect "$1":"$DIR" "$DIR"
 
 if [ ! -f "/media/$2" ]; then
   sudo mkdir -p /media/$2
@@ -45,6 +45,13 @@ else
   sudo mount --bind --verbose "$DIR" "/media/$2"
 fi
 
+tput setaf 4
+echo "Caching files"
+tput sgr0
+for file in $(find "$DIR"); do
+    cat $file > /dev/null  2>&1
+done
+
 tput setaf 2
 echo "Done"
 tput sgr0
diff --git a/install/install_linux.sh b/install/install_linux.sh
index 34b8ab4..099f764 100755
--- a/install/install_linux.sh
+++ b/install/install_linux.sh
@@ -80,6 +80,7 @@ if [ $res -eq 1 ]; then
     ln -isf "$CWD/Common/sway" ~/.config/sway
     ln -isf "$CWD/Common/waybar" ~/.config/waybar
     ln -isf "$CWD/Common/foot" ~/.config/foot
+    ln -isf "$CWD/Common/alacritty" ~/.config/alacritty
     ln -isf "$CWD/Common/powerline_config" ~/.config/powerline
     tput rc; tput ed
 fi
diff --git a/linux/tmux.conf b/linux/tmux.conf
index d4f8a7d..35f249b 100644
--- a/linux/tmux.conf
+++ b/linux/tmux.conf
@@ -1,7 +1,7 @@
 # -- general -------------------------------------------------------------------
 #set -g default-terminal "xterm-256color"
-#set -g default-terminal "screen-256color"
-set -g default-terminal "xterm-256color"
+set -g default-terminal "screen-256color"
+#set -g default-terminal "xterm-256color"
 
 #set -as terminal-overrides ",*:U8=0"
 #set-option -sa terminal-overrides ',xterm-256color:RGB'