diff --git a/flake.nix b/flake.nix
index f928a8d..13c3ac7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,6 +4,10 @@
     stable.url = "github:NixOS/nixpkgs/nixos-24.11";
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     staging-next.url = "github:NixOS/nixpkgs/staging-next";
+    disko = {
+      url = "github:nix-community/disko";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     copilot-lsp-fix.url = "github:arunoruto/nixpkgs/copilot-language-server-fhs";
     home-manager = {
       url = "github:nix-community/home-manager/master";
@@ -56,25 +60,25 @@
     }@inputs:
     let
       user = "cswimr";
-      system = "x86_64-linux";
+      x86_system = "x86_64-linux";
       stablePkgs = import inputs.stable {
-        inherit system;
+        system = x86_system;
         config.allowUnfree = true;
       };
       copilot-lsp-fix = import inputs.copilot-lsp-fix {
-        inherit system;
+        system = x86_system;
         config.allowUnfree = true;
       };
     in
     {
       nixosConfigurations = {
         eclipse = nixpkgs.lib.nixosSystem {
-          system = system;
+          system = x86_system;
           specialArgs = {
             inherit inputs;
             inherit stablePkgs;
             inherit copilot-lsp-fix;
-            system = system;
+            system = x86_system;
             hostname = "eclipse";
             user = user;
           };
@@ -139,7 +143,7 @@
                 extraSpecialArgs = {
                   inherit inputs;
                   inherit stablePkgs;
-                  system = system;
+                  system = x86_system;
                   hostname = "eclipse";
                   user = user;
                 };
@@ -164,6 +168,64 @@
             }
           ];
         };
+        supernova = nixpkgs.lib.nixosSystem {
+          system = x86_system;
+          specialArgs = {
+            inherit inputs;
+            inherit stablePkgs;
+            inherit copilot-lsp-fix;
+            system = x86_system;
+            hostname = "supernova";
+            user = user;
+          };
+          modules = [
+            # imports
+            ./hosts/supernova
+            ./nixos/configuration.nix
+            ./nixos/development.nix
+            ./nixos/environment.nix
+            ./nixos/lazygit.nix
+            ./nixos/nvim
+            ./nixos/pkg.nix
+            ./nixos/shell.nix
+            ./nixos/sops.nix
+            ./nixos/sudo.nix
+            ./nixos/symlinks.nix
+            ./nixos/tailscale.nix
+
+            inputs.sops-nix.nixosModules.sops
+            inputs.nixvim.nixosModules.nixvim
+
+            inputs.nix-index-database.nixosModules.nix-index
+            { programs.nix-index-database.comma.enable = true; }
+
+            # Home Manager
+            home-manager.nixosModules.home-manager
+            {
+              home-manager = {
+                useUserPackages = true;
+                backupFileExtension = "bak";
+                extraSpecialArgs = {
+                  inherit inputs;
+                  inherit stablePkgs;
+                  system = x86_system;
+                  hostname = "supernova";
+                  user = user;
+                };
+                users.${user} = {
+                  imports = [
+                    ./home-manager/kitty.nix
+                    ./home-manager/nnn.nix
+                    ./home-manager/user.nix
+                    {
+                      #programs.git.extraConfig.user.signingkey = "0EC431A8DA8F8087";
+                    }
+                  ];
+                };
+              };
+            }
+          ];
+        };
       };
     };
 }