modules/user/sternenseemann/sway: fix startup by enabling opengl

sway needs opengl driver's to be enabled and loadable in order to start.
I previously didn't notice this oversight as I still had them loaded and
did not reboot after the rebuild.

4 files changed, 42 insertions, 14 deletions

diff --git a/modules/user/sternenseemann/services/sway.nix b/modules/user/sternenseemann/services/sway.nix
index 8a81c41c..e575e9d7 100644
--- a/modules/user/sternenseemann/services/sway.nix
+++ b/modules/user/sternenseemann/services/sway.nix
@@ -154,6 +154,8 @@ in {
 
     security.pam.services.swaylock = {};
 
+    hardware.opengl.enable = true;
+
     environment.etc = {
       "sway/config".text = ''
         # correct DPI after hotplugging
diff --git a/pkgs/profpatsch/default.nix b/pkgs/profpatsch/default.nix
index 0528471b..cf00f5e0 100644
--- a/pkgs/profpatsch/default.nix
+++ b/pkgs/profpatsch/default.nix
@@ -127,7 +127,9 @@ in rec {
   display-infos = callPackage ./display-infos { inherit sfttime; };
   git-commit-index = callPackage ./git-commit-index { inherit script; };
   nix-http-serve = callPackage ./nix-http-serve {};
-  nman = callPackage ./nman {};
+  nman = callPackage ./nman {
+    inherit writeRustSimpleBin;
+  };
   sfttime = callPackage ./sfttime {};
   show-qr-code = callPackage ./show-qr-code {};
   warpspeed = callPackage ./warpspeed {
@@ -164,6 +166,7 @@ in rec {
 
   inherit (import ./write-rust.nix { inherit pkgs runExeclineLocal getBins; })
     writeRustSimple
+    writeRustSimpleBin
     writeRustSimpleLib
     ;
 
diff --git a/pkgs/profpatsch/nman/default.nix b/pkgs/profpatsch/nman/default.nix
index 96699833..bb4b4544 100644
--- a/pkgs/profpatsch/nman/default.nix
+++ b/pkgs/profpatsch/nman/default.nix
@@ -1,14 +1,3 @@
-{ lib, runCommand, go }:
-
-runCommand "nman" {
-  meta = with lib; {
-    description = "Invoke manpage in temporary nix-shell";
-    license = licenses.gpl3;
-  };
-} ''
-    mkdir cache
-    env GOCACHE="$PWD/cache" \
-      ${lib.getBin go}/bin/go build -o nman ${./nman.go}
-    install -D nman $out/bin/nman
-''
+{ writeRustSimpleBin }:
 
+writeRustSimpleBin "nman" {} ./nman.rs
diff --git a/pkgs/profpatsch/nman/nman.rs b/pkgs/profpatsch/nman/nman.rs
new file mode 100644
index 00000000..16bd6271
--- /dev/null
+++ b/pkgs/profpatsch/nman/nman.rs
@@ -0,0 +1,34 @@
+#[derive(Debug)]
+enum DrvOutput<'a> {
+    Out,
+    Bin,
+    Lib,
+    Man,
+    Dev,
+    DevDoc,
+    DevMan,
+    Other(&'a [u8]),
+}
+
+#[derive(Debug)]
+struct DrvWithOutput<'a> {
+    drv_path: &'a [u8],
+    output: DrvOutput<'a>,
+}
+
+fn parse_drv_path<'a>(path: &'a [u8]) -> Option<DrvWithOutput<'a>> {
+    let mut split = path.split(|c| char::from(c.to_owned()) == '!');
+    split.next().map(|p| DrvWithOutput {
+        drv_path: p,
+        output: split.next().map(|s| DrvOutput::Other(s))
+                            .unwrap_or(DrvOutput::Out),
+    }).and_then(|parsed| match split.next() {
+        Some(_) => None,
+        None => Some(parsed),
+    })
+}
+
+fn main() -> std::io::Result<()> {
+    println!("{:?}", parse_drv_path(b"/nix/store/58i9psln992xjwk8ig1v3l3a4p9sslnp-lowdown-0.7.9.drv"));
+    Ok(())
+}