From 7868dcc06dea92cadb9b8de542a585929e99b739 Mon Sep 17 00:00:00 2001 From: Taylor Bockman Date: Sat, 5 Nov 2016 18:49:16 -0700 Subject: [PATCH 1/7] Update README.md --- ubuntu/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ubuntu/README.md b/ubuntu/README.md index 73ef7f9..3d8cf06 100644 --- a/ubuntu/README.md +++ b/ubuntu/README.md @@ -10,6 +10,8 @@ Supply either `desktop` or `laptop` as the argument to the installer. Otherwise, ## Desktop Setup Information +![desktop screenshot](../current-desktop-desktop.png?raw=true "Current Desktop") + Installing Ubuntu on a desktop with these scripts is a little different. I currently use cinnamon instead of xmonad on my desktop. ### Nvidia Graphics Card Issues with LUKS From b2c65c4784cc7fbac4b09977b3716a002f16aad5 Mon Sep 17 00:00:00 2001 From: Taylor Bockman Date: Sun, 6 Nov 2016 14:23:51 -0800 Subject: [PATCH 2/7] Update README.md --- ubuntu/README.md | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/ubuntu/README.md b/ubuntu/README.md index 3d8cf06..4d6feee 100644 --- a/ubuntu/README.md +++ b/ubuntu/README.md @@ -14,17 +14,23 @@ Supply either `desktop` or `laptop` as the argument to the installer. Otherwise, Installing Ubuntu on a desktop with these scripts is a little different. I currently use cinnamon instead of xmonad on my desktop. -### Nvidia Graphics Card Issues with LUKS +### Nvidia Graphics Card Issues Booting to Black Screen with Ubuntu 16.04 and LUKS It seems that the Nvidia proprietary drivers screw up booting into the splash -screen irrepairably. This likely won't bother you much if you don't use LUKS -but for those of us who do disabling the splash screen is the only way to +screen irrepairably. This likely won't bother you much if you don't use LUKS (I'm guessing since it will just boot through to where it needs to be anyway) but for those of us who do, disabling the splash screen is the only way I have found to be able to enter your password in and continue booting. -To fix this problem change `splash` to `nosplash` -in your GRUB config and run `sudo update-grub` to lock in the changes. +To fix this problem change `splash` to `nosplash` in your GRUB config and run `sudo update-grub` to lock in the changes. -An additional script `fixplymouth.sh` was included here for archiving purposes. This script did not work for me, but it may work for your install. If you want to keep the splash script, try running `fixplymouth.sh` first. +If you've found yourself in a situation where you are booting into a black screen and don't know how to fix it: + +1. Push right shift a bunch of times until you get to the GRUB boot selection screen +2. Select your installation and press `e` +3. Scroll down until you see a place where it says `quiet splash` +4. Erase `quiet splash` and put either `nomodeset` or `nvidia.modeset=0` - If one doesn't work try the other (this isn't a permanent change) +5. You should be able to boot into your install far enough to `ctrl + alt + fN` (where N is 1 - 12) into a terminal so you can make the above changes to your GRUB config permanently + +An additional script `fixplymouth.sh` was included here for archiving purposes. This script did not work for me, but it may work for your install. If you want to keep the splash screen, try running `fixplymouth.sh` first. ## Laptop Setup Information @@ -48,7 +54,7 @@ It also substitutes Ubuntu's stock media players with less resource intensive al *NOTE:* After rebooting you will boot into a black screen. See the section on GRUB for details. To get to a login screen press `ctrl + alt + f1` and login normally. -## X Server +### X Server To start Xmonad simply type `startx` at the tty. From 90f6cbe4534b7ce8deb6228fff9e30b717db138b Mon Sep 17 00:00:00 2001 From: Taylor Bockman Date: Sun, 6 Nov 2016 14:24:13 -0800 Subject: [PATCH 3/7] Update README.md --- ubuntu/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/README.md b/ubuntu/README.md index 4d6feee..51204f2 100644 --- a/ubuntu/README.md +++ b/ubuntu/README.md @@ -14,7 +14,7 @@ Supply either `desktop` or `laptop` as the argument to the installer. Otherwise, Installing Ubuntu on a desktop with these scripts is a little different. I currently use cinnamon instead of xmonad on my desktop. -### Nvidia Graphics Card Issues Booting to Black Screen with Ubuntu 16.04 and LUKS +### Nvidia Graphics Card Issues - Booting to Black Screen with Ubuntu 16.04 and LUKS It seems that the Nvidia proprietary drivers screw up booting into the splash screen irrepairably. This likely won't bother you much if you don't use LUKS (I'm guessing since it will just boot through to where it needs to be anyway) but for those of us who do, disabling the splash screen is the only way I have found to From 261e547a8a9e8e7b21972d6edffaf906591fb7d6 Mon Sep 17 00:00:00 2001 From: Taylor Bockman Date: Sun, 6 Nov 2016 14:24:38 -0800 Subject: [PATCH 4/7] Update README.md --- ubuntu/README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ubuntu/README.md b/ubuntu/README.md index 51204f2..864ea2b 100644 --- a/ubuntu/README.md +++ b/ubuntu/README.md @@ -17,8 +17,7 @@ Installing Ubuntu on a desktop with these scripts is a little different. I curre ### Nvidia Graphics Card Issues - Booting to Black Screen with Ubuntu 16.04 and LUKS It seems that the Nvidia proprietary drivers screw up booting into the splash -screen irrepairably. This likely won't bother you much if you don't use LUKS (I'm guessing since it will just boot through to where it needs to be anyway) but for those of us who do, disabling the splash screen is the only way I have found to -be able to enter your password in and continue booting. +screen irrepairably. This likely won't bother you much if you don't use LUKS (I'm guessing since it will just boot through to where it needs to be anyway) but for those of us who do, disabling the splash screen is the only way I have found to be able to enter your password in and continue booting. To fix this problem change `splash` to `nosplash` in your GRUB config and run `sudo update-grub` to lock in the changes. From 6124ff9f99d1fa6e4ec83ad3d4e2821ad31a61e8 Mon Sep 17 00:00:00 2001 From: Taylor Bockman Date: Sun, 6 Nov 2016 14:26:05 -0800 Subject: [PATCH 5/7] Update README.md --- ubuntu/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/README.md b/ubuntu/README.md index 864ea2b..b21b0ce 100644 --- a/ubuntu/README.md +++ b/ubuntu/README.md @@ -27,7 +27,7 @@ If you've found yourself in a situation where you are booting into a black scree 2. Select your installation and press `e` 3. Scroll down until you see a place where it says `quiet splash` 4. Erase `quiet splash` and put either `nomodeset` or `nvidia.modeset=0` - If one doesn't work try the other (this isn't a permanent change) -5. You should be able to boot into your install far enough to `ctrl + alt + fN` (where N is 1 - 12) into a terminal so you can make the above changes to your GRUB config permanently +5. You should be able to boot into your install far enough to `ctrl + alt + fN` (where N is 1 - 6) into a virtual terminal so you can make the above changes to your GRUB config permanently An additional script `fixplymouth.sh` was included here for archiving purposes. This script did not work for me, but it may work for your install. If you want to keep the splash screen, try running `fixplymouth.sh` first. From 206b2560ddf0c9c72a8bbd41e3f2a9e3fad4b562 Mon Sep 17 00:00:00 2001 From: Taylor Bockman Date: Sun, 6 Nov 2016 14:26:33 -0800 Subject: [PATCH 6/7] Update README.md --- ubuntu/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/README.md b/ubuntu/README.md index b21b0ce..a180a5b 100644 --- a/ubuntu/README.md +++ b/ubuntu/README.md @@ -27,7 +27,7 @@ If you've found yourself in a situation where you are booting into a black scree 2. Select your installation and press `e` 3. Scroll down until you see a place where it says `quiet splash` 4. Erase `quiet splash` and put either `nomodeset` or `nvidia.modeset=0` - If one doesn't work try the other (this isn't a permanent change) -5. You should be able to boot into your install far enough to `ctrl + alt + fN` (where N is 1 - 6) into a virtual terminal so you can make the above changes to your GRUB config permanently +5. You should be able to boot into your install far enough to `ctrl + alt + fN` (where N is 1 - 6) into a virtual terminal so you can make the above `nosplash` change to your GRUB config permanent An additional script `fixplymouth.sh` was included here for archiving purposes. This script did not work for me, but it may work for your install. If you want to keep the splash screen, try running `fixplymouth.sh` first. From 7568e47dce1003156be6272c351982d1fc55f81f Mon Sep 17 00:00:00 2001 From: Taylor Bockman Date: Thu, 10 Nov 2016 16:15:38 -0800 Subject: [PATCH 7/7] Add vim plugins for slim and nerdtree --- dotfiles/config/nvim/init.vim | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dotfiles/config/nvim/init.vim b/dotfiles/config/nvim/init.vim index 9269fbd..db9a67e 100644 --- a/dotfiles/config/nvim/init.vim +++ b/dotfiles/config/nvim/init.vim @@ -49,6 +49,7 @@ Plug 'digitaltoad/vim-jade' Plug 'wavded/vim-stylus' Plug 'raichoo/haskell-vim' Plug 'OCamlPro/ocp-indent' +Plug 'slim-template/vim-slim' " Org Mode Plug 'jceb/vim-orgmode' @@ -70,7 +71,8 @@ if !has("win32") || !has("win16") " on vim start Plug 'scrooloose/nerdtree' - + " For nerdtree indicators of what has changed + Plug 'Xuyuanp/nerdtree-git-plugin' " Make Vim play nice with tmux " Use