From da3041ef4f28b72f216e0475b6cd1b4ee4fe1eca Mon Sep 17 00:00:00 2001
From: Felix Albrigtsen <felix@albrigtsen.it>
Date: Tue, 8 Aug 2023 08:51:20 +0200
Subject: [PATCH] Minor worf updates

---
 hosts/worf/configuration.nix |  3 ++-
 hosts/worf/home.nix          |  7 +++++--
 hosts/worf/neovim.nix        | 27 ++++++++++++---------------
 hosts/worf/zsh.nix           | 15 ++++++++-------
 4 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/hosts/worf/configuration.nix b/hosts/worf/configuration.nix
index d941950..3aca848 100644
--- a/hosts/worf/configuration.nix
+++ b/hosts/worf/configuration.nix
@@ -20,6 +20,7 @@
       gnugrep
       ripgrep
       wget
+      sshfs
     ];
 
     variables = {
@@ -80,7 +81,7 @@
       autohide = true;
       autohide-delay = 0.0;
       autohide-time-modifier = 1.0;
-      tilesize = 80;
+      tilesize = 45;
       static-only = false;
       showhidden = false;
       show-recents = false;
diff --git a/hosts/worf/home.nix b/hosts/worf/home.nix
index d08928c..d9c12f1 100644
--- a/hosts/worf/home.nix
+++ b/hosts/worf/home.nix
@@ -12,13 +12,15 @@
 
   home.packages = with pkgs; [
     bottom
-    discord
+    cocoapods
     exa
     iterm2
+    ncdu
+    neofetch
     nix-index
     nodejs
-    slack
     spotify
+    tldr
     vscode
   ];
 
@@ -29,6 +31,7 @@
       pull.rebase = "true";
       color.ui = "auto";
       init.defaultBranch = "main";
+      lfs.enable = true;
 
       user = {
         name = "Felix Albrigtsen";
diff --git a/hosts/worf/neovim.nix b/hosts/worf/neovim.nix
index 3d206a8..0981c66 100644
--- a/hosts/worf/neovim.nix
+++ b/hosts/worf/neovim.nix
@@ -1,15 +1,5 @@
 { pkgs, lib, inputs, config, ...}:
-let
-  # fromGitHub = rev: ref: repo: pkgs.vimUtils.buildVimPluginFrom2Nix {
-  #   pname = "${lib.strings.sanitizeDerivationName repo}";
-  #   version = ref;
-  #   src = builtins.fetchGit {
-  #     url = "https://github.com/${repo}.git";
-  #     ref = ref;
-  #     rev = rev;
-  #   };
-  # };
-in {
+{
   programs.neovim = {
     enable = true;
     defaultEditor = true;
@@ -19,7 +9,7 @@ in {
     plugins = with pkgs.vimPlugins; [
       lightline-vim
       vim-lightline-coc
-      
+
       vim-commentary
       vim-fugitive
 
@@ -30,16 +20,23 @@ in {
       nvim-lspconfig
       copilot-vim
       nvim-treesitter
-      
+
+      coc-css
+      coc-json
       coc-nvim
       coc-pyright
+      coc-go
 
       vim-nix
     ];
 
     extraConfig = ''
       let mapleader = ','
-      
+      set number
+      set shiftwidth=2
+      set tabstop=2
+      set expandtab
+
       " Integrate status with lightline
       let g:lightline = {
         \   'active': {
@@ -106,4 +103,4 @@ in {
       map <Leader><Space> :noh<CR>
     '';
   };
-}
\ No newline at end of file
+}
diff --git a/hosts/worf/zsh.nix b/hosts/worf/zsh.nix
index 96ac24b..8538297 100644
--- a/hosts/worf/zsh.nix
+++ b/hosts/worf/zsh.nix
@@ -1,9 +1,4 @@
-{ pkgs
-, lib
-, inputs
-, config
-, ...
-}: {
+{ pkgs, lib, inputs, config, ... }: {
   programs = {
     zsh = {
       enable = true;
@@ -39,10 +34,16 @@
         ];
       };
 
+      initExtra = ''
+        # Autocomplete ../
+        zstyle ':completion:*' special-dirs true
+      '';
+
       shellAliases = {
         l = "exa -l";
         tree = "exa --tree --icons";
         rebuild = "darwin-rebuild switch --flake /Users/felixalb/nix";
+        shell = "nix-shell --run zsh";
         gst = "git status -sb";
         gcm = "git commit -m";
         gps = "git push";
@@ -50,4 +51,4 @@
       };
     };
   };
-}
\ No newline at end of file
+}