Big omen laptop migration

flake.nix

@@ -18,14 +18,53 @@
       url = "github:nix-community/home-manager/release-25.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    unstable-home-manager = {
+      url = "github:nix-community/home-manager/master";
+      inputs.nixpkgs.follows = "unstable";
+    };
+
+
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+
+    ###
+    # Applications and other
+    ###
     copyparty.url = "github:9001/copyparty";
 
     vscode-server.url = "github:nix-community/nixos-vscode-server";
+
+    emacs-overlay.url = "github:nix-community/emacs-overlay/master";
+
+    stylix = {
+      url = "github:nix-community/stylix";
+      inputs.nixpkgs.follows = "unstable";
+    };
+
+    nix-ld = {
+      url = "github:Mic92/nix-ld";
+      inputs.nixpkgs.follows = "unstable";
+    };
+
+    hyprland = {
+      url = "git+https://github.com/hyprwm/Hyprland";
+      inputs.nixpkgs.follows = "unstable";
+    };
+
+    hyprland-plugins = {
+      url = "github:hyprwm/hyprland-plugins";
+      inputs.hyprland.follows = "hyprland";
+    };
+
+    split-monitor-workspaces = {
+      url = "github:Duckonaut/split-monitor-workspaces";
+      inputs.hyprland.follows = "hyprland";
+    };
+
+    zen-browser.url = "github:0xc000022070/zen-browser-flake";
   };
 
   outputs = {
@@ -43,9 +82,41 @@
       ./hm-modules
     ];
 
-    upkgs = import inputs.unstable { system = "x86_64-linux"; config.allowUnfree = true; };
+    upkgs = import inputs.unstable {
+      system = "x86_64-linux";
+      config.allowUnfree = true;
+    };
+    pkgs = import inputs.nixpkgs {
+      system = "x86_64-linux";
+      config.allowUnfree = true;
+    };
+
+    mkComputer = configurationNix: extraModules: username: inputs.nixpkgs.lib.nixosSystem {
+      specialArgs = { inherit inputs pkgs nixos-hardware extraHomeModules username; };
+
+      modules = [
+        disko.nixosModules.disko
+        home-manager.nixosModules.home-manager
+
+        configurationNix
+      ] ++ extraModules;
+    };
+
+    mkUnstableComputer = configurationNix: extraModules: username: inputs.unstable.lib.nixosSystem {
+      specialArgs = { inherit inputs upkgs nixos-hardware extraHomeModules username; };
+
+      modules = [
+        disko.nixosModules.disko
+        inputs.unstable-home-manager.nixosModules.home-manager
+
+        configurationNix
+      ] ++ extraModules;
+    };
   in {
     nixosConfigurations = {
+      ###
+      # Proxmox Homelab Machine
+      ###
       susano-minimal = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs outputs extraHomeModules; };
         modules = [
@@ -61,13 +132,19 @@
           disko.nixosModules.disko
           home-manager.nixosModules.home-manager
           sops-nix.nixosModules.sops
+
+          # Applications
           inputs.copyparty.nixosModules.default
+          inputs.vscode-server.nixosModules.default
 
           ./machines/susano
           ./modules
         ];
       };
 
+      ###
+      # Proxmox Remote Dev Machine
+      ###
       izanagi-minimal =
         let
           username = "izanagi";
@@ -97,6 +174,32 @@
             ./modules
           ];
         };
+
+      ###
+      # Omen Laptop
+      ###
+      fujin-minimal = mkUnstableComputer
+        ./machines/fujin/minimal
+        [
+          nixos-hardware.nixosModules.omen-15-en0002np
+        ] # Extra modules
+        "fujin";
+
+      fujin = mkUnstableComputer
+        ./machines/fujin/main
+        [
+          nixos-hardware.nixosModules.omen-15-en0002np
+          sops-nix.nixosModules.sops
+
+          # Applications
+          inputs.copyparty.nixosModules.default
+          inputs.vscode-server.nixosModules.default
+          inputs.stylix.nixosModules.stylix
+          inputs.nix-ld.nixosModules.nix-ld
+
+          ./modules
+        ] # Extra modules
+        "fujin";
     };
 
     packages.x86_64-linux = {