diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index d5b79fe..c4da522 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -96,6 +96,25 @@ local plugins = {
             },
         },
     },
+
+    {
+  "christoomey/vim-tmux-navigator",
+  cmd = {
+    "TmuxNavigateLeft",
+    "TmuxNavigateDown",
+    "TmuxNavigateUp",
+    "TmuxNavigateRight",
+    "TmuxNavigatePrevious",
+    "TmuxNavigatorProcessList",
+  },
+  keys = {
+    { "<c-h>", "<cmd><C-U>TmuxNavigateLeft<cr>" },
+    { "<c-j>", "<cmd><C-U>TmuxNavigateDown<cr>" },
+    { "<c-k>", "<cmd><C-U>TmuxNavigateUp<cr>" },
+    { "<c-l>", "<cmd><C-U>TmuxNavigateRight<cr>" },
+    { "<c-\\>", "<cmd><C-U>TmuxNavigatePrevious<cr>" },
+  },
+}
 }
 
 -- -----------------------------------------------------------------------------------------------
diff --git a/core-setup/arch-surface.conf b/core-setup/arch-surface.conf
new file mode 100755
index 0000000..bc602fb
--- /dev/null
+++ b/core-setup/arch-surface.conf
@@ -0,0 +1,4 @@
+title   Arch Linux (Surface Kernel)
+linux   /vmlinuz-linux-surface
+initrd  /initramfs-linux-surface.img
+options root=/dev/nvme0n1p2 rw
diff --git a/core-setup/cpupower b/core-setup/cpupower
new file mode 100644
index 0000000..c1a61aa
--- /dev/null
+++ b/core-setup/cpupower
@@ -0,0 +1,29 @@
+# Define CPUs governor
+# valid governors: ondemand, performance, powersave, conservative, userspace.
+governor='ondemand'
+
+# Limit frequency range
+# Valid suffixes: Hz, kHz (default), MHz, GHz, THz
+#min_freq="400MHz"
+max_freq="2GHz"
+
+# Specific frequency to be set.
+# Requires userspace governor to be available.
+# Do not set governor field if you use this one.
+#freq=
+
+# Utilizes cores in one processor package/socket first before processes are 
+# scheduled to other processor packages/sockets.
+# See man (1) CPUPOWER-SET for additional details.
+#mc_scheduler=
+
+# Utilizes thread siblings of one processor core first before processes are
+# scheduled to other cores. See man (1) CPUPOWER-SET for additional details.
+#smp_scheduler=
+
+#  Sets a register on supported Intel processore which allows software to convey
+# its policy for the relative importance of performance versus energy savings to
+# the  processor. See man (1) CPUPOWER-SET for additional details.
+#perf_bias=
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/core-setup/setup b/core-setup/setup
new file mode 100644
index 0000000..fce1216
--- /dev/null
+++ b/core-setup/setup
@@ -0,0 +1,2 @@
+cp ./arch-surface.conf /boot/loader/entries/arch-surface.conf
+cp ./cpupower /etc/default/cpupower