Work on spacebar container

Squashed 36

3 files changed, 33 insertions, 1 deletions

diff --git a/modules/auto-redeploy.nix b/modules/auto-redeploy.nix

index 2260a55..f436679 100644
--- a/modules/auto-redeploy.nix
+++ b/modules/auto-redeploy.nix
@@ -2,6 +2,7 @@
 {
   systemd.timers = {
     "auto-redeploy" = {
+      enable = false;
       wantedBy = [ "timers.target" ];
       after = [ "network.target" ];
       timerConfig = {
@@ -14,6 +15,7 @@
   #Emma - Auto-redeploy service  
   systemd.services = {
     "auto-redeploy" = {
+      enable = false;
       stopIfChanged = false;
       restartIfChanged = false;
       #wantedBy = [ "multi-user.target" ];
diff --git a/modules/base.nix b/modules/base.nix

index 6fbd6ae..ee27780 100755
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -9,6 +9,7 @@
       ./users/Rory.nix
       ./users/chris.nix
       ./users/maddy.nix
+      ./vim.nix
     ];
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
@@ -83,13 +84,20 @@
     wget
     neofetch
     lnav
+    pciutils
     git
     lsd
+    duf
     htop
     btop
     duf
     kitty.terminfo
-    neovim
+    tmux
+    jq
+    yq
+    pv
+    dig
+    cloud-utils
   ];
 
   systemd.coredump.extraConfig = lib.mkDefault ''
diff --git a/modules/vim.nix b/modules/vim.nix
new file mode 100755

index 0000000..3524e2c
--- /dev/null
+++ b/modules/vim.nix
@@ -0,0 +1,22 @@
+{ pkgs, ... }:
+{
+  environment.variables = { EDITOR = "vim"; };
+
+  environment.systemPackages = with pkgs; [
+    (neovim.override {
+      vimAlias = true;
+      configure = {
+        packages.myPlugins = with pkgs.vimPlugins; {
+          start = [ vim-lastplace vim-nix vim-airline ]; 
+          opt = [];
+        };
+        customRC = ''
+          " your custom vimrc
+          set nocompatible
+          set backspace=indent,eol,start
+          " ...
+        '';
+      };
+    }
+  )];
+}