Fixup stuff for laptop

4 files changed, 8 insertions, 8 deletions

diff --git a/home.nix b/home.nix
index 9b2bca8..118f98d 100644
--- a/home.nix
+++ b/home.nix
@@ -87,6 +87,9 @@
 
     bash = {
       enable = true;
+      initExtra = ''
+        [[ -f ~/.nix-profile/etc/profile.d/nix.sh ]] && . ~/.nix-profile/etc/profile.d/nix.sh
+      '';
       shellAliases = {
         #z = "fasd_cd -d";     # cd, same functionality as j in autojump
         #zz = "fasd_cd -d -i"; # cd with interactive selection
diff --git a/packages.nix b/packages.nix
index 1433e7b..fe14408 100644
--- a/packages.nix
+++ b/packages.nix
@@ -41,6 +41,7 @@ pkgs.vlc
 pkgs.vpnc
 pkgs.w3m
 pkgs.wakatime
+pkgs.xterm
 pkgs.yank
 pkgs.youtube-dl
 ]
diff --git a/vim.nix b/vim.nix
index aeabaef..80954c7 100644
--- a/vim.nix
+++ b/vim.nix
@@ -1,6 +1,7 @@
 {
   enable = true;
   plugins = [
+    "sensible"
     "colors-solarized"
     "fugitive"
   ];
@@ -18,26 +19,20 @@
     else
       set background=dark
     endif
+    let g:solarized_termcolors=256
     colorscheme solarized
-    filetype plugin indent on
+    "
     set cuc cul        " Crosshair
     set cc=80          " 80 column lines
     set linebreak      " Break lines at word (requires Wrap lines)
-    set showbreak=     " Wrap-broken line prefix
     set textwidth=80   " Line wrap (number of cols)
     set showmatch      " Highlight matching brace
     set visualbell     " Use visual bell (no beeping)
     set hlsearch       " Highlight all search results
     set smartcase      " Enable smart-case search
-    set incsearch      " Searches for strings incrementally
-    ret autoindent     " Auto-indent new lines
     set shiftwidth=4   " Number of auto-indent spaces
     set smartindent    " Enable smart-indent
-    set smarttab       " Enable smart-tabs
-    set ruler          " Show row and column ruler information
-    set backspace=indent,eol,start " Backspace behaviour
     imap fd <Esc>
-    set wildmenu       " cool menu effect
     set mouse=a
   '';
 }
diff --git a/xmonad.hs b/xmonad.hs
index 142d896..77dfa5f 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -14,4 +14,5 @@ main =
     , focusedBorderColor = "#eee8d5" -- ^ solarized light
     , manageHook = manageDocks <+> manageHook defaultConfig
     , layoutHook = avoidStruts $ layoutHook defaultConfig
+    , terminal = "/home/ben/.nix-profile/bin/xterm"
     }