diff --git a/flake.nix b/flake.nix index 8d7f518..22a2cde 100644 --- a/flake.nix +++ b/flake.nix @@ -16,8 +16,6 @@ outputs = { self, nixpkgs, nixpkgs-master, nixos-hardware, home-manager, website, ... }: { nixosModules = { - minecraft = ./modules/minecraft.nix; - declarativeHome = { ... }: { imports = [ home-manager.nixosModules.home-manager ]; config = { @@ -33,8 +31,6 @@ }; environment.stub-ld.enable = false; # 24.05 }; - # theres probably a better way to do this lol - overlays = ./overlays; }; nixosConfigurations = { "foxbox" = nixpkgs.lib.nixosSystem rec { @@ -43,7 +39,7 @@ pkgs-master = nixpkgs-master.legacyPackages.${system}; }; modules = with self.nixosModules; [ - overlays defaults + defaults ./machines/foxbox nixos-hardware.nixosModules.lenovo-thinkpad-e14-intel declarativeHome ./users/chfour @@ -55,7 +51,7 @@ website = website.packages.${system}; }; modules = with self.nixosModules; [ - overlays defaults + defaults ./machines/fovps declarativeHome ./users/chfour minecraft diff --git a/machines/foxbox/default.nix b/machines/foxbox/default.nix index b3068fb..68e287a 100644 --- a/machines/foxbox/default.nix +++ b/machines/foxbox/default.nix @@ -96,7 +96,7 @@ services.avahi.nssmdns4 = true; #sound.enable = true; # apparently gone - hardware.pulseaudio.enable = false; + services.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { enable = true; diff --git a/overlays/default.nix b/oldstuff/overlays.nix similarity index 100% rename from overlays/default.nix rename to oldstuff/overlays.nix