diff --git a/flake.nix b/flake.nix index 5e8899b..b61b990 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,6 @@ nixosConfigurations = { "nixos" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = { inherit inputs; }; modules = [ # Add Disko for disk management disko.nixosModules.disko @@ -37,7 +36,6 @@ "shepard" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = { inherit inputs; }; modules = [ # Add Disko for disk management disko.nixosModules.disko @@ -57,7 +55,6 @@ "edi" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = { inherit inputs; }; modules = [ # Add Disko for disk management disko.nixosModules.disko @@ -75,7 +72,7 @@ # Add Disko for disk management disko.nixosModules.disko ./disko-config.nix - ./gnome.nix +# ./gnome.nix ./configuration.nix home-manager.nixosModules.home-manager { @@ -94,21 +91,8 @@ ]; }; - "pixel-slate" = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { inherit inputs; }; - modules = [ - # Add Disko for disk management - disko.nixosModules.disko - ./disko-config.nix - ./pixel-slate.nix - ./configuration.nix - ]; - }; - "drack" = nixpkgs.lib.nixosSystem { system = "aarch64-linux"; - specialArgs = { inherit inputs; }; modules = [ # Add Disko for disk management disko.nixosModules.disko @@ -116,6 +100,7 @@ ./gnome.nix ./drack.nix ./configuration.nix + ./hardware-configuration.nix home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; diff --git a/hosts/x86_64/garrus/configuration.nix b/hosts/x86_64/garrus/configuration.nix index ca99ef6..6585d4f 100644 --- a/hosts/x86_64/garrus/configuration.nix +++ b/hosts/x86_64/garrus/configuration.nix @@ -18,4 +18,8 @@ stellarshot ]; + # COSMIC + services.desktopManager.cosmic.enable = true; + services.displayManager.cosmic-greeter.enable = true; + } diff --git a/hosts/x86_64/pixel-slate.nix b/hosts/x86_64/pixel-slate.nix deleted file mode 100644 index 568162b..0000000 --- a/hosts/x86_64/pixel-slate.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ config, pkgs, ... }: - -{ - # Name your host machine - networking.hostName = "pixel-slate"; - - # Enable Lomiri since this is a tablet - services.desktopManager.lomiri.enable = true; - services.displayManager.defaultSession = "lomiri"; -} \ No newline at end of file