From c059af5248c67353953f95052aaa9c238180c538 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Fri, 29 Oct 2021 16:43:36 +0200
Subject: [PATCH 1/2] terminal-life: add upstream nixos-option gc fix

---
 modules/terminal-life/default.nix     | 4 ++--
 modules/terminal-life/zsh/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/terminal-life/default.nix b/modules/terminal-life/default.nix
index 4d36655f..87b2ee45 100644
--- a/modules/terminal-life/default.nix
+++ b/modules/terminal-life/default.nix
@@ -1,4 +1,4 @@
-{ lib, config, pkgs, ... }:
+{ lib, config, pkgs, self, ... }:
 with lib;
 let
   psCfg = config.pub-solar;
@@ -37,7 +37,7 @@ in
 
       programs.neovim = import ./nvim { inherit config; inherit pkgs; };
       programs.fzf = import ./fzf { inherit config; inherit pkgs; };
-      programs.zsh = import ./zsh { inherit config; inherit pkgs; };
+      programs.zsh = import ./zsh { inherit config; inherit pkgs; inherit self; };
     };
   };
 }
diff --git a/modules/terminal-life/zsh/default.nix b/modules/terminal-life/zsh/default.nix
index 0ff87812..f4923c50 100644
--- a/modules/terminal-life/zsh/default.nix
+++ b/modules/terminal-life/zsh/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, self, ... }:
 let
   psCfg = config.pub-solar;
   xdg = config.home-manager.users."${psCfg.user.name}".xdg;
@@ -32,7 +32,7 @@ in
     drone = "DRONE_TOKEN=$(secret-tool lookup drone token) drone";
     no = "manix \"\" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | fzf --preview=\"manix '{}'\" | xargs manix";
     # fix nixos-option
-    nixos-option = "nixos-option -I nixpkgs=/etc/nixos/lib/compat";
+    nixos-option = "nixos-option -I nixpkgs=${self}/lib/compat";
   };
   zplug = {
     enable = true;

From 9bd3f7d871ac240b777f2625086e2446a75f4181 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Fri, 29 Oct 2021 16:44:35 +0200
Subject: [PATCH 2/2] nvim: sort alphabetically, add gopls (go lsp)

---
 modules/terminal-life/nvim/default.nix | 45 +++++++++++++-------------
 modules/terminal-life/nvim/plugins.vim |  2 +-
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/modules/terminal-life/nvim/default.nix b/modules/terminal-life/nvim/default.nix
index 4647a76c..8d1be99d 100644
--- a/modules/terminal-life/nvim/default.nix
+++ b/modules/terminal-life/nvim/default.nix
@@ -69,73 +69,74 @@ in
   ];
 
   extraPackages = with pkgs; [
-    nodejs
+    ccls
     code-minimap
+    gopls
+    nodejs
     nodePackages.bash-language-server
     nodePackages.dockerfile-language-server-nodejs
     nodePackages.svelte-language-server
-    nodePackages.typescript-language-server
     nodePackages.typescript
+    nodePackages.typescript-language-server
     nodePackages.vim-language-server
     nodePackages.vue-language-server
-    nodePackages.yaml-language-server
-    nodePackages.vscode-json-languageserver-bin
-    nodePackages.vscode-html-languageserver-bin
     nodePackages.vscode-css-languageserver-bin
-    python3Full
+    nodePackages.vscode-html-languageserver-bin
+    nodePackages.vscode-json-languageserver-bin
+    nodePackages.yaml-language-server
     python-language-server
+    python3Full
     solargraph
-    rust-analyzer
-    universal-ctags
-    ccls
     rnix-lsp
+    rust-analyzer
     terraform-ls
+    universal-ctags
   ];
 
   plugins = with pkgs.vimPlugins; [
-    nvim-lspconfig
-    lsp_extensions-nvim
     completion-nvim
+    lsp_extensions-nvim
+    nvim-lspconfig
 
-    suda
     ack-vim
-    syntastic
     airline
-    workspace
     editorconfig-vim
-    vim-vinegar
-    vim-gutentags
     minimap-vim
     nnn-vim
+    suda
+    syntastic
+    vim-gutentags
+    vim-vinegar
+    workspace
 
     sonokai
 
     fugitive
-    vim-rhubarb
     vim-gitgutter
+    vim-rhubarb
     vimagit
 
-    vim-highlightedyank
     fzf-vim
     fzfWrapper
+    vim-highlightedyank
 
     beautify
     vim-surround
 
-    vim-sensible
     vim-bufkill
+    vim-sensible
 
     ansible-vim
     emmet-vim
     rust-vim
     vim-go
-    vim-vue
     vim-javascript
     vim-json
     vim-markdown
-    yats-vim
+    vim-nix
     vim-ruby
     vim-toml
-    vim-nix
+    vim-vue
+    yats-vim
   ];
 }
diff --git a/modules/terminal-life/nvim/plugins.vim b/modules/terminal-life/nvim/plugins.vim
index b174531e..1ff28d6c 100644
--- a/modules/terminal-life/nvim/plugins.vim
+++ b/modules/terminal-life/nvim/plugins.vim
@@ -6,7 +6,7 @@ let g:gutentags_file_list_command = 'git ls-files'
 
 " Golang
 " Go test shortcut
-nmap <Leader>got :GoTest<CR>
+nmap <Leader>got :GoTest<CR>:botright copen<CR>
 
 " Go formatting
 autocmd FileType go setlocal noexpandtab shiftwidth=4 tabstop=4 softtabstop=4 nolist