From 108748696603d119b0627734f3752f71299ec799 Mon Sep 17 00:00:00 2001
From: Sense T <me@sense-t.eu.org>
Date: Wed, 28 Jun 2023 09:30:10 +0800
Subject: [PATCH] podman autostart

---
 .gitignore                        |  2 ++
 README.md                         |  4 ++--
 global/software-configuration.nix | 28 ++++++++++++++++++++++++++++
 home/user/home.nix                |  6 ++----
 4 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index a806510..281bbb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
 result
 result-*
 
+.DS_Store
+passwords/*
\ No newline at end of file
diff --git a/README.md b/README.md
index 1a5cd59..0336974 100644
--- a/README.md
+++ b/README.md
@@ -12,10 +12,10 @@ nixos-rebuild switch --flake 'git+https://git.sense-t.eu.org/NixOS/gpd-configura
 
 - [x] 无状态 `/` 分区
 - [ ] wsproxy on podman
-- [ ] waybar 微调
+- [x] waybar 微调
   - [x] 使用 pipewire
   - [x] 电源选项
 - [x] hyprland 微调
 - [x] nwg-launchers 微调+配置
 - [x] [HMCL](https://gitlab.com/accessable-net/hmcl-flatpak)
-- [ ] tailscale
+- [x] tailscale
diff --git a/global/software-configuration.nix b/global/software-configuration.nix
index 566d4ea..8346da4 100644
--- a/global/software-configuration.nix
+++ b/global/software-configuration.nix
@@ -63,4 +63,32 @@
         zsh.enable = true;
         light.enable = true;
     };
+
+    virtualisation = {
+        podman.enable = true;
+        oci-containers.backend = "podman";
+        oci-containers.containers = {
+            wsproxy = {
+                login.username = "senseab";
+                login.registry = "ghcr.io";
+                login.passwordFile = "/var/lib/secrets/podman/wsproxy";  # should create it manually.
+                image = "ghcr.io/senseab/wsproxy:master";
+                autoStart = true;
+
+                environment = {
+                    CONFIG_NO_TLS_VERIFY = "true";
+                    CONFIG_ADDR = "wss://dev.wetofu.me/path";
+                    WSPROXY_MODE = "client";
+                };
+
+                ports = [
+                    "1089:1089";
+                ];
+
+                extraOptions = [
+                    "--restart=always"
+                ];
+            };
+        };
+    };
 }
\ No newline at end of file
diff --git a/home/user/home.nix b/home/user/home.nix
index f550d27..271bc3d 100644
--- a/home/user/home.nix
+++ b/home/user/home.nix
@@ -10,8 +10,6 @@
             thefuck
             ranger
             icdiff
-            podman
-            jdk17
             #rofi
             #rofi-rbw
             nwg-launchers
@@ -25,8 +23,8 @@
         sessionVariables = {
             #GTK_IM_MODULE = "fcitx";
             #QT_IM_MODULE = "fcitx";
-            SDL_VIDEODRIVER = "wayland";
-            SDL_IM_MODULE = "fcitx";
+            #SDL_VIDEODRIVER = "wayland";
+            #SDL_IM_MODULE = "fcitx";
         };
 
         shellAliases = {