some changes

home/base/zsh.nix

@@ -1,10 +1,35 @@
-{ ... }: {
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    exa
+    ripgrep
+  ];
+
   programs.zsh = {
     enable = true;
+    enableSyntaxHighlighting = true;
+    enableAutosuggestions = true;
     oh-my-zsh = {
       enable = true;
       theme = "afowler";
       plugins = [ ];
     };
+    shellAliases = {
+      nixdirfmt = "nixpkgs-fmt $(fd -e nix)";
+      exa = "exa --time-style long-iso";
+      ls = "exa -G";
+      la = "exa -Ga";
+      ll = "exa -l";
+      lla = "exa -lga";
+      sys = "systemctl";
+      sysu = "systemctl --user";
+      logu = "journalctl --user";
+      log = "journalctl";
+      dmesg = "dmesg -HP";
+      hg = "history 0 | rg";
+    };
+  };
+  programs.direnv = {
+    enable = true;
+    enableZshIntegration = true;
   };
 }

home/dev/extra.nix

@@ -1 +1,11 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ jq ripgrep fd pv tmux socat ]; }
+{ pkgs, inputs, ... }: {
+  home.packages = with pkgs; [
+    jq
+    ripgrep
+    fd
+    pv
+    tmux
+    socat
+    inputs.deploy-rs.defaultPackage.${pkgs.system}
+  ];
+}

hosts/default.nix

@@ -11,6 +11,6 @@ in {
   lappy = nixpkgs.lib.nixosSystem {
     specialArgs = defaultSpecialArgs;
     system = "x86_64-linux";
-    modules = defaultModules ++ [ ./lappy.nix ];
+    modules = defaultModules ++ [ ./lappy/lappy.nix ];
   };
 }

hosts/lappy.nix

@@ -1,69 +0,0 @@
-{ tree, config, pkgs, lib, ... }:
-
-{
-  imports = with tree; [
-    users.chaoticryptidz
-
-    profiles.gui
-    profiles.laptop
-    profiles.bluetooth
-    profiles.pulse
-    profiles.network_manager
-    profiles.sway
-    profiles.dnscrypt
-    profiles.gaming
-    # For sci-hub and whenever websites break
-    # profiles.tor
-  ];
-
-  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
-      ];
-    };
-
-    networking.hostName = "lappy";
-    time.timeZone = "Europe/London";
-    powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-
-    services.fstrim.enable = true;
-
-    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-label/nixos";
-        fsType = "ext4";
-      };
-      "/boot" = {
-        device = "/dev/disk/by-label/nixboot";
-        fsType = "vfat";
-      };
-    };
-
-    system.stateVersion = "21.11";
-  };
-}
-

hosts/lappy/lappy.nix

@@ -0,0 +1,68 @@
+{ tree, config, pkgs, lib, ... }:
+
+{
+  imports = with tree; [
+    users.chaoticryptidz
+    profiles.tailscale
+    profiles.gui
+    profiles.laptop
+    profiles.bluetooth
+    profiles.pulse
+    profiles.network_manager
+    profiles.sway
+    profiles.dnscrypt
+    profiles.gaming
+    # For sci-hub and whenever websites break
+    # profiles.tor
+    # profiles.sshd
+  ];
+
+  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
+    ];
+  };
+
+  networking.hostName = "lappy";
+  time.timeZone = "Europe/London";
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+
+  services.fstrim.enable = true;
+
+  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-label/nixos";
+      fsType = "ext4";
+    };
+    "/boot" = {
+      device = "/dev/disk/by-label/nixboot";
+      fsType = "vfat";
+    };
+  };
+
+  system.stateVersion = "21.11";
+}
+

outputs.nix

@@ -5,6 +5,7 @@ let
     inherit inputs;
     folder = ./.;
     config = {
+      "hosts/*/services".functor.enable = true;
       "profiles/*".functor.enable = true;
       "users/*".functor.enable = true;
       "home/*".functor.enable = true;
@@ -14,10 +15,10 @@ let
   };
 in {
   #legacyPackages.tree = tree;
-  nixosConfigurations = import ./hosts { inherit nixpkgs home-manager tree; };
+  nixosConfigurations = import ./hosts ({ inherit tree; } // inputs);
 
   deploy.nodes.lappy = {
-    hostname = "my.server.gov";
+    hostname = "localhost";
     profiles.system = {
       user = "root";
       path = deploy-rs.lib.x86_64-linux.activate.nixos

profiles/tailscale/tailscale.nix

@@ -0,0 +1,3 @@
+{...}: {
+    services.tailscale.enable = true;
+}

scripts/update.sh

@@ -10,8 +10,4 @@ sudo ${BASH_SOURCE[0]} $@
 exit
 fi
 
-FIRST_ARG="${1:-switch}"
-
-shift
-
 nix flake update