Compare commits
3 Commits
5eae08c7ba
...
1723ab53b8
| Author | SHA1 | Date | |
|---|---|---|---|
| 1723ab53b8 | |||
| d7c9951d6b | |||
| a911adf284 |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -5,4 +5,5 @@ documentation.md
|
||||
session.md
|
||||
build/*
|
||||
examples/*
|
||||
things_todo.md
|
||||
things_todo.md
|
||||
ly/*
|
||||
10
CHANGELOG.md
10
CHANGELOG.md
@@ -24,6 +24,14 @@ first public release
|
||||
|
||||
### Recent Fixes
|
||||
|
||||
- **DesktopNames parsing** — `.desktop` files now parse the `DesktopNames` field. the first semicolon-delimited entry becomes `XDG_SESSION_DESKTOP`, and the full list with `:` separators becomes `XDG_CURRENT_DESKTOP`. fixes GNOME/KDE sessions not getting proper environment variables
|
||||
- **utmpx accounting wired** — `AddUtmpx` and `Close` are now called from `spawnSession` so user logins appear in `who`/`w`/`last`
|
||||
- **fixed hardcoded shell** — `Credentials.Shell` now reads from `/etc/passwd` instead of always returning `/bin/sh`. removes duplicate `userShell` logic in exec.go
|
||||
- **automata background wired** — `Automata.Frame()` is now rendered in `View()` as the base layer with the login form card overlaid using ANSI cursor positioning. the form has a dark card background for readability
|
||||
- **clock widget** — added a datetime display (`Mon Jan 02 15:04:05`) to the top bar, updated every tick
|
||||
- **session specifier label** — the environment switcher now shows the session type (`x11`, `wayland`) above the session name, like ly's specifier
|
||||
- **form card background** — login content is rendered inside a padded card with a dark background so it reads cleanly over the animated automata
|
||||
|
||||
- **utmpx time field portability** — replaced hardcoded `C.__uint32_t` / `C.__int32_t` casts with a C helper function (`auth/utmpx_time.h`) that lets the compiler handle type conversion. fixes build failure on systems where `ut_tv` uses `struct timeval` instead of the 32/64 compat struct
|
||||
- **cgo pointer safety for pam** — replaced `unsafe.Pointer(&h)` (Go stack pointer passed to C) with `storeHandle`/`loadHandle` helpers that keep the `cgo.Handle` in C-heap memory. fixes `cgo argument has Go pointer to unpinned Go pointer` panic on Go 1.22+
|
||||
- **pam conversation callback** — fixed `unsafe.Slice` using `&r` (pointer-to-pointer) as the backing array instead of `r` (the calloc'd response array), which wrote password bytes into random stack memory. also now only responds to `PAM_PROMPT_ECHO_OFF`/`PAM_PROMPT_ECHO_ON` messages — info and error messages get nil. fixes `pam_unix: auth could not identify password`
|
||||
@@ -46,4 +54,4 @@ first public release
|
||||
- session leader is the latchd process, not the desktop — pam session tracking via systemd-logind may be imperfect
|
||||
- not all config options affect the rendering yet
|
||||
- occasional terminal state corruption on abrupt exit
|
||||
- automata background rendered as tick-only visual (not wired into the view yet)
|
||||
- automata background visible at screen edges; form card covers the center
|
||||
|
||||
17
README.md
17
README.md
@@ -65,9 +65,9 @@ pacman -S latchd
|
||||
systemctl enable latchd
|
||||
```
|
||||
|
||||
## command line
|
||||
## Command Line
|
||||
|
||||
```
|
||||
```bash
|
||||
latchd [options]
|
||||
|
||||
-c, --config <file> config path (default: /etc/latchd/config.toml)
|
||||
@@ -82,9 +82,9 @@ latchd [options]
|
||||
--initial-path <path> override initial PATH value
|
||||
```
|
||||
|
||||
## adding sessions
|
||||
## Adding Sessions
|
||||
|
||||
drop executable scripts into the right folder and they show up in the switcher.
|
||||
Drop executable scripts into the right folder and they show up in the switcher.
|
||||
|
||||
**x11** — put your xinitrc scripts in `/etc/latchd/wms/`:
|
||||
|
||||
@@ -113,7 +113,7 @@ tty sessions are added automatically if no other environments are found, or you
|
||||
|
||||
## configuring
|
||||
|
||||
the config lives at `/etc/latchd/config.toml`. all options are documented inline in the file. you can also use a `variables.toml` file with `$VAR` syntax:
|
||||
The config lives at `/etc/latchd/config.toml`. all options are documented inline in the file. you can also use a `variables.toml` file with `$VAR` syntax:
|
||||
|
||||
```toml
|
||||
# /etc/latchd/variables.toml
|
||||
@@ -127,7 +127,7 @@ title_color_focused = "$accent"
|
||||
border_color_focused = "$accent"
|
||||
```
|
||||
|
||||
## debugging
|
||||
## Debugging
|
||||
|
||||
three log files:
|
||||
|
||||
@@ -137,7 +137,7 @@ three log files:
|
||||
|
||||
run `latchd --show-config` to verify your configuration. run `latchd --preview` to test the login screen without leaving your current session.
|
||||
|
||||
## keybindings
|
||||
## Keybindings
|
||||
|
||||
standard shell-style bindings in text fields:
|
||||
|
||||
@@ -151,6 +151,7 @@ standard shell-style bindings in text fields:
|
||||
| ctrl+b/f | left/right |
|
||||
| ctrl+p/n | up/down (previous/next field) |
|
||||
| tab, shift+tab | next/prev field |
|
||||
| down / up | next/prev field |
|
||||
| left/right | previous/next session (switcher mode) |
|
||||
| , / . | previous/next session (any mode) |
|
||||
| f1, f2 | power controls |
|
||||
@@ -158,7 +159,7 @@ standard shell-style bindings in text fields:
|
||||
|
||||
## source layout
|
||||
|
||||
```
|
||||
```bash
|
||||
src/
|
||||
├── main.go entry point, cli, vt switching, session forking
|
||||
├── auth/
|
||||
|
||||
@@ -37,9 +37,11 @@ static struct pam_conv makePAMConv(void *data) {
|
||||
import "C"
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
ouser "os/user"
|
||||
"runtime"
|
||||
"runtime/cgo"
|
||||
"strings"
|
||||
"unsafe"
|
||||
)
|
||||
|
||||
@@ -169,7 +171,7 @@ func Validate(user, pass, service string) (*Credentials, error) {
|
||||
PrimaryGID: gid,
|
||||
AllGIDs: gids,
|
||||
HomeDir: u.HomeDir,
|
||||
Shell: "/bin/sh",
|
||||
Shell: shellFromPasswd(uid),
|
||||
pamHandle: pamh,
|
||||
pamData: cData,
|
||||
pamCB: h,
|
||||
@@ -211,3 +213,21 @@ func atou32(s string) uint32 {
|
||||
}
|
||||
return n
|
||||
}
|
||||
|
||||
func shellFromPasswd(uid uint32) string {
|
||||
data, err := os.ReadFile("/etc/passwd")
|
||||
if err != nil {
|
||||
return "/bin/sh"
|
||||
}
|
||||
uidStr := fmt.Sprint(uid)
|
||||
for _, line := range strings.Split(string(data), "\n") {
|
||||
parts := strings.Split(line, ":")
|
||||
if len(parts) >= 7 && parts[2] == uidStr && parts[6] != "" {
|
||||
sh := parts[6]
|
||||
if sh != "/sbin/nologin" && sh != "/usr/sbin/nologin" && sh != "/bin/false" {
|
||||
return sh
|
||||
}
|
||||
}
|
||||
}
|
||||
return "/bin/sh"
|
||||
}
|
||||
|
||||
@@ -438,6 +438,9 @@ var (
|
||||
infoCol = lipgloss.Color("3") // yellow
|
||||
greenCol = lipgloss.Color("2") // green
|
||||
|
||||
cardBg = lipgloss.Color("0") // black card background
|
||||
cardPad = 2
|
||||
|
||||
avatarStyle = lipgloss.NewStyle().Foreground(accent)
|
||||
|
||||
fieldBox = lipgloss.NewStyle().
|
||||
@@ -481,6 +484,14 @@ func (m *Model) View() string {
|
||||
content := m.renderLayout()
|
||||
|
||||
if m.width > 0 && m.height > 0 {
|
||||
if m.automata != nil {
|
||||
bg := m.automata.Frame()
|
||||
var sb strings.Builder
|
||||
sb.WriteString(bg)
|
||||
sb.WriteString("\x1b[H") // cursor home before overlaying
|
||||
sb.WriteString(overlayCenter(m.width, m.height, content))
|
||||
return sb.String()
|
||||
}
|
||||
return lipgloss.Place(m.width, m.height, lipgloss.Center, lipgloss.Center,
|
||||
content,
|
||||
)
|
||||
@@ -488,17 +499,49 @@ func (m *Model) View() string {
|
||||
return content
|
||||
}
|
||||
|
||||
func overlayCenter(w, h int, content string) string {
|
||||
lines := strings.Split(content, "\n")
|
||||
cw := 0
|
||||
for _, l := range lines {
|
||||
if lw := lipgloss.Width(l); lw > cw {
|
||||
cw = lw
|
||||
}
|
||||
}
|
||||
cx := (w - cw) / 2
|
||||
cy := (h - len(lines)) / 2
|
||||
if cx < 0 {
|
||||
cx = 0
|
||||
}
|
||||
if cy < 0 {
|
||||
cy = 0
|
||||
}
|
||||
|
||||
var sb strings.Builder
|
||||
for i, line := range lines {
|
||||
sb.WriteString(fmt.Sprintf("\x1b[%d;%dH", cy+i+1, cx+1))
|
||||
sb.WriteString(line)
|
||||
}
|
||||
return sb.String()
|
||||
}
|
||||
|
||||
func (m *Model) renderLayout() string {
|
||||
// top bar: power hints
|
||||
top := m.renderPowerHints()
|
||||
clock := m.renderClock()
|
||||
|
||||
// top bar: power hints on left, clock on right
|
||||
var topParts []string
|
||||
topParts = append(topParts, m.renderPowerHints())
|
||||
if clock != "" {
|
||||
topParts = append(topParts, clock)
|
||||
}
|
||||
top := strings.Join(topParts, " ")
|
||||
|
||||
// avatar + form side by side
|
||||
avatar := m.renderAvatar()
|
||||
form := m.renderForm()
|
||||
mid := lipgloss.JoinHorizontal(lipgloss.Top, avatar, " ", form)
|
||||
|
||||
// DE switcher below
|
||||
sw := m.renderSwitcherDots()
|
||||
// DE switcher with specifier label
|
||||
sw := m.renderSwitcher()
|
||||
|
||||
// caps lock
|
||||
caps := m.renderCapsLock()
|
||||
@@ -536,7 +579,10 @@ func (m *Model) renderLayout() string {
|
||||
joined = pad + joined
|
||||
}
|
||||
}
|
||||
return joined
|
||||
return lipgloss.NewStyle().
|
||||
Background(cardBg).
|
||||
Padding(cardPad, cardPad+2).
|
||||
Render(joined)
|
||||
}
|
||||
|
||||
func (m *Model) renderPowerHints() string {
|
||||
@@ -594,7 +640,12 @@ func (m *Model) renderForm() string {
|
||||
return lipgloss.JoinVertical(lipgloss.Left, userField, "", passField)
|
||||
}
|
||||
|
||||
func (m *Model) renderSwitcherDots() string {
|
||||
func (m *Model) renderClock() string {
|
||||
now := time.Now()
|
||||
return powerHint.Render(now.Format("Mon Jan 02 15:04:05"))
|
||||
}
|
||||
|
||||
func (m *Model) renderSwitcher() string {
|
||||
if len(m.envs) == 0 {
|
||||
return swNeighbour.Align(lipgloss.Center).Render("no desktop environments found")
|
||||
}
|
||||
@@ -604,6 +655,9 @@ func (m *Model) renderSwitcherDots() string {
|
||||
|
||||
var parts []string
|
||||
|
||||
// session specifier (like "x11", "wayland")
|
||||
spec := swDot.Render(m.envs[m.selIdx].Kind + " ")
|
||||
|
||||
if cfg.ShowMovers && m.selIdx > 0 {
|
||||
parts = append(parts, swMover.Render(cfg.LeftMover+" "))
|
||||
}
|
||||
@@ -636,7 +690,7 @@ func (m *Model) renderSwitcherDots() string {
|
||||
}
|
||||
dotLine := strings.Join(dots, " ")
|
||||
|
||||
return lipgloss.JoinVertical(lipgloss.Center, swLine, dotLine)
|
||||
return lipgloss.JoinVertical(lipgloss.Center, spec, swLine, dotLine)
|
||||
}
|
||||
|
||||
func (m *Model) renderCapsLock() string {
|
||||
|
||||
@@ -165,12 +165,16 @@ func spawnSession(res *login.Result) error {
|
||||
session.SetSeatVars(res.Config.TTY)
|
||||
session.SetSessionVars(creds.UID)
|
||||
session.SetXDGCommonPaths(creds.HomeDir)
|
||||
session.SetDesktopVars(res.Env.DesktopNames, res.Env.SessionDesktop)
|
||||
|
||||
sess, err := session.Spawn(&res.Env, creds.UID, creds.PrimaryGID, creds.AllGIDs, &res.Config)
|
||||
if err != nil {
|
||||
return fmt.Errorf("spawn: %w", err)
|
||||
}
|
||||
|
||||
utmpx := auth.AddUtmpx(creds.Username, res.Config.TTY, uint32(sess.PID()))
|
||||
defer utmpx.Close()
|
||||
|
||||
err = sess.Wait()
|
||||
if err != nil {
|
||||
log.Printf("session exited: %v", err)
|
||||
|
||||
@@ -57,6 +57,15 @@ func SetXDGCommonPaths(home string) {
|
||||
setOrOwn("XDG_CONFIG_DIRS", "/etc/xdg")
|
||||
}
|
||||
|
||||
func SetDesktopVars(currentDesktop, sessionDesktop string) {
|
||||
if currentDesktop != "" {
|
||||
setOrOwn("XDG_CURRENT_DESKTOP", currentDesktop)
|
||||
}
|
||||
if sessionDesktop != "" {
|
||||
setOrOwn("XDG_SESSION_DESKTOP", sessionDesktop)
|
||||
}
|
||||
}
|
||||
|
||||
func setOrOwn(k, v string) {
|
||||
if _, ok := os.LookupEnv(k); !ok {
|
||||
os.Setenv(k, v)
|
||||
|
||||
@@ -16,10 +16,12 @@ import (
|
||||
)
|
||||
|
||||
type PostLoginEnv struct {
|
||||
Kind string // "x11", "wayland", "tty"
|
||||
Title string
|
||||
XinitrcPath string
|
||||
ScriptPath string
|
||||
Kind string // "x11", "wayland", "tty"
|
||||
Title string
|
||||
XinitrcPath string
|
||||
ScriptPath string
|
||||
DesktopNames string // for XDG_CURRENT_DESKTOP (colon-separated)
|
||||
SessionDesktop string // for XDG_SESSION_DESKTOP
|
||||
}
|
||||
|
||||
type SpawnedEnv struct {
|
||||
|
||||
@@ -13,10 +13,11 @@ import (
|
||||
)
|
||||
|
||||
type DesktopEntry struct {
|
||||
Name string
|
||||
Exec string
|
||||
Hidden bool
|
||||
NoDisplay bool
|
||||
Name string
|
||||
Exec string
|
||||
DesktopNames string
|
||||
Hidden bool
|
||||
NoDisplay bool
|
||||
}
|
||||
|
||||
func parseDesktopEntry(path string) (*DesktopEntry, error) {
|
||||
@@ -51,6 +52,8 @@ func parseDesktopEntry(path string) (*DesktopEntry, error) {
|
||||
e.Name = v
|
||||
case "Exec":
|
||||
e.Exec = v
|
||||
case "DesktopNames":
|
||||
e.DesktopNames = v
|
||||
case "Hidden":
|
||||
e.Hidden = strings.EqualFold(v, "true")
|
||||
case "NoDisplay":
|
||||
@@ -97,15 +100,28 @@ func scanDesktopDir(dir, kind string, envs *[]PostLoginEnv) {
|
||||
if err != nil || de.Hidden || de.NoDisplay {
|
||||
continue
|
||||
}
|
||||
desktopNames, sessionDesktop := splitDesktopNames(de.DesktopNames, e.Name())
|
||||
*envs = append(*envs, PostLoginEnv{
|
||||
Kind: kind,
|
||||
Title: de.Name,
|
||||
XinitrcPath: de.Exec,
|
||||
ScriptPath: de.Exec,
|
||||
Kind: kind,
|
||||
Title: de.Name,
|
||||
XinitrcPath: de.Exec,
|
||||
ScriptPath: de.Exec,
|
||||
DesktopNames: desktopNames,
|
||||
SessionDesktop: sessionDesktop,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func splitDesktopNames(raw, fallback string) (currentDesktop, sessionDesktop string) {
|
||||
if raw == "" {
|
||||
return fallback, fallback
|
||||
}
|
||||
parts := strings.SplitN(raw, ";", 2)
|
||||
sessionDesktop = strings.TrimSpace(parts[0])
|
||||
currentDesktop = strings.ReplaceAll(raw, ";", ":")
|
||||
return
|
||||
}
|
||||
|
||||
func scanScriptDir(dir, kind string, envs *[]PostLoginEnv) {
|
||||
entries, err := os.ReadDir(dir)
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user