Compare commits
9
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
70d4cdf5fa
|
||
|
|
d04371d0ab
|
||
|
|
88f8cde7f0
|
||
|
|
6774645704
|
||
|
|
2ec34dbf34
|
||
|
|
51554e4019
|
||
|
|
9ce9fefaa7
|
||
|
|
422bf29318
|
||
|
|
919930f6b1
|
No files matched your search
@@ -0,0 +1,4 @@
|
||||
{ ... }:
|
||||
{
|
||||
lucid.liveDecoder = "cuda";
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
{ config, ... }:
|
||||
{
|
||||
lucid.prefsSeed = ./lucid-prefs-impreza.json;
|
||||
lucid.widgetSeed = ./lucid-widgets-impreza.json;
|
||||
lucid.initialFiles = {
|
||||
"${config.home.homeDirectory}/.config/hypr/lucid-settings.lua" = ./lucid-settings-impreza.lua;
|
||||
"${config.home.homeDirectory}/.config/hypr/lucid-glass.lua" = ./lucid-glass-impreza.lua;
|
||||
};
|
||||
}
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,21 @@
|
||||
{ config, lib, ... }:
|
||||
{
|
||||
lucid.widgetSeed = ./lucid-widgets-rias.json;
|
||||
lucid.liveDecoder = "cuda";
|
||||
lucid.bindsModule = lib.mkDefault "${config.lucid.upstreamSource}/support/hypr/modules/binds.lua";
|
||||
lucid.luaModules = {
|
||||
"modules/decorations.lua" = "${config.lucid.upstreamSource}/support/hypr/modules/decorations.lua";
|
||||
"modules/gestures.lua" = "${config.lucid.upstreamSource}/support/hypr/modules/gestures.lua";
|
||||
"modules/input.lua" = "${config.lucid.upstreamSource}/support/hypr/modules/input.lua";
|
||||
"modules/layout.lua" = "${config.lucid.upstreamSource}/support/hypr/modules/layout.lua";
|
||||
"modules/layerrules.lua" = "${config.lucid.upstreamSource}/support/hypr/modules/layerrules.lua";
|
||||
"modules/lumen.lua" = "${config.lucid.upstreamSource}/support/hypr/modules/lumen.lua";
|
||||
"modules/misc.lua" = "${config.lucid.upstreamSource}/support/hypr/modules/misc.lua";
|
||||
"modules/plugins.lua" = "${config.lucid.upstreamSource}/support/hypr/modules/plugins.lua";
|
||||
"modules/windowrules.lua" = "${config.lucid.upstreamSource}/support/hypr/modules/windowrules.lua";
|
||||
"modules/monitors.lua" = { content = "${config.lucid.upstreamSource}/support/hypr/modules/monitors.lua"; autoLoad = false; };
|
||||
"modules/glass.lua" = { content = "${config.lucid.upstreamSource}/support/hypr/modules/glass.lua"; autoLoad = false; };
|
||||
"modules/settings.lua" = { content = "${config.lucid.upstreamSource}/support/hypr/modules/settings.lua"; autoLoad = false; };
|
||||
"modules/startup.lua" = { content = "${config.lucid.upstreamSource}/support/hypr/modules/startup.lua"; autoLoad = false; };
|
||||
};
|
||||
}
|
||||
File renamed without changes.
@@ -43,6 +43,8 @@ in {
|
||||
wl-clipboard
|
||||
wl-clip-persist
|
||||
xclip
|
||||
rbw
|
||||
wtype
|
||||
awww
|
||||
wifitui
|
||||
];
|
||||
@@ -126,6 +128,7 @@ in {
|
||||
workspace_rule = [
|
||||
{
|
||||
workspace = "w[t1]";
|
||||
gaps_in = 0;
|
||||
gaps_out = 0;
|
||||
}
|
||||
];
|
||||
@@ -167,6 +170,7 @@ in {
|
||||
|
||||
lucidHyprlandBinds = [
|
||||
(bind "SUPER + V" (exec "ghostty --title=clipse -e clipse"))
|
||||
(bind "SUPER + X" (exec "qs ipc call -- launcher search '>vault'"))
|
||||
(hyprLua.bind "SUPER + SHIFT + V" (hyprLua.execLauncher "qs ipc call launcher clipboard"))
|
||||
(bind "Print" (exec "qs ipc call screenshot full"))
|
||||
(bind "SUPER + Print" (exec "qs ipc call screenshot full"))
|
||||
|
||||
@@ -0,0 +1,129 @@
|
||||
import QtQuick
|
||||
import Quickshell
|
||||
import Quickshell.Hyprland
|
||||
import Quickshell.Io
|
||||
pragma Singleton
|
||||
|
||||
Singleton {
|
||||
id: root
|
||||
|
||||
property var entries: []
|
||||
property bool loading: false
|
||||
property string error: ""
|
||||
property string targetAddress: ""
|
||||
property string pendingPassword: ""
|
||||
property var passwordProcess: null
|
||||
|
||||
signal passwordReady(string password, string targetAddress)
|
||||
|
||||
function refresh() {
|
||||
if (listReader.running)
|
||||
return;
|
||||
|
||||
root.loading = true;
|
||||
root.error = "";
|
||||
listReader.command = ["rbw", "list", "--fields", "id,name,user,folder"];
|
||||
listReader.running = true;
|
||||
}
|
||||
|
||||
function getPassword(id, target) {
|
||||
if (root.passwordProcess)
|
||||
return;
|
||||
|
||||
root.targetAddress = target || "";
|
||||
root.error = "";
|
||||
root.passwordProcess = passwordProcessComponent.createObject(root, { entryId: id });
|
||||
if (!root.passwordProcess) {
|
||||
root.error = "Could not start rbw.";
|
||||
return;
|
||||
}
|
||||
root.passwordProcess.running = true;
|
||||
}
|
||||
|
||||
function typePassword(password, target) {
|
||||
root.pendingPassword = password;
|
||||
root.targetAddress = target || "";
|
||||
typeDelay.restart();
|
||||
}
|
||||
|
||||
Process {
|
||||
id: listReader
|
||||
|
||||
command: []
|
||||
stdout: StdioCollector {
|
||||
id: listOutput
|
||||
}
|
||||
|
||||
onExited: (code) => {
|
||||
root.loading = false;
|
||||
if (code !== 0) {
|
||||
root.error = "Could not read the vault. Unlock it with rbw, then retry.";
|
||||
root.entries = [];
|
||||
return;
|
||||
}
|
||||
|
||||
root.entries = listOutput.text.split(/\r?\n/).filter((line) => line !== "").map((line) => {
|
||||
const fields = line.split("\t");
|
||||
return {
|
||||
id: fields[0] || "",
|
||||
name: fields[1] || "Untitled",
|
||||
user: fields[2] || "",
|
||||
folder: fields[3] || ""
|
||||
};
|
||||
}).filter((entry) => entry.id !== "");
|
||||
root.error = "";
|
||||
}
|
||||
}
|
||||
|
||||
Component {
|
||||
id: passwordProcessComponent
|
||||
|
||||
Process {
|
||||
id: passwordJob
|
||||
|
||||
property string entryId: ""
|
||||
command: ["rbw", "get", entryId]
|
||||
stdout: StdioCollector {
|
||||
id: passwordOutput
|
||||
}
|
||||
|
||||
onExited: (code) => {
|
||||
if (root.passwordProcess === passwordJob)
|
||||
root.passwordProcess = null;
|
||||
if (code !== 0) {
|
||||
root.error = "Could not read that password.";
|
||||
} else {
|
||||
root.passwordReady(passwordOutput.text.replace(/\r?\n$/, ""), root.targetAddress);
|
||||
}
|
||||
passwordJob.destroy();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Process {
|
||||
id: typer
|
||||
|
||||
command: ["wtype", "-"]
|
||||
stdinEnabled: true
|
||||
onStarted: {
|
||||
write(root.pendingPassword);
|
||||
stdinEnabled = false;
|
||||
root.pendingPassword = "";
|
||||
root.targetAddress = "";
|
||||
}
|
||||
}
|
||||
|
||||
Timer {
|
||||
id: typeDelay
|
||||
|
||||
interval: 260
|
||||
onTriggered: {
|
||||
if (root.targetAddress !== "")
|
||||
Hyprland.dispatch("focuswindow address:" + root.targetAddress);
|
||||
|
||||
typer.running = false;
|
||||
typer.stdinEnabled = true;
|
||||
typer.running = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
+241
-389
@@ -1,100 +1,5 @@
|
||||
{ config, lib, osConfig, pkgs, ... }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
host = osConfig.networking.hostName;
|
||||
isChest = config.home.username == "chest";
|
||||
isRias = host == "Rias";
|
||||
specialBindIds = [ "scratchpad" "scratchpad-stash" "special-music" "special-comms" "special-todo" "special-sysmon" "daemons-workspace" ];
|
||||
specialSeed = pkgs.writeText "lucid-special-bindings.json" (builtins.toJSON {
|
||||
version = 1;
|
||||
binds = builtins.filter (entry: builtins.elem entry.id specialBindIds)
|
||||
(builtins.fromJSON (builtins.readFile ./lucid-keybinds-rias.json)).binds;
|
||||
});
|
||||
chestBindingsScript = pkgs.writeText "lucid-chest-bindings.py" ''
|
||||
import hashlib
|
||||
import json
|
||||
import re
|
||||
import sys
|
||||
from collections import Counter
|
||||
|
||||
source, reference, special, output = sys.argv[1:]
|
||||
binds = json.loads(source)
|
||||
refs = json.load(open(reference))["binds"]
|
||||
specials = json.load(open(special))["binds"]
|
||||
counts = Counter()
|
||||
result = []
|
||||
for entry in binds:
|
||||
args = entry["_args"]
|
||||
if not 2 <= len(args) <= 3 or args[1].get("_type") != "lua-inline":
|
||||
raise ValueError(f"Unsupported Hyprland binding: {entry}")
|
||||
keys, expr = args[0], args[1]["expr"]
|
||||
opts = args[2] if len(args) == 3 else {}
|
||||
signature = json.dumps([keys.upper().replace(" ", ""), opts], sort_keys=True)
|
||||
counts[signature] += 1
|
||||
identifier = hashlib.sha256(signature.encode()).hexdigest()[:12]
|
||||
b = {"id": f"chest-{identifier}-{counts[signature]}", "keys": keys}
|
||||
match = next((r for r in refs if r.get("keys", "").upper().replace(" ", "") == keys.upper().replace(" ", "") and r.get("opts", {}) == opts), None)
|
||||
b["desc"] = match.get("desc", keys) if match else keys
|
||||
b["category"] = match.get("category", "Other") if match else "Other"
|
||||
workspace = re.search(r"workspace = (\d+)", expr)
|
||||
if workspace and expr.startswith("hl.dsp.focus("):
|
||||
b.update(desc=f"Focus workspace {workspace.group(1)}", category="Workspaces")
|
||||
elif workspace and expr.startswith("hl.dsp.window.move("):
|
||||
b.update(desc=f"Move window to workspace {workspace.group(1)}", category="Workspaces")
|
||||
if keys.upper().replace(" ", "") == "SUPER+SHIFT+S":
|
||||
b.update(desc="Region screenshot and edit", category="Screenshots")
|
||||
m = re.fullmatch(r'hl\.dsp\.exec_cmd\(("(?:\\.|[^"\\])*")\)\s*', expr, re.S)
|
||||
if m:
|
||||
cmd = json.loads(m.group(1))
|
||||
cmd = re.sub(r'/nix/store/[0-9a-z]{32}-[^/\s"\\]+/bin/([A-Za-z0-9_.+-]+)', r'\1', cmd)
|
||||
b.update(type="exec", cmd=cmd)
|
||||
else:
|
||||
b.update(type="lua", lua=expr)
|
||||
if opts:
|
||||
b["opts"] = opts
|
||||
result.append(b)
|
||||
json.dump({"version": 1, "binds": result + specials}, open(output, "w"), indent=2)
|
||||
'';
|
||||
chestSeed = pkgs.runCommand "lucid-chest-bindings.json" { nativeBuildInputs = [ pkgs.python3 ]; } ''
|
||||
python3 ${chestBindingsScript} ${lib.escapeShellArg (builtins.toJSON config.lucidHyprlandBinds)} \
|
||||
${./lucid-keybinds-rias.json} ${specialSeed} "$out"
|
||||
'';
|
||||
mergeChestBinds = pkgs.writeText "lucid-merge-chest-bindings.jq" ''
|
||||
def normlua: (. // "") | gsub("\\s+"; "") | gsub("\u0027"; "\"");
|
||||
def normkeys: (. // "") | ascii_upcase | gsub("\\s+"; "") | split("+")
|
||||
| map(if . == "WIN" or . == "LOGO" or . == "MOD4" then "SUPER"
|
||||
elif . == "CONTROL" then "CTRL" else . end) | sort | join("+");
|
||||
def combos:
|
||||
if .each == "workspace" then .keys as $k | [range(1;11) as $i | ($k | gsub("\\{key\\}"; (($i % 10) | tostring)) | normkeys)]
|
||||
else [(.keys | normkeys)] end;
|
||||
def trigger: {click: (.opts.click // false), long_press: (.opts.long_press // false), release: (.opts.release // false), mouse: (.opts.mouse // false)};
|
||||
if (.binds | type) != "array" then error("keybinds.json has no binds array") else . end
|
||||
| . as $old
|
||||
| .binds += [$seed[0].binds[] as $b
|
||||
| select([$old.binds[] | select(
|
||||
.id == $b.id
|
||||
or ((["scratchpad", "scratchpad-stash", "special-music", "special-comms", "special-todo", "special-sysmon", "daemons-workspace"] | index($b.id)) != null and .type == "lua" and $b.type == "lua" and ((.lua | normlua) == ($b.lua | normlua)))
|
||||
or ((trigger == ($b | trigger)) and ((combos - ($b | combos) | length) < (combos | length)))
|
||||
)] | length == 0) | $b]
|
||||
'';
|
||||
mergeSpecialBinds = pkgs.writeText "lucid-merge-special-binds.jq" ''
|
||||
def normlua: (. // "") | gsub("\\s+"; "") | gsub("\u0027"; "\"");
|
||||
def normkeys: (. // "") | ascii_upcase | gsub("\\s+"; "") | split("+")
|
||||
| map(if . == "WIN" or . == "LOGO" or . == "MOD4" then "SUPER"
|
||||
elif . == "CONTROL" then "CTRL" else . end) | sort | join("+");
|
||||
if (.binds | type) != "array" then error("keybinds.json has no binds array") else . end
|
||||
| . as $old
|
||||
| .binds += [ $seed[0].binds[] as $b
|
||||
| select([$old.binds[] | select(.id == $b.id or (.type == "lua" and ((.lua | normlua) == ($b.lua | normlua))))] | length == 0)
|
||||
| if ([$old.binds[] | select(.enabled != false and ((.keys | normkeys) == ($b.keys | normkeys)))] | length) > 0
|
||||
then $b + { enabled: false } else $b end ]
|
||||
'';
|
||||
mergeSpecialPrefs = pkgs.writeText "lucid-merge-special-prefs.jq" ''
|
||||
.specialCustom = ((.specialCustom // "[]" | fromjson)
|
||||
| if type != "array" then error("specialCustom is not an array") else . end
|
||||
| if any(.[]; .key == "daemons") then .
|
||||
else . + [{key: "daemons", label: "Daemons", glyph: "build", on: true, apps: ""}] end
|
||||
| tojson)
|
||||
'';
|
||||
staticBindKeys = map (entry: builtins.elemAt entry._args 0) config.wayland.windowManager.hyprland.settings.bind;
|
||||
nonRiasBinds = pkgs.runCommand "lucid-nix-binds.lua" { nativeBuildInputs = [ pkgs.python3 ]; } ''
|
||||
python3 - ${source}/support/hypr/modules/binds.lua "$out" ${lib.escapeShellArg (builtins.toJSON staticBindKeys)} <<'PY'
|
||||
@@ -143,50 +48,129 @@ source = source.replace(fallback_text, 'Nix bindings remain active.', 1)
|
||||
pathlib.Path(sys.argv[2]).write_text(source)
|
||||
PY
|
||||
'';
|
||||
chestBinds = pkgs.runCommand "lucid-chest-loader.lua" { nativeBuildInputs = [ pkgs.python3 ]; } ''
|
||||
python3 - ${source}/support/hypr/modules/binds.lua "$out" <<'PYCODE'
|
||||
import pathlib
|
||||
import sys
|
||||
source = pathlib.Path(sys.argv[1]).read_text()
|
||||
old = '{ id = "terminal", keys = "F9", type = "exec", cmd = "kitty" }'
|
||||
new = '{ id = "terminal", keys = "SUPER + RETURN", type = "exec", cmd = "ghostty" }'
|
||||
if source.count(old) != 1:
|
||||
raise SystemExit("Lucid emergency bindings changed")
|
||||
pathlib.Path(sys.argv[2]).write_text(source.replace(old, new, 1))
|
||||
PYCODE
|
||||
'';
|
||||
chestMonitors = pkgs.runCommand "lucid-chest-monitors.lua" { nativeBuildInputs = [ pkgs.python3 ]; } ''
|
||||
python3 - ${source}/support/hypr/modules/monitors.lua "$out" <<'PY'
|
||||
vaultwardenLauncherPatch = pkgs.writeText "lucid-vaultwarden-launcher.py" ''
|
||||
import pathlib
|
||||
import sys
|
||||
|
||||
source = pathlib.Path(sys.argv[1]).read_text()
|
||||
default_rule = """hl.monitor({
|
||||
output = "",
|
||||
mode = M.defaults.mode,
|
||||
position = M.defaults.position,
|
||||
scale = M.defaults.scale,
|
||||
})
|
||||
"""
|
||||
if source.count(default_rule) != 1:
|
||||
raise SystemExit("Lucid monitor defaults changed; refusing to replace host monitor rules")
|
||||
pathlib.Path(sys.argv[2]).write_text(source.replace(default_rule, "", 1))
|
||||
PY
|
||||
'';
|
||||
chestBorders = pkgs.runCommand "lucid-chest-decorations.lua" { nativeBuildInputs = [ pkgs.python3 ]; } ''
|
||||
python3 - ${source}/support/hypr/modules/decorations.lua "$out" <<'PY'
|
||||
import pathlib
|
||||
import sys
|
||||
face_path, dock_path = map(pathlib.Path, sys.argv[1:])
|
||||
face = face_path.read_text()
|
||||
dock = dock_path.read_text()
|
||||
|
||||
source = pathlib.Path(sys.argv[1]).read_text()
|
||||
marker = "local active_border, inactive_border = borders()"
|
||||
if source.count(marker) != 1:
|
||||
raise SystemExit("Lucid border module changed; refusing to replace host appearance settings")
|
||||
pathlib.Path(sys.argv[2]).write_text(source.split(marker, 1)[0])
|
||||
PY
|
||||
def replace_once(source, old, new, label):
|
||||
count = source.count(old)
|
||||
if count != 1:
|
||||
raise SystemExit(f"Lucid {label} anchor changed (found {count}); refusing an unsafe launcher patch")
|
||||
return source.replace(old, new, 1)
|
||||
|
||||
face = replace_once(face,
|
||||
' "clipboard": "Search clipboard history",\n',
|
||||
' "clipboard": "Search clipboard history",\n "vaultwarden": "Search Vaultwarden",\n', "launcher placeholder")
|
||||
face = replace_once(face,
|
||||
' "clipboard": "content_paste",\n',
|
||||
' "clipboard": "content_paste",\n "vaultwarden": "key",\n', "launcher icon")
|
||||
face = replace_once(face,
|
||||
' "icon": "content_paste"\n }, {\n "key": "wallpaper",',
|
||||
' "icon": "content_paste"\n }, {\n "key": "vaultwarden",\n "label": "Vaultwarden",\n "icon": "key"\n }, {\n "key": "wallpaper",', "launcher mode")
|
||||
face = replace_once(face,
|
||||
' emptyLabel: {\n',
|
||||
' emptyLabel: {\n if (face.displayMode === "vaultwarden")\n return "No matching vault entries";\n', "launcher empty label")
|
||||
face = replace_once(face,
|
||||
' emptyHint: {\n',
|
||||
' emptyHint: {\n if (face.displayMode === "vaultwarden")\n return "Unlock the vault with rbw, then search by name, username, or folder.";\n', "launcher empty hint")
|
||||
|
||||
dock = replace_once(dock,
|
||||
' if (q.indexOf(">clip") === 0)\n return "clipboard";\n',
|
||||
' if (q.indexOf(">clip") === 0)\n return "clipboard";\n\n if (q.indexOf(">pass") === 0)\n return "vaultwarden";\n', "launcher prefix")
|
||||
dock = replace_once(dock,
|
||||
' if (mode === "clipboard")\n return ">clip";\n',
|
||||
' if (mode === "clipboard")\n return ">clip ";\n\n if (mode === "vaultwarden")\n return ">pass ";\n', "launcher mode prefix")
|
||||
dock = replace_once(dock,
|
||||
' if (mode === "wallpaper")\n return ">wallpaper";\n',
|
||||
' if (mode === "wallpaper")\n return ">wallpaper ";\n', "wallpaper prefix spacing")
|
||||
dock = replace_once(dock,
|
||||
' if (mode === "theme")\n return ">theme";\n',
|
||||
' if (mode === "theme")\n return ">theme ";\n', "theme prefix spacing")
|
||||
dock = replace_once(dock,
|
||||
' if (mode === "live")\n return ">live";\n',
|
||||
' if (mode === "live")\n return ">live ";\n', "live prefix spacing")
|
||||
dock = replace_once(dock,
|
||||
' if (mode === "commands")\n return ">";\n',
|
||||
' if (mode === "commands")\n return "> ";\n', "command prefix spacing")
|
||||
dock = replace_once(dock,
|
||||
' if (text === ">wallpaper" && !exact && Prefs.liveWallpapers && LiveWall.isVideo(dockWindow.appliedWallpaper))\n text = ">live";\n',
|
||||
' if (text.trim() === ">wallpaper" && !exact && Prefs.liveWallpapers && LiveWall.isVideo(dockWindow.appliedWallpaper))\n text = ">live ";\n', "wallpaper live prefix spacing")
|
||||
dock = replace_once(dock,
|
||||
' dockWindow.setSearchText(">wallpaper");\n } else if (id === "theme") {\n dockWindow.setSearchText(">theme");\n',
|
||||
' dockWindow.setSearchText(">wallpaper ");\n } else if (id === "theme") {\n dockWindow.setSearchText(">theme ");\n', "menu prefix spacing")
|
||||
dock = replace_once(dock,
|
||||
' } else if (id === "clipboard") {\n dockWindow.setSearchText(">clip");\n',
|
||||
' } else if (id === "clipboard") {\n dockWindow.setSearchText(">clip ");\n', "clipboard prefix spacing")
|
||||
dock = replace_once(dock,
|
||||
' dockWindow.setSearchText(">wallpaper", true);',
|
||||
' dockWindow.setSearchText(">wallpaper ", true);', "wallpaper picker prefix spacing")
|
||||
dock = replace_once(dock,
|
||||
'onPickerKindRequested: (kind) => dockWindow.setSearchText(kind === "live" ? ">live" : ">wallpaper", true)',
|
||||
'onPickerKindRequested: (kind) => dockWindow.setSearchText(kind === "live" ? ">live " : ">wallpaper ", true)', "picker tab prefix spacing")
|
||||
dock = replace_once(dock,
|
||||
' dockWindow.openLauncher(">wallpaper");\n }\n\n function live(): void {\n dockWindow.openLauncher(">live");',
|
||||
' dockWindow.openLauncher(">wallpaper ");\n }\n\n function live(): void {\n dockWindow.openLauncher(">live ");', "wallpaper ipc prefix spacing")
|
||||
dock = replace_once(dock,
|
||||
'onBackRequested: dockWindow.setSearchText(dockWindow.mode === "commands" ? "" : ">")',
|
||||
'onBackRequested: dockWindow.setSearchText(dockWindow.mode === "commands" ? "" : "> ")', "back prefix spacing")
|
||||
dock = replace_once(dock,
|
||||
' if (dockWindow.mode === "clipboard")\n Clip.refresh();\n',
|
||||
' if (dockWindow.mode === "clipboard")\n Clip.refresh();\n if (dockWindow.mode === "vaultwarden")\n Vaultwarden.refresh();\n', "launcher mode activation")
|
||||
dock = replace_once(dock,
|
||||
' readonly property var allCommands: [{',
|
||||
""" Connections {
|
||||
target: Vaultwarden
|
||||
|
||||
function onEntriesChanged() { dockWindow.rebuildResults(); }
|
||||
function onLoadingChanged() { dockWindow.rebuildResults(); }
|
||||
function onErrorChanged() { dockWindow.rebuildResults(); }
|
||||
function onPasswordReady(password, targetAddress) {
|
||||
dockWindow.menuOpen = false;
|
||||
Vaultwarden.typePassword(password, targetAddress);
|
||||
}
|
||||
}
|
||||
|
||||
readonly property var allCommands: [{""", "vaultwarden updates")
|
||||
dock = replace_once(dock,
|
||||
' function rebuildResults() {',
|
||||
""" function vaultRows(query) {
|
||||
if (Vaultwarden.loading)
|
||||
return [dockWindow.headerRow("Loading Vaultwarden…")];
|
||||
if (Vaultwarden.error !== "")
|
||||
return [dockWindow.headerRow(Vaultwarden.error)];
|
||||
|
||||
var rows = [];
|
||||
var entries = Vaultwarden.entries || [];
|
||||
for (var i = 0; i < entries.length; i++) {
|
||||
var entry = entries[i];
|
||||
var haystack = (entry.name + " " + entry.user + " " + entry.folder).toLowerCase();
|
||||
if (query !== "" && haystack.indexOf(query) === -1)
|
||||
continue;
|
||||
var detail = [entry.user, entry.folder].filter((part) => part !== "").join(" · ");
|
||||
rows.push(dockWindow.makeRow("vaultwarden", "vault-" + entry.id, entry.name, detail, {
|
||||
"glyph": "key",
|
||||
"payload": entry.id
|
||||
}));
|
||||
}
|
||||
return rows;
|
||||
}
|
||||
|
||||
function rebuildResults() {""", "vaultwarden search")
|
||||
dock = replace_once(dock,
|
||||
' } else if (mode === "clipboard") {\n var ents = Clip.entries;',
|
||||
' } else if (mode === "vaultwarden") {\n rows = dockWindow.vaultRows(q);\n } else if (mode === "clipboard") {\n var ents = Clip.entries;', "vaultwarden results")
|
||||
dock = replace_once(dock,
|
||||
' } else if (row.kind === "clip") {\n Clip.copy(row.payload);\n dockWindow.menuOpen = false;\n',
|
||||
' } else if (row.kind === "clip") {\n Clip.copy(row.payload);\n dockWindow.menuOpen = false;\n } else if (row.kind === "vaultwarden") {\n Vaultwarden.getPassword(row.payload, Hyprland.activeToplevel ? Hyprland.activeToplevel.address : "");\n', "vaultwarden selection")
|
||||
|
||||
face_path.write_text(face)
|
||||
dock_path.write_text(dock)
|
||||
'';
|
||||
liveDecoder = if builtins.elem osConfig.networking.hostName [ "Rias" "Eclipse" ] then "cuda" else "vaapi";
|
||||
source = pkgs.applyPatches {
|
||||
baseSource = pkgs.applyPatches {
|
||||
src = pkgs.fetchgit {
|
||||
url = "https://github.com/Sn3akyy1/lucid.git";
|
||||
rev = "bdd7f79da18efd837f79dcecbe5d2ec178abc10c";
|
||||
@@ -243,13 +227,34 @@ PY
|
||||
"label": "DuckDuckGo"
|
||||
}, {
|
||||
'')
|
||||
(pkgs.writeText "lucid-shot-special-workspace-name.patch" ''
|
||||
diff --git a/lucidshot/ShotOverlay.qml b/lucidshot/ShotOverlay.qml
|
||||
--- a/lucidshot/ShotOverlay.qml
|
||||
+++ b/lucidshot/ShotOverlay.qml
|
||||
@@ -228,1 +228,1 @@
|
||||
- const ws = mon.activeWorkspace ? mon.activeWorkspace.id : null;
|
||||
+ const ws = mon.activeWorkspace ? mon.activeWorkspace.name : null;
|
||||
@@ -229,1 +229,1 @@
|
||||
- const special = mon.specialWorkspace ? mon.specialWorkspace.id : 0;
|
||||
+ const special = mon.specialWorkspace ? mon.specialWorkspace.name : "";
|
||||
@@ -234,1 +234,1 @@
|
||||
- return c.workspace.id === ws || (special !== 0 && c.workspace.id === special) || (c.pinned && c.monitor === mon.id);
|
||||
+ return c.workspace.name === ws || (special && c.workspace.name === special) || (c.pinned && c.monitor === mon.id);
|
||||
@@ -246,1 +246,1 @@
|
||||
- "special": special !== 0 && c.workspace.id === special,
|
||||
+ "special": !!special && c.workspace.name === special,
|
||||
'')
|
||||
];
|
||||
};
|
||||
source = pkgs.runCommand "lucid-vaultwarden-launcher-source" {
|
||||
nativeBuildInputs = [ pkgs.python3 ];
|
||||
} ''
|
||||
cp -r ${baseSource} "$out"
|
||||
chmod -R u+w "$out"
|
||||
python3 ${vaultwardenLauncherPatch} "$out/luciddocks/LauncherFace.qml" "$out/luciddocks/Dock.qml"
|
||||
'';
|
||||
wallpaperDir = "${config.home.homeDirectory}/Wallpapers";
|
||||
wallpaperScript = "${config.home.homeDirectory}/.config/hypr/scripts/wallpaper/set-wallpaper.sh";
|
||||
widgetLayout = if osConfig.networking.hostName == "Rias"
|
||||
then ./lucid-widgets-rias.json
|
||||
else ./lucid-widgets.json;
|
||||
defaultWallpaper = "${wallpaperDir}/bluehour.jpg";
|
||||
hyprLua = import ../hyprland/lua.nix { inherit lib; };
|
||||
colors = config.lib.stylix.colors.withHashtag;
|
||||
@@ -315,29 +320,6 @@ PY
|
||||
user = true;
|
||||
});
|
||||
themeName = pkgs.writeText "lucid-current-theme" "stylix\n";
|
||||
chestOsdPatch = pkgs.writeText "lucid-chest-osd.patch" ''
|
||||
--- a/lucidosd/Osd.qml
|
||||
+++ b/lucidosd/Osd.qml
|
||||
@@ -26 +26 @@
|
||||
- readonly property int brightnessPercent: osdWindow.maxBrightness > 0 ? Math.round((parseInt(brightnessFile.text()) / osdWindow.maxBrightness) * 100) : 0
|
||||
+ property int brightnessPercent: 0
|
||||
@@ -378,2 +378,15 @@
|
||||
onFileChanged: reload()
|
||||
+ onLoaded: {
|
||||
+ const value = parseInt(brightnessFile.text());
|
||||
+ if (osdWindow.maxBrightness > 0 && !isNaN(value))
|
||||
+ osdWindow.brightnessPercent = Math.round(value / osdWindow.maxBrightness * 100);
|
||||
+ }
|
||||
}
|
||||
+
|
||||
+ Timer {
|
||||
+ id: chestBrightnessPoll
|
||||
+ interval: 500
|
||||
+ repeat: true
|
||||
+ running: osdWindow.backlightDevice !== ""
|
||||
+ onTriggered: brightnessFile.reload()
|
||||
+ }
|
||||
'';
|
||||
themeAutoPatch = pkgs.writeText "lucid-theme-auto.patch" ''
|
||||
--- a/Prefs.qml
|
||||
+++ b/Prefs.qml
|
||||
@@ -443,19 +425,6 @@ PY
|
||||
'';
|
||||
qmlPackages = with pkgs.qt6; [ qt5compat qtmultimedia ];
|
||||
tesseract = pkgs.tesseract4.override { enableLanguages = [ "eng" "rus" ]; };
|
||||
shellFile = if isChest then pkgs.writeText "lucid-chest-shell.qml" (builtins.replaceStrings [
|
||||
''import "./lucidlock"''
|
||||
" Lock {\n }\n"
|
||||
" void Clip.probed;"
|
||||
] [
|
||||
""
|
||||
""
|
||||
" void Notifs.count;\n void KdeConnect.installed;\n void HyprConfig.moduleProbed;\n void Monitors.moduleProbed;\n void Glass.moduleProbed;\n void Startup.moduleProbed;\n void Clip.probed;"
|
||||
] (builtins.readFile ./lucid-shell.qml)) else ./lucid-shell.qml;
|
||||
prefsFilter = if isChest then
|
||||
''.barEnabled = true | .widgetOnTop = false | .widgetHideFullscreen = true | .fontFamily = $font | .liveWallpapers = false | .idleLock = false | .idleLockBeforeSleep = false | .launcherPowerButtons = "suspend,reboot,shutdown" | .powerModuleActions = "suspend,hibernate,logout,reboot,shutdown"''
|
||||
else
|
||||
''.barEnabled = true | .widgetOnTop = false | .widgetHideFullscreen = true | .fontFamily = $font | .wallpaperFolder = $wallpaperDir | .liveDecoder = $decoder'';
|
||||
lucid = pkgs.writeShellScript "lucid" ''
|
||||
export NIXPKGS_QT6_QML_IMPORT_PATH="${lib.makeSearchPath "lib/qt-6/qml" qmlPackages}:''${NIXPKGS_QT6_QML_IMPORT_PATH:-}"
|
||||
export QT_PLUGIN_PATH="${lib.makeSearchPath "lib/qt-6/plugins" qmlPackages}:''${QT_PLUGIN_PATH:-}"
|
||||
@@ -484,10 +453,82 @@ PY
|
||||
exec "${wallpaperScript}" "$selected"
|
||||
'';
|
||||
in {
|
||||
options.lucid = {
|
||||
upstreamSource = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
default = source;
|
||||
description = "Patched Lucid source tree used by profile modules.";
|
||||
};
|
||||
keybindSeed = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
default = null;
|
||||
description = "Optional initial Lucid keybinding file.";
|
||||
};
|
||||
prefsSeed = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
default = "${source}/defaults/prefs.json";
|
||||
description = "Initial Lucid preferences file.";
|
||||
};
|
||||
widgetSeed = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
default = null;
|
||||
description = "Optional initial Lucid widget layout.";
|
||||
};
|
||||
initialFiles = lib.mkOption {
|
||||
type = lib.types.attrsOf lib.types.path;
|
||||
default = {};
|
||||
description = "Files to seed once at their absolute destinations.";
|
||||
};
|
||||
managedFiles = lib.mkOption {
|
||||
type = lib.types.attrsOf lib.types.path;
|
||||
default = {};
|
||||
description = "Lucid files installed at their absolute destinations.";
|
||||
};
|
||||
prefsFilter = lib.mkOption {
|
||||
type = lib.types.lines;
|
||||
default = ''.barEnabled = true | .widgetOnTop = false | .widgetHideFullscreen = true | .fontFamily = $font | .wallpaperFolder = $wallpaperDir | .liveDecoder = $decoder'';
|
||||
description = "Declarative jq updates applied to Lucid preferences.";
|
||||
};
|
||||
liveDecoder = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "vaapi";
|
||||
description = "Hardware decoder used by Lucid wallpaper playback.";
|
||||
};
|
||||
bindsModule = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
default = nonRiasBinds;
|
||||
description = "Lua module that loads this profile's Hyprland bindings.";
|
||||
};
|
||||
luaModules = lib.mkOption {
|
||||
type = lib.types.attrs;
|
||||
default = {};
|
||||
description = "Additional Lucid Hyprland Lua modules for this profile.";
|
||||
};
|
||||
extraHyprlandConfig = lib.mkOption {
|
||||
type = lib.types.lines;
|
||||
default = "";
|
||||
description = "Profile-specific Hyprland Lua configuration loaded after the shared Lucid setup.";
|
||||
};
|
||||
startWallpaper = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Apply the configured wallpaper before Lucid starts.";
|
||||
};
|
||||
installWallpaperSupport = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Install Lucid wallpaper integration scripts.";
|
||||
};
|
||||
shellFile = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
default = ./lucid-shell.qml;
|
||||
description = "Lucid Quickshell entry point for this user profile.";
|
||||
};
|
||||
};
|
||||
|
||||
programs.waybar.enable = lib.mkForce false;
|
||||
services.mako.enable = lib.mkForce false;
|
||||
home.packages = with pkgs; [ cliphist ffmpeg grim imagemagick libnotify pywal16 wf-recorder tesseract ]
|
||||
++ lib.optionals isChest [ brightnessctl playerctl slurp swappy ];
|
||||
home.packages = with pkgs; [ cliphist ffmpeg grim imagemagick libnotify pywal16 wf-recorder tesseract ];
|
||||
|
||||
home.activation.installLucid = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
|
||||
target="${config.home.homeDirectory}/.config/quickshell"
|
||||
@@ -507,26 +548,6 @@ in {
|
||||
--exclude='/lucidkeys/state.json' \
|
||||
--exclude='/lucidwidgets/widgets.json' \
|
||||
"${source}/" "$target/"
|
||||
${lib.optionalString isChest ''
|
||||
# Notifs refers to Lockscreen even without a lock surface. Keep its
|
||||
# singleton from taking over logind lock signals or its LockedHint.
|
||||
lock_qml="$target/Lockscreen.qml"
|
||||
if ! grep -Fq 'return; // Lucid lock disabled for chest' "$lock_qml"; then
|
||||
grep -Fq 'function lock(settle) {' "$lock_qml" && \
|
||||
grep -Fq 'function pushLockedHint() {' "$lock_qml" && \
|
||||
grep -Fq 'id: logindWatch' "$lock_qml" || {
|
||||
echo "Lucid lock integration changed; refusing to leave it active for chest" >&2
|
||||
exit 1
|
||||
}
|
||||
$DRY_RUN_CMD sed -i \
|
||||
-e '/function lock(settle) {/a\ return; // Lucid lock disabled for chest' \
|
||||
-e '/function pushLockedHint() {/a\ return; // Lucid lock disabled for chest' \
|
||||
-e '/id: logindWatch/{n;n;s/running: true/running: false/;}' "$lock_qml"
|
||||
fi
|
||||
if ! grep -Fq 'id: chestBrightnessPoll' "$target/lucidosd/Osd.qml"; then
|
||||
$DRY_RUN_CMD ${pkgs.patch}/bin/patch --batch --forward -p1 -d "$target" < ${chestOsdPatch}
|
||||
fi
|
||||
''}
|
||||
$DRY_RUN_CMD ${pkgs.patch}/bin/patch --batch -p1 -d "$target" < ${./idle-work.patch}
|
||||
if ! grep -Fq 'mode === "auto"' "$target/Prefs.qml"; then
|
||||
$DRY_RUN_CMD ${pkgs.patch}/bin/patch --batch --forward -p1 -d "$target" < ${themeAutoPatch}
|
||||
@@ -566,17 +587,12 @@ in {
|
||||
// Nix focus workaround for Hyprland 0.57: detach pointer and keyboard focus while menus are open.\
|
||||
Quickshell.execDetached(["hyprctl", "eval", "hl.config({ input = { follow_mouse = " + (dockWindow.menuOpen ? 2 : 1) + " } })"]);' "$dock_qml"
|
||||
fi
|
||||
$DRY_RUN_CMD install -m644 ${shellFile} "$target/shell.qml"
|
||||
$DRY_RUN_CMD install -m644 ${config.lucid.shellFile} "$target/shell.qml"
|
||||
$DRY_RUN_CMD install -m644 ${./LucidBar.qml} "$target/LucidBar.qml"
|
||||
${lib.optionalString (!isChest) ''
|
||||
$DRY_RUN_CMD install -m644 ${./Agenda.qml} "$target/Agenda.qml"
|
||||
$DRY_RUN_CMD install -m644 ${./CalendarSource.qml} "$target/CalendarSource.qml"
|
||||
$DRY_RUN_CMD install -m644 ${./ClockCalendar.qml} "$target/lucidbar/ClockCalendar.qml"
|
||||
$DRY_RUN_CMD install -m644 ${./thunderbird-calendar.py} "$target/thunderbird-calendar.py"
|
||||
''}
|
||||
$DRY_RUN_CMD install -m644 ${./Vaultwarden.qml} "$target/Vaultwarden.qml"
|
||||
$DRY_RUN_CMD install -m644 ${./WidgetLayer.qml} "$target/lucidwidgets/WidgetLayer.qml"
|
||||
$DRY_RUN_CMD install -m644 ${./WidgetsPage.qml} "$target/lucidprefs/WidgetsPage.qml"
|
||||
${lib.optionalString (!isChest) ''
|
||||
${lib.optionalString config.lucid.installWallpaperSupport ''
|
||||
$DRY_RUN_CMD mkdir -p "${wallpaperDir}" \
|
||||
"${config.home.homeDirectory}/.config/hypr/scripts/wallpaper"
|
||||
$DRY_RUN_CMD install -m755 "${source}/support/wallpaper/set-wallpaper.sh" \
|
||||
@@ -588,59 +604,8 @@ in {
|
||||
|
||||
lucid_dir="${config.home.homeDirectory}/.config/lucid"
|
||||
$DRY_RUN_CMD mkdir -p "$lucid_dir/themes"
|
||||
if [ "${host}" = Rias ] && [ ! -s "$lucid_dir/keybinds.json" ]; then
|
||||
$DRY_RUN_CMD install -m644 ${./lucid-keybinds-rias.json} "$lucid_dir/keybinds.json"
|
||||
fi
|
||||
${lib.optionalString (!isRias) ''
|
||||
special_migration="$lucid_dir/special-workspaces-v1"
|
||||
if [ -z "''${DRY_RUN_CMD:-}" ] && [ ! -e "$special_migration" ]; then
|
||||
if [ -f "${config.home.homeDirectory}/.config/hypr/lucid-specials.lua" ] && \
|
||||
[ ! -e "${config.home.homeDirectory}/.config/hypr/lucid-specials.before-special-workspaces-v1.lua" ]; then
|
||||
cp -p "${config.home.homeDirectory}/.config/hypr/lucid-specials.lua" \
|
||||
"${config.home.homeDirectory}/.config/hypr/lucid-specials.before-special-workspaces-v1.lua"
|
||||
fi
|
||||
if [ ! -s "$lucid_dir/keybinds.json" ]; then
|
||||
install -m644 ${specialSeed} "$lucid_dir/keybinds.json"
|
||||
else
|
||||
binds_tmp=$(${pkgs.coreutils}/bin/mktemp "$lucid_dir/keybinds.json.XXXXXX")
|
||||
if ${pkgs.jq}/bin/jq --slurpfile seed ${specialSeed} -f ${mergeSpecialBinds} \
|
||||
"$lucid_dir/keybinds.json" > "$binds_tmp"; then
|
||||
chmod 644 "$binds_tmp"
|
||||
mv "$binds_tmp" "$lucid_dir/keybinds.json"
|
||||
else
|
||||
rm -f "$binds_tmp"
|
||||
echo "Could not merge Lucid special workspace bindings" >&2
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
''}
|
||||
${lib.optionalString isChest ''
|
||||
chest_migration="$lucid_dir/chest-keybinds-v1"
|
||||
if [ -z "''${DRY_RUN_CMD:-}" ] && [ ! -e "$chest_migration" ]; then
|
||||
if [ ! -s "$lucid_dir/keybinds.json" ]; then
|
||||
install -m644 ${chestSeed} "$lucid_dir/keybinds.json"
|
||||
else
|
||||
if [ ! -e "$lucid_dir/keybinds.before-chest-migration.json" ]; then
|
||||
cp -p "$lucid_dir/keybinds.json" "$lucid_dir/keybinds.before-chest-migration.json"
|
||||
fi
|
||||
binds_tmp=$(${pkgs.coreutils}/bin/mktemp "$lucid_dir/keybinds.json.XXXXXX")
|
||||
if ${pkgs.jq}/bin/jq --slurpfile seed ${chestSeed} -f ${mergeChestBinds} "$lucid_dir/keybinds.json" > "$binds_tmp"; then
|
||||
chmod 644 "$binds_tmp"
|
||||
mv "$binds_tmp" "$lucid_dir/keybinds.json"
|
||||
else
|
||||
rm -f "$binds_tmp"
|
||||
echo "Could not migrate chest keybindings to Lucid" >&2
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
touch "$chest_migration"
|
||||
fi
|
||||
''}
|
||||
monitor_file="${config.home.homeDirectory}/.config/hypr/lucid-monitors.lua"
|
||||
if [ "${host}" = Rias ] && { [ ! -s "$monitor_file" ] || ! grep -qE 'output[[:space:]]*=' "$monitor_file"; } && \
|
||||
! grep -qE 'workspace[[:space:]]*=' "$monitor_file" 2>/dev/null; then
|
||||
$DRY_RUN_CMD install -m644 ${./lucid-monitors-rias.lua} "$monitor_file"
|
||||
if [ ! -s "$lucid_dir/keybinds.json" ]; then
|
||||
${lib.optionalString (config.lucid.keybindSeed != null) ''$DRY_RUN_CMD install -m644 ${config.lucid.keybindSeed} "$lucid_dir/keybinds.json"''}
|
||||
fi
|
||||
$DRY_RUN_CMD ${pkgs.rsync}/bin/rsync -rltp --chmod=Du+rwx,Fu+rw --ignore-existing \
|
||||
"${source}/support/lucid/themes/" "$lucid_dir/themes/"
|
||||
@@ -656,14 +621,14 @@ in {
|
||||
"$lucid_dir/apply-theme.sh"
|
||||
|
||||
if [ ! -e "$target/lucidprefs/prefs.json" ]; then
|
||||
$DRY_RUN_CMD install -m644 ${if isChest then "${source}/defaults/prefs.json" else ./lucid-prefs.json} "$target/lucidprefs/prefs.json"
|
||||
$DRY_RUN_CMD install -m644 ${config.lucid.prefsSeed} "$target/lucidprefs/prefs.json"
|
||||
fi
|
||||
if [ -z "''${DRY_RUN_CMD:-}" ] && [ -f "$target/lucidprefs/prefs.json" ]; then
|
||||
prefs_tmp=$(${pkgs.coreutils}/bin/mktemp "$target/lucidprefs/prefs.json.XXXXXX")
|
||||
if ${pkgs.jq}/bin/jq --arg font ${lib.escapeShellArg config.stylix.fonts.sansSerif.name} \
|
||||
--arg wallpaperDir ${lib.escapeShellArg wallpaperDir} \
|
||||
--arg decoder ${lib.escapeShellArg liveDecoder} \
|
||||
${lib.escapeShellArg prefsFilter} \
|
||||
--arg decoder ${lib.escapeShellArg config.lucid.liveDecoder} \
|
||||
${lib.escapeShellArg config.lucid.prefsFilter} \
|
||||
"$target/lucidprefs/prefs.json" > "$prefs_tmp"; then
|
||||
${pkgs.coreutils}/bin/chmod 644 "$prefs_tmp"
|
||||
${pkgs.coreutils}/bin/mv "$prefs_tmp" "$target/lucidprefs/prefs.json"
|
||||
@@ -672,26 +637,21 @@ in {
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
${lib.optionalString (!isRias) ''
|
||||
if [ -z "''${DRY_RUN_CMD:-}" ] && [ ! -e "$special_migration" ]; then
|
||||
prefs_tmp=$(${pkgs.coreutils}/bin/mktemp "$target/lucidprefs/prefs.json.XXXXXX")
|
||||
if ${pkgs.jq}/bin/jq -f ${mergeSpecialPrefs} "$target/lucidprefs/prefs.json" > "$prefs_tmp"; then
|
||||
chmod 644 "$prefs_tmp"
|
||||
mv "$prefs_tmp" "$target/lucidprefs/prefs.json"
|
||||
touch "$special_migration"
|
||||
else
|
||||
rm -f "$prefs_tmp"
|
||||
echo "Could not merge Lucid special workspace settings" >&2
|
||||
exit 1
|
||||
fi
|
||||
${lib.optionalString (config.lucid.widgetSeed != null) ''
|
||||
if [ ! -e "$target/lucidwidgets/widgets.json" ]; then
|
||||
$DRY_RUN_CMD install -m644 ${config.lucid.widgetSeed} "$target/lucidwidgets/widgets.json"
|
||||
fi
|
||||
''}
|
||||
if [ ! -e "$target/luciddocks/pinned.json" ]; then
|
||||
$DRY_RUN_CMD install -m644 ${./lucid-pinned.json} "$target/luciddocks/pinned.json"
|
||||
fi
|
||||
if [ ! -e "$target/lucidwidgets/widgets.json" ]; then
|
||||
$DRY_RUN_CMD install -m644 ${widgetLayout} "$target/lucidwidgets/widgets.json"
|
||||
${lib.concatStringsSep "\n" (lib.mapAttrsToList (destination: sourceFile: ''
|
||||
if [ ! -e ${lib.escapeShellArg destination} ]; then
|
||||
$DRY_RUN_CMD mkdir -p ${lib.escapeShellArg (builtins.dirOf destination)}
|
||||
$DRY_RUN_CMD install -m644 ${sourceFile} ${lib.escapeShellArg destination}
|
||||
fi
|
||||
'') config.lucid.initialFiles)}
|
||||
${lib.concatStringsSep "\n" (lib.mapAttrsToList (destination: sourceFile: ''
|
||||
$DRY_RUN_CMD mkdir -p ${lib.escapeShellArg (builtins.dirOf destination)}
|
||||
$DRY_RUN_CMD install -m644 ${sourceFile} ${lib.escapeShellArg destination}
|
||||
'') config.lucid.managedFiles)}
|
||||
|
||||
for pair in \
|
||||
'blur.json lucidbar/blur.json' \
|
||||
@@ -708,47 +668,6 @@ in {
|
||||
fi
|
||||
done
|
||||
|
||||
${lib.optionalString (isChest && host == "Impreza") ''
|
||||
# Import Eclipse's appearance once. Keep later Lucid edits and back up
|
||||
# existing laptop settings before changing them; monitor state is untouched.
|
||||
appearance_marker="$lucid_dir/impreza-appearance-v1"
|
||||
if [ -z "''${DRY_RUN_CMD:-}" ] && [ ! -e "$appearance_marker" ]; then
|
||||
mkdir -p "${config.home.homeDirectory}/.cache" "${config.home.homeDirectory}/.config/hypr"
|
||||
prefs="$target/lucidprefs/prefs.json"
|
||||
prefs_tmp=$(${pkgs.coreutils}/bin/mktemp "$prefs.XXXXXX")
|
||||
if ${pkgs.jq}/bin/jq --slurpfile appearance ${./lucid-prefs-impreza.json} \
|
||||
'. + $appearance[0]' "$prefs" > "$prefs_tmp"; then
|
||||
cp --backup=numbered "$prefs" "$prefs.before-impreza-appearance"
|
||||
chmod 644 "$prefs_tmp"
|
||||
mv "$prefs_tmp" "$prefs"
|
||||
else
|
||||
rm -f "$prefs_tmp"
|
||||
exit 1
|
||||
fi
|
||||
for pair in \
|
||||
'${./lucid-widgets-impreza.json} lucidwidgets/widgets.json' \
|
||||
'${./lucid-pinned-impreza.json} luciddocks/pinned.json'; do
|
||||
set -- $pair
|
||||
[ ! -e "$target/$2" ] || cp --backup=numbered "$target/$2" "$target/$2.before-impreza-appearance"
|
||||
install -m644 "$1" "$target/$2"
|
||||
done
|
||||
for pair in \
|
||||
'${./lucid-settings-impreza.lua} lucid-settings.lua' \
|
||||
'${./lucid-glass-impreza.lua} lucid-glass.lua'; do
|
||||
set -- $pair
|
||||
file="${config.home.homeDirectory}/.config/hypr/$2"
|
||||
[ ! -e "$file" ] || cp --backup=numbered "$file" "$file.before-impreza-appearance"
|
||||
install -m644 "$1" "$file"
|
||||
done
|
||||
if [ -e "${config.home.homeDirectory}/.cache/current_theme" ]; then
|
||||
cp --backup=numbered "${config.home.homeDirectory}/.cache/current_theme" \
|
||||
"${config.home.homeDirectory}/.cache/current_theme.before-impreza-appearance"
|
||||
fi
|
||||
install -m644 ${themeName} "${config.home.homeDirectory}/.cache/current_theme"
|
||||
touch "$appearance_marker"
|
||||
fi
|
||||
''}
|
||||
|
||||
$DRY_RUN_CMD mkdir -p "${config.home.homeDirectory}/.config/lucid/themes/stylix" \
|
||||
"${config.home.homeDirectory}/.cache/quickshell"
|
||||
$DRY_RUN_CMD install -m644 ${paletteFile} \
|
||||
@@ -776,73 +695,25 @@ in {
|
||||
ExecStart = "${lucid}";
|
||||
Restart = "on-failure";
|
||||
RestartSec = 2;
|
||||
} // lib.optionalAttrs (!isChest) { ExecStartPre = "${startWallpaper}"; };
|
||||
} // lib.optionalAttrs config.lucid.startWallpaper { ExecStartPre = "${startWallpaper}"; };
|
||||
Install.WantedBy = [ "hyprland-session.target" ];
|
||||
};
|
||||
|
||||
wayland.windowManager.hyprland = {
|
||||
settings = {
|
||||
on = [ (hyprLua.onStart [ "systemctl --user start lucid.service" ]) ];
|
||||
bind = lib.mkIf (isRias || isChest) (lib.mkForce []);
|
||||
window_rule = lib.mkIf isChest [
|
||||
{
|
||||
name = "float-lucid-settings";
|
||||
match = { class = "org.quickshell"; title = "Lucid Settings"; };
|
||||
float = true;
|
||||
size = [ 1180 800 ];
|
||||
center = true;
|
||||
}
|
||||
{
|
||||
name = "float-lucid-choosers";
|
||||
match = {
|
||||
class = "^(org\\.gnome\\.Nautilus|xdg-desktop-portal-gtk|xdg-desktop-portal-gnome|zenity|org\\.kde\\.kdialog|kdialog)$";
|
||||
title = "^(Choose an account picture|Choose a template|Choose a colour scheme|Export the palette|Save received files to|Send files|Send to .+)$";
|
||||
};
|
||||
float = true;
|
||||
center = true;
|
||||
}
|
||||
];
|
||||
};
|
||||
# Home Manager autoloads these before its generated settings. Lucid's
|
||||
# stateful UI modules are installed too, then required after the Nix base
|
||||
# config below so saved UI choices take effect without losing that base.
|
||||
extraLuaFiles = {
|
||||
"modules/binds.lua" = builtins.toPath (if isRias then "${source}/support/hypr/modules/binds.lua" else if isChest then "${chestBinds}" else "${nonRiasBinds}");
|
||||
"modules/binds.lua" = config.lucid.bindsModule;
|
||||
"modules/json.lua" = builtins.toPath "${source}/support/hypr/modules/json.lua";
|
||||
"modules/specials.lua" = {
|
||||
content = builtins.toPath "${source}/support/hypr/modules/specials.lua";
|
||||
autoLoad = false;
|
||||
};
|
||||
} // lib.optionalAttrs isRias {
|
||||
"modules/decorations.lua" = builtins.toPath "${source}/support/hypr/modules/decorations.lua";
|
||||
"modules/gestures.lua" = builtins.toPath "${source}/support/hypr/modules/gestures.lua";
|
||||
"modules/input.lua" = builtins.toPath "${source}/support/hypr/modules/input.lua";
|
||||
"modules/layout.lua" = builtins.toPath "${source}/support/hypr/modules/layout.lua";
|
||||
"modules/layerrules.lua" = builtins.toPath "${source}/support/hypr/modules/layerrules.lua";
|
||||
"modules/lumen.lua" = builtins.toPath "${source}/support/hypr/modules/lumen.lua";
|
||||
"modules/misc.lua" = builtins.toPath "${source}/support/hypr/modules/misc.lua";
|
||||
"modules/plugins.lua" = builtins.toPath "${source}/support/hypr/modules/plugins.lua";
|
||||
"modules/windowrules.lua" = builtins.toPath "${source}/support/hypr/modules/windowrules.lua";
|
||||
} // lib.optionalAttrs isChest {
|
||||
"modules/decorations.lua" = builtins.toPath "${chestBorders}";
|
||||
} // lib.optionalAttrs (isRias || isChest) {
|
||||
"modules/glass.lua" = {
|
||||
content = builtins.toPath "${source}/support/hypr/modules/glass.lua";
|
||||
autoLoad = false;
|
||||
};
|
||||
"modules/monitors.lua" = {
|
||||
content = builtins.toPath (if isChest then "${chestMonitors}" else "${source}/support/hypr/modules/monitors.lua");
|
||||
autoLoad = false;
|
||||
};
|
||||
"modules/settings.lua" = {
|
||||
content = builtins.toPath "${source}/support/hypr/modules/settings.lua";
|
||||
autoLoad = false;
|
||||
};
|
||||
"modules/startup.lua" = {
|
||||
content = builtins.toPath "${source}/support/hypr/modules/startup.lua";
|
||||
autoLoad = false;
|
||||
};
|
||||
};
|
||||
} // config.lucid.luaModules;
|
||||
# Nix owns session startup and environment exports; don't load Lucid's
|
||||
# generic autostart/env defaults on top of the existing host setup.
|
||||
extraConfig = ''
|
||||
@@ -850,25 +721,6 @@ in {
|
||||
package.path = config_home .. "/hypr/?.lua;" .. config_home .. "/hypr/?/init.lua;" .. package.path
|
||||
require("modules.specials")
|
||||
LucidSpecials.apply()
|
||||
'' + lib.optionalString (isRias || isChest) ''
|
||||
require("modules.monitors")
|
||||
'' + lib.optionalString isRias ''
|
||||
local lucid_monitor_apply = LucidMonitors.apply
|
||||
LucidMonitors.apply = function(...)
|
||||
lucid_monitor_apply(...)
|
||||
hl.monitor({ output = "desc:Huawei Technologies Co. Inc. ZQE-CAA 0xC080F622", cm = "srgb", supports_hdr = -1 })
|
||||
end
|
||||
LucidMonitors.apply()
|
||||
-- Lucid previously left empty workspaces 3-6 persistent on this host.
|
||||
-- Retire those stale rules after applying the monitor layout so they do
|
||||
-- not return on the next Hyprland reload.
|
||||
for _, workspace in ipairs({ "3", "4", "5", "6" }) do
|
||||
hl.workspace_rule({ workspace = workspace, persistent = false })
|
||||
end
|
||||
'' + lib.optionalString (isRias || isChest) ''
|
||||
require("modules.settings")
|
||||
require("modules.glass")
|
||||
require("modules.startup")
|
||||
'';
|
||||
'' + config.lucid.extraHyprlandConfig;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,483 @@
|
||||
{
|
||||
"version": 1,
|
||||
"binds": [
|
||||
{
|
||||
"id": "wallpaper-picker",
|
||||
"keys": "SUPER + W",
|
||||
"desc": "Wallpaper picker",
|
||||
"category": "Lucid"
|
||||
},
|
||||
{
|
||||
"id": "wallpaper-random",
|
||||
"keys": "SUPER + SHIFT + W",
|
||||
"desc": "Set a random wallpaper",
|
||||
"category": "Desktop"
|
||||
},
|
||||
{
|
||||
"id": "calculator-volume",
|
||||
"keys": "XF86Calculator",
|
||||
"desc": "Open volume mixer",
|
||||
"category": "Apps"
|
||||
},
|
||||
{
|
||||
"id": "zoom-reset-scroll-up",
|
||||
"keys": "SUPER + SHIFT + mouse_up",
|
||||
"desc": "Reset cursor zoom",
|
||||
"category": "Accessibility"
|
||||
},
|
||||
{
|
||||
"id": "zoom-reset-scroll-down",
|
||||
"keys": "SUPER + SHIFT + mouse_down",
|
||||
"desc": "Reset cursor zoom",
|
||||
"category": "Accessibility"
|
||||
},
|
||||
{
|
||||
"id": "zoom-reset-minus",
|
||||
"keys": "SUPER + SHIFT + minus",
|
||||
"desc": "Reset cursor zoom",
|
||||
"category": "Accessibility"
|
||||
},
|
||||
{
|
||||
"id": "zoom-reset-kp-subtract",
|
||||
"keys": "SUPER + SHIFT + KP_SUBTRACT",
|
||||
"desc": "Reset cursor zoom",
|
||||
"category": "Accessibility"
|
||||
},
|
||||
{
|
||||
"id": "zoom-reset-zero",
|
||||
"keys": "SUPER + SHIFT + 0",
|
||||
"desc": "Reset cursor zoom",
|
||||
"category": "Accessibility"
|
||||
},
|
||||
{
|
||||
"id": "zoom-in-equal",
|
||||
"keys": "SUPER + equal",
|
||||
"desc": "Zoom in",
|
||||
"category": "Accessibility",
|
||||
"opts": {
|
||||
"repeating": true
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "zoom-out-minus",
|
||||
"keys": "SUPER + minus",
|
||||
"desc": "Zoom out",
|
||||
"category": "Accessibility",
|
||||
"opts": {
|
||||
"repeating": true
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "zoom-in-kp-add",
|
||||
"keys": "SUPER + KP_ADD",
|
||||
"desc": "Zoom in",
|
||||
"category": "Accessibility",
|
||||
"opts": {
|
||||
"repeating": true
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "zoom-out-kp-subtract",
|
||||
"keys": "SUPER + KP_SUBTRACT",
|
||||
"desc": "Zoom out",
|
||||
"category": "Accessibility",
|
||||
"opts": {
|
||||
"repeating": true
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "widgets-panel",
|
||||
"keys": "SUPER + SHIFT + G",
|
||||
"desc": "Toggle widgets panel",
|
||||
"category": "Lucid"
|
||||
},
|
||||
{
|
||||
"id": "launcher",
|
||||
"keys": "SUPER + D",
|
||||
"desc": "App launcher",
|
||||
"category": "Lucid"
|
||||
},
|
||||
{
|
||||
"id": "vaultwarden-password",
|
||||
"keys": "SUPER + X",
|
||||
"desc": "Type a password from Vaultwarden",
|
||||
"category": "Apps"
|
||||
},
|
||||
{
|
||||
"id": "clipse",
|
||||
"keys": "SUPER + V",
|
||||
"desc": "Clipboard manager",
|
||||
"category": "Apps"
|
||||
},
|
||||
{
|
||||
"id": "clipboard",
|
||||
"keys": "SUPER + SHIFT + V",
|
||||
"desc": "Clipboard history",
|
||||
"category": "Lucid"
|
||||
},
|
||||
{
|
||||
"id": "screenshot",
|
||||
"keys": "Print",
|
||||
"desc": "Full screenshot",
|
||||
"category": "Screenshots"
|
||||
},
|
||||
{
|
||||
"id": "screenshot-full",
|
||||
"keys": "SUPER + Print",
|
||||
"desc": "Full screenshot",
|
||||
"category": "Screenshots"
|
||||
},
|
||||
{
|
||||
"id": "screenshot-region",
|
||||
"keys": "CTRL + Print",
|
||||
"desc": "Region screenshot",
|
||||
"category": "Screenshots"
|
||||
},
|
||||
{
|
||||
"id": "screenshot-window",
|
||||
"keys": "ALT + Print",
|
||||
"desc": "Window screenshot",
|
||||
"category": "Screenshots"
|
||||
},
|
||||
{
|
||||
"id": "terminal",
|
||||
"keys": "SUPER + RETURN",
|
||||
"desc": "Terminal",
|
||||
"category": "Apps"
|
||||
},
|
||||
{
|
||||
"id": "close-window",
|
||||
"keys": "SUPER + Q",
|
||||
"desc": "Close window",
|
||||
"category": "Windows"
|
||||
},
|
||||
{
|
||||
"id": "exit-hyprland",
|
||||
"keys": "SUPER + M",
|
||||
"desc": "Exit Hyprland",
|
||||
"category": "Session"
|
||||
},
|
||||
{
|
||||
"id": "file-manager",
|
||||
"keys": "SUPER + E",
|
||||
"desc": "File manager",
|
||||
"category": "Apps"
|
||||
},
|
||||
{
|
||||
"id": "toggle-float",
|
||||
"keys": "SUPER + F",
|
||||
"desc": "Toggle floating window",
|
||||
"category": "Windows"
|
||||
},
|
||||
{
|
||||
"id": "toggle-pseudo",
|
||||
"keys": "SUPER + P",
|
||||
"desc": "Toggle pseudo-tile",
|
||||
"category": "Windows"
|
||||
},
|
||||
{
|
||||
"id": "toggle-split",
|
||||
"keys": "SUPER + J",
|
||||
"desc": "Toggle split direction",
|
||||
"category": "Windows"
|
||||
},
|
||||
{
|
||||
"id": "swap-split",
|
||||
"keys": "SUPER + K",
|
||||
"desc": "Swap split direction",
|
||||
"category": "Windows"
|
||||
},
|
||||
{
|
||||
"id": "focus-left",
|
||||
"keys": "SUPER + LEFT",
|
||||
"desc": "Focus left",
|
||||
"category": "Windows"
|
||||
},
|
||||
{
|
||||
"id": "focus-right",
|
||||
"keys": "SUPER + RIGHT",
|
||||
"desc": "Focus right",
|
||||
"category": "Windows"
|
||||
},
|
||||
{
|
||||
"id": "focus-up",
|
||||
"keys": "SUPER + UP",
|
||||
"desc": "Focus up",
|
||||
"category": "Windows"
|
||||
},
|
||||
{
|
||||
"id": "focus-down",
|
||||
"keys": "SUPER + DOWN",
|
||||
"desc": "Focus down",
|
||||
"category": "Windows"
|
||||
},
|
||||
{
|
||||
"id": "swap-left",
|
||||
"keys": "SUPER + SHIFT + LEFT",
|
||||
"desc": "Move window left",
|
||||
"category": "Windows"
|
||||
},
|
||||
{
|
||||
"id": "swap-right",
|
||||
"keys": "SUPER + SHIFT + RIGHT",
|
||||
"desc": "Move window right",
|
||||
"category": "Windows"
|
||||
},
|
||||
{
|
||||
"id": "swap-up",
|
||||
"keys": "SUPER + SHIFT + UP",
|
||||
"desc": "Move window up",
|
||||
"category": "Windows"
|
||||
},
|
||||
{
|
||||
"id": "swap-down",
|
||||
"keys": "SUPER + SHIFT + DOWN",
|
||||
"desc": "Move window down",
|
||||
"category": "Windows"
|
||||
},
|
||||
{
|
||||
"id": "resize-left",
|
||||
"keys": "SUPER + CTRL + LEFT",
|
||||
"desc": "Resize window left",
|
||||
"category": "Windows"
|
||||
},
|
||||
{
|
||||
"id": "resize-right",
|
||||
"keys": "SUPER + CTRL + RIGHT",
|
||||
"desc": "Resize window right",
|
||||
"category": "Windows"
|
||||
},
|
||||
{
|
||||
"id": "resize-up",
|
||||
"keys": "SUPER + CTRL + UP",
|
||||
"desc": "Resize window up",
|
||||
"category": "Windows"
|
||||
},
|
||||
{
|
||||
"id": "resize-down",
|
||||
"keys": "SUPER + CTRL + DOWN",
|
||||
"desc": "Resize window down",
|
||||
"category": "Windows"
|
||||
},
|
||||
{
|
||||
"id": "workspace-focus",
|
||||
"keys": "SUPER + {key}",
|
||||
"desc": "Focus workspace {n}",
|
||||
"category": "Workspaces",
|
||||
"each": "workspace"
|
||||
},
|
||||
{
|
||||
"id": "workspace-move",
|
||||
"keys": "SUPER + SHIFT + {key}",
|
||||
"desc": "Move window to workspace {n}",
|
||||
"category": "Workspaces",
|
||||
"each": "workspace"
|
||||
},
|
||||
{
|
||||
"id": "scratchpad",
|
||||
"keys": "SUPER + ALT + P",
|
||||
"desc": "Toggle scratchpad",
|
||||
"category": "Workspaces",
|
||||
"type": "lua",
|
||||
"lua": "specials.scratchpad()"
|
||||
},
|
||||
{
|
||||
"id": "scratchpad-stash",
|
||||
"keys": "SUPER + ALT + S",
|
||||
"desc": "Stash or restore the focused window",
|
||||
"category": "Workspaces",
|
||||
"type": "lua",
|
||||
"lua": "specials.stash()"
|
||||
},
|
||||
{
|
||||
"id": "special-music",
|
||||
"keys": "SUPER + ALT + M",
|
||||
"desc": "Toggle Music workspace",
|
||||
"category": "Workspaces",
|
||||
"type": "lua",
|
||||
"lua": "specials.toggle('music')"
|
||||
},
|
||||
{
|
||||
"id": "special-comms",
|
||||
"keys": "SUPER + ALT + C",
|
||||
"desc": "Toggle Comms workspace",
|
||||
"category": "Workspaces",
|
||||
"type": "lua",
|
||||
"lua": "specials.toggle('comms')"
|
||||
},
|
||||
{
|
||||
"id": "special-todo",
|
||||
"keys": "SUPER + ALT + T",
|
||||
"desc": "Toggle To-do workspace",
|
||||
"category": "Workspaces",
|
||||
"type": "lua",
|
||||
"lua": "specials.toggle('todo')"
|
||||
},
|
||||
{
|
||||
"id": "special-sysmon",
|
||||
"keys": "SUPER + ALT + B",
|
||||
"desc": "Toggle system monitor workspace",
|
||||
"category": "Workspaces",
|
||||
"type": "lua",
|
||||
"lua": "specials.toggle('sysmon')"
|
||||
},
|
||||
{
|
||||
"id": "daemons-workspace",
|
||||
"keys": "SUPER + ALT + D",
|
||||
"desc": "Daemons workspace",
|
||||
"category": "Workspaces",
|
||||
"type": "lua",
|
||||
"lua": "specials.toggle('daemons')"
|
||||
},
|
||||
{
|
||||
"id": "fullscreen",
|
||||
"keys": "SUPER + SHIFT + F",
|
||||
"desc": "Toggle fullscreen",
|
||||
"category": "Windows"
|
||||
},
|
||||
{
|
||||
"id": "workspace-next-scroll",
|
||||
"keys": "SUPER + mouse_down",
|
||||
"desc": "Next workspace",
|
||||
"category": "Workspaces"
|
||||
},
|
||||
{
|
||||
"id": "workspace-previous-scroll",
|
||||
"keys": "SUPER + mouse_up",
|
||||
"desc": "Previous workspace",
|
||||
"category": "Workspaces"
|
||||
},
|
||||
{
|
||||
"id": "keyboard-brightness-up",
|
||||
"keys": "SUPER + F3",
|
||||
"desc": "Keyboard backlight up",
|
||||
"category": "Displays"
|
||||
},
|
||||
{
|
||||
"id": "keyboard-brightness-down",
|
||||
"keys": "SUPER + F2",
|
||||
"desc": "Keyboard backlight down",
|
||||
"category": "Displays"
|
||||
},
|
||||
{
|
||||
"id": "audio-mute",
|
||||
"keys": "XF86AudioMute",
|
||||
"desc": "Toggle audio mute",
|
||||
"category": "Media"
|
||||
},
|
||||
{
|
||||
"id": "microphone-mute",
|
||||
"keys": "XF86AudioMicMute",
|
||||
"desc": "Toggle microphone mute",
|
||||
"category": "Media"
|
||||
},
|
||||
{
|
||||
"id": "play-pause",
|
||||
"keys": "XF86AudioPlay",
|
||||
"desc": "Play or pause media",
|
||||
"category": "Media"
|
||||
},
|
||||
{
|
||||
"id": "file-manager-media",
|
||||
"keys": "XF86Explorer",
|
||||
"desc": "File manager",
|
||||
"category": "Apps"
|
||||
},
|
||||
{
|
||||
"id": "email",
|
||||
"keys": "XF86Mail",
|
||||
"desc": "Email",
|
||||
"category": "Apps"
|
||||
},
|
||||
{
|
||||
"id": "browser",
|
||||
"keys": "XF86WWW",
|
||||
"desc": "Web browser",
|
||||
"category": "Apps"
|
||||
},
|
||||
{
|
||||
"id": "display-brightness-down",
|
||||
"keys": "XF86MonBrightnessDown",
|
||||
"desc": "Brightness down",
|
||||
"category": "Displays"
|
||||
},
|
||||
{
|
||||
"id": "display-brightness-up",
|
||||
"keys": "XF86MonBrightnessUp",
|
||||
"desc": "Brightness up",
|
||||
"category": "Displays"
|
||||
},
|
||||
{
|
||||
"id": "volume-up",
|
||||
"keys": "XF86AudioRaiseVolume",
|
||||
"desc": "Volume up",
|
||||
"category": "Media",
|
||||
"opts": {
|
||||
"repeating": true
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "volume-down",
|
||||
"keys": "XF86AudioLowerVolume",
|
||||
"desc": "Volume down",
|
||||
"category": "Media",
|
||||
"opts": {
|
||||
"repeating": true
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "previous-seek",
|
||||
"keys": "XF86AudioPrev",
|
||||
"desc": "Seek backward",
|
||||
"category": "Media",
|
||||
"opts": {
|
||||
"click": true
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "next-seek",
|
||||
"keys": "XF86AudioNext",
|
||||
"desc": "Seek forward",
|
||||
"category": "Media",
|
||||
"opts": {
|
||||
"click": true
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "previous-track",
|
||||
"keys": "XF86AudioPrev",
|
||||
"desc": "Previous track",
|
||||
"category": "Media",
|
||||
"opts": {
|
||||
"long_press": true
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "next-track",
|
||||
"keys": "XF86AudioNext",
|
||||
"desc": "Next track",
|
||||
"category": "Media",
|
||||
"opts": {
|
||||
"long_press": true
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "move-window-drag",
|
||||
"keys": "SUPER + mouse:272",
|
||||
"desc": "Move window with mouse",
|
||||
"category": "Windows",
|
||||
"opts": {
|
||||
"mouse": true
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "resize-window-drag",
|
||||
"keys": "SUPER + mouse:273",
|
||||
"desc": "Resize window with mouse",
|
||||
"category": "Windows",
|
||||
"opts": {
|
||||
"mouse": true
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
-- Initial Rias display layout; Home Manager seeds this only while the
|
||||
-- user-owned Lucid monitor list is empty.
|
||||
return {
|
||||
monitors = {
|
||||
{ output = "desc:Huawei Technologies Co. Inc. ZQE-CAA 0xC080F622", mode = "3440x1440@120.00", position = "1920x0", scale = "1" },
|
||||
{ output = "desc:Samsung Electric Company SAMSUNG 0x01000E00", mode = "1920x1080@60.00", position = "0x0", scale = "1" },
|
||||
},
|
||||
workspaces = {},
|
||||
}
|
||||
@@ -1,3 +0,0 @@
|
||||
{
|
||||
"pinnedApps": []
|
||||
}
|
||||
@@ -1,3 +0,0 @@
|
||||
{
|
||||
"pinnedApps": []
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
{
|
||||
"nextId": 3,
|
||||
"boardFull": true,
|
||||
"instances": [
|
||||
{
|
||||
"uid": "w1",
|
||||
"type": "clock",
|
||||
"variant": "digital",
|
||||
"wx": 40,
|
||||
"wy": 70
|
||||
},
|
||||
{
|
||||
"uid": "w2",
|
||||
"type": "system",
|
||||
"variant": "rings",
|
||||
"wx": 40,
|
||||
"wy": 250
|
||||
}
|
||||
]
|
||||
}
|
||||
+8
-1
@@ -1,7 +1,14 @@
|
||||
{ pkgs, pkgs-pinned, host, ... }: {
|
||||
{ pkgs, pkgs-pinned, lib, osConfig, ... }: {
|
||||
imports = [
|
||||
../../modules/user/packages/cs_utils.nix
|
||||
../../modules/user/lucid
|
||||
./modules/lucid
|
||||
] ++ lib.optionals (osConfig.networking.hostName == "Impreza") [
|
||||
../../host/Impreza/modules/lucid
|
||||
] ++ lib.optionals (osConfig.networking.hostName == "Rias") [
|
||||
../../host/Rias/modules/lucid
|
||||
] ++ lib.optionals (osConfig.networking.hostName == "Eclipse") [
|
||||
../../host/Eclipse/modules/lucid
|
||||
];
|
||||
disabledModules = [
|
||||
../../modules/user/packages/art.nix
|
||||
|
||||
@@ -0,0 +1,185 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
source = config.lucid.upstreamSource;
|
||||
specialBindIds = [ "scratchpad" "scratchpad-stash" "special-music" "special-comms" "special-todo" "special-sysmon" "daemons-workspace" ];
|
||||
specialSeed = pkgs.writeText "lucid-special-bindings.json" (builtins.toJSON {
|
||||
version = 1;
|
||||
binds = builtins.filter (entry: builtins.elem entry.id specialBindIds)
|
||||
(builtins.fromJSON (builtins.readFile ../../../../modules/user/lucid/lucid-keybind-catalog.json)).binds;
|
||||
});
|
||||
chestBindingsScript = pkgs.writeText "lucid-chest-bindings.py" ''
|
||||
import hashlib, json, re, sys
|
||||
from collections import Counter
|
||||
source, reference, special, output = sys.argv[1:]
|
||||
binds = json.loads(source)
|
||||
refs = json.load(open(reference))["binds"]
|
||||
specials = json.load(open(special))["binds"]
|
||||
counts, result = Counter(), []
|
||||
for entry in binds:
|
||||
args = entry["_args"]
|
||||
if not 2 <= len(args) <= 3 or args[1].get("_type") != "lua-inline":
|
||||
raise ValueError(f"Unsupported Hyprland binding: {entry}")
|
||||
keys, expr = args[0], args[1]["expr"]
|
||||
opts = args[2] if len(args) == 3 else {}
|
||||
signature = json.dumps([keys.upper().replace(" ", ""), opts], sort_keys=True)
|
||||
counts[signature] += 1
|
||||
identifier = hashlib.sha256(signature.encode()).hexdigest()[:12]
|
||||
b = {"id": f"chest-{identifier}-{counts[signature]}", "keys": keys}
|
||||
match = next((r for r in refs if r.get("keys", "").upper().replace(" ", "") == keys.upper().replace(" ", "") and r.get("opts", {}) == opts), None)
|
||||
b["desc"] = match.get("desc", keys) if match else keys
|
||||
b["category"] = match.get("category", "Other") if match else "Other"
|
||||
workspace = re.search(r"workspace = (\d+)", expr)
|
||||
if workspace and expr.startswith("hl.dsp.focus("):
|
||||
b.update(desc=f"Focus workspace {workspace.group(1)}", category="Workspaces")
|
||||
elif workspace and expr.startswith("hl.dsp.window.move("):
|
||||
b.update(desc=f"Move window to workspace {workspace.group(1)}", category="Workspaces")
|
||||
if keys.upper().replace(" ", "") == "SUPER+SHIFT+S": b.update(desc="Region screenshot and edit", category="Screenshots")
|
||||
m = re.fullmatch(r'hl\.dsp\.exec_cmd\(("(?:\\.|[^"\\])*")\)\s*', expr, re.S)
|
||||
if m:
|
||||
cmd = json.loads(m.group(1))
|
||||
cmd = re.sub(r'/nix/store/[0-9a-z]{32}-[^/\s"\\]+/bin/([A-Za-z0-9_.+-]+)', r'\1', cmd)
|
||||
b.update(type="exec", cmd=cmd)
|
||||
else: b.update(type="lua", lua=expr)
|
||||
if opts: b["opts"] = opts
|
||||
result.append(b)
|
||||
json.dump({"version": 1, "binds": result + specials}, open(output, "w"), indent=2)
|
||||
'';
|
||||
chestSeed = pkgs.runCommand "lucid-chest-bindings.json" { nativeBuildInputs = [ pkgs.python3 ]; } ''
|
||||
python3 ${chestBindingsScript} ${lib.escapeShellArg (builtins.toJSON config.lucidHyprlandBinds)} \
|
||||
${../../../../modules/user/lucid/lucid-keybind-catalog.json} ${specialSeed} "$out"
|
||||
'';
|
||||
chestBinds = pkgs.runCommand "lucid-chest-loader.lua" { nativeBuildInputs = [ pkgs.python3 ]; } ''
|
||||
python3 - ${source}/support/hypr/modules/binds.lua "$out" <<'PY'
|
||||
import pathlib, sys
|
||||
source = pathlib.Path(sys.argv[1]).read_text()
|
||||
old = '{ id = "terminal", keys = "F9", type = "exec", cmd = "kitty" }'
|
||||
new = '{ id = "terminal", keys = "SUPER + RETURN", type = "exec", cmd = "ghostty" }'
|
||||
if source.count(old) != 1: raise SystemExit("Lucid emergency bindings changed")
|
||||
pathlib.Path(sys.argv[2]).write_text(source.replace(old, new, 1))
|
||||
PY
|
||||
'';
|
||||
chestMonitors = pkgs.runCommand "lucid-chest-monitors.lua" { nativeBuildInputs = [ pkgs.python3 ]; } ''
|
||||
python3 - ${source}/support/hypr/modules/monitors.lua "$out" <<'PY'
|
||||
import pathlib, sys
|
||||
source = pathlib.Path(sys.argv[1]).read_text()
|
||||
rule = """hl.monitor({
|
||||
output = "",
|
||||
mode = M.defaults.mode,
|
||||
position = M.defaults.position,
|
||||
scale = M.defaults.scale,
|
||||
})
|
||||
"""
|
||||
if source.count(rule) != 1: raise SystemExit("Lucid monitor defaults changed")
|
||||
pathlib.Path(sys.argv[2]).write_text(source.replace(rule, "", 1))
|
||||
PY
|
||||
'';
|
||||
chestBorders = pkgs.runCommand "lucid-chest-decorations.lua" { nativeBuildInputs = [ pkgs.python3 ]; } ''
|
||||
python3 - ${source}/support/hypr/modules/decorations.lua "$out" <<'PY'
|
||||
import pathlib, sys
|
||||
source = pathlib.Path(sys.argv[1]).read_text()
|
||||
marker = "local active_border, inactive_border = borders()"
|
||||
if source.count(marker) != 1: raise SystemExit("Lucid border module changed")
|
||||
pathlib.Path(sys.argv[2]).write_text(source.split(marker, 1)[0])
|
||||
PY
|
||||
'';
|
||||
chestPrefs = pkgs.writeText "lucid-chest-prefs.json" (builtins.toJSON (
|
||||
(builtins.fromJSON (builtins.readFile "${source}/defaults/prefs.json")) // {
|
||||
specialCustom = builtins.toJSON [ { key = "daemons"; label = "Daemons"; glyph = "build"; on = true; apps = ""; } ];
|
||||
}
|
||||
));
|
||||
in
|
||||
{
|
||||
lucid.keybindSeed = chestSeed;
|
||||
lucid.prefsSeed = chestPrefs;
|
||||
lucid.bindsModule = chestBinds;
|
||||
lucid.luaModules = {
|
||||
"modules/decorations.lua" = lib.mkForce chestBorders;
|
||||
"modules/monitors.lua" = lib.mkForce { content = chestMonitors; autoLoad = false; };
|
||||
"modules/glass.lua" = { content = "${source}/support/hypr/modules/glass.lua"; autoLoad = false; };
|
||||
"modules/settings.lua" = { content = "${source}/support/hypr/modules/settings.lua"; autoLoad = false; };
|
||||
"modules/startup.lua" = { content = "${source}/support/hypr/modules/startup.lua"; autoLoad = false; };
|
||||
};
|
||||
lucid.extraHyprlandConfig = ''
|
||||
require("modules.monitors")
|
||||
require("modules.settings")
|
||||
require("modules.glass")
|
||||
require("modules.startup")
|
||||
'';
|
||||
lucid.shellFile = pkgs.writeText "lucid-chest-shell.qml" (builtins.replaceStrings [
|
||||
''import "./lucidlock"''
|
||||
" Lock {\n }\n"
|
||||
" void Clip.probed;"
|
||||
] [
|
||||
""
|
||||
""
|
||||
" void Notifs.count;\n void KdeConnect.installed;\n void HyprConfig.moduleProbed;\n void Monitors.moduleProbed;\n void Glass.moduleProbed;\n void Startup.moduleProbed;\n void Clip.probed;"
|
||||
] (builtins.readFile ../../../../modules/user/lucid/lucid-shell.qml));
|
||||
|
||||
lucid.prefsFilter = ''.barEnabled = true | .widgetOnTop = false | .widgetHideFullscreen = true | .fontFamily = $font | .liveWallpapers = false | .idleLock = false | .idleLockBeforeSleep = false | .launcherPowerButtons = "suspend,reboot,shutdown" | .powerModuleActions = "suspend,hibernate,logout,reboot,shutdown"'';
|
||||
|
||||
home.packages = with pkgs; [ brightnessctl playerctl slurp swappy ];
|
||||
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
bind = lib.mkForce [];
|
||||
window_rule = [
|
||||
{
|
||||
name = "float-lucid-settings";
|
||||
match = { class = "org.quickshell"; title = "Lucid Settings"; };
|
||||
float = true;
|
||||
size = [ 1180 800 ];
|
||||
center = true;
|
||||
}
|
||||
{
|
||||
name = "float-lucid-choosers";
|
||||
match = {
|
||||
class = "^(org\\.gnome\\.Nautilus|xdg-desktop-portal-gtk|xdg-desktop-portal-gnome|zenity|org\\.kde\\.kdialog|kdialog)$";
|
||||
title = "^(Choose an account picture|Choose a template|Choose a colour scheme|Export the palette|Save received files to|Send files|Send to .+)$";
|
||||
};
|
||||
float = true;
|
||||
center = true;
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
home.activation.installChestLucidFixes = lib.hm.dag.entryAfter [ "installLucid" ] ''
|
||||
target="${config.home.homeDirectory}/.config/quickshell"
|
||||
lock_qml="$target/Lockscreen.qml"
|
||||
if ! grep -Fq 'return; // Lucid lock disabled for chest' "$lock_qml"; then
|
||||
grep -Fq 'function lock(settle) {' "$lock_qml" && \
|
||||
grep -Fq 'function pushLockedHint() {' "$lock_qml" && \
|
||||
grep -Fq 'id: logindWatch' "$lock_qml" || {
|
||||
echo "Lucid lock integration changed; refusing to leave it active for chest" >&2
|
||||
exit 1
|
||||
}
|
||||
$DRY_RUN_CMD sed -i \
|
||||
-e '/function lock(settle) {/a\ return; // Lucid lock disabled for chest' \
|
||||
-e '/function pushLockedHint() {/a\ return; // Lucid lock disabled for chest' \
|
||||
-e '/id: logindWatch/{n;n;s/running: true/running: false/;}' "$lock_qml"
|
||||
fi
|
||||
if ! grep -Fq 'id: chestBrightnessPoll' "$target/lucidosd/Osd.qml"; then
|
||||
$DRY_RUN_CMD ${pkgs.patch}/bin/patch --batch --forward -p1 -d "$target" < ${pkgs.writeText "lucid-chest-osd.patch" ''
|
||||
--- a/lucidosd/Osd.qml
|
||||
+++ b/lucidosd/Osd.qml
|
||||
@@ -26 +26 @@
|
||||
- readonly property int brightnessPercent: osdWindow.maxBrightness > 0 ? Math.round((parseInt(brightnessFile.text()) / osdWindow.maxBrightness) * 100) : 0
|
||||
+ property int brightnessPercent: 0
|
||||
@@ -378,2 +378,15 @@
|
||||
onFileChanged: reload()
|
||||
+ onLoaded: {
|
||||
+ const value = parseInt(brightnessFile.text());
|
||||
+ if (osdWindow.maxBrightness > 0 && !isNaN(value))
|
||||
+ osdWindow.brightnessPercent = Math.round(value / osdWindow.maxBrightness * 100);
|
||||
+ }
|
||||
}
|
||||
+
|
||||
+ Timer {
|
||||
+ id: chestBrightnessPoll
|
||||
+ interval: 500
|
||||
+ repeat: true
|
||||
+ running: osdWindow.backlightDevice !== ""
|
||||
+ onTriggered: brightnessFile.reload()
|
||||
+ }
|
||||
''}
|
||||
fi
|
||||
'';
|
||||
}
|
||||
@@ -1,11 +1,30 @@
|
||||
{ pkgs, ... }: {
|
||||
imports = [ ../../modules/user/lucid ];
|
||||
{ pkgs, lib, osConfig, ... }: let
|
||||
# Match the Electron FFmpeg build recommended by Vivaldi 8.2.
|
||||
vivaldiCodecs = pkgs.runCommand "vivaldi-ffmpeg-electron-44.4.2" {
|
||||
nativeBuildInputs = [ pkgs.unzip ];
|
||||
} ''
|
||||
mkdir -p "$out/lib"
|
||||
unzip -p ${pkgs.fetchurl {
|
||||
url = "https://github.com/electron/electron/releases/download/v44.4.2/electron-v44.4.2-linux-x64.zip";
|
||||
hash = "sha256-rXEGPnfaKaZH+HKwkEePn6nM/9Z957KuYxVAnPHxNDY=";
|
||||
}} libffmpeg.so > "$out/lib/libffmpeg.so"
|
||||
echo "39f63af3ef6f8db9eea20803c6f6dff8b2d5ad596d506ea1effb3f856715ac1c $out/lib/libffmpeg.so" | sha256sum -c
|
||||
'';
|
||||
in {
|
||||
imports = [
|
||||
../../modules/user/lucid
|
||||
./modules/lucid
|
||||
] ++ lib.optionals (osConfig.networking.hostName == "Rias") [
|
||||
../../host/Rias/modules/lucid
|
||||
./modules/lucid/rias.nix
|
||||
];
|
||||
|
||||
programs.hyprlock.enable = true;
|
||||
home.packages = with pkgs; [
|
||||
android-studio
|
||||
(vivaldi.override {
|
||||
proprietaryCodecs = true;
|
||||
vivaldi-ffmpeg-codecs = vivaldiCodecs;
|
||||
enableWidevine = true;
|
||||
})
|
||||
weechat
|
||||
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,28 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
specialCustom = builtins.toJSON [ {
|
||||
key = "daemons";
|
||||
label = "Daemons";
|
||||
glyph = "build";
|
||||
on = true;
|
||||
apps = "";
|
||||
} ];
|
||||
in {
|
||||
lucid.keybindSeed = ./lucid-keybinds.json;
|
||||
lucid.prefsSeed = pkgs.writeText "sweetbread-lucid-prefs.json" (builtins.toJSON (
|
||||
(builtins.fromJSON (builtins.readFile ./lucid-prefs.json)) // {
|
||||
specialCustom = specialCustom;
|
||||
}
|
||||
));
|
||||
lucid.startWallpaper = true;
|
||||
lucid.installWallpaperSupport = true;
|
||||
|
||||
lucid.managedFiles = {
|
||||
"${config.home.homeDirectory}/.config/quickshell/Agenda.qml" = ./Agenda.qml;
|
||||
"${config.home.homeDirectory}/.config/quickshell/CalendarSource.qml" = ./CalendarSource.qml;
|
||||
"${config.home.homeDirectory}/.config/quickshell/lucidbar/ClockCalendar.qml" = ./ClockCalendar.qml;
|
||||
"${config.home.homeDirectory}/.config/quickshell/thunderbird-calendar.py" = ./thunderbird-calendar.py;
|
||||
};
|
||||
|
||||
wayland.windowManager.hyprland.settings.bind = lib.mkForce [];
|
||||
}
|
||||
+1
@@ -15,6 +15,7 @@
|
||||
{ "id": "zoom-out-kp-subtract", "keys": "SUPER + KP_SUBTRACT", "desc": "Zoom out", "category": "Accessibility", "type": "lua", "lua": "function() local current = hl.get_config('cursor.zoom_factor'); hl.config({ cursor = { zoom_factor = math.max(1, current * 0.9) } }) end", "opts": { "repeating": true } },
|
||||
{ "id": "widgets-panel", "keys": "SUPER + SHIFT + G", "desc": "Toggle widgets panel", "category": "Lucid", "type": "exec", "cmd": "qs ipc call widgets panel" },
|
||||
{ "id": "launcher", "keys": "SUPER + D", "desc": "App launcher", "category": "Lucid", "type": "exec", "cmd": "hyprctl eval 'hl.config({ input = { follow_mouse = 2 } })' && qs ipc call launcher toggle" },
|
||||
{ "id": "vaultwarden-password", "keys": "SUPER + X", "desc": "Type a password from Vaultwarden", "category": "Apps", "type": "exec", "cmd": "qs ipc call -- launcher search '>pass '" },
|
||||
{ "id": "clipse", "keys": "SUPER + V", "desc": "Clipboard manager", "category": "Apps", "type": "exec", "cmd": "ghostty --title=clipse -e clipse" },
|
||||
{ "id": "clipboard", "keys": "SUPER + SHIFT + V", "desc": "Clipboard history", "category": "Lucid", "type": "exec", "cmd": "hyprctl eval 'hl.config({ input = { follow_mouse = 2 } })' && qs ipc call launcher clipboard" },
|
||||
{ "id": "screenshot", "keys": "Print", "desc": "Full screenshot", "category": "Screenshots", "type": "exec", "cmd": "qs ipc call screenshot full" },
|
||||
File renamed without changes.
@@ -0,0 +1,13 @@
|
||||
{ config, lib, ... }:
|
||||
{
|
||||
lucid.prefsSeed = lib.mkForce (builtins.toFile "sweetbread-rias-lucid-prefs.json" (builtins.toJSON (
|
||||
(builtins.fromJSON (builtins.readFile ./lucid-prefs.json)) // {
|
||||
specialCustom = "[]";
|
||||
}
|
||||
)));
|
||||
lucid.extraHyprlandConfig = ''
|
||||
require("modules.settings")
|
||||
require("modules.glass")
|
||||
require("modules.startup")
|
||||
'';
|
||||
}
|
||||
File renamed without changes.
Reference in new issue
Block a user