From a6c2155b006ed958c20fc8a5b2ddd10b400ada0d Mon Sep 17 00:00:00 2001
From: Felix Albrigtsen <felix@albrigtsen.it>
Date: Fri, 18 Aug 2023 19:06:07 +0200
Subject: [PATCH] Minor worf updates

---
 flake.nix             | 7 +++----
 hosts/worf/home.nix   | 7 +++++--
 hosts/worf/neovim.nix | 3 ++-
 hosts/worf/zsh.nix    | 1 +
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/flake.nix b/flake.nix
index 6235a8a..d7c0cf8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,12 +19,12 @@
 
   outputs = {
     self
-    , nixpkgs
-    , unstable
-    , nix-darwin
     , home-manager
     , matrix-synapse-next
+    , nix-darwin
+    , nixpkgs
     , sops-nix
+    , unstable
   , ... }@inputs:
     let
       overlay-unstable = final: prev: {
@@ -81,7 +81,6 @@
           home-manager.darwinModules.home-manager {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
-            # home-manager.extraSpecialArgs = { inherit user; };
             home-manager.users."felixalb" = import ./hosts/worf/home.nix;
           }
           # sops-nix.nixosModules.sops
diff --git a/hosts/worf/home.nix b/hosts/worf/home.nix
index d9c12f1..c24f202 100644
--- a/hosts/worf/home.nix
+++ b/hosts/worf/home.nix
@@ -4,16 +4,18 @@
 , config
 , ...
 }: {
-
   imports = [
     ./neovim.nix
     ./zsh.nix
   ];
 
   home.packages = with pkgs; [
+    bat
     bottom
     cocoapods
+    emacs
     exa
+    gnutar
     iterm2
     ncdu
     neofetch
@@ -28,7 +30,8 @@
     enable = true;
 
     extraConfig = {
-      pull.rebase = "true";
+      pull.rebase = true;
+      push.autoSetupRemote = true;
       color.ui = "auto";
       init.defaultBranch = "main";
       lfs.enable = true;
diff --git a/hosts/worf/neovim.nix b/hosts/worf/neovim.nix
index 0981c66..06d7cf9 100644
--- a/hosts/worf/neovim.nix
+++ b/hosts/worf/neovim.nix
@@ -22,10 +22,11 @@
       nvim-treesitter
 
       coc-css
+      coc-go
+      coc-html
       coc-json
       coc-nvim
       coc-pyright
-      coc-go
 
       vim-nix
     ];
diff --git a/hosts/worf/zsh.nix b/hosts/worf/zsh.nix
index 8538297..0e01cf3 100644
--- a/hosts/worf/zsh.nix
+++ b/hosts/worf/zsh.nix
@@ -37,6 +37,7 @@
       initExtra = ''
         # Autocomplete ../
         zstyle ':completion:*' special-dirs true
+        export PATH="$HOME/.config/emacs/bin:$PATH"
       '';
 
       shellAliases = {