Merge branch 'main' of https://gitea.xeovalyte.dev/xeovalyte/nix

flake.nix

@@ -11,11 +11,20 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+
     nix-colors.url = "github:misterio77/nix-colors";
-    apple-fonts.url = "github:lyndeno/apple-fonts.nix";
+
+    stylix.url = "github:danth/stylix";
+
+    nixpkgs.follows = "nixos-cosmic/nixpkgs-stable";
+
+    nixos-cosmic = {
+      url = "github:lilyinstarlight/nixos-cosmic";
+    };
   };
 
-  outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, home-manager, nix-colors, apple-fonts, ... }:
+  outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, home-manager, nix-colors, stylix, nixos-cosmic, ... }:
   let
     system = "x86_64-linux";
     overlay-unstable = final: prev: {
@@ -34,6 +43,9 @@
         modules = [
           ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
 
+          inputs.nixos-hardware.nixosModules.framework-13-7040-amd
+          nixos-cosmic.nixosModules.default
+
           ./hosts/laptop
         ];
       };
@@ -45,12 +57,40 @@
         extraSpecialArgs = { inherit inputs nix-colors; };
         modules = [
           ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
-        
+
           ./hosts/laptop/home.nix
         ];
       };
     };
 
+    # Surface Configuration
+    nixosConfigurations = {
+      xv-surface = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        specialArgs = { inherit inputs; };
+        modules = [
+          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
+
+          inputs.nixos-hardware.nixosModules.microsoft-surface-go
+          nixos-cosmic.nixosModules.default
+
+          ./hosts/surface
+        ];
+      };
+    };
+
+    homeConfigurations = {
+      "xeovalyte@xv-surface" = home-manager.lib.homeManagerConfiguration {
+        pkgs = nixpkgs.legacyPackages.x86_64-linux;
+        extraSpecialArgs = { inherit inputs nix-colors; };
+        modules = [
+          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
+        
+          ./hosts/surface/home.nix
+        ];
+      };
+    };
+
     nixosConfigurations = {
       xv-desktop = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";