Merge remote-tracking branch 'prism/staging/jeschli'

2 files changed, 22 insertions, 32 deletions

diff --git a/jeschli/2configs/vim.nix b/jeschli/2configs/vim.nix
index c13113f1c..586016f60 100644
--- a/jeschli/2configs/vim.nix
+++ b/jeschli/2configs/vim.nix
@@ -11,16 +11,24 @@ let
       sha256 = "08l7ricd3j5h2bj9i566byh39v9n5wj5mj75f2c8a5dsc732b2k7";
     };
   };
-   customPlugins.vim-jsx = pkgs.vimUtils.buildVimPlugin {
-     name = "vim-jsx";
-     src = pkgs.fetchFromGitHub {
-       owner = "mxw";
-       repo = "vim-jsx";
-       rev = "5b968dfa512c57c38ad7fe420f3e8ab75a73949a";
-       sha256 = "1z3yhhbmbzfw68qjzyvpbmlyv2a1p814sy5q2knn04kcl30vx94a";
-     };
-   };
-
+  customPlugins.vim-jsx = pkgs.vimUtils.buildVimPlugin {
+    name = "vim-jsx";
+    src = pkgs.fetchFromGitHub {
+      owner = "mxw";
+      repo = "vim-jsx";
+      rev = "5b968dfa512c57c38ad7fe420f3e8ab75a73949a";
+      sha256 = "1z3yhhbmbzfw68qjzyvpbmlyv2a1p814sy5q2knn04kcl30vx94a";
+    };
+  };
+  customPlugins.vim-fileline = pkgs.vimUtils.buildVimPlugin {
+    name = "file-line-1.0";
+    src = pkgs.fetchFromGitHub {
+      owner = "bogado";
+      repo = "file-line";
+      rev = "1.0";
+      sha256 = "0z47zq9rqh06ny0q8lpcdsraf3lyzn9xvb59nywnarf3nxrk6hx0";
+    };
+  };
 in {
   environment.systemPackages = [
     (pkgs.vim_configurable.customize {
@@ -33,6 +41,8 @@ in {
         setStatements = ''
           set autowrite
           set clipboard=unnamedplus
+          set listchars=trail:¶
+          set mouse=a
           set nocompatible
           set path+=**
           set ruler
@@ -40,7 +50,6 @@ in {
           set undofile                 "turn on the feature
           set wildignore+=*.o,*.class,*.hi,*.dyn_hi,*.dyn_o
           set wildmenu
-          set listchars=trail:¶
         '';
         remapStatements = ''
           imap jk <Esc>
@@ -91,13 +100,14 @@ in {
          { names = [
             "ctrlp"
             "easymotion"
+            "elm-vim"
+            "vim-fileline"
             "molokai"
             "nerdtree"
             "snipmate"
             "surround"
             "Syntastic"
             "undotree"
-            "elm-vim"
            ];
          }
          { names = [ "vim-addon-nix" ]; ft_regex = "^nix\$"; }
diff --git a/jeschli/2configs/xserver/default.nix b/jeschli/2configs/xserver/default.nix
index 748d12258..ec3977c7e 100644
--- a/jeschli/2configs/xserver/default.nix
+++ b/jeschli/2configs/xserver/default.nix
@@ -34,26 +34,6 @@ in {
     };
   };
 
-  services.xserver = {
-  
-    # Don't install feh into systemPackages
-    # refs <nixpkgs/nixos/modules/services/x11/desktop-managers>
-    desktopManager.session = mkForce [];
-  
-    enable = true;
-    display = 11;
-    tty = 11;
-
-    dpi = 200;
-  
-    videoDrivers = [ "nvidia" ];
-    synaptics = {
-      enable = true;
-      twoFingerScroll = true;
-      accelFactor = "0.035";
-    };
-  };
-
   systemd.services.display-manager.enable = false;
 
   systemd.services.xmonad = {