5 files changed, 107 insertions, 0 deletions
diff --git a/users/glittershark/keys.nix b/users/glittershark/keys.nix
index 6ed217327496..c52229b3a898 100644
--- a/users/glittershark/keys.nix
+++ b/users/glittershark/keys.nix
@@ -1,4 +1,5 @@
 { ... }:
 {
   whitby = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDIwl+xQYRCk6Ijz/Ll8eXKZrcTH9/7xwlvIowiuqDSFtGkf+73QJkwVJ0YiKHWAPwIUWMzCEO/Ab2g6j4PcR+XYu8kXbrwT5aW65L/AK1oaav2RfV1bnQEVUP9FRPL52BN42J0ibI2QJZKJVws9JF7vxTWPPG0V0eoxcaRMk1ZEqq+/k3GuN8D69VSV8xo9lB8yZEvTxs0YQRiiF7Q6t/3jhYtz6lCdazQviRcSEOj5AVsDjcf1XIAPOcLK4Q4OEXL49T3UaitSYMyKIO8hzNLiyGAUlSbshAnutPXdyNBypkCs6FrSPSRdBfFjzUVE/a+JWCPmx0q0xAVd497Efxby+Vsa2/TPMp7tSisPaqk3MpPmjBS7eI/y4Pl2GpAB4OVANEBNd1Q6K2/37Pk+PrZtIUBiRG8sM0Od36BjwLCxvG0G5P/UYZ93aC8GzqkRf4evOBMiJCvR2o9CDEDycNyTm1y5dyJzQewOTWX9nsiF1rllc92W0ZALvpO03+W2+k= grfn@chupacabra";
+  main = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDHPiNpPB6Uqs/VSW/C8tR/Z5wCQxKppNL2iETb1ucsYsFf1B2apG5txj06NMT6IWXwWpZXq7ld+/sA+a2I03lO2INP7S1Dto5nAwpNhhKN/UBXk76qYTdY5tEvb9J89S2ZzfQWR30aZ0CEDDrcbc+YktU1eSLdluu6QH+M/uPBweSiVn5wNHkc5sRdbyiVsZSQJ41MO7PQrzGpe7Pxola/ghOHdEFlESJMKA5uoRpCGboxtDE9tMJwG5MxNwHERpfI9FjvvLsJRrp9dRf6A/RQjlV/nb1GmpX0I8pvrXEPxm/l0rOAgE81VSsM+BxJ7ZvCe8u/YqMYJ8xVfskzlVsf griffin@MacBook-Pro";
 }
diff --git a/users/glittershark/system/home/machines/roswell.nix b/users/glittershark/system/home/machines/roswell.nix
new file mode 100644
index 000000000000..1b1bbf29c616
--- /dev/null
+++ b/users/glittershark/system/home/machines/roswell.nix
@@ -0,0 +1,57 @@
+{ pkgs, lib, config, ... }:
+
+let
+  laptopKeyboardId = "5";
+in
+
+{
+  imports = [
+    ../platforms/linux.nix
+    ../modules/shell.nix
+    ../modules/development.nix
+    ../modules/emacs.nix
+    ../modules/vim.nix
+  ];
+
+  home.packages = with pkgs; [
+    # System utilities
+    bat
+    htop
+    killall
+    bind
+    zip unzip
+    tree
+    ncat
+    bc
+    pv
+
+    # Security
+    gnupg
+    keybase
+    openssl
+
+    # Nix things
+    nixfmt
+    nix-prefetch-github
+    nix-review
+    cachix
+  ];
+
+
+  nixpkgs.config.allowUnfree = true;
+
+  programs.password-store.enable = true;
+
+  programs.home-manager.enable = true;
+  home.stateVersion = "20.03";
+
+  xsession.enable = lib.mkForce false;
+
+  services.lorri.enable = true;
+
+  programs.direnv = {
+    enable = true;
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+  };
+}
diff --git a/users/glittershark/system/home/modules/common.nix b/users/glittershark/system/home/modules/common.nix
index 8f3df0955ab4..0b295a450b61 100644
--- a/users/glittershark/system/home/modules/common.nix
+++ b/users/glittershark/system/home/modules/common.nix
@@ -74,6 +74,12 @@
         hostname = "172.16.0.5";
         forwardAgent = true;
       };
+
+      "roswell" = {
+        host = "roswell";
+        hostname = "18.223.118.13";
+        forwardAgent = true;
+      };
     };
   };
 
diff --git a/users/glittershark/system/system/default.nix b/users/glittershark/system/system/default.nix
index 174ccfb36011..aa0afb4c5935 100644
--- a/users/glittershark/system/system/default.nix
+++ b/users/glittershark/system/system/default.nix
@@ -1,5 +1,9 @@
 args @ { depot, pkgs, ... }:
 
+let
+  nixpkgs = import pkgs.nixpkgsSrc {};
+in
+
 rec {
   chupacabra = import ./machines/chupacabra.nix;
 
@@ -13,6 +17,27 @@ rec {
     configuration = mugwump;
   }).system;
 
+  roswell = import ./machines/roswell.nix;
+
+  roswellSystem = (pkgs.nixos {
+    configuration = { ... }: {
+      imports = [
+        ./machines/roswell.nix
+        "${nixpkgs.home-manager.src}/nixos"
+        "${depot.depotPath}/ops/nixos/depot.nix"
+      ];
+      inherit depot;
+
+      home-manager.users.grfn = { config, lib, ... }: {
+        imports = [ ../home/machines/roswell.nix ];
+        lib.depot = depot;
+        _module.args.pkgs = lib.mkForce
+          (import pkgs.nixpkgsSrc
+            (lib.filterAttrs (n: v: v != null) config.nixpkgs));
+      };
+    };
+  }).system;
+
   yeren = import ./machines/yeren.nix;
 
   yerenSystem = (pkgs.nixos {
@@ -31,6 +56,7 @@ rec {
   meta.targets = [
     "chupacabraSystem"
     "mugwumpSystem"
+    "roswellSystem"
     "yerenSystem"
 
     "iso"
diff --git a/users/glittershark/system/system/machines/roswell.nix b/users/glittershark/system/system/machines/roswell.nix
new file mode 100644
index 000000000000..c0ed2264a0e0
--- /dev/null
+++ b/users/glittershark/system/system/machines/roswell.nix
@@ -0,0 +1,17 @@
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports = [
+    ../modules/common.nix
+    "${modulesPath}/installer/scan/not-detected.nix"
+    "${modulesPath}/virtualisation/amazon-image.nix"
+  ];
+
+  ec2.hvm = true;
+
+  networking.hostName = "roswell";
+
+  users.users.grfn.openssh.authorizedKeys.keys = [
+    config.depot.users.glittershark.keys.main
+  ];
+}