Switch back to sway

Flake lock file updates:

• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/e0bec9f768c938411adbc3861ae712cf38bf5a0a' (2023-03-23)
  → 'github:nix-community/emacs-overlay/f03b172233e1bf1fb2ffbc543b86aae00fbad444' (2023-03-24)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/a4bc66709604ab78abc575b60baa6d23ae027a59' (2023-03-19)
  → 'github:NixOS/nixos-hardware/648021dcb2b65498eed3ea3a7339cdfc3bea4d82' (2023-03-23)

flake.lock

@@ -71,11 +71,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1679540305,
+        "lastModified": 1679649158,
-        "narHash": "sha256-W+9askXWmuEl2eKPvMG61ZpuygAWW0Unw7bbpja2Rsw=",
+        "narHash": "sha256-RWsxTBWQwdoCihH0NOZjIFbv56Pe4whXt4zxSAfTlPo=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "e0bec9f768c938411adbc3861ae712cf38bf5a0a",
+        "rev": "f03b172233e1bf1fb2ffbc543b86aae00fbad444",
         "type": "github"
       },
       "original": {
@@ -229,11 +229,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1679224149,
+        "lastModified": 1679598117,
-        "narHash": "sha256-TSY37Zv0icF/aijR3/KWGLVBlnKKHlG9QTj7vHbF/UU=",
+        "narHash": "sha256-Vs1f/7imI77OkMOQhO3xgx4jalN2Gx3D3C2wmnlpWJM=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "a4bc66709604ab78abc575b60baa6d23ae027a59",
+        "rev": "648021dcb2b65498eed3ea3a7339cdfc3bea4d82",
         "type": "github"
       },
       "original": {

machines/nucturne/default.nix

@@ -5,11 +5,7 @@
   nixos-hardware,
   ...
 }: {
-  imports = [
+  imports = [../../common/users.nix ./hardware-configuration.nix ./software.nix];
-    ../../common/users.nix
-    ./hardware-configuration.nix
-    ./software.nix
-  ];
 
   elss = {
     # base system
@@ -25,6 +21,7 @@
       enable = true;
       sway.enable = true;
       i3.enable = false;
+      plasma.enable = false;
       # set dpi if used in mobile applications
       #      dpi = 180;
     };
@@ -36,13 +33,10 @@
     openvpn.enable = true;
 
     # nm-networks
-    networking.nmConnections = [
+    networking.nmConnections = [];
-    ];
 
     # enable sops
-    sops = {
+    sops = {enable = true;};
-      enable = true;
-    };
 
     # enable wireguard
     wireguard.enable = true;
@@ -53,22 +47,14 @@
       admins = ["ellmau"];
       users = [];
 
-      meta = {
+      meta = {ellmau.git = {signDefault = true;};};
-        ellmau.git = {
-          signDefault = true;
-        };
-      };
     };
   };
 
   boot = {
-    extraModulePackages = [
+    extraModulePackages = [config.boot.kernelPackages.v4l2loopback];
-      config.boot.kernelPackages.v4l2loopback
-    ];
 
-    kernelModules = [
+    kernelModules = ["v4l2loopback"];
-      "v4l2loopback"
-    ];
 
     plymouth.enable = true;
   };

modules/plasma.nix

@@ -0,0 +1,27 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+with lib; {
+  options.elss.graphical.plasma.enable = mkEnableOption "Use plasma";
+  config = let
+    cfg = config.elss.graphical.plasma;
+  in
+    mkIf cfg.enable {
+      services.xserver = {
+        enable = true;
+        displayManager = {
+          sddm.enable = true;
+          defaultSession = "plasmawayland";
+        };
+        desktopManager.plasma5.enable = true;
+      };
+
+      environment.systemPackages = with pkgs; [
+        firefox
+        thunderbird
+      ];
+    };
+}