Cleanups

machines/remote-builder-01/configuration.nix

@@ -1,13 +1,11 @@
 { config, pkgs, ... }:
 
 {
-  imports =
+  imports = [
-    [
+    ./hardware-configuration.nix
-      ./hardware-configuration.nix
+    ./system.nix
-      ./programs.nix
+    # TODO monitoring
-      ./system.nix
+  ];
-      # TODO monitoring
-    ];
 
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
@@ -54,6 +52,8 @@
     enableSSHSupport = true;
   };
 
+  programs.mosh.enable = true;
+
   # List services that you want to enable:
 
   services.zfs.autoScrub.enable = true;

machines/remote-builder-01/programs.nix

@@ -1,24 +0,0 @@
-{ pkgs, ... }:
-let pkgsList = with pkgs; [
-  nix-prefetch-git
-  dnsutils
-
-  unzip
-  zip
-  ripgrep
-
-  niv
-  nixfmt
-  ];
-in
-{
-  imports = [
-    ./vim.nix
-  ];
-  programs = {
-    tmux.enable = true;
-    mosh.enable = true;
-  };
-
-  environment.systemPackages = pkgsList;
-}

machines/remote-builder-01/system.nix

@@ -1,14 +1,8 @@
 { pkgs, ... }:
 {
-  # # Auto upgrades
-  # system.autoUpgrade = {
-  #   enable = false; # TODO(Ryan): do not enable, it will break deployments.
-  #   allowReboot = false;
-  # };
-
   # Auto GC and store optimizations
   nix = {
-    trustedUsers = [ "root" "gab" ];
+    trustedUsers = [ "root" ];
     gc = {
       automatic = true;
       dates = "weekly";
@@ -20,9 +14,4 @@
       max-free = ${toString (1024 * 1024 * 1024)}
     '';
   };
-
-  services.locate = {
-    enable = true;
-    interval = "04:05";
-  };
 }

machines/remote-builder-01/vim.nix

@@ -1,31 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.variables = { EDITOR = "vim"; };
-
-  environment.systemPackages = with pkgs; [
-    nixfmt
-    git
-    (neovim.override {
-      vimAlias = true;
-      configure = {
-        packages.myPlugins = with pkgs.vimPlugins; {
-          start = [ vim-lastplace vim-nix ];
-          opt = [];
-        };
-        customRC = ''
-          set encoding=utf-8
-          set wildmenu
-
-          set nocompatible
-          set backspace=indent,eol,start
-          set cursorline
-          hi CursorLine term=bold cterm=bold ctermbg=darkgrey
-          set number
-          set relativenumber
-          set tabstop=4
-          set expandtab
-        '';
-      };
-    }
-  )];
-}