diff --git a/system/flake.nix b/system/flake.nix index aa5caf9..f22b339 100644 --- a/system/flake.nix +++ b/system/flake.nix @@ -65,8 +65,7 @@ } ]; ###*** IMPORTANT: Please set your system's hostname here ***### - #hostName = builtins.abort "Please set the hostName variable in flake.nix"; - hostName = "myHost"; + hostName = builtins.abort "Please set the hostName variable in flake.nix"; in { nixosConfigurations."${hostName}" = nixpkgs.lib.nixosSystem { diff --git a/system/host/hardware-configuration.nix b/system/host/hardware-configuration.nix index b24c117..f2cd324 100644 --- a/system/host/hardware-configuration.nix +++ b/system/host/hardware-configuration.nix @@ -1,39 +1 @@ -#builtins.abort "Please run 'nixos-generate-config --show-hardware-config' and copy the output into hardware-configuration.nix" - -# Surface Laptop Go 1st gen -{ - config, - lib, - pkgs, - modulesPath, - hostName, - ... -}: -{ - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - - boot = { - initrd = { - availableKernelModules = [ ]; - kernelModules = [ ]; - }; - - kernelModules = [ ]; - extraModulePackages = [ ]; - }; - - fileSystems = { - "/" = { - device = "/dev/sda2"; - fsType = "btrfs"; - options = [ "subvol=@,compress=zstd,discard" ]; - }; - "/boot" = { - device = "/dev/sda1"; - fsType = "vfat"; - }; - }; - - networking.useDHCP = lib.mkDefault true; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} +builtins.abort "Please run 'nixos-generate-config --show-hardware-config' and copy the output into hardware-configuration.nix" diff --git a/system/modules/ui/desktops/budgie.nix b/system/modules/ui/desktops/budgie.nix index 99f103c..a3c3c03 100644 --- a/system/modules/ui/desktops/budgie.nix +++ b/system/modules/ui/desktops/budgie.nix @@ -21,7 +21,12 @@ in services.xserver = { enable = true; desktopManager.budgie.enable = true; - displayManager.lightdm.enable = lib.mkIf (!(config.services.xserver.displayManager.gdm.enable || config.services.xserver.displayManager.sddm.enable)) true; + displayManager.lightdm.enable = lib.mkIf ( + !( + config.services.xserver.displayManager.gdm.enable + || config.services.xserver.displayManager.sddm.enable + ) + ) true; }; }; } diff --git a/system/modules/ui/desktops/kde.nix b/system/modules/ui/desktops/kde.nix index eb64a04..d1bb84c 100644 --- a/system/modules/ui/desktops/kde.nix +++ b/system/modules/ui/desktops/kde.nix @@ -26,7 +26,12 @@ in xserver.displayManager = lib.mkIf cfg.useX11 { defaultSession = "plasmaX11"; - sddm.wayland.enable = lib.mkIf (!(config.services.xserver.displayManager.gdm.enable || config.services.xserver.displayManager.lightdm.enable)) true; + sddm.wayland.enable = lib.mkIf ( + !( + config.services.xserver.displayManager.gdm.enable + || config.services.xserver.displayManager.lightdm.enable + ) + ) true; }; };