Fixup displaymanger format

Flake lock file updates:

• Updated input 'me-emacs':
    'git+https://git.syzygial.cc/Syzygial/EmacsConfig.git?ref=refs/heads/master&rev=d3452d3f0a30162a8acdf11f452ac0ef3a3f5670' (2024-01-29)
  → 'git+https://git.syzygial.cc/Syzygial/EmacsConfig.git?ref=refs/heads/master&rev=116b93e52a97d4922f086b004fa9e8043ba8931c' (2024-05-04)

flake.lock

@@ -88,11 +88,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1706555256,
+        "lastModified": 1714853356,
-        "narHash": "sha256-nBLS68TsIbwd04oQRISqk/xaehZYWzGNDmdBOWpKWXw=",
+        "narHash": "sha256-2I7uFSeTAF0b8MU+Apb2JoczlAYmEAxj+ke/eWe1boA=",
         "ref": "refs/heads/master",
-        "rev": "d3452d3f0a30162a8acdf11f452ac0ef3a3f5670",
+        "rev": "a25078b1c1afd3fd887042ac8187bd9b300a6e83",
-        "revCount": 46,
+        "revCount": 51,
         "type": "git",
         "url": "https://git.syzygial.cc/Syzygial/EmacsConfig.git"
       },

flake.nix

@@ -11,58 +11,43 @@
   };
   
   outputs = { self, nixpkgs, sops-nix, me-emacs, nix-darwin, home-manager }@attrs: let
-    hydraGitea = (final: prev: {
+    hydraGitea = import ./overlays/hydra.nix;
-      hydra_unstable = prev.hydra_unstable.overrideAttrs
+    nvidiaContainer = import ./overlays/nvidiacontainer.nix nixpkgs;
-        (old: {
+    me-emacs-overlay = me-emacs.overlays.default;
-          doCheck = false;
-          patches = [
-            (final.fetchpatch {
-              name = "hydra-gitea-push-patch";
-              url = "https://patch-diff.githubusercontent.com/raw/NixOS/hydra/pull/1227.patch";
-              sha256 = "A4dN/4zLMKLYaD38lu87lzAWH/3EUM7G5njx7Q4W47w=";
-            })
-          ];
-        });
-    });
-    nvidiaContainer = import ./nvidiacontainer-overlay.nix nixpkgs;
 
     # Configuration for `nixpkgs`
     nixpkgsConfig = {
       config = { allowUnfree = true; };
     };
-    me-emacs-overlay = (final: prev: {
-      me-emacs = me-emacs.packages."x86_64-linux".emacs;
-      # Will in future be macports based
-      mac-emacs = me-emacs.packages."aarch64-darwin".emacs;
-    });
 
     pkgs_linux-x86_64 = nixpkgs.legacyPackages."x86-linux";
     pkgs_linux-aarch64 = nixpkgs.legacyPackages."aarch64-linux";
-
   in {
-    nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
+    nixosConfigurations = {
-      system = "x86_64-linux";
+      nixos = nixpkgs.lib.nixosSystem {
-      specialArgs = attrs;
+        system = "x86_64-linux";
-      modules =
+        specialArgs = attrs;
-        [
+        modules =
-          ({ config, pkgs, ... }: {
+          [
-            nixpkgs.overlays = [ hydraGitea nvidiaContainer ];
+            ({ config, pkgs, ... }: {
-          })
+              nixpkgs.overlays = [ hydraGitea nvidiaContainer ];
-          ./machines/hippocampus/configuration.nix
+            })
-          sops-nix.nixosModules.sops
+            ./machines/hippocampus/configuration.nix
-        ];
+            sops-nix.nixosModules.sops
-    };    
+          ];
-    nixosConfigurations.universedesktop = nixpkgs.lib.nixosSystem {
+      };
-      system = "x86_64-linux";
+      universedesktop = nixpkgs.lib.nixosSystem {
-      specialArgs = attrs;
+        system = "x86_64-linux";
-      modules =
+        specialArgs = attrs;
-        [
+        modules =
-          ({ config, pkgs, ... }: {
+          [
-            nixpkgs.overlays = [ me-emacs-overlay ];
+            ({ config, pkgs, ... }: {
-          })
+              nixpkgs.overlays = [ me-emacs-overlay ];
-          ./machines/universedesktop/configuration.nix
+            })
-          sops-nix.nixosModules.sops
+            ./machines/universedesktop/configuration.nix
-        ];
+            sops-nix.nixosModules.sops
+          ];
+      };
     };
     darwinConfigurations."UniverseAir" = nix-darwin.lib.darwinSystem {
       system = "aarch64-darwin";

machines/universeair/configuration.nix

@@ -52,11 +52,12 @@ in
     services.emacs = {
       # Emacsclient behaving weirdly
       # enable = true;
-      package = pkgs.mac-emacs;
+      package = pkgs.me-emacs;
     };
 
     environment.variables = {
-      EDITOR = "emacs";
+      EDITOR = "emacs -nw";
+      VISUAL = "emacs";
     };
 
     environment.systemPackages = (with pkgs; [

machines/universedesktop/configuration.nix

@@ -82,71 +82,6 @@
 
     users.users.brltty.isSystemUser = true;
     
-    # Enable the X11 windowing system.
-    services.xserver.enable = true;
-
-    # Enable the GNOME Desktop Environment.
-    services.xserver.displayManager.sddm.enable = true;
-    services.xserver.desktopManager.plasma5.enable = true;
-    programs.xwayland.enable = true;
-
-    # Configure keymap in X11
-    services.xserver.layout = "us";
-    # services.xserver.xkbOptions = "grp:switch";
-    # services.xserver.extraLayouts = {
-    #   bqn = {
-    #     description = "BQN Symbol Modifiers";
-    #     languages = ["eng"];
-    #     symbolsFile = pkgs.fetchurl {
-    #       url = "https://raw.githubusercontent.com/mlochbaum/BQN/master/editors/bqn";
-    #       sha256 = "F2fgLlWghcOrMu0BXGiyNHa0qh9YUyQE80GK0BWU2EY=";
-    #     };
-    #   };
-    # };
-    # # services.xserver.xkbOptions = {
-    # };
-
-    # Enable CUPS to print documents.
-    services.printing.enable = true;
-
-    # Enable sound.
-    #sound.enable = true;
-    #hardware.pulseaudio.enable = true;
-    # rtkit is optional but recommended
-    security.rtkit.enable = true;
-    services.pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-      # If you want to use JACK applications, uncomment this
-      # jack.enable = true;
-    };
-#    services.pipewire.extraConfig.pipewire."92-low-latency" = {
-#      context.properties = {
-#        default.clock.rate = 48000;
-#        default.clock.quantum = 32;
-#        default.clock.min-quantum = 32;
-#        default.clock.max-quantum = 32;
-#      };
-#      context.modules = [
-#        {
-#          name = "libpipewire-module-protocol-pulse";
-#          args = {
-#            pulse.min.req = "32/48000";
-#            pulse.default.req = "32/48000";
-#            pulse.max.req = "32/48000";
-#            pulse.min.quantum = "32/48000";
-#            pulse.max.quantum = "32/48000";
-#          };
-#        }
-#      ];
-#      stream.properties = {
-#        node.latency = "32/48000";
-#        resample.quality = 1;
-#      };
-#    };
-    
     # Enable touchpad support (enabled default in most desktopManager).
     # services.xserver.libinput.enable = true;
     users.groups.net = {};
@@ -172,20 +107,7 @@
     
     nixpkgs.config.allowUnfree = true;
     services.xserver.videoDrivers = [ "nvidia" ];
-    
+        
-    # Wayland support
-    hardware = {
-      opengl.enable = true;
-      opengl.driSupport = true;
-      opengl.driSupport32Bit = true;
-
-      nvidia = {
-        modesetting.enable = true;
-        powerManagement.enable = true;
-        open = false;
-      };
-    };
-    
     services.fwupd.enable = true;
         
     programs.adb.enable = true;

machines/universedesktop/programs/desktop.nix

@@ -9,6 +9,36 @@
     };
   })];
 
+  # Wayland support
+  hardware = {
+    opengl.enable = true;
+    opengl.driSupport = true;
+    opengl.driSupport32Bit = true;
+
+    nvidia = {
+      modesetting.enable = true;
+      powerManagement.enable = true;
+      open = false;
+    };
+  };
+  services.xserver.enable = true;
+  services.displayManager.sddm.enable = true;
+  services.xserver.desktopManager.plasma5.enable = true;
+  programs.xwayland.enable = true;
+  # Configure keymap in X11
+  services.xserver.xkb.layout = "us";
+  # Enable sound.
+  # rtkit is optional but recommended
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    # If you want to use JACK applications, uncomment this
+    # jack.enable = true;
+  };
+
   # Bitwarden Outdaed Nodejs
   nixpkgs.config.permittedInsecurePackages = [
     "openssl-1.1.1v"

overlays/hydra.nix

@@ -0,0 +1,13 @@
+(final: prev: {
+  hydra_unstable = prev.hydra_unstable.overrideAttrs
+    (old: {
+      doCheck = false;
+      patches = [
+        (final.fetchpatch {
+          name = "hydra-gitea-push-patch";
+          url = "https://patch-diff.githubusercontent.com/raw/NixOS/hydra/pull/1227.patch";
+          sha256 = "A4dN/4zLMKLYaD38lu87lzAWH/3EUM7G5njx7Q4W47w=";
+        })
+      ];
+    });
+});