Stuff

2 files changed, 10 insertions, 2 deletions

diff --git a/.config/terminator/config b/.config/terminator/config
index 479ede6..c408a3a 100644
--- a/.config/terminator/config
+++ b/.config/terminator/config
@@ -4,14 +4,22 @@
   title_transmit_bg_color = "#d30102"
 [keybindings]
 [layouts]
+  [[default]]
+    [[[child1]]]
+      parent = window0
+      type = Terminal
+    [[[window0]]]
+      parent = ""
+      type = Window
 [plugins]
 [profiles]
   [[default]]
     background_color = "#1e1e1e"
     cursor_color = "#ffffff"
-    font = Ubuntu Mono derivative Powerline 12
+    font = Ubuntu Mono derivative Powerline 13
     foreground_color = "#ffffff"
     palette = "#050505:#b81109:#1cb228:#baa407:#2c5fad:#e35682:#16a085:#ffffff:#1c1b19:#e8160c:#24e534:#fcdf09:#408afc:#e02c6d:#1abc9c:#ebe3e3"
+    scrollback_infinite = True
     show_titlebar = False
     use_system_font = False
   [[Tomorddrow Night Eighties]]
diff --git a/.emacs b/.emacs
index a176df6..fcd70e3 100644
--- a/.emacs
+++ b/.emacs
@@ -197,7 +197,7 @@
 
 (show-paren-mode 1)
 
-<<<<<<< HEAD
+
 (require 'dired-single)
 
 (defun my-dired-init ()