bad commit

3 files changed, 15 insertions, 18 deletions

diff --git a/mixins/greet.nix b/mixins/greet.nix
index fc1d151..fe2c825 100644
--- a/mixins/greet.nix
+++ b/mixins/greet.nix
@@ -7,12 +7,9 @@
   user = "tzlil";
 
   users.users.greeter.packages = [pkgs.sway];
-  greet = "${pkgs.greetd.wlgreet}/bin/wlgreet";
+  greet = "${pkgs.greetd.gtkgreet.out}/bin/gtkgreet";
 
-  sway-kiosk = command: "env WLR_RENDERER=pixman ${pkgs.sway}/bin/sway --unsupported-gpu --config ${pkgs.writeText "kiosk.config" ''
-    output * bg #000000 solid_color
-    exec "${command}; ${pkgs.sway}/bin/swaymsg exit"
-  ''}";
+  kiosk = command: "${pkgs.cage.out}/bin/cage -- ${command}";
 in {
   options.greeter.initialSession = lib.mkOption {
     type = lib.types.str;
@@ -29,12 +26,12 @@ in {
       settings = {
         default_session = {
           inherit user;
-          command = sway-kiosk "${greet} -l &>/dev/null";
-        };
-        initial_session = {
-          inherit user;
-          command = config.greeter.initialSession;
+          command = kiosk "${greet} -l &>/dev/null";
         };
+        # initial_session = {
+        #   inherit user;
+        #   command = config.greeter.initialSession;
+        # };
       };
     };
   };
diff --git a/mixins/sway.nix b/mixins/sway.nix
index 79c20d0..3345a4c 100644
--- a/mixins/sway.nix
+++ b/mixins/sway.nix
@@ -140,7 +140,7 @@ in {
             }
           ];
 
-          modifier = "Mod5";
+          modifier = "Mod4";
           left = "h";
           down = "n";
           up = "e";
diff --git a/mixins/tailscale.nix b/mixins/tailscale.nix
index 1398a1e..d66a5ec 100644
--- a/mixins/tailscale.nix
+++ b/mixins/tailscale.nix
@@ -12,12 +12,12 @@
 
     environment.persistence."/nix/persist".directories = ["/var/lib/tailscale"];
 
-    systemd.services.tailscaled = {
-      restartIfChanged = false;
-      serviceConfig.ExecStart = [
-        ""
-        "${config.services.tailscale.package}/bin/tailscaled --state=mem: --port $PORT $FLAGS"
-      ];
-    };
+    # systemd.services.tailscaled = {
+    #   restartIfChanged = false;
+    #   serviceConfig.ExecStart = [
+    #     ""
+    #     "${config.services.tailscale.package}/bin/tailscaled --state=mem: --port $PORT $FLAGS"
+    #   ];
+    # };
   };
 }