.

17 files changed, 233 insertions, 45 deletions

diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml
index 34a675c..6f07fb8 100644
--- a/alacritty/alacritty.yml
+++ b/alacritty/alacritty.yml
@@ -45,17 +45,6 @@ scrolling:
   # scrollback is enabled (history > 0).
   multiplier: 3
 
-  # Scroll to the bottom when new text is written to the terminal.
-  auto_scroll: false
-
-# Spaces per Tab (changes require restart)
-#
-# This setting defines the width of a tab in cells.
-#
-# Some applications, like Emacs, rely on knowing about the width of a tab.
-# To prevent unexpected behavior in these applications, it's also required to
-# change the `it` value in terminfo when altering this setting.
-tabspaces: 4
 
 # Font configuration (changes require restart)
 #
diff --git a/atom/config.cson b/atom/config.cson
index f3b4d8e..6d99888 100644
--- a/atom/config.cson
+++ b/atom/config.cson
@@ -19,6 +19,7 @@
     ]
   editor:
     fontFamily: "Source Code Pro"
+    fontSize: 15
     invisibles: {}
     scrollPastEnd: true
     showIndentGuide: true
diff --git a/bash/.profile b/bash/.profile
index a1a30f9..5d249ab 100644
--- a/bash/.profile
+++ b/bash/.profile
@@ -2,5 +2,6 @@ export PATH=~/python/bin:~/programs:~/programs/chicken/bin:~/.gem/ruby/2.7.0/bin
 export CHICKEN_REPOSITORY=~/programs/chicken_repository
 export ATOM_NODE_URL=http://gh-contractor-zcbenz.s3.amazonaws.com/atom-shell/dist
 export QT_QPA_PLATFORMTHEME=qt5ct
+export QT_AUTO_SCREEN_SCALE_FACTOR=1
+export QT_ENABLE_HIGHDPI_SCALING=1
 export VISUAL=nvim
-
diff --git a/git/.gitconfig b/git/.gitconfig
index 2d2cb15..fd017a5 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -10,14 +10,16 @@
     autocrlf = false
     editor = vim
 [alias]
-    tree = log --graph --all --pretty='format:"%C(auto)%h [%ad] %an%d: %s"' --date=short
-    tree-single = log --graph --pretty='format:"%C(auto)%h [%ad] %an%d: %s"' --date=short
+    tree = log --graph --pretty='format:"%C(auto)%h [%ad] %an%d: %s"' --date=short
 [diff]
     tool = meld
     guitool = meld
+    submodule = log
 [push]
     default = simple
 [difftool "meld"]
     path = /usr/bin/meld
 [commit]
     gpgsign = true
+[status]
+    submodulesummary = 1
diff --git a/i3/config b/i3/config
index 9b2b38d..56bc71d 100644
--- a/i3/config
+++ b/i3/config
@@ -114,14 +114,19 @@ bar {
 # picom
 exec --no-startup-id picom
 
+# gajim
+exec --no-startup-id gajim
+
+# zeal
+exec --no-startup-id zeal
+
 # background
 exec_always --no-startup-id feh --bg-scale ~/.dotfiles/pictures/bg1.jpg \
                                            ~/.dotfiles/pictures/bg2.jpg
 
 # terminal
-exec --no-startup-id alacritty --class scratchpad_term -e tmux new-session -A -s default
-for_window [instance="scratchpad_term"] move scratchpad
-bindsym F12 [instance="scratchpad_term"] scratchpad show, \
-                                         resize set 100 ppt 100 ppt, \
-                                         resize shrink height 30 px, \
-                                         move position center
+for_window [instance="scratchpad_term"] \
+    move scratchpad, \
+    border none, \
+    exec --no-startup-id ~/.config/i3/terminal.sh
+bindsym F12 exec --no-startup-id ~/.config/i3/terminal.sh
diff --git a/i3/terminal.sh b/i3/terminal.sh
new file mode 100755
index 0000000..5d6808d
--- /dev/null
+++ b/i3/terminal.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+CLASSNAME=scratchpad_term
+
+[[ -z $(xdotool search --classname $CLASSNAME) ]] && \
+    alacritty --class $CLASSNAME -e tmux new-session -A -s default
+
+i3-msg [instance=\"$CLASSNAME\"] scratchpad show, \
+                                 resize set 100 ppt 100 ppt, \
+                                 resize shrink height 22 px, \
+                                 move position center
diff --git a/install.sh b/install.sh
index 006b638..758bdee 100755
--- a/install.sh
+++ b/install.sh
@@ -50,6 +50,19 @@ ln -sf $DOTFILES/qutebrowser/autoconfig.yml ~/.config/qutebrowser/autoconfig.yml
 mkdir -p ~/.config/ranger
 ln -sf $DOTFILES/ranger/rc.conf ~/.config/ranger/rc.conf
 
+# sublime
+mkdir -p ~/.config/sublime-text-3/Packages/User
+ln -sf "$DOTFILES/subl3/Package Control.sublime-settings" \
+       ~/.config/sublime-text-3/Packages/User/"Package Control.sublime-settings"
+for i in Adaptive.sublime-theme \
+         Preferences.sublime-settings \
+         Python.sublime-settings \
+         PythonImproves.sublime-settings \
+         SublimeLinter.sublime-settings
+do
+    ln -sf $DOTFILES/subl3/$i ~/.config/sublime-text-3/Packages/User/$i
+done
+
 # tmux
 ln -sf $DOTFILES/tmux/.tmux.conf ~/.tmux.conf
 
diff --git a/qutebrowser/autoconfig.yml b/qutebrowser/autoconfig.yml
index 7d5e32a..7734076 100644
--- a/qutebrowser/autoconfig.yml
+++ b/qutebrowser/autoconfig.yml
@@ -8,9 +8,13 @@ config_version: 2
 settings:
   fonts.tabs:
     global: 12pt Droid Sans
+  qt.highdpi:
+    global: true
   tabs.padding:
     global:
       bottom: 2
       left: 5
       right: 5
       top: 2
+  zoom.default:
+    global: 125%
diff --git a/subl3/Adaptive.sublime-theme b/subl3/Adaptive.sublime-theme
new file mode 100644
index 0000000..bdd3a3a
--- /dev/null
+++ b/subl3/Adaptive.sublime-theme
@@ -0,0 +1,24 @@
+[
+    {
+        "class": "sidebar_label",
+        "font.bold": false,
+        "font.size": 16,
+        "font.face": "Droid Sans",
+        "offset": [20, 0]
+    },
+    {
+        "class": "sidebar_tree",
+        "row_padding": [10, 5],
+        "indent": 20
+    },
+    {
+        "class": "tab_label",
+        "font.size": 14
+    },
+    {
+        "class": "label_control",
+        "font.size": 14,
+        "font.face": "Droid Sans",
+        "content_margin": 5
+    }
+]
diff --git a/subl3/Package Control.sublime-settings b/subl3/Package Control.sublime-settings
new file mode 100644
index 0000000..15e7c51
--- /dev/null
+++ b/subl3/Package Control.sublime-settings
@@ -0,0 +1,22 @@
+{
+	"bootstrapped": true,
+	"in_process_packages":
+	[
+	],
+	"installed_packages":
+	[
+		"A File Icon",
+		"Compare Side-By-Side",
+		"Material Theme",
+		"Origami",
+		"Package Control",
+		"PackageResourceViewer",
+		"Python Improved",
+		"Sass",
+		"SideBarEnhancements",
+		"SublimeLinter",
+		"SublimeLinter-contrib-sass-lint",
+		"SublimeLinter-eslint",
+		"SublimeLinter-flake8"
+	]
+}
diff --git a/subl3/Preferences.sublime-settings b/subl3/Preferences.sublime-settings
new file mode 100644
index 0000000..cd002df
--- /dev/null
+++ b/subl3/Preferences.sublime-settings
@@ -0,0 +1,66 @@
+{
+	"always_show_minimap_viewport": true,
+	"binary_file_patterns":
+	[
+		"*.pyc",
+		"*.pyo",
+		"*.exe",
+		"*.dll",
+		"*.obj",
+		"*.o",
+		"*.a",
+		"*.lib",
+		"*.so",
+		"*.dylib",
+		"*.ncb",
+		"*.sdf",
+		"*.suo",
+		"*.pdb",
+		"*.idb",
+		".DS_Store",
+		"*.class",
+		"*.psd",
+		"*.db",
+		"*.sublime-workspace",
+		"*.jpg",
+		"*.jpeg",
+		"*.png",
+		"*.gif",
+		"*.ttf",
+		"*.tga",
+		"*.dds",
+		"*.ico",
+		"*.eot",
+		"*.pdf",
+		"*.swf",
+		"*.jar",
+		"*.zip"
+	],
+	"color_scheme": "Packages/Color Scheme - Default/Monokai.sublime-color-scheme",
+	"default_line_ending": "unix",
+	"ensure_newline_at_eof_on_save": true,
+	"file_exclude_patterns":
+	[
+	],
+	"font_face": "Droid Sans Mono",
+	"font_size": 11,
+	"highlight_line": true,
+	"highlight_modified_tabs": true,
+	"ignored_packages":
+	[
+		"Vintage"
+	],
+	"line_padding_bottom": 1,
+	"line_padding_top": 1,
+	"material_theme_compact_sidebar": true,
+	"material_theme_small_tab": true,
+	"rulers":
+	[
+		80
+	],
+	"shift_tab_unindent": true,
+	"show_line_endings": true,
+	"theme": "Adaptive.sublime-theme",
+	"translate_tabs_to_spaces": true,
+	"trim_trailing_white_space_on_save": true
+}
diff --git a/subl3/Python.sublime-settings b/subl3/Python.sublime-settings
new file mode 100644
index 0000000..c9fb4e6
--- /dev/null
+++ b/subl3/Python.sublime-settings
@@ -0,0 +1,5 @@
+{
+	"extensions":
+	[
+	]
+}
diff --git a/subl3/PythonImproved.sublime-settings b/subl3/PythonImproved.sublime-settings
new file mode 100644
index 0000000..345ec57
--- /dev/null
+++ b/subl3/PythonImproved.sublime-settings
@@ -0,0 +1,6 @@
+{
+	"extensions":
+	[
+		"py"
+	]
+}
diff --git a/subl3/SublimeLinter.sublime-settings b/subl3/SublimeLinter.sublime-settings
new file mode 100644
index 0000000..4f10839
--- /dev/null
+++ b/subl3/SublimeLinter.sublime-settings
@@ -0,0 +1,9 @@
+// SublimeLinter Settings - User
+{
+    "styles": [
+        {
+            "mark_style": "squiggly_underline"
+        }
+    ],
+    "statusbar.counters_template": " ({} warn; {} err)",
+}
diff --git a/sway/.Xresources b/sway/.Xresources
new file mode 100644
index 0000000..1d5c21f
--- /dev/null
+++ b/sway/.Xresources
@@ -0,0 +1,3 @@
+Xcursor.theme: Neutral
+Xcursor.size:  32
+Xft.dpi: 120
diff --git a/sway/config b/sway/config
index c8d8dd7..2579d56 100644
--- a/sway/config
+++ b/sway/config
@@ -1,12 +1,13 @@
+
 set $mod Mod4
-set $ws1 "1"
-set $ws2 "2"
-set $ws3 "3"
-set $ws4 "4"
-set $wsa "a"
-set $wss "s"
-set $wsd "d"
-set $wsf "f"
+set $ws1 "1:1"
+set $ws2 "2:2"
+set $ws3 "3:3"
+set $ws4 "4:4"
+set $wsa "5:a"
+set $wss "6:s"
+set $wsd "7:d"
+set $wsf "8:f"
 
 floating_modifier $mod
 font pango:Droid Sans 11
@@ -16,10 +17,10 @@ workspace $ws1 output eDP-1
 workspace $ws2 output eDP-1
 workspace $ws3 output eDP-1
 workspace $ws4 output eDP-1
-workspace $wsa output DP-4
-workspace $wss output DP-4
-workspace $wsd output DP-4
-workspace $wsf output DP-4
+workspace $wsa output DP-4 DP-5
+workspace $wss output DP-4 DP-5
+workspace $wsd output DP-4 DP-5
+workspace $wsf output DP-4 DP-5
 
 output eDP-1 {
     position 0 0
@@ -31,22 +32,29 @@ output DP-4 {
     background ~/.dotfiles/pictures/bg2.jpg fill
 }
 
+output DP-5 {
+    position 1920 0
+    background ~/.dotfiles/pictures/bg2.jpg fill
+}
+
 
 bindsym $mod+Return exec alacritty
-bindsym $mod+Shift+q kill
-bindsym $mod+space exec --no-startup-id wofi --show run
+bindsym $mod+space exec --no-startup-id wofi --show drun --allow-images
 bindsym $mod+backslash split h
 bindsym $mod+minus split v
-bindsym $mod+Shift+Return fullscreen toggle
 #bindsym $mod+s layout stacking
 #bindsym $mod+w layout tabbed
-#bindsym $mod+e layout toggle split
-bindsym $mod+Shift+space floating toggle
-#bindsym $mod+space focus mode_toggle
+bindsym $mod+Tab layout toggle split
 bindsym $mod+p focus parent
+#bindsym $mod+d focus child
 bindsym $mod+r mode "resize"
+
 bindsym $mod+Shift+r restart
 bindsym $mod+Shift+e exit
+bindsym $mod+Shift+q kill
+bindsym $mod+Shift+space floating toggle
+bindsym $mod+Shift+Return fullscreen toggle
+
 
 bindsym $mod+h focus left
 bindsym $mod+j focus down
@@ -68,6 +76,7 @@ bindsym $mod+Shift+Down move down
 bindsym $mod+Shift+Up move up
 bindsym $mod+Shift+Right move right
 
+
 bindsym $mod+1 workspace $ws1
 bindsym $mod+2 workspace $ws2
 bindsym $mod+3 workspace $ws3
@@ -86,6 +95,7 @@ bindsym $mod+Shift+s move container to workspace $wss
 bindsym $mod+Shift+d move container to workspace $wsd
 bindsym $mod+Shift+f move container to workspace $wsf
 
+
 mode "resize" {
     bindsym h resize shrink width 10 px or 10 ppt
     bindsym j resize grow height 10 px or 10 ppt
@@ -102,13 +112,20 @@ mode "resize" {
     bindsym $mod+r mode "default"
 }
 
+
 bar {
-    swaybar_command waybar
+    status_command py3status
+    tray_output primary
+    strip_workspace_numbers yes
+    font pango:Font Awesome 5 Free, Font Awesome 5 Brands, Droid Sans Mono 12
 }
 
+
+exec xrdb -load ~/.config/sway/.Xresources
+
+
 exec --no-startup-id alacritty --class scratchpad_term -e tmux new-session -A -s default
 for_window [app_id="scratchpad_term"] move scratchpad
 bindsym F12 [app_id="scratchpad_term"] scratchpad show, \
                                        resize set 100 ppt 100 ppt, \
                                        move position center
-
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index e011822..9eec3eb 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -3,9 +3,9 @@ set -g default-command "fish"
 
 set -g escape-time 0
 
-unbind C-b
 set -g prefix C-a
 bind C-a send-prefix
+unbind C-b
 
 set -g set-clipboard on
 
@@ -17,13 +17,23 @@ set -g default-terminal "screen-256color"
 
 set -g mouse on
 
-bind-key -n 'C-M-Left' prev
-bind-key -n 'C-M-h' prev
-bind-key -n 'C-M-Right' next
-bind-key -n 'C-M-l' next
+bind-key -n 'C-M-Left'      prev
+bind-key -n 'C-M-Right'     next
+bind-key -n 'C-M-Up'        new-window
+bind-key -n 'C-M-Down'      confirm-before -p "kill-window #W? (y/n)" kill-window
+
+bind-key -n 'C-M-h'         select-pane -L
+bind-key -n 'C-M-l'         select-pane -R
+bind-key -n 'C-M-k'         select-pane -U
+bind-key -n 'C-M-j'         select-pane -D
+#bind-key -n 'C-M-\\'        split-window -h
+#bind-key -n 'C-M-\-'        split-window
+bind-key -n 'C-M-x'         confirm-before -p "kill-pane #P? (y/n)" kill-pane
+
 
 set -g status-style "fg=black,bg=colour34"
 bind-key 'Up' select-pane -P 'fg=white,bg=black'
 bind-key 'Down' select-pane -P 'fg=black,bg=white'
 
+
 bind-key ] run "xclip -o -selection clipboard | tmux load-buffer - && tmux paste-buffer"