swap to gtklock
This commit is contained in:
parent
c5c04a8aac
commit
502f41380b
8 changed files with 270 additions and 46 deletions
6
flake.lock
generated
6
flake.lock
generated
|
|
@ -935,10 +935,10 @@
|
|||
"niri-mobile": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1794856587,
|
||||
"narHash": "sha256-3QcIjmE7szOtZKpWXg36lcPZ/v8vFW3SkYrg59M9GT4=",
|
||||
"lastModified": 1794866348,
|
||||
"narHash": "sha256-xOlwRx2pt3b/XGu7C1HBF8OljMrRV1whr+PL5o+czlM=",
|
||||
"ref": "quad/mobile-testing",
|
||||
"rev": "9256350fa5b80e7420661e369a2bca91522a1690",
|
||||
"rev": "fb33c8f8fa9ed74ea5477d6f6caf258f5733aae4",
|
||||
"shallow": true,
|
||||
"type": "git",
|
||||
"url": "file:///home/quadradical/Documents/Code/niri"
|
||||
|
|
|
|||
|
|
@ -63,6 +63,8 @@ in
|
|||
"org.freedesktop.impl.portal.ScreenCast" = [ "fht-compositor" ];
|
||||
};
|
||||
|
||||
quad.session = lib.getExe' cfg.package "fht-compositor-session";
|
||||
|
||||
environment = {
|
||||
# Called by name (rather than by store path), so Super+Ctrl+R after a rebuild runs the new version
|
||||
systemPackages = [ session-programs ];
|
||||
|
|
|
|||
|
|
@ -4,49 +4,21 @@
|
|||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
lock = "pidof gtklock || ${lib.getExe config.programs.gtklock.package}";
|
||||
in
|
||||
{
|
||||
services.logind.settings.Login.HandlePowerKey = "suspend";
|
||||
|
||||
programs = {
|
||||
hyprlock.enable = true;
|
||||
programs.fht-compositor = {
|
||||
# We log in automatically, so lock straight away.
|
||||
settings.autostart = [ lock ];
|
||||
|
||||
fht-compositor.sessionPrograms.hypridle =
|
||||
"${lib.getExe pkgs.hypridle} --config ${pkgs.writeText "hypridle.conf" ''
|
||||
general {
|
||||
lock_cmd = pidof hyprlock || ${lib.getExe pkgs.hyprlock} --config ${
|
||||
let
|
||||
inherit (config.lib.stylix) colors;
|
||||
in
|
||||
pkgs.writeText "hyprlock.conf" ''
|
||||
background {
|
||||
path = screenshot
|
||||
blur_passes = 3
|
||||
}
|
||||
|
||||
label {
|
||||
text = $TIME
|
||||
font_size = 96
|
||||
position = 0, 200
|
||||
}
|
||||
|
||||
label {
|
||||
text = cmd[update:60000] date +"%A, %B %-d"
|
||||
font_size = 20
|
||||
position = 0, 110
|
||||
}
|
||||
|
||||
input-field {
|
||||
size = 300, 50
|
||||
outline_thickness = 0
|
||||
inner_color = rgb(${colors.base01})
|
||||
font_color = rgb(${colors.base05})
|
||||
check_color = rgb(${colors.base0D})
|
||||
fade_on_empty = false
|
||||
}
|
||||
''
|
||||
}
|
||||
before_sleep_cmd = loginctl lock-session
|
||||
}
|
||||
''}";
|
||||
sessionPrograms.hypridle = "${lib.getExe pkgs.hypridle} --config ${pkgs.writeText "hypridle.conf" ''
|
||||
general {
|
||||
lock_cmd = ${lock}
|
||||
before_sleep_cmd = loginctl lock-session
|
||||
}
|
||||
''}";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
80
modules/graphical/gnome.nix
Normal file
80
modules/graphical/gnome.nix
Normal file
|
|
@ -0,0 +1,80 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
services = {
|
||||
gnome = {
|
||||
core-os-services.enable = true;
|
||||
core-apps.enable = true;
|
||||
};
|
||||
|
||||
gvfs.enable = true;
|
||||
};
|
||||
|
||||
systemd.user.tmpfiles.users.quadradical.rules =
|
||||
let
|
||||
keyring = pkgs.writeText "login.keyring" ''
|
||||
[keyring]
|
||||
display-name=Login
|
||||
ctime=0
|
||||
mtime=0
|
||||
lock-on-idle=false
|
||||
lock-after=false
|
||||
'';
|
||||
in
|
||||
[
|
||||
"d %h/.local/share/keyrings 0700 - - -"
|
||||
"C %h/.local/share/keyrings/login.keyring 0600 - - - ${keyring}"
|
||||
"f %h/.local/share/keyrings/default 0600 - - - login"
|
||||
];
|
||||
|
||||
environment.sessionVariables.NAUTILUS_4_EXTENSION_DIR = lib.mkForce "${config.system.path}/lib/nautilus/extensions-4";
|
||||
|
||||
environment.gnome.excludePackages = with pkgs; [
|
||||
yelp
|
||||
orca
|
||||
totem
|
||||
xterm
|
||||
evince
|
||||
decibels
|
||||
epiphany
|
||||
gnome-logs
|
||||
gnome-tour
|
||||
gnome-music
|
||||
simple-scan
|
||||
gnome-console
|
||||
gnome-software
|
||||
gnome-user-docs
|
||||
gnome-characters
|
||||
gnome-font-viewer
|
||||
gnome-connections
|
||||
gnome-text-editor
|
||||
gnome-system-monitor
|
||||
];
|
||||
|
||||
users.users.quadradical.maid.gsettings.settings.org.gnome = {
|
||||
desktop = {
|
||||
interface = rec {
|
||||
color-scheme = "prefer-dark";
|
||||
|
||||
cursor-theme = "GoogleDot-Blue";
|
||||
cursor-size = 24;
|
||||
|
||||
icon-theme = "Papirus";
|
||||
toolkit-accessibility = false;
|
||||
|
||||
font-name = "sans 11";
|
||||
document-font-name = font-name;
|
||||
monospace-font-name = "monospace";
|
||||
};
|
||||
|
||||
lockdown = {
|
||||
disable-printing = true;
|
||||
disable-print-setup = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
175
modules/graphical/gtklock.nix
Normal file
175
modules/graphical/gtklock.nix
Normal file
|
|
@ -0,0 +1,175 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit (config.lib.stylix) colors;
|
||||
|
||||
background =
|
||||
pkgs.runCommand "lock-background.jpg" { nativeBuildInputs = [ pkgs.buildPackages.imagemagick ]; }
|
||||
''
|
||||
magick ${../../background.jpg} -resize 50% -blur 0x16 -modulate 80 $out
|
||||
'';
|
||||
|
||||
layout = pkgs.writeText "gtklock.ui" ''
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<interface>
|
||||
<object class="GtkBox" id="window-box">
|
||||
<property name="name">window-box</property>
|
||||
<property name="halign">center</property>
|
||||
<property name="valign">center</property>
|
||||
<property name="orientation">vertical</property>
|
||||
<child>
|
||||
<object class="GtkBox" id="info-box">
|
||||
<property name="name">info-box</property>
|
||||
<property name="orientation">vertical</property>
|
||||
<child>
|
||||
<object class="GtkBox" id="time-box">
|
||||
<property name="name">time-box</property>
|
||||
<property name="orientation">vertical</property>
|
||||
<child>
|
||||
<object class="GtkLabel" id="clock-label">
|
||||
<property name="name">clock-label</property>
|
||||
</object>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="date-label">
|
||||
<property name="name">date-label</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkRevealer" id="body-revealer">
|
||||
<property name="transition-type">none</property>
|
||||
<child>
|
||||
<object class="GtkGrid" id="body-grid">
|
||||
<property name="halign">center</property>
|
||||
<property name="row-spacing">8</property>
|
||||
<child>
|
||||
<object class="GtkLabel" id="input-label">
|
||||
<property name="no-show-all">1</property>
|
||||
</object>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkEntry" id="input-field">
|
||||
<property name="name">input-field</property>
|
||||
<property name="width-request">300</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="visibility">0</property>
|
||||
<property name="caps-lock-warning">0</property>
|
||||
<property name="input-purpose">password</property>
|
||||
<property name="placeholder-text">Input Password</property>
|
||||
<signal name="activate" handler="window_pw_check"/>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="top-attach">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkRevealer" id="message-revealer">
|
||||
<property name="transition-type">none</property>
|
||||
<property name="no-show-all">1</property>
|
||||
<child>
|
||||
<object class="GtkScrolledWindow" id="message-scrolled-window">
|
||||
<property name="hscrollbar-policy">never</property>
|
||||
<property name="max-content-height">256</property>
|
||||
<property name="propagate-natural-height">1</property>
|
||||
<child>
|
||||
<object class="GtkViewport">
|
||||
<child>
|
||||
<object class="GtkBox" id="message-box">
|
||||
<property name="orientation">vertical</property>
|
||||
<property name="homogeneous">1</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="top-attach">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkBox">
|
||||
<property name="halign">center</property>
|
||||
<property name="spacing">8</property>
|
||||
<child>
|
||||
<object class="GtkLabel" id="warning-label">
|
||||
<property name="name">warning-label</property>
|
||||
</object>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="error-label">
|
||||
<property name="name">error-label</property>
|
||||
</object>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkButton" id="unlock-button">
|
||||
<property name="no-show-all">1</property>
|
||||
<signal name="clicked" handler="window_pw_check"/>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="top-attach">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</interface>
|
||||
'';
|
||||
in
|
||||
{
|
||||
programs.gtklock = {
|
||||
enable = true;
|
||||
|
||||
config.main = {
|
||||
layout = "${layout}";
|
||||
time-format = "%H:%M";
|
||||
date-format = "%A, %B %-d";
|
||||
};
|
||||
|
||||
style = ''
|
||||
window {
|
||||
background-image: url("${background}");
|
||||
background-size: cover;
|
||||
background-position: center;
|
||||
}
|
||||
|
||||
#clock-label {
|
||||
font-size: 96pt;
|
||||
color: white;
|
||||
}
|
||||
|
||||
#date-label {
|
||||
font-size: 20pt;
|
||||
color: white;
|
||||
margin-bottom: 80px;
|
||||
}
|
||||
|
||||
#input-field {
|
||||
min-height: 50px;
|
||||
padding: 0 20px;
|
||||
border: none;
|
||||
border-radius: 25px;
|
||||
box-shadow: none;
|
||||
background: #${colors.base01};
|
||||
color: #${colors.base05};
|
||||
}
|
||||
|
||||
#error-label,
|
||||
#warning-label {
|
||||
color: #${colors.base08};
|
||||
}
|
||||
'';
|
||||
};
|
||||
}
|
||||
23
modules/graphical/login.nix
Normal file
23
modules/graphical/login.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ config, lib, ... }:
|
||||
{
|
||||
options.quad.session = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
description = "Command for the graphical session. greetd logs straight into it, and the session is expected to lock itself.";
|
||||
};
|
||||
|
||||
config.services.greetd = {
|
||||
enable = true;
|
||||
settings =
|
||||
let
|
||||
initial_session = {
|
||||
command = config.quad.session;
|
||||
user = "quadradical";
|
||||
};
|
||||
in
|
||||
{
|
||||
inherit initial_session;
|
||||
|
||||
default_session = initial_session;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
|
|
@ -54,6 +55,15 @@ let
|
|||
'';
|
||||
|
||||
swayosd-client = lib.getExe' pkgs.swayosd "swayosd-client";
|
||||
|
||||
# Stevia normally needs a phoc-only protocol to start.
|
||||
stevia = pkgs.stevia.overrideAttrs (old: {
|
||||
patches = (old.patches or [ ]) ++ [ ./stevia-optional-device-state.patch ];
|
||||
});
|
||||
|
||||
lock = pkgs.writeShellScript "lock" ''
|
||||
${lib.getExe' pkgs.procps "pidof"} gtklock || exec ${lib.getExe config.programs.gtklock.package}
|
||||
'';
|
||||
in
|
||||
{
|
||||
programs.niri = {
|
||||
|
|
@ -101,15 +111,20 @@ in
|
|||
|
||||
spawn-at-startup "${lib.getExe pkgs.swaybg}" "-i" "${../../background.jpg}" "-m" "fill"
|
||||
spawn-at-startup "${lib.getExe grid}"
|
||||
spawn-at-startup "${lib.getExe pkgs.stevia}"
|
||||
spawn-at-startup "${lib.getExe stevia}"
|
||||
spawn-at-startup "${lib.getExe' pkgs.swayosd "swayosd-server"}" "--style" "${swayosdStyle}"
|
||||
// We log in automatically, so lock straight away.
|
||||
spawn-at-startup "${lock}"
|
||||
|
||||
binds {
|
||||
XF86PowerOff { spawn "${lock}"; }
|
||||
XF86AudioRaiseVolume allow-when-locked=true { spawn "${swayosd-client}" "--output-volume" "raise"; }
|
||||
XF86AudioLowerVolume allow-when-locked=true { spawn "${swayosd-client}" "--output-volume" "lower"; }
|
||||
}
|
||||
'';
|
||||
|
||||
quad.session = lib.getExe' niri "niri-session";
|
||||
|
||||
services.logind.settings.Login = {
|
||||
HandlePowerKey = "ignore";
|
||||
HandlePowerKeyLongPress = "poweroff";
|
||||
|
|
|
|||
22
modules/mobile/stevia-optional-device-state.patch
Normal file
22
modules/mobile/stevia-optional-device-state.patch
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
--- a/src/pos-hw-tracker.c
|
||||
+++ b/src/pos-hw-tracker.c
|
||||
@@ -72,7 +72,9 @@
|
||||
gpointer device_state)
|
||||
{
|
||||
self->device_state = device_state;
|
||||
- zphoc_device_state_v1_add_listener (self->device_state, &device_state_listener, self);
|
||||
+ /* Only phoc has the device state protocol. Without it, assume there is no hardware keyboard. */
|
||||
+ if (self->device_state)
|
||||
+ zphoc_device_state_v1_add_listener (self->device_state, &device_state_listener, self);
|
||||
}
|
||||
|
||||
|
||||
--- a/src/pos-wayland.c
|
||||
+++ b/src/pos-wayland.c
|
||||
@@ -387,6 +387,5 @@
|
||||
self->zwlr_foreign_toplevel_manager_v1 &&
|
||||
self->layer_shell &&
|
||||
self->zxdg_output_manager_v1 &&
|
||||
- self->zphoc_device_state_v1 &&
|
||||
self->wlr_data_control_manager);
|
||||
}
|
||||
Loading…
Reference in a new issue