start work on allowing use of deploy-rs

home/apps/telegram/telegram.nix

@@ -1,5 +1 @@
-{ config, pkgs, ... }: {
-  home.packages = with pkgs; [
-    tdesktop
-  ];
-}
+{ config, pkgs, ... }: { home.packages = with pkgs; [ tdesktop ]; }

home/apps/vivaldi/vivaldi.nix

@@ -1,7 +1,3 @@
 { config, pkgs, ... }: {
-  home.packages = with pkgs; [
-    vivaldi
-    vivaldi-ffmpeg-codecs
-    vivaldi-widevine
-  ];
+  home.packages = with pkgs; [ vivaldi vivaldi-ffmpeg-codecs vivaldi-widevine ];
 }

home/dev/extra.nix

@@ -1,3 +1 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [ jq ripgrep fd pv tmux socat ];
-}
+{ pkgs, ... }: { home.packages = with pkgs; [ jq ripgrep fd pv tmux socat ]; }

home/dev/info.nix

@@ -1,3 +1 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [ neofetch inxi htop ];
-}
+{ pkgs, ... }: { home.packages = with pkgs; [ neofetch inxi htop ]; }

home/dev/network.nix

@@ -8,5 +8,6 @@
     rsync
     openssh
     mosh
+    nmap
   ];
 }

hosts/lappy.nix

@@ -14,51 +14,52 @@
     profiles.gaming
   ];
 
-  config.home-manager.users.root = { imports = with tree; [ home.base ]; };
-
-  config.home-manager.users.chaoticryptidz = {
-    imports = with tree; [
-      home.base
-      home.bluetooth
-      home.gui
-      home.gaming
-      home.dev
-      home.network_manager
-      home.sway
-      home.reversing
-      home.apps.vivaldi
-      home.apps.telegram
-      home.programming
-      home.programming.languages.go
-      home.programming.languages.nix
-    ];
-  };
-
-  config.networking.hostName = "lappy";
-  config.time.timeZone = "Europe/London";
-  config.powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-
-  config.boot = {
-    loader = {
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
+  config = {
+    home-manager.users.root = { imports = with tree; [ home.base ]; };
+    home-manager.users.chaoticryptidz = {
+      imports = with tree; [
+        home.base
+        home.bluetooth
+        home.gui
+        home.gaming
+        home.dev
+        home.network_manager
+        home.sway
+        home.reversing
+        home.apps.vivaldi
+        home.apps.telegram
+        home.programming
+        home.programming.languages.go
+        home.programming.languages.nix
+      ];
     };
-    initrd.availableKernelModules =
-      [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
-    kernelModules = [ "kvm-intel" ];
-  };
 
-  config.fileSystems = {
-    "/" = {
-      device = "/dev/disk/by-uuid/491ec94c-5e6a-4d23-a2a6-bcf4971a6e7b";
-      fsType = "ext4";
-    };
-    "/boot" = {
-      device = "/dev/disk/by-uuid/61F3-FD84";
-      fsType = "vfat";
-    };
-  };
+    networking.hostName = "lappy";
+    time.timeZone = "Europe/London";
+    powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 
-  config.system.stateVersion = "21.11";
+    boot = {
+      loader = {
+        systemd-boot.enable = true;
+        efi.canTouchEfiVariables = true;
+      };
+      initrd.availableKernelModules =
+        [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+      kernelModules = [ "kvm-intel" ];
+    };
+
+    fileSystems = {
+      "/" = {
+        device = "/dev/disk/by-uuid/491ec94c-5e6a-4d23-a2a6-bcf4971a6e7b";
+        fsType = "ext4";
+      };
+      "/boot" = {
+        device = "/dev/disk/by-uuid/61F3-FD84";
+        fsType = "vfat";
+      };
+    };
+
+    system.stateVersion = "21.11";
+  };
 }
 

outputs.nix

@@ -1,4 +1,4 @@
-{ nixpkgs, home-manager, ... }@inputs:
+{ self, nixpkgs, home-manager, deploy-rs, ... }@inputs:
 let
   mkTree = import ./tree.nix { inherit (nixpkgs) lib; };
   tree = mkTree {
@@ -13,9 +13,15 @@ let
     };
   };
 in {
-  legacyPackages.tree = tree;
-  nixosConfigurations = import ./hosts {
-    nixosSystem = nixpkgs.lib.nixosSystem;
-    inherit nixpkgs home-manager tree;
+  #legacyPackages.tree = tree;
+  nixosConfigurations = import ./hosts { inherit nixpkgs home-manager tree; };
+
+  deploy.nodes.lappy = {
+    hostname = "my.server.gov";
+    profiles.system = {
+      user = "root";
+      path = deploy-rs.lib.x86_64-linux.activate.nixos
+        self.nixosConfigurations.lappy;
+    };
   };
 }

profiles/gaming/gaming.nix

@@ -1,3 +1 @@
-{ pkgs, ... }: {
-  programs.steam.enable = true;
-}
+{ pkgs, ... }: { programs.steam.enable = true; }

profiles/gui/default.nix

@@ -1,3 +1 @@
-{ config, pkgs, ... }: {
-  fonts.fonts = with pkgs; [ comic-neue comic-code ];
-}
+{ config, pkgs, ... }: { fonts.fonts = with pkgs; [ comic-neue comic-code ]; }

profiles/sway/sway.nix

@@ -1,7 +1,7 @@
 { config, pkgs, ... }: {
   programs.sway.enable = true;
   programs.xwayland.enable = true;
-  services.xserver.enable = true;
+  #services.xserver.enable = true;
   #systemd.services.display-manager.enable = true;
   #services.xserver.displayManager.sddm.enable = true;
 }

users/chaoticryptidz/chaoticryptidz.nix

@@ -3,5 +3,8 @@
     isNormalUser = true;
     extraGroups =
       [ "wheel" "video" "systemd-journal" "plugdev" "vfio" "input" "uinput" ];
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL4L1eBZzYXZNGBucTn/eOFp48el9JPiYt9iXQDpBSg/ chaoticryptidz@owo.monster"
+    ];
   };
 }