Do some changes, switch to alacritty, etc

11 files changed, 159 insertions, 11 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