From 587a482b13ae3188f26e4617b8ed26c7bb204c2a Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Sun, 9 Jul 2023 00:51:45 +0200
Subject: [PATCH] fix kmonad key bindings

---
 nixos/components/gui/kmonad.nix        |  2 +-
 nixos/machines/cream/configuration.nix |  2 ++
 nixos/machines/cream/test.nix          | 17 +++++++++++++++++
 nixos/machines/robi/configuration.nix  |  2 +-
 nixos/machines/robi/screeps.nix        |  9 ++++-----
 5 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 nixos/machines/cream/test.nix

diff --git a/nixos/components/gui/kmonad.nix b/nixos/components/gui/kmonad.nix
index d334d0e..e055c4b 100644
--- a/nixos/components/gui/kmonad.nix
+++ b/nixos/components/gui/kmonad.nix
@@ -46,7 +46,7 @@
                 tab  q    w    e    r    t    y    u    i    o    p    [    ]    \
                 esc  a    s    d    f    g    h    j    k    l    ;    '    ret
                 lsft z    x    c    v    b    n    m    ,    .    /    rsft
-                lctl lalt lmet           spc            @sym rmet cmp  rctrl
+                lctl lmet lalt spc            @sym rmet cmp  rctrl
               )
 
               (deflayer symbols
diff --git a/nixos/machines/cream/configuration.nix b/nixos/machines/cream/configuration.nix
index c2e738e..7b0e737 100644
--- a/nixos/machines/cream/configuration.nix
+++ b/nixos/machines/cream/configuration.nix
@@ -22,6 +22,8 @@
 
     ./borg.nix
     ./trilium.nix
+
+    ./test.nix
   ];
 
   # stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-light-hard.yaml";
diff --git a/nixos/machines/cream/test.nix b/nixos/machines/cream/test.nix
new file mode 100644
index 0000000..5bbc090
--- /dev/null
+++ b/nixos/machines/cream/test.nix
@@ -0,0 +1,17 @@
+{
+
+
+  virtualisation.oci-containers = {
+    containers.nginx = {
+      image = "nginx";
+    };
+  };
+
+
+  systemd.services.podman-nginx = {
+    unitConfig = {
+      OnFailure = "echo oh noes!";
+      StartLimitBurst = 10;
+    };
+  };
+}
diff --git a/nixos/machines/robi/configuration.nix b/nixos/machines/robi/configuration.nix
index 7f1f421..e36c119 100644
--- a/nixos/machines/robi/configuration.nix
+++ b/nixos/machines/robi/configuration.nix
@@ -14,7 +14,7 @@
 
     ./hetzner.nix
 
-    # ./screeps.nix
+    #./screeps.nix
 
     ./borg.nix
     ./codimd.nix
diff --git a/nixos/machines/robi/screeps.nix b/nixos/machines/robi/screeps.nix
index 5f1c303..d597ae4 100644
--- a/nixos/machines/robi/screeps.nix
+++ b/nixos/machines/robi/screeps.nix
@@ -20,7 +20,7 @@ in
     };
   };
 
-  systemd.services =
+  systemd.services.docker-screeps =
     let
       configuration = builtins.toJSON {
         steamKey = "keyFromStep3";
@@ -41,11 +41,14 @@ in
           tickRate = 1000;
         };
       };
+    in
+    {
 
       unitConfig = {
         StartLimitInterval = 200;
         StartLimitBurst = 2;
       };
+
       serviceConfig = {
         Restart = mkForce (if debug then "no" else "always");
         RestartSec = 30;
@@ -59,10 +62,6 @@ in
           ''))
         ];
       };
-    in
-    {
-      podman-screeps = { inherit serviceConfig; };
-      docker-screeps = { inherit serviceConfig; };
     };
 
   #networking.firewall.allowedTCPPorts = [ 8123 ];