add xesite to flake

Signed-off-by: Xe <me@christine.website>

flake.lock

@@ -34,6 +34,33 @@
         "type": "github"
       }
     },
+    "deno2nix": {
+      "inputs": {
+        "devshell": "devshell",
+        "flake-compat": "flake-compat_3",
+        "flake-utils": [
+          "xesite",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "xesite",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1670562741,
+        "narHash": "sha256-13PVEXOYrbsGn05bIp/WWhG6lREgfcQtRTQU9Jd4g8w=",
+        "owner": "Xe",
+        "repo": "deno2nix",
+        "rev": "db3563f20f74eab34e2c268e2a159325df315085",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Xe",
+        "repo": "deno2nix",
+        "type": "github"
+      }
+    },
     "deploy-rs": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -54,6 +81,33 @@
         "type": "github"
       }
     },
+    "devshell": {
+      "inputs": {
+        "flake-utils": [
+          "xesite",
+          "deno2nix",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "xesite",
+          "deno2nix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1667210711,
+        "narHash": "sha256-IoErjXZAkzYWHEpQqwu/DeRNJGFdR7X2OGbkhMqMrpw=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "96a9dd12b8a447840cc246e17a47b81a4268bba7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "devshell",
+        "type": "github"
+      }
+    },
     "emacs-overlay": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -105,6 +159,38 @@
         "type": "github"
       }
     },
+    "flake-compat_3": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1668681692,
+        "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "009399224d5e398d03b22badca40a37ac85412a1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_4": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1668681692,
+        "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "009399224d5e398d03b22badca40a37ac85412a1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "locked": {
         "lastModified": 1667395993,
@@ -251,6 +337,27 @@
         "type": "github"
       }
     },
+    "naersk_4": {
+      "inputs": {
+        "nixpkgs": [
+          "xesite",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1662220400,
+        "narHash": "sha256-9o2OGQqu4xyLZP9K6kNe1pTHnyPz0Wr3raGYnr9AIgY=",
+        "owner": "nix-community",
+        "repo": "naersk",
+        "rev": "6944160c19cb591eb85bbf9b2f2768a935623ed3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "naersk",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1665732960,
@@ -267,21 +374,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-master": {
-      "locked": {
-        "lastModified": 1672335071,
-        "narHash": "sha256-MZ2/ioXmrooR08M7KmTBTakVxpbzNMfWg+pJFFTz5UE=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d4513957f671620cbc768cd2b823139f105921e3",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "master",
-        "type": "indirect"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1671417167,
@@ -497,13 +589,13 @@
         "home-manager": "home-manager",
         "mara": "mara",
         "nixpkgs": "nixpkgs_5",
-        "nixpkgs-master": "nixpkgs-master",
         "printerfacts": "printerfacts",
         "rhea": "rhea",
         "utils": "utils_4",
         "waifud": "waifud",
         "wsl": "wsl",
-        "x": "x"
+        "x": "x",
+        "xesite": "xesite"
       }
     },
     "rust-overlay": {
@@ -667,6 +759,32 @@
         "type": "github"
       }
     },
+    "xesite": {
+      "inputs": {
+        "deno2nix": "deno2nix",
+        "flake-compat": "flake-compat_4",
+        "flake-utils": [
+          "utils"
+        ],
+        "naersk": "naersk_4",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1672248415,
+        "narHash": "sha256-PgnN3FoOKly8o5orMych0AS6f5AIs+JZ/rmsF2FHrsM=",
+        "owner": "Xe",
+        "repo": "site",
+        "rev": "7b1e0e83b06abb8908ca7800525ec098ea85f1df",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Xe",
+        "repo": "site",
+        "type": "github"
+      }
+    },
     "xess": {
       "inputs": {
         "nixpkgs": "nixpkgs_8",

flake.nix

@@ -9,8 +9,6 @@
     utils.url = "github:numtide/flake-utils";
     emacs-overlay.url = "github:nix-community/emacs-overlay";
 
-    nixpkgs-master.url = "nixpkgs/master";
-
     wsl = {
       url = "github:nix-community/NixOS-WSL";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -42,13 +40,17 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.utils.follows = "utils";
     };
+    xesite = {
+      url = "github:Xe/site";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "utils";
+    };
   };
 
   outputs = { self, nixpkgs, deploy-rs, home-manager, agenix, printerfacts, mara
-    , rhea, waifud, emacs-overlay, wsl, x, nixpkgs-master, ... }:
+    , rhea, waifud, emacs-overlay, wsl, x, xesite, ... }:
     let
       pkgs = nixpkgs.legacyPackages."x86_64-linux";
-      pkgsMaster = nixpkgs-master.legacyPackages."x86_64-linux";
 
       mkSystem = extraModules:
         nixpkgs.lib.nixosSystem rec {
@@ -73,7 +75,8 @@
             printerfacts.nixosModules.${system}.printerfacts
             mara.nixosModules.${system}.bot
             rhea.nixosModule.${system}
-            x.nixosModules.${system}.robocadey
+            x.nixosModules.default
+            xesite.nixosModules.default
 
           ] ++ extraModules;
         };
@@ -82,11 +85,11 @@
         buildInputs = [
           deploy-rs.packages.x86_64-linux.deploy-rs
           agenix.packages.x86_64-linux.agenix
-          pkgsMaster.vim
         ];
       };
 
       nixosModules = {
+        microcode = import ./common/microcode.nix;
         home-manager = import ./common/home-manager;
         workVM = ({ pkgs, config, ... }: {
           home-manager.useGlobalPkgs = true;
@@ -327,10 +330,6 @@
         ];
 
         firgu = mkSystem [ ./hosts/firgu ./hardware/location/YYZ ];
-
-        # vms
-        ## logos
-        hugo = mkSystem [ ./hosts/vm/hugo ./hardware/libvirt-generic ];
       };
 
       deploy.nodes.akko = {

hosts/vm/hugo/default.nix

@@ -1,3 +0,0 @@
-{ ... }: {
-  networking.hostName = "hugo";
-}