Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b5ce26f244 | |||
| 793a16b2fc | |||
| 1e2f869bf3 | |||
| 7e7c62ec42 | |||
| e6d69e1e45 | |||
| 514e284b16 | |||
| efa96077a5 | |||
| 734906d50e |
+28
-11
@@ -12,14 +12,19 @@ end
|
||||
local main_mod = "SUPER"
|
||||
local terminal = "alacritty"
|
||||
|
||||
local input = {
|
||||
kb_layout = "us",
|
||||
kb_variant = "intl",
|
||||
numlock_by_default = true,
|
||||
}
|
||||
for key, value in pairs(machine.input or {}) do
|
||||
input[key] = value
|
||||
end
|
||||
|
||||
hl.config({
|
||||
input = {
|
||||
kb_layout = "us",
|
||||
kb_variant = "intl",
|
||||
numlock_by_default = true,
|
||||
},
|
||||
input = input,
|
||||
general = {
|
||||
gaps_in = 8,
|
||||
gaps_in = 4,
|
||||
-- Keep a thin black perimeter so the bottom border remains on-screen.
|
||||
gaps_out = 2,
|
||||
border_size = 2,
|
||||
@@ -35,6 +40,16 @@ hl.config({
|
||||
animations = {
|
||||
enabled = false,
|
||||
},
|
||||
binds = {
|
||||
-- Selecting the current workspace again returns to the last workspace.
|
||||
workspace_back_and_forth = true,
|
||||
},
|
||||
})
|
||||
|
||||
-- Dynamically hide the border when a workspace has exactly one tiled app.
|
||||
hl.workspace_rule({
|
||||
workspace = "w[t1]",
|
||||
no_border = true,
|
||||
})
|
||||
|
||||
-- Application and session bindings.
|
||||
@@ -64,10 +79,10 @@ hl.bind("XF86AudioNext", hl.dsp.exec_cmd("playerctl next"), { locked = true })
|
||||
hl.bind("XF86AudioPrev", hl.dsp.exec_cmd("playerctl previous"), { locked = true })
|
||||
hl.bind(main_mod .. " + XF86AudioRaiseVolume", hl.dsp.exec_cmd("playerctl next"), { locked = true })
|
||||
hl.bind(main_mod .. " + XF86AudioLowerVolume", hl.dsp.exec_cmd("playerctl previous"), { locked = true })
|
||||
hl.bind("XF86MonBrightnessUp", hl.dsp.exec_cmd('light -A 5 && notify-send "Brightness set to $(light)"'), { locked = true })
|
||||
hl.bind("XF86MonBrightnessDown", hl.dsp.exec_cmd('light -U 5 && notify-send "Brightness set to $(light)"'), { locked = true })
|
||||
hl.bind(main_mod .. " + XF86MonBrightnessDown", hl.dsp.exec_cmd('light -S 0.2 && notify-send "Brightness set to min"'), { locked = true })
|
||||
hl.bind(main_mod .. " + XF86MonBrightnessUp", hl.dsp.exec_cmd('light -S 100 && notify-send "Brightness set to max"'), { locked = true })
|
||||
hl.bind("XF86MonBrightnessUp", hl.dsp.exec_cmd('light -A 5'), { locked = true })
|
||||
hl.bind("XF86MonBrightnessDown", hl.dsp.exec_cmd('light -U 5'), { locked = true })
|
||||
hl.bind(main_mod .. " + XF86MonBrightnessDown", hl.dsp.exec_cmd('light -S 0.0'), { locked = true })
|
||||
hl.bind(main_mod .. " + XF86MonBrightnessUp", hl.dsp.exec_cmd('light -S 100'), { locked = true })
|
||||
hl.bind("XF86Calculator", hl.dsp.exec_cmd("qalculate-qt"), { locked = true })
|
||||
|
||||
-- Retain i3's hjkl and arrow-key directional workflow.
|
||||
@@ -88,7 +103,9 @@ for workspace = 1, 9 do
|
||||
hl.bind(main_mod .. " + SHIFT + " .. key, hl.dsp.window.move({ workspace = workspace }))
|
||||
hl.bind(main_mod .. " + CTRL + " .. key, hl.dsp.window.move({ workspace = workspace, follow = true }))
|
||||
end
|
||||
-- Hyprland has no direct i3-style back_and_forth dispatcher; use numbered workspaces.
|
||||
-- Match i3's back-and-forth workflow: Super+Tab switches to the last workspace;
|
||||
-- selecting the current numbered workspace also returns to it.
|
||||
hl.bind(main_mod .. " + TAB", hl.dsp.focus({ workspace = "previous" }))
|
||||
hl.bind(main_mod .. " + CTRL + RIGHT", hl.dsp.focus({ workspace = "+1" }))
|
||||
hl.bind(main_mod .. " + CTRL + LEFT", hl.dsp.focus({ workspace = "-1" }))
|
||||
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
-- Laptop profile: leave monitor selection to Hyprland's hotplug support.
|
||||
-- Noctalia replaces the i3-era Redshift, Polybar, Blueman Applet, and Picom stack.
|
||||
return {
|
||||
input = {
|
||||
touchpad = {
|
||||
natural_scroll = true,
|
||||
},
|
||||
},
|
||||
monitors = {},
|
||||
startup = {
|
||||
"noctalia",
|
||||
|
||||
@@ -10,3 +10,41 @@ mode = "dark"
|
||||
source = "custom"
|
||||
custom_palette = "Ember OLED"
|
||||
pure_black_dark = true
|
||||
|
||||
# Noctalia merges files alphabetically. Keep reusable modules here; machine-specific
|
||||
# layout and hardware settings live in 90-machine.toml, while 99-extend.toml is local.
|
||||
[plugins]
|
||||
enabled = ["alex/system-status"]
|
||||
|
||||
[widget.cpu]
|
||||
type = "alex/system-status:cpu"
|
||||
|
||||
[widget.ram]
|
||||
type = "alex/system-status:memory"
|
||||
|
||||
[widget.temp]
|
||||
type = "sysmon"
|
||||
stat = "cpu_temp"
|
||||
display = "text"
|
||||
|
||||
[widget.disk]
|
||||
type = "sysmon"
|
||||
stat = "disk_pct"
|
||||
display = "text"
|
||||
path = "/"
|
||||
|
||||
[desktop_widgets]
|
||||
enabled = false
|
||||
|
||||
[wallpaper]
|
||||
enabled = true
|
||||
fill_color = "#000000"
|
||||
|
||||
[wallpaper.default]
|
||||
path = "color:#000000"
|
||||
|
||||
[nightlight]
|
||||
enabled = true
|
||||
force = false
|
||||
temperature_day = 6500
|
||||
temperature_night = 2500
|
||||
|
||||
@@ -1,19 +1,20 @@
|
||||
# Desktop-specific shell layout and hardware telemetry.
|
||||
[bar.main]
|
||||
position = "bottom"
|
||||
layer = "overlay"
|
||||
layer = "top"
|
||||
capsule_radius = 5
|
||||
center = ["group:g3", "notifications"]
|
||||
end = ["bluetooth", "volume", "control-center", "group:g1", "session"]
|
||||
end = ["bluetooth", "input_volume", "volume", "control-center", "group:g1", "session"]
|
||||
font_weight = 400
|
||||
margin_ends = 0
|
||||
padding = 0
|
||||
panel_overlap = 3
|
||||
radius = 0
|
||||
shadow = false
|
||||
smart_auto_hide = true
|
||||
# The bar may overlay the thin perimeter while visible; hidden bars release the space.
|
||||
reserve_space = false
|
||||
# Keep the desktop status bar visible and reserve its screen edge.
|
||||
auto_hide = false
|
||||
smart_auto_hide = false
|
||||
reserve_space = true
|
||||
start = ["tray", "group:g4", "group:g2", "privacy"]
|
||||
thickness = 39
|
||||
widget_spacing = 10
|
||||
@@ -47,21 +48,10 @@ radius = 5.0
|
||||
enabled = true
|
||||
fill = "surface_variant"
|
||||
id = "g4"
|
||||
members = ["cpu", "temp", "ram", "gpu", "gpu_temp", "disk", "battery"]
|
||||
members = ["cpu", "temp", "ram", "gpu", "gpu_temp", "disk"]
|
||||
opacity = 1.0
|
||||
padding = 6.0
|
||||
|
||||
[widget.cpu]
|
||||
type = "alex/system-status:cpu"
|
||||
|
||||
[widget.ram]
|
||||
type = "alex/system-status:memory"
|
||||
|
||||
[widget.temp]
|
||||
type = "sysmon"
|
||||
stat = "cpu_temp"
|
||||
display = "text"
|
||||
|
||||
[widget.gpu]
|
||||
type = "sysmon"
|
||||
stat = "gpu_usage"
|
||||
@@ -72,39 +62,11 @@ type = "sysmon"
|
||||
stat = "gpu_temp"
|
||||
display = "text"
|
||||
|
||||
[widget.disk]
|
||||
type = "sysmon"
|
||||
stat = "disk_pct"
|
||||
display = "text"
|
||||
path = "/"
|
||||
|
||||
[battery.device."/org/freedesktop/UPower/devices/battery_hidpp_battery_0"]
|
||||
warning_threshold = 20
|
||||
|
||||
[control_center]
|
||||
sidebar = "full"
|
||||
sidebar_section = "full"
|
||||
width = 880
|
||||
|
||||
[desktop_widgets]
|
||||
enabled = false
|
||||
|
||||
[wallpaper]
|
||||
enabled = true
|
||||
fill_color = "#000000"
|
||||
|
||||
[wallpaper.default]
|
||||
path = "color:#000000"
|
||||
|
||||
[system.monitor]
|
||||
# GPU polling is disabled by Noctalia by default; enable it for the RTX 3090 widgets.
|
||||
gpu_poll_seconds = 2.0
|
||||
|
||||
[plugins]
|
||||
enabled = ["alex/system-status"]
|
||||
|
||||
[nightlight]
|
||||
enabled = true
|
||||
force = false
|
||||
temperature_day = 6500
|
||||
temperature_night = 2500
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
# Laptop-specific Noctalia layout. Shared privacy/theme defaults live in 10-base.toml.
|
||||
[bar.main]
|
||||
position = "top"
|
||||
layer = "overlay"
|
||||
layer = "top"
|
||||
scale = 0.95
|
||||
capsule_radius = 5
|
||||
center = ["group:g3", "notifications"]
|
||||
end = ["bluetooth", "volume", "control-center", "group:g1", "session"]
|
||||
end = ["group:g2", "group:g6", "group:g5", "group:g1", "session"]
|
||||
font_weight = 400
|
||||
margin_ends = 0
|
||||
padding = 0
|
||||
@@ -14,8 +15,8 @@ shadow = false
|
||||
auto_hide = false
|
||||
smart_auto_hide = false
|
||||
reserve_space = true
|
||||
start = ["tray", "group:g4", "group:g2", "privacy"]
|
||||
thickness = 39
|
||||
start = ["tray", "group:g4", "privacy"]
|
||||
thickness = 28
|
||||
widget_spacing = 10
|
||||
|
||||
[[bar.main.capsule_group]]
|
||||
@@ -30,7 +31,7 @@ padding = 6.0
|
||||
enabled = true
|
||||
fill = "surface_variant"
|
||||
id = "g2"
|
||||
members = ["network_rx", "network_tx", "network"]
|
||||
members = ["network_rx", "network_tx", "network", "bluetooth"]
|
||||
opacity = 1.0
|
||||
padding = 6.0
|
||||
|
||||
@@ -47,47 +48,35 @@ radius = 5.0
|
||||
enabled = true
|
||||
fill = "surface_variant"
|
||||
id = "g4"
|
||||
members = ["cpu", "temp", "ram", "disk", "battery"]
|
||||
members = ["gpu-mode", "cpu", "temp", "ram", "disk"]
|
||||
opacity = 1.0
|
||||
padding = 6.0
|
||||
|
||||
[widget.cpu]
|
||||
type = "alex/system-status:cpu"
|
||||
[[bar.main.capsule_group]]
|
||||
enabled = true
|
||||
fill = "surface_variant"
|
||||
id = "g5"
|
||||
members = ["battery-rate", "battery", "power_profile"]
|
||||
opacity = 1.0
|
||||
padding = 6.0
|
||||
radius = 5.0
|
||||
|
||||
[widget.ram]
|
||||
type = "alex/system-status:memory"
|
||||
[[bar.main.capsule_group]]
|
||||
enabled = true
|
||||
fill = "surface_variant"
|
||||
id = "g6"
|
||||
members = ["input_volume", "volume"]
|
||||
opacity = 1.0
|
||||
padding = 6.0
|
||||
radius = 5.0
|
||||
|
||||
[widget.temp]
|
||||
type = "sysmon"
|
||||
stat = "cpu_temp"
|
||||
display = "text"
|
||||
[widget.battery-rate]
|
||||
type = "alex/system-status:battery-rate"
|
||||
|
||||
[widget.disk]
|
||||
type = "sysmon"
|
||||
stat = "disk_pct"
|
||||
display = "text"
|
||||
path = "/"
|
||||
[widget.gpu-mode]
|
||||
type = "alex/system-status:gpu-mode"
|
||||
|
||||
[control_center]
|
||||
sidebar = "full"
|
||||
sidebar_section = "full"
|
||||
width = 720
|
||||
|
||||
[desktop_widgets]
|
||||
enabled = false
|
||||
|
||||
[wallpaper]
|
||||
enabled = true
|
||||
fill_color = "#000000"
|
||||
|
||||
[wallpaper.default]
|
||||
path = "color:#000000"
|
||||
|
||||
[plugins]
|
||||
enabled = ["alex/system-status"]
|
||||
|
||||
[nightlight]
|
||||
enabled = true
|
||||
force = false
|
||||
temperature_day = 6500
|
||||
temperature_night = 2500
|
||||
|
||||
@@ -12,3 +12,11 @@ entry = "cpu.luau"
|
||||
[[widget]]
|
||||
id = "memory"
|
||||
entry = "memory.luau"
|
||||
|
||||
[[widget]]
|
||||
id = "battery-rate"
|
||||
entry = "battery-rate.luau"
|
||||
|
||||
[[widget]]
|
||||
id = "gpu-mode"
|
||||
entry = "gpu-mode.luau"
|
||||
|
||||
+17
-11
@@ -32,9 +32,12 @@ bind e new-window -n tmux.conf "exec \${EDITOR:-nvim} ~/.tmux.conf"
|
||||
|
||||
# --- Vim-style panes ----------------------------------------------------------
|
||||
# Keep the familiar split keys and always inherit the active pane's directory.
|
||||
bind - split-window -v -c "#{pane_current_path}"
|
||||
bind | split-window -h -c "#{pane_current_path}"
|
||||
bind m split-window -v -c "#{pane_current_path}"
|
||||
bind n split-window -h -c "#{pane_current_path}"
|
||||
bind c new-window -c "#{pane_current_path}"
|
||||
# Re-tile the current window using Ctrl-a, Ctrl-h / Ctrl-a, Ctrl-k.
|
||||
bind C-h select-layout even-vertical
|
||||
bind C-k select-layout even-horizontal
|
||||
|
||||
bind -r h select-pane -L
|
||||
bind -r j select-pane -D
|
||||
@@ -47,17 +50,17 @@ bind -r L resize-pane -R 5
|
||||
bind -r \{ swap-pane -U
|
||||
bind -r \} swap-pane -D
|
||||
bind z resize-pane -Z
|
||||
bind x confirm-before -p "kill pane #P? (y/n)" kill-pane
|
||||
bind w confirm-before -p "kill pane #P? (y/n)" kill-pane
|
||||
|
||||
# --- Windows, sessions, and buffers ------------------------------------------
|
||||
bind -r n next-window
|
||||
bind -r p previous-window
|
||||
bind -r f next-window
|
||||
bind -r b previous-window
|
||||
bind Tab last-window
|
||||
bind w choose-tree -Zw
|
||||
bind d choose-tree -Zw
|
||||
bind s choose-tree -Zs
|
||||
bind f command-prompt -p "switch to session:" "switch-client -t '%%'"
|
||||
bind g command-prompt -p "switch to session:" "switch-client -t '%%'"
|
||||
bind [ choose-buffer
|
||||
bind ] paste-buffer
|
||||
bind P paste-buffer # tmux buffer fallback; prefix + ] pastes the system clipboard
|
||||
bind C-l send-keys C-l \; clear-history
|
||||
|
||||
# --- Copy mode ----------------------------------------------------------------
|
||||
@@ -72,9 +75,12 @@ bind -T copy-mode-vi L send -X end-of-line
|
||||
bind -T copy-mode-vi C-u send -X halfpage-up
|
||||
bind -T copy-mode-vi C-d send -X halfpage-down
|
||||
|
||||
# Prefer a native Wayland clipboard; use xclip elsewhere. set-clipboard keeps
|
||||
# OSC 52-capable terminals in sync as well.
|
||||
if-shell 'command -v wl-copy >/dev/null 2>&1' 'bind -T copy-mode-vi y send -X copy-pipe-and-cancel "wl-copy"' 'bind -T copy-mode-vi y send -X copy-pipe-and-cancel "xclip -in -selection clipboard"'
|
||||
# Keep tmux and the desktop clipboard in sync by default. `set-clipboard on`
|
||||
# handles OSC 52-capable terminals; these bindings cover local Wayland/X11.
|
||||
# Copy-mode y writes to the system clipboard. Prefix + ] reads it back and
|
||||
# pastes it; prefix + P remains available for the most recent tmux buffer.
|
||||
bind -T copy-mode-vi y send -X copy-pipe-and-cancel 'if command -v wl-copy >/dev/null 2>&1; then wl-copy; elif command -v xclip >/dev/null 2>&1; then xclip -in -selection clipboard; fi'
|
||||
bind ] run-shell 'if command -v wl-paste >/dev/null 2>&1; then wl-paste --no-newline | tmux load-buffer - && tmux paste-buffer; elif command -v xclip >/dev/null 2>&1; then xclip -out -selection clipboard | tmux load-buffer - && tmux paste-buffer; fi'
|
||||
|
||||
# --- Status line --------------------------------------------------------------
|
||||
set -g status on
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
# Dotfiles
|
||||
|
||||
Personal, Arch-oriented user dotfiles and support scripts for shells, window management, applications, and package lists. This repository is a collection of machine-specific configuration, not a general-purpose installer.
|
||||
|
||||
## Status and scope
|
||||
|
||||
There is no authoritative root installation, linking, backup, overwrite, or rollback script. Do not infer one: review and apply only the individual files appropriate to a machine. Some filenames use `##class.arch_*` suffixes to distinguish machine classes. The repository also includes a nested README for the custom/vendored `st` terminal under `.config/st/`; it documents that component, not installation of this repository.
|
||||
|
||||
Several scripts assume paths below `~/.setup`, Arch tooling, and root access. Some repository scripts contain machine-specific connection details; do not publish, copy, or document such values. Use local, private configuration for hosts, addresses, accounts, and credentials.
|
||||
|
||||
## Prerequisites
|
||||
|
||||
- An Arch-based system for the supplied `pacman`/`yay` package workflows.
|
||||
- The package manager or helper required by the script being considered (`pacman` and/or `yay`).
|
||||
- Desktop/session tools matching the chosen configuration (for example X11/XMonad-related files where applicable).
|
||||
- Root access only for the system-changing scripts described below.
|
||||
|
||||
Package lists in `.setup/packages/` are inputs for a user-managed installation; no repository command defines how to install an entire list. Inspect package names and select lists for the intended machine before installing anything.
|
||||
|
||||
## Safe review and user-level configuration
|
||||
|
||||
Start by reviewing the intended files and any machine-class variants. Typical areas are:
|
||||
|
||||
- `.zshrc`, `.bashrc`, `.terminal_aliases`, `.tmux.conf`, and `.p10k.zsh` — shell and terminal setup.
|
||||
- `.xmonad/`, `.Xresources##class.*`, `.xprofile##class.*`, and `.config/` — desktop/window-manager and application configuration.
|
||||
- `.scripts/` — optional shell, network, virtual-environment, and update helpers.
|
||||
- `.setup/packages/` — package lists grouped by purpose.
|
||||
|
||||
Back up existing configuration before manually placing or linking a file. No test suite is provided; validate a change in the relevant shell/session or application and keep a rollback copy of the previous configuration.
|
||||
|
||||
## Package updates
|
||||
|
||||
`.scripts/updating.sh` defines, but does not invoke, two functions. It expects `~/.setup/packages/exclude_from_updating.list`:
|
||||
|
||||
```sh
|
||||
source .scripts/updating.sh
|
||||
update_system
|
||||
# or
|
||||
update_pacman_packages
|
||||
```
|
||||
|
||||
> **Warning: system-wide, potentially disruptive operation.** `update_system` runs `yay -Syu` and `update_pacman_packages` runs `sudo pacman -Syu`, both non-interactively and with the exclusion list. Review the exclusion list and pending package changes first. These functions update the running system; they are not tests.
|
||||
|
||||
## System-changing scripts
|
||||
|
||||
The following scripts mutate files outside this repository and must be inspected before use:
|
||||
|
||||
- `.setup/config/setup_touchpad.sh` copies an X11 configuration into `/etc/X11/xorg.conf.d/` when absent.
|
||||
- `.setup/config/exclude_from_update.sh` edits `/etc/pacman.conf` with `sudo` based on `~/.setup/packages/exclude_from_updating.list`.
|
||||
- `.setup/config/dinit_add_logs_to_all_services.sh` edits files in `/etc/dinit.d` and writes log specifications under `/var/log/dinit`; its `-o` option removes existing logfile lines before adding them.
|
||||
|
||||
> **Warning: destructive/system-wide operations.** These scripts can alter system package policy, service definitions, or input configuration. They have no repository-provided dry run or rollback. Run only on a machine you control after backups and after checking paths, permissions, and the script contents.
|
||||
|
||||
`.setup/config/set_default_programs.sh` sets the default HTTP/HTTPS handler through `xdg-mime`; review the desktop entry before using it.
|
||||
|
||||
## Custom `st` terminal
|
||||
|
||||
The nested `.config/st/README.md` documents its own `make` and `sudo make install` workflow. Those commands build/install only that terminal component, may modify the system, and are not a bootstrap procedure for all dotfiles.
|
||||
Reference in New Issue
Block a user