4 files changed, 80 insertions, 47 deletions
diff --git a/nix/hosts/caladan/aliases.nix b/nix/hosts/caladan/aliases.nix
index 58c224e..a48d403 100644
--- a/nix/hosts/caladan/aliases.nix
+++ b/nix/hosts/caladan/aliases.nix
@@ -24,8 +24,7 @@
   "........" = "cd ../../../../../../..";
 
   grep = "grep --color=auto";
-  nix-stray-roots = ''
-    nix-store --gc --print-roots | egrep -v "^(/nix/var|/run/w+-system|{memory)"'';
+  nix-stray-roots = ''nix-store --gc --print-roots | egrep -v "^(/nix/var|/run/w+-system|{memory)"'';
 
   holdmybeer = "sudo ";
 
@@ -44,7 +43,7 @@
   nmap_check_for_vulns = "nmap --script = vuln";
   nmap_full_udp = "sudo nmap -sS -sU -T4 -A -v -PE -PS22,25,80 -PA21,23,80,443,3389 ";
   nmap_traceroute = "sudo nmap -sP -PE -PS22,25,80 -PA21,23,80,3389 -PU -PO --traceroute ";
-  nmap_full_with_scripts = "sudo nmap -sS -sU -T4 -A -v -PE -PP -PS21,22,23,25,80,113,31339 -PA80,113,443,10042 -PO --script all " ;
+  nmap_full_with_scripts = "sudo nmap -sS -sU -T4 -A -v -PE -PP -PS21,22,23,25,80,113,31339 -PA80,113,443,10042 -PO --script all ";
   nmap_web_safe_osscan = "sudo nmap -p 80,443 -O -v --osscan-guess --fuzzy ";
   nmap_ping_scan = "nmap -n -sP";
 
diff --git a/nix/hosts/caladan/darwin-configuration.nix b/nix/hosts/caladan/darwin-configuration.nix
index 2461fd2..597ee1a 100644
--- a/nix/hosts/caladan/darwin-configuration.nix
+++ b/nix/hosts/caladan/darwin-configuration.nix
@@ -1,9 +1,7 @@
 { pkgs, lib, ... }:
 
 {
-  imports = [
-    ./overlay.nix
-  ];
+  imports = [ ./overlay.nix ];
 
   users.users.emile = {
     name = "emile";
@@ -31,15 +29,21 @@
   nix = {
     useDaemon = true;
     package = pkgs.nixFlakes;
-    extraOptions = ''
-  		builders-use-substitutes = true
-      auto-optimise-store = true
-    '' + lib.optionalString (pkgs.system == "aarch64-darwin") ''
-      extra-platforms = x86_64-darwin aarch64-darwin
-    '';
+    extraOptions =
+      ''
+        		builders-use-substitutes = true
+            auto-optimise-store = true
+      ''
+      + lib.optionalString (pkgs.system == "aarch64-darwin") ''
+        extra-platforms = x86_64-darwin aarch64-darwin
+      '';
 
     settings = {
-      trusted-users = [ "root" "hydra" "emile" ];
+      trusted-users = [
+        "root"
+        "hydra"
+        "emile"
+      ];
 
       trusted-public-keys = [
         "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
@@ -52,12 +56,15 @@
         "https://cache.garnix.io"
       ];
 
-      experimental-features = [ "nix-command" "flakes" ];
+      experimental-features = [
+        "nix-command"
+        "flakes"
+      ];
     };
 
     distributedBuilds = true;
 
-  	buildMachines = [
+    buildMachines = [
       {
         hostName = "corrino.emile.space";
         system = "x86_64-linux";
@@ -75,9 +82,14 @@
         # cat /etc/nix/machines
         # root@corrino  x86_64-linux      /home/nix/.ssh/id_ed25519        8 1     kvm,benchmark
 
-        supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
+        supportedFeatures = [
+          "nixos-test"
+          "benchmark"
+          "big-parallel"
+          "kvm"
+        ];
         mandatoryFeatures = [ ];
-    	}
+      }
     ];
   };
 
@@ -92,7 +104,10 @@
 
   environment = {
     systemPackages = [ ]; # set via home-manager
-    shells = with pkgs; [ bashInteractive zsh ];
+    shells = with pkgs; [
+      bashInteractive
+      zsh
+    ];
   };
 
 }
diff --git a/nix/hosts/caladan/home_emile.nix b/nix/hosts/caladan/home_emile.nix
index ee6c64b..c700da6 100644
--- a/nix/hosts/caladan/home_emile.nix
+++ b/nix/hosts/caladan/home_emile.nix
@@ -14,7 +14,7 @@
     # let home-manager install and manage itself
     home-manager.enable = true;
 
-    direnv = { 
+    direnv = {
       enable = true;
       nix-direnv.enable = true;
     };
@@ -33,7 +33,11 @@
       # enableAutosuggestions = true;
       oh-my-zsh = {
         enable = true;
-        plugins = [ "git" "web-search" "urltools" ];
+        plugins = [
+          "git"
+          "web-search"
+          "urltools"
+        ];
       };
 
       defaultKeymap = "viins";
@@ -59,11 +63,12 @@
     emacs = {
       enable = true;
       package = pkgs.emacs;
-      extraPackages = epkgs: with epkgs; [
-        nix-mode
-        magit
-        meow
-      ];
+      extraPackages =
+        epkgs: with epkgs; [
+          nix-mode
+          magit
+          meow
+        ];
       extraConfig = ''
         (setq standard-indent 2)
 
@@ -407,16 +412,30 @@
   };
 
   home.packages = with pkgs; [
-    coreutils mpv
+    coreutils
+    mpv
 
     # terminal foo
     # kitty
-    jq ripgrep fd eza lsd tree broot
-    du-dust mktemp htop rsync
-    p7zip imagemagick binwalk lftp
+    jq
+    ripgrep
+    fd
+    eza
+    lsd
+    tree
+    broot
+    du-dust
+    mktemp
+    htop
+    rsync
+    p7zip
+    imagemagick
+    binwalk
+    lftp
     graphviz
 
-    git tig 
+    git
+    tig
 
     # nix related tools
     deploy-rs
@@ -442,7 +461,8 @@
     yarr
 
     # go foo
-    go delve
+    go
+    delve
 
     # c foo
     cmake
@@ -458,7 +478,7 @@
 
     # qemu tooling
     qemu
-    sphinx #docs
+    sphinx # docs
     virt-manager
 
     # lisp foo
@@ -468,7 +488,8 @@
     clisp
 
     # infrastructure as code foo
-    terraform ansible
+    terraform
+    ansible
 
     portmidi
 
@@ -480,6 +501,6 @@
 
     # blender
 
-  # ] ++ lib.optionals stdenv.isDarwin [
+    # ] ++ lib.optionals stdenv.isDarwin [
   ];
 }
diff --git a/nix/hosts/caladan/home_hydra.nix b/nix/hosts/caladan/home_hydra.nix
index 1161d9a..4834b67 100644
--- a/nix/hosts/caladan/home_hydra.nix
+++ b/nix/hosts/caladan/home_hydra.nix
@@ -1,20 +1,18 @@
 { pkgs, ... }:
 
 {
- home = {
-  stateVersion = "22.11";
-  username = "hydra";
-  homeDirectory = "/Users/hydra";
- };
+  home = {
+    stateVersion = "22.11";
+    username = "hydra";
+    homeDirectory = "/Users/hydra";
+  };
 
- programs = {
-  # let home-manager install and manage itself
-  home-manager.enable = true;
- };
+  programs = {
+    # let home-manager install and manage itself
+    home-manager.enable = true;
+  };
 
- home.packages = with pkgs; [
-  tailscale
- ];
+  home.packages = with pkgs; [ tailscale ];
 
- services.openssh.enable = true;
+  services.openssh.enable = true;
 }