diff --git a/flake.nix b/flake.nix
index 5d7278f..b473b72 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,13 +2,17 @@
    description = "Generic System Flake file";
 
    inputs = {
-      nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
-      # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+      #nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
+      nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
       disko = {
          url = github:nix-community/disko;
          inputs.nixpkgs.follows = "nixpkgs";
       };
       nix-software-center.url = "github:snowfallorg/nix-software-center";
+      nixos-cosmic = {
+        url = "github:lilyinstarlight/nixos-cosmic";
+        inputs.nixpkgs.follows = "nixpkgs";
+      };
       home-manager = {
          url = "github:nix-community/home-manager";
          inputs.nixpkgs.follows = "nixpkgs";
@@ -16,7 +20,7 @@
       nixos-hardware.url = "github:NixOS/nixos-hardware/master";
    };
 
-   outputs = { self, nixpkgs, disko, home-manager, nixos-hardware, ... }@inputs: {
+   outputs = inputs@{ self, nixpkgs, disko, nixos-cosmic, home-manager, nixos-hardware, ... }: {
       nixosConfigurations = {
          "nixos" = nixpkgs.lib.nixosSystem {
             system = "x86_64-linux";
@@ -50,20 +54,29 @@
 
          "garrus" = nixpkgs.lib.nixosSystem {
             system = "x86_64-linux";
+            specialArgs = { inherit inputs; };
             modules = [
                # Add Disko for disk management
                disko.nixosModules.disko
                ./disko-config.nix
-               ./gnome.nix
+#               ./gnome.nix
                ./garrus.nix
                ./configuration.nix
-               ./hardware-configuration.nix
                home-manager.nixosModules.home-manager
                {
                   home-manager.useGlobalPkgs = true;
                   home-manager.useUserPackages = true;
                   home-manager.users.aaronh = import ./home.nix;
                }
+               nixos-hardware.nixosModules.system76
+               nixos-hardware.nixosModules.system76-galp5-1650
+               {
+                 nix.settings = {
+                   substituters = [ "https://cosmic.cachix.org/" ];
+                   trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
+                 };
+               }
+               nixos-cosmic.nixosModules.default
             ];
          };
 
@@ -98,7 +111,7 @@
                ./hardware-configuration.nix
             ];
          };
-
+         
       };
    };
-}
\ No newline at end of file
+}