diff --git a/flake.nix b/flake.nix index 8d3b032..aae9bc6 100644 --- a/flake.nix +++ b/flake.nix @@ -22,11 +22,11 @@ mkNixos = import ./lib/nixos { inherit inputs self username; }; mkWsl = import ./lib/wsl2 { inherit inputs self username; }; - inherit (pkgs) just mkShell nixfmt; + inherit (pkgs) just mkShell; in { packages.${system}.default = mkShell { buildInputs = [ just ]; }; - formatter.${system} = nixfmt; + formatter.${system} = pkgs.nixfmt-classic; nixosConfigurations = { apollo = mkNixos { diff --git a/lib/nixos/modules/sway.nix b/lib/nixos/modules/sway.nix index 84e6bed..5cd69f9 100644 --- a/lib/nixos/modules/sway.nix +++ b/lib/nixos/modules/sway.nix @@ -1,11 +1,9 @@ { inputs, username, ... }: { pkgs, ... }: { services = { - xserver = { - displayManager = { - defaultSession = "sway"; - sddm.enable = true; - }; + displayManager = { + defaultSession = "sway"; + sddm.enable = true; }; };