From 1034e3fe251df2129fec4a20d747482a25937482 Mon Sep 17 00:00:00 2001 From: Stefan Ellmauthaler Date: Fri, 24 Mar 2023 16:34:12 +0100 Subject: [PATCH] Switch back to sway --- machines/nucturne/default.nix | 25 +++++++++++++++---------- modules/plasma.nix | 5 ++++- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/machines/nucturne/default.nix b/machines/nucturne/default.nix index a053fb4..5f59bd7 100644 --- a/machines/nucturne/default.nix +++ b/machines/nucturne/default.nix @@ -1,6 +1,11 @@ -{ config, pkgs, inputs, nixos-hardware, ... }: { - imports = - [ ../../common/users.nix ./hardware-configuration.nix ./software.nix ]; +{ + config, + pkgs, + inputs, + nixos-hardware, + ... +}: { + imports = [../../common/users.nix ./hardware-configuration.nix ./software.nix]; elss = { # base system @@ -28,10 +33,10 @@ openvpn.enable = true; # nm-networks - networking.nmConnections = [ ]; + networking.nmConnections = []; # enable sops - sops = { enable = true; }; + sops = {enable = true;}; # enable wireguard wireguard.enable = true; @@ -39,17 +44,17 @@ # user setup users = { enable = true; - admins = [ "ellmau" ]; - users = [ ]; + admins = ["ellmau"]; + users = []; - meta = { ellmau.git = { signDefault = true; }; }; + meta = {ellmau.git = {signDefault = true;};}; }; }; boot = { - extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ]; + extraModulePackages = [config.boot.kernelPackages.v4l2loopback]; - kernelModules = [ "v4l2loopback" ]; + kernelModules = ["v4l2loopback"]; plymouth.enable = true; }; diff --git a/modules/plasma.nix b/modules/plasma.nix index fa83c6d..9d6057c 100644 --- a/modules/plasma.nix +++ b/modules/plasma.nix @@ -12,7 +12,10 @@ with lib; { mkIf cfg.enable { services.xserver = { enable = true; - displayManager.sddm.enable = true; + displayManager = { + sddm.enable = true; + defaultSession = "plasmawayland"; + }; desktopManager.plasma5.enable = true; };