Compare commits
65
Commits
0bf7af3b03
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0d61477072 | ||
|
|
4846325583 | ||
|
|
1d654cf470 | ||
|
|
e9ad0175a1 | ||
|
|
093cd97a96 | ||
|
|
f9a44ac5aa | ||
|
|
7302e87fa3 | ||
|
|
4434feed16 | ||
|
|
94fa42672c | ||
|
|
3c1b727a7e | ||
|
|
c7bf98775b | ||
|
|
590e568061 | ||
|
|
0e7f76200c | ||
|
|
30cab18e60 | ||
|
|
e5dd0039a2 | ||
|
|
00e4931d29 | ||
|
|
e5ce0d0957 | ||
|
|
540baacb15 | ||
|
|
99b0075ada | ||
|
|
049e9a9f5e | ||
|
|
1d2878ad81 | ||
|
|
60db3ba63c | ||
|
|
51b2cdb6a8 | ||
|
|
b8f3861901 | ||
|
|
a2efd03c15 | ||
|
|
ad61c53bfc | ||
|
|
a316ad7221 | ||
|
|
e73f49282c | ||
|
|
3c0fc3ae6b | ||
|
|
dc1a319165 | ||
|
|
1f0bde731e | ||
|
|
6208eea2f8 | ||
|
|
5bc878492e | ||
|
|
73d1297c79 | ||
|
|
10c23c4d24 | ||
|
|
77f70e318c | ||
|
|
8ec820976f | ||
|
|
6924c1e05e | ||
|
|
6cd9427b40 | ||
|
|
050efc2b71 | ||
|
|
8d81e802df | ||
|
|
a0e6ad88d1 | ||
|
|
71cedb7454 | ||
|
|
53b763ee4d | ||
|
|
5438f786a9 | ||
|
|
e80ccf74bb | ||
|
|
4b9b926c60 | ||
|
|
e499e63a49 | ||
|
|
df5abce062 | ||
|
|
aed6d46846 | ||
|
|
30619b00ce | ||
|
|
545485f3c5 | ||
|
|
a8947283a5 | ||
|
|
496920cbdd | ||
|
|
519432d630 | ||
|
|
15d77eeaca | ||
|
|
23d0d1ecd3 | ||
|
|
1d7ed473f6 | ||
|
|
c055c5d592 | ||
|
|
b7e396a1f0 | ||
|
|
4be3a67dfe | ||
|
|
a5eab1dda0 | ||
|
|
4d9b3f99ac | ||
|
|
143f1ad86a | ||
|
|
466c79f1df |
+8
-2
@@ -2,10 +2,16 @@ hypr/.config/hypr/env
|
|||||||
hypr/.config/hypr/env.conf
|
hypr/.config/hypr/env.conf
|
||||||
hypr/.config/hypr/env.sh
|
hypr/.config/hypr/env.sh
|
||||||
hypr/.config/hypr/monitor_setup.lua
|
hypr/.config/hypr/monitor_setup.lua
|
||||||
hypr/.config/hypr/hyprpaper.conf
|
# Noctalia template output (shell-owned, regenerated on palette change)
|
||||||
|
# hypr/.config/kitty/themes/noctalia.conf
|
||||||
|
# Caelestia runtime output (shell-owned, regenerated on scheme change)
|
||||||
|
hypr/.config/hypr/scheme/
|
||||||
*~lock.*#
|
*~lock.*#
|
||||||
lazy-lock.json
|
lazy-lock.json
|
||||||
fish_variables
|
fish_variables
|
||||||
term/.config/opencode/cli.json
|
term/.config/opencode/cli.json
|
||||||
term/.config/opencode/service.json
|
term/.config/opencode/service.json
|
||||||
hypr/.config/waypaper/config.ini
|
hypr/.config/hypr/scheme/current.lua
|
||||||
|
hypr/.config/hypr/env.lua
|
||||||
|
hypr/.config/hypr/hyprland-buntes-monster-gui.lua
|
||||||
|
hypr/.config/hypr/hyprland-gui.lua
|
||||||
|
|||||||
+2
-1
@@ -1,5 +1,6 @@
|
|||||||
{
|
{
|
||||||
"diagnostics.globals": [
|
"diagnostics.globals": [
|
||||||
"vim"
|
"vim",
|
||||||
|
"hl"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -15,7 +15,7 @@ Only entries that would be missed without explicit help are included.
|
|||||||
|
|
||||||
| Task | Command | Why it matters |
|
| Task | Command | Why it matters |
|
||||||
|------|---------|----------------|
|
|------|---------|----------------|
|
||||||
| **Install required programs** | `bash term/setup.sh` <br>`bash _install_skripte/install_basic_pcks.sh` <br>`bash hypr/setup.sh` <br>`bash _install_skripte/install_kreation_pcks.sh` | These scripts install Neovim, hyprland, VST runtime, and other utilities. Edit `term/packages.txt` to add/remove terminal packages. |
|
| **Install required programs** | `bash setup/term/setup.sh` <br>`bash setup/basic/setup.sh` <br>`bash setup/hypr/setup.sh` <br>`bash setup/kreation/setup.sh` | These scripts install Neovim, hyprland, VST runtime, and other utilities. Edit `setup/term/packages.txt` to add/remove terminal packages. |
|
||||||
| **Link configuration directories** | `ln -s ~/.dotfiles/hypr/.config/hypr ~/.config/hypr` <br>`ln -s ~/.dotfiles/term/.config/nvim ~/.config/nvim` | The repository expects the configs to live in `~/.config`. |
|
| **Link configuration directories** | `ln -s ~/.dotfiles/hypr/.config/hypr ~/.config/hypr` <br>`ln -s ~/.dotfiles/term/.config/nvim ~/.config/nvim` | The repository expects the configs to live in `~/.config`. |
|
||||||
| **Add VST plugin** | Copy `kreation/.vst3/MT-PowerDrumKit.vst3` into your DAW’s plugins folder (usually `~/.vst`). | The repo contains a pre‑built VST for use in audio software. |
|
| **Add VST plugin** | Copy `kreation/.vst3/MT-PowerDrumKit.vst3` into your DAW’s plugins folder (usually `~/.vst`). | The repo contains a pre‑built VST for use in audio software. |
|
||||||
|
|
||||||
@@ -26,7 +26,7 @@ Only entries that would be missed without explicit help are included.
|
|||||||
|
|
||||||
| Item | Detail |
|
| Item | Detail |
|
||||||
|------|--------|
|
|------|--------|
|
||||||
| **Wayland compositor** | Requires `hyprland` (and dependencies like `wlroots`). The script `hypr/setup.sh` installs it from `hypr/packages.txt`. |
|
| **Wayland compositor** | Requires `hyprland` (and dependencies like `wlroots`). The script `setup/hypr/setup.sh` installs it from `setup/hypr/packages.txt`. |
|
||||||
| **MIME defaults** | Run `bash hypr/.config/hypr/scripts/ensure-env.sh` after installing to set environment variables (`$XDG_DATA_HOME`, etc.). |
|
| **MIME defaults** | Run `bash hypr/.config/hypr/scripts/ensure-env.sh` after installing to set environment variables (`$XDG_DATA_HOME`, etc.). |
|
||||||
| **Dolphin file associations** | `bash hypr/.config/hypr/scripts/fix_dolphin_file_associations.sh` must be executed once to register the compositor with KDE. |
|
| **Dolphin file associations** | `bash hypr/.config/hypr/scripts/fix_dolphin_file_associations.sh` must be executed once to register the compositor with KDE. |
|
||||||
| **Portal host override** | `bash hypr/.config/hypr/scripts/portal-host-override.sh` fixes Wayland portal issues on some distros. |
|
| **Portal host override** | `bash hypr/.config/hypr/scripts/portal-host-override.sh` fixes Wayland portal issues on some distros. |
|
||||||
|
|||||||
@@ -6,27 +6,26 @@
|
|||||||
# Zweige abhaengen. Die uebrigen Ziele haengen nur von basic ab und sind
|
# Zweige abhaengen. Die uebrigen Ziele haengen nur von basic ab und sind
|
||||||
# untereinander unabhaengig.
|
# untereinander unabhaengig.
|
||||||
basic:
|
basic:
|
||||||
bash basic/setup.sh
|
bash setup/basic/setup.sh
|
||||||
stow --ignore='.stow-ignore' --ignore='scripts' --ignore='setup.sh' --ignore='packages.txt' basic
|
stow basic
|
||||||
|
|
||||||
term: basic
|
term: basic
|
||||||
bash term/scripts/setup.sh
|
bash setup/term/setup.sh
|
||||||
stow --ignore='.stow-ignore' --ignore='scripts' --ignore='\.config/tmux/plugins' term
|
stow term
|
||||||
|
|
||||||
utils: basic
|
utils: term
|
||||||
bash utils/setup.sh
|
bash setup/utils/setup.sh
|
||||||
bash _install_skripte/nextcloud.sh
|
|
||||||
|
|
||||||
hypr: basic
|
hypr: utils
|
||||||
bash hypr/scripts/setup.sh
|
bash setup/hypr/setup.sh
|
||||||
stow --ignore='.stow-ignore' --ignore='scripts' hypr
|
stow hypr
|
||||||
|
|
||||||
kreation: basic
|
kreation: hypr
|
||||||
bash _install_skripte/install_kreation_pcks.sh
|
bash setup/kreation/setup.sh
|
||||||
stow kreation
|
stow kreation
|
||||||
|
|
||||||
buntes-monster: hypr kreation
|
buntes-monster: kreation
|
||||||
_install_skripte/buntes-monster-links.sh
|
bash setup/buntes-monster-links.sh
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Testing (see README.md "Testing" and test/ for details)
|
# Testing (see README.md "Testing" and test/ for details)
|
||||||
|
|||||||
@@ -8,10 +8,10 @@ Personal configuration files for an Arch Linux workstation (Hyprland + Neovim +
|
|||||||
|-----------|----------|
|
|-----------|----------|
|
||||||
| `basic/` | Base system packages + the **central theme** (`basic/.config/themes` → `~/.config/themes`: Catppuccin Mocha palette, `current` symlink, `switch-theme.sh`/`sync-theme.sh`). All other packages reference it instead of copying colors. |
|
| `basic/` | Base system packages + the **central theme** (`basic/.config/themes` → `~/.config/themes`: Catppuccin Mocha palette, `current` symlink, `switch-theme.sh`/`sync-theme.sh`). All other packages reference it instead of copying colors. |
|
||||||
| `term/` | Fish + kitty + starship + nvim + tmux + yazi + fastfetch + opencode terminal environment |
|
| `term/` | Fish + kitty + starship + nvim + tmux + yazi + fastfetch + opencode terminal environment |
|
||||||
| `hypr/` | Hyprland compositor config, kitty theme, waypaper/hyprpaper wallpapers |
|
| `hypr/` | Hyprland compositor config + selectable Noctalia/Caelestia shell configs |
|
||||||
| `kreation/`| VST plugin (`MT-PowerDrumKit.vst3`) |
|
| `kreation/`| VST plugin (`MT-PowerDrumKit.vst3`) |
|
||||||
| `local_ai/`| Local AI / MCP tooling config |
|
| `local_ai/`| Local AI / MCP tooling config |
|
||||||
| `_install_skripte/` | Miscellaneous install helper scripts |
|
| `setup/` | Install/setup scripts + package lists (one subdir per target, shared helpers in `setup/lib/`; not stowed) |
|
||||||
| `test/` | Docker test harness (lint + smoke tests) |
|
| `test/` | Docker test harness (lint + smoke tests) |
|
||||||
|
|
||||||
Each top-level directory is a **stow package**. `stow` symlinks the files from the repository into your home directory (e.g. `term/.config/...` → `~/.config/...`).
|
Each top-level directory is a **stow package**. `stow` symlinks the files from the repository into your home directory (e.g. `term/.config/...` → `~/.config/...`).
|
||||||
@@ -31,7 +31,7 @@ cd ~/.dotfiles
|
|||||||
|
|
||||||
# 2. Install a target and symlink its files
|
# 2. Install a target and symlink its files
|
||||||
make term # terminal + fish + kitty + nvim
|
make term # terminal + fish + kitty + nvim
|
||||||
make hypr # Hyprland (also pulls in basic + term)
|
make hypr # Hyprland + selectable Noctalia/Caelestia shells
|
||||||
make kreation # VST plugin (also pulls in basic)
|
make kreation # VST plugin (also pulls in basic)
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -43,34 +43,48 @@ Run `make <target>` from the repository root. Each target first runs the relevan
|
|||||||
|
|
||||||
| Target | What it does |
|
| Target | What it does |
|
||||||
|--------|--------------|
|
|--------|--------------|
|
||||||
| `make term` | Runs `term/setup.sh` (installs terminal packages, sets fish as default shell, clones tmuxifier), then `stow term`. Pulls in `basic`. |
|
| `make term` | Runs `setup/term/setup.sh` (installs terminal packages, sets fish as default shell, clones tmuxifier), then `stow term`. Pulls in `basic`. |
|
||||||
| `make basic` | Runs `basic/setup.sh`: enables multilib, updates the system, installs `yay` if missing, installs the `basic/packages.txt` packages, and sets up Docker (enables/starts the service, adds your user to the `docker` group, verifies the service) |
|
| `make basic` | Runs `setup/basic/setup.sh`: enables multilib, updates the system, installs `yay` if missing, installs the `setup/basic/packages.txt` packages, and sets up Docker (enables/starts the service, adds your user to the `docker` group, verifies the service) |
|
||||||
| `make hypr` | `make basic`, installs Hyprland packages, stows `hypr`, runs the Hyprland setup scripts (`ensure-env.sh`, `portal-host-override.sh`, `fix_dolphin_file_associations.sh`) |
|
| `make hypr` | Runs `make basic`, installs Hyprland plus the Noctalia and Caelestia frontends, creates a local shell selection when needed, stows `hypr`, and runs the portal/file-association integration scripts |
|
||||||
| `make kreation` | `make basic`, installs VST runtime, stows `kreation` |
|
| `make kreation` | `make basic`, installs VST runtime, stows `kreation` |
|
||||||
| `make buntes-monster` | Everything (`basic` + `hypr` + `kreation`), then wires up symlinks |
|
| `make buntes-monster` | Everything (`basic` + `hypr` + `kreation`), then wires up symlinks |
|
||||||
|
|
||||||
|
### Choosing between Noctalia and Caelestia
|
||||||
|
|
||||||
|
`make hypr` installs both desktop-shell frontends. Hyprland starts the one selected in `~/.config/hypr/env.lua`:
|
||||||
|
|
||||||
|
```lua
|
||||||
|
return {
|
||||||
|
shell = "noctalia", -- or "caelestia"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
The local `env.lua` is created from `env.example.lua` on the first setup and is preserved on later runs. After changing the value, log out of and back into Hyprland; the running shell is not replaced live.
|
||||||
|
|
||||||
|
Caelestia requires the upstream AUR package `quickshell-git`; the release package `quickshell` must not be installed instead. Do not substitute CachyOS's `noctalia-qs`, even though it provides the virtual `quickshell-git` dependency: its Quickshell parser is not compatible with Caelestia. The package list uses the explicit `aur/quickshell-git` target because `yay --aur` alone may still select a repository provider. `make hypr` then replaces an existing `noctalia-qs` installation transactionally and verifies that `/usr/bin/qs` belongs to `quickshell-git`.
|
||||||
|
|
||||||
### Managing terminal packages
|
### Managing terminal packages
|
||||||
|
|
||||||
The terminal package list lives in a single editable file:
|
The terminal package list lives in a single editable file:
|
||||||
|
|
||||||
```
|
```
|
||||||
term/packages.txt
|
setup/term/packages.txt
|
||||||
```
|
```
|
||||||
|
|
||||||
Add/remove packages on separate lines. Lines starting with `#` are ignored, and you can switch between package sources with section markers:
|
Add/remove packages on separate lines. Lines starting with `#` are ignored, and you can switch between package sources with section markers:
|
||||||
|
|
||||||
```
|
```
|
||||||
@pacman # install via pacman (default)
|
@pacman # install via pacman (default)
|
||||||
@aur # install via yay (AUR)
|
@aur # use yay's AUR mode; use aur/<pkg> for an explicit source
|
||||||
@npm # install via npm -g
|
@npm # install via npm -g
|
||||||
```
|
```
|
||||||
|
|
||||||
The default section is `@pacman`. The AUR helper `yay` is bootstrapped automatically by `basic/setup.sh`.
|
The default section is `@pacman`. The AUR helper `yay` is bootstrapped automatically by `setup/basic/setup.sh`.
|
||||||
|
|
||||||
## What the install scripts do
|
## What the install scripts do
|
||||||
|
|
||||||
- **`basic/setup.sh`** – enables multilib, updates the system (`pacman -Syu`), ensures `yay` is installed, reads `basic/packages.txt` and installs all packages with `--needed` (skips already-installed ones), and sets up Docker (`sudo systemctl enable --now docker`, adds the current user to the `docker` group, checks the service). Idempotent and safe to re-run.
|
- **`setup/basic/setup.sh`** – enables multilib, updates the system (`pacman -Syu`), ensures `yay` is installed, reads `setup/basic/packages.txt` and installs all packages with `--needed` (skips already-installed ones), and sets up Docker (`sudo systemctl enable --now docker`, adds the current user to the `docker` group, checks the service). Idempotent and safe to re-run.
|
||||||
- **`term/setup.sh`** – reads `term/packages.txt` and installs all packages (pacman/AUR via `yay --needed`, npm via `sudo npm install -g`), sets `fish` as the default shell (`chsh`), clones `tmuxifier`, adds the `git` yazi plugin (skips if already present), and runs `sudo updatedb`. Idempotent and safe to re-run.
|
- **`setup/term/setup.sh`** – reads `setup/term/packages.txt` and installs all packages (pacman/AUR via `yay --needed`, npm via `sudo npm install -g`), sets `fish` as the default shell (`chsh`), clones `tmuxifier`, adds the `git` yazi plugin (skips if already present), and runs `sudo updatedb`. Idempotent and safe to re-run.
|
||||||
|
|
||||||
## Stow: resolving conflicts with existing paths
|
## Stow: resolving conflicts with existing paths
|
||||||
|
|
||||||
@@ -138,7 +152,7 @@ There are **two tiers**:
|
|||||||
|
|
||||||
| Target | What it does | Docker required? |
|
| Target | What it does | Docker required? |
|
||||||
|--------|--------------|------------------|
|
|--------|--------------|------------------|
|
||||||
| `make test-lint` | Fast, offline integrity checks: `bash -n` syntax pass over every script, `shellcheck` (if installed), `packages.txt` marker validation, and Makefile ↔ script/stow-package name consistency. Catches typos like `_install_skripte_install_basic_pcks.sh` (missing `/`). | No |
|
| `make test-lint` | Fast, offline integrity checks: `bash -n` syntax pass over every script, `shellcheck` (if installed), `packages.txt` marker validation, and Makefile ↔ script/stow-package name consistency. Catches typos like `setup/basic/setuo.sh` (missing `/`). | No |
|
||||||
| `make test-stow` | `stow --simulate` for every stow-able package; fails if a package the Makefile stows doesn't exist (e.g. `stow nvim` — nvim lives under `term/`). | No |
|
| `make test-stow` | `stow --simulate` for every stow-able package; fails if a package the Makefile stows doesn't exist (e.g. `stow nvim` — nvim lives under `term/`). | No |
|
||||||
| `make test-shellcheck` | Runs shellcheck over all tracked scripts (shellcheck must be installed). | No |
|
| `make test-shellcheck` | Runs shellcheck over all tracked scripts (shellcheck must be installed). | No |
|
||||||
| `make test-lint-docker` | Builds the `/dev` stage (`archlinux:latest` + shellcheck) and runs `test/lint.sh` inside it. | Yes |
|
| `make test-lint-docker` | Builds the `/dev` stage (`archlinux:latest` + shellcheck) and runs `test/lint.sh` inside it. | Yes |
|
||||||
|
|||||||
@@ -1,16 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
sudo pacman -S --needed \
|
|
||||||
reaper \
|
|
||||||
guitarix \
|
|
||||||
kdenlive \
|
|
||||||
yabridge \
|
|
||||||
yabridgectl \
|
|
||||||
obs-studio \
|
|
||||||
surge-xt \
|
|
||||||
lsp-plugins \
|
|
||||||
calf \
|
|
||||||
dragonfly-reverb
|
|
||||||
|
|
||||||
yay -S --needed \
|
|
||||||
numaplayer
|
|
||||||
@@ -53,10 +53,6 @@ main() {
|
|||||||
if command -v tmux >/dev/null 2>&1 && [[ -n "${TMUX:-}" ]]; then
|
if command -v tmux >/dev/null 2>&1 && [[ -n "${TMUX:-}" ]]; then
|
||||||
tmux source-file "$HOME/.config/tmux/tmux.conf" >/dev/null 2>&1 || true
|
tmux source-file "$HOME/.config/tmux/tmux.conf" >/dev/null 2>&1 || true
|
||||||
fi
|
fi
|
||||||
if pgrep -x waybar >/dev/null 2>&1; then
|
|
||||||
pkill -x waybar >/dev/null 2>&1 || true
|
|
||||||
(waybar >/dev/null 2>&1 &) || true
|
|
||||||
fi
|
|
||||||
echo "note: restart Neovim (or :colorscheme \$THEME_NVIM_COLORSCHEME) and open a new shell to pick up theme.env.sh."
|
echo "note: restart Neovim (or :colorscheme \$THEME_NVIM_COLORSCHEME) and open a new shell to pick up theme.env.sh."
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,9 +6,9 @@
|
|||||||
# - term/.config/tmux/plugins/ (vendored upstream, stow-ignored)
|
# - term/.config/tmux/plugins/ (vendored upstream, stow-ignored)
|
||||||
# - term/.config/yazi/theme.toml (declared mirror: yazi has no include)
|
# - term/.config/yazi/theme.toml (declared mirror: yazi has no include)
|
||||||
# - term/.config/starship.toml (declared mirror: starship has no include)
|
# - term/.config/starship.toml (declared mirror: starship has no include)
|
||||||
# - hypr/.config/rofi/themes/ltmnight.rasi (declared mirror: rasi has no
|
# - hypr/.config/hypr/noctalia.lua + hypr/.config/kitty/themes/noctalia.conf
|
||||||
# alpha() function, so the two translucency values are #RRGGBBAA hex;
|
# (Noctalia template output: shell-owned, gitignored, regenerated from
|
||||||
# everything else maps onto the central theme via @import)
|
# the active palette on every theme change)
|
||||||
# - test/ + docs (may quote values in prose)
|
# - test/ + docs (may quote values in prose)
|
||||||
#
|
#
|
||||||
# Run with: bash basic/.config/themes/scripts/sync-theme.sh
|
# Run with: bash basic/.config/themes/scripts/sync-theme.sh
|
||||||
@@ -27,7 +27,7 @@ matches="$(grep -rniE --include='*.conf' --include='*.css' --include='*.rasi' \
|
|||||||
--exclude-dir='.git' --exclude-dir='plugins' --exclude-dir='test' \
|
--exclude-dir='.git' --exclude-dir='plugins' --exclude-dir='test' \
|
||||||
-E "$SENTINELS" . 2>/dev/null | grep -vE '^./basic/.config/themes' \
|
-E "$SENTINELS" . 2>/dev/null | grep -vE '^./basic/.config/themes' \
|
||||||
| grep -vE 'term/.config/(yazi/theme.toml|starship.toml)' \
|
| grep -vE 'term/.config/(yazi/theme.toml|starship.toml)' \
|
||||||
| grep -vE 'hypr/.config/rofi/themes/ltmnight.rasi' || true)"
|
| grep -vE 'hypr/.config/(hypr/noctalia.lua|kitty/themes/noctalia.conf)' || true)"
|
||||||
|
|
||||||
if [[ -n "$matches" ]]; then
|
if [[ -n "$matches" ]]; then
|
||||||
echo "FAIL: hardcoded theme colors outside basic/.config/themes (and declared mirrors):"
|
echo "FAIL: hardcoded theme colors outside basic/.config/themes (and declared mirrors):"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# Central theme: catppuccin-mocha (Catppuccin Mocha), hyprland $vars.
|
# Central theme: catppuccin-mocha (Catppuccin Mocha), hyprland $vars.
|
||||||
# Part of basic/.config/themes. Managed file: refresh via
|
# Part of basic/.config/themes. Managed file: refresh via
|
||||||
# basic/scripts/fetch-ports.sh
|
# setup/fetch-ports.sh
|
||||||
# (upstream: catppuccin/hyprland generated mocha.conf).
|
# (upstream: catppuccin/hyprland generated mocha.conf).
|
||||||
# Hyprland consumers load it via: source = ~/.config/themes/current/hypr.conf
|
# Hyprland consumers load it via: source = ~/.config/themes/current/hypr.conf
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# Central theme: catppuccin-mocha (Catppuccin Mocha), kitty colors.
|
# Central theme: catppuccin-mocha (Catppuccin Mocha), kitty colors.
|
||||||
# Part of basic/.config/themes. Managed file: refresh via
|
# Part of basic/.config/themes. Managed file: refresh via
|
||||||
# basic/scripts/fetch-ports.sh
|
# setup/fetch-ports.sh
|
||||||
# (upstream: catppuccin/kitty themes/mocha.conf).
|
# (upstream: catppuccin/kitty themes/mocha.conf).
|
||||||
# vim:ft=kitty
|
# vim:ft=kitty
|
||||||
|
|
||||||
|
|||||||
@@ -1,33 +0,0 @@
|
|||||||
/* Central theme: catppuccin-mocha (Catppuccin Mocha), rofi palette.
|
|
||||||
* Part of basic/.config/themes. Managed file: refresh via
|
|
||||||
* basic/scripts/fetch-ports.sh
|
|
||||||
* (upstream: catppuccin/rofi themes/catppuccin-mocha.rasi). */
|
|
||||||
* {
|
|
||||||
rosewater: #f5e0dc;
|
|
||||||
flamingo: #f2cdcd;
|
|
||||||
pink: #f5c2e7;
|
|
||||||
mauve: #cba6f7;
|
|
||||||
red: #f38ba8;
|
|
||||||
maroon: #eba0ac;
|
|
||||||
peach: #fab387;
|
|
||||||
yellow: #f9e2af;
|
|
||||||
green: #a6e3a1;
|
|
||||||
teal: #94e2d5;
|
|
||||||
sky: #89dceb;
|
|
||||||
sapphire: #74c7ec;
|
|
||||||
blue: #89b4fa;
|
|
||||||
lavender: #b4befe;
|
|
||||||
text: #cdd6f4;
|
|
||||||
subtext1: #bac2de;
|
|
||||||
subtext0: #a6adc8;
|
|
||||||
overlay2: #9399b2;
|
|
||||||
overlay1: #7f849c;
|
|
||||||
overlay0: #6c7086;
|
|
||||||
surface2: #585b70;
|
|
||||||
surface1: #45475a;
|
|
||||||
surface0: #313244;
|
|
||||||
base: #1e1e2e;
|
|
||||||
mantle: #181825;
|
|
||||||
crust: #11111b;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,7 +1,8 @@
|
|||||||
/* Central theme: catppuccin-mocha (Catppuccin Mocha).
|
/* Central theme: catppuccin-mocha (Catppuccin Mocha).
|
||||||
* Part of basic/.config/themes. Managed file: refresh via
|
* Part of basic/.config/themes. Managed file: edit the palette here.
|
||||||
* basic/scripts/fetch-ports.sh (upstream: catppuccin/waybar themes/mocha.css),
|
* (theme.css was originally ported from catppuccin/waybar themes/mocha.css;
|
||||||
* then re-apply the role aliases below. Consumers must use this file via
|
* the waybar port is gone, so this file is hand-maintained now.)
|
||||||
|
* Consumers must use this file via
|
||||||
* ~/.config/themes/current/theme.css, never a private copy.
|
* ~/.config/themes/current/theme.css, never a private copy.
|
||||||
* Role aliases (stable interface, theme-agnostic) follow the palette. */
|
* Role aliases (stable interface, theme-agnostic) follow the palette. */
|
||||||
@define-color rosewater #f5e0dc;
|
@define-color rosewater #f5e0dc;
|
||||||
@@ -33,7 +34,7 @@
|
|||||||
|
|
||||||
/* ---- Stable role interface (theme-agnostic; consumers use THESE) ----
|
/* ---- Stable role interface (theme-agnostic; consumers use THESE) ----
|
||||||
* NOTE: values are literal hex, NOT @references to the palette above.
|
* NOTE: values are literal hex, NOT @references to the palette above.
|
||||||
* Some parsers (wofi/waybar Gtk.CssProvider paths) silently drop
|
* Some Gtk.CssProvider-based parsers silently drop
|
||||||
* @define-color lines that reference another @color, which made every
|
* @define-color lines that reference another @color, which made every
|
||||||
* background transparent. Keep each role in sync with its palette twin
|
* background transparent. Keep each role in sync with its palette twin
|
||||||
* (mapping below); scripts/sync-theme.sh verifies this mechanically. */
|
* (mapping below); scripts/sync-theme.sh verifies this mechanically. */
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
-- Central theme interface: catppuccin-mocha (Catppuccin Mocha).
|
-- Central theme interface: catppuccin-mocha (Catppuccin Mocha).
|
||||||
-- Part of basic/.config/themes. Managed file: edit the palette here.
|
-- Part of basic/.config/themes. Managed file: edit the palette here.
|
||||||
-- Consumers (hyprland.lua, hyprlock helpers) load this via
|
-- Consumers (hyprland.lua) load this via
|
||||||
-- dofile(os.getenv("HOME") .. "/.config/themes/current/theme.lua")
|
-- dofile(os.getenv("HOME") .. "/.config/themes/current/theme.lua")
|
||||||
-- and must use the generic roles (bg/fg/accent/...) so a future
|
-- and must use the generic roles (bg/fg/accent/...) so a future
|
||||||
-- non-Catppuccin theme only adds a new directory. Full palette is
|
-- non-Catppuccin theme only adds a new directory. Full palette is
|
||||||
|
|||||||
@@ -1,4 +0,0 @@
|
|||||||
setup.sh
|
|
||||||
packages.txt
|
|
||||||
scripts
|
|
||||||
.stow-ignore
|
|
||||||
-150
@@ -1,150 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
||||||
PACKAGES_FILE="$SCRIPT_DIR/packages.txt"
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# Enable multilib in /etc/pacman.conf (with a safety backup)
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
enable_multilib() {
|
|
||||||
sudo sed -i.bak '/^#\[multilib\]/,+1 s/^#//' /etc/pacman.conf
|
|
||||||
}
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# Ensure yay (AUR helper) is installed.
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
install_yay() {
|
|
||||||
if pacman -Q yay &>/dev/null; then
|
|
||||||
echo "yay bereits installiert; fahre fort."
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
if pacman -Si yay &>/dev/null; then
|
|
||||||
echo "Installiere yay mit pacman ..."
|
|
||||||
sudo pacman -S --needed yay
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
echo "installiere yay via git ..."
|
|
||||||
sudo pacman -S --needed base-devel git
|
|
||||||
local tmp
|
|
||||||
tmp="$(mktemp -d)"
|
|
||||||
git clone https://aur.archlinux.org/yay.git "$tmp/yay"
|
|
||||||
(
|
|
||||||
cd "$tmp/yay"
|
|
||||||
makepkg -si
|
|
||||||
)
|
|
||||||
rm -rf "$tmp"
|
|
||||||
}
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# Read packages.txt, split into pacman / aur / npm sections.
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
read_packages() {
|
|
||||||
local section="pacman"
|
|
||||||
local current
|
|
||||||
current=""
|
|
||||||
while IFS= read -r line || [[ -n "$line" ]]; do
|
|
||||||
current="${line%%#*}"
|
|
||||||
current="${current##*( )}"
|
|
||||||
current="${current%%*( )}"
|
|
||||||
[[ -z "$current" ]] && continue
|
|
||||||
case "$current" in
|
|
||||||
@pacman) section="pacman" ;;
|
|
||||||
@aur) section="aur" ;;
|
|
||||||
@npm) section="npm" ;;
|
|
||||||
*)
|
|
||||||
case "$section" in
|
|
||||||
pacman) pacman_pkgs+=("$current") ;;
|
|
||||||
aur) aur_pkgs+=("$current") ;;
|
|
||||||
npm) npm_pkgs+=("$current") ;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done < "$PACKAGES_FILE"
|
|
||||||
}
|
|
||||||
|
|
||||||
declare -a pacman_pkgs=() aur_pkgs=() npm_pkgs=()
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# Install sections.
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
install_pacman() {
|
|
||||||
if ((${#pacman_pkgs[@]})); then
|
|
||||||
echo "==> Installiere Pacman-Pakete: ${pacman_pkgs[*]}"
|
|
||||||
yay -S --needed "${pacman_pkgs[@]}"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
install_aur() {
|
|
||||||
if ((${#aur_pkgs[@]})); then
|
|
||||||
echo "==> Installiere AUR-Pakete: ${aur_pkgs[*]}"
|
|
||||||
yay -S --needed "${aur_pkgs[@]}"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
install_npm() {
|
|
||||||
if ((${#npm_pkgs[@]})); then
|
|
||||||
echo "==> Installiere globale npm-Pakete: ${npm_pkgs[*]}"
|
|
||||||
npm install -g "${npm_pkgs[@]}"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# Docker: Dienst aktivieren/starten, Benutzer in die docker-Gruppe aufnehmen
|
|
||||||
# und den Dienst verifizieren. (docker selbst wird ueber basic/packages.txt
|
|
||||||
# als Pacman-Paket installiert.)
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
setup_docker() {
|
|
||||||
if ! command -v docker >/dev/null 2>&1; then
|
|
||||||
echo "Warnung: docker nicht installiert; ueberspringe Docker-Setup."
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "==> Aktiviere und starte Docker-Dienst ..."
|
|
||||||
sudo systemctl enable --now docker
|
|
||||||
|
|
||||||
# Bei Aufruf via `sudo <script>` ist SUDO_USER der eigentliche Benutzer.
|
|
||||||
local target_user="${SUDO_USER:-$USER}"
|
|
||||||
echo "==> Stelle sicher, dass $target_user in der docker-Gruppe ist ..."
|
|
||||||
if [[ "$target_user" == "root" ]] || id -nG "$target_user" 2>/dev/null | grep -qw docker; then
|
|
||||||
echo "Benutzer $target_user ist bereits in der docker-Gruppe."
|
|
||||||
else
|
|
||||||
sudo usermod -aG docker "$target_user"
|
|
||||||
echo "Benutzer $target_user zur docker-Gruppe hinzugefuegt; wirksam nach dem naechsten Login."
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "==> Pruefe Docker-Dienst ..."
|
|
||||||
if systemctl is-active --quiet docker; then
|
|
||||||
echo "Docker-Dienst laeuft (Socket: /var/run/docker.sock)."
|
|
||||||
else
|
|
||||||
echo "Warnung: Docker-Dienst laeuft nicht; pruefe mit: systemctl status docker"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# Main
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
main() {
|
|
||||||
echo "==> Aktiviere multilib ..."
|
|
||||||
enable_multilib
|
|
||||||
|
|
||||||
echo "==> System aktualisieren ..."
|
|
||||||
sudo pacman -Syu
|
|
||||||
|
|
||||||
echo "==> Sicherstelle yay ..."
|
|
||||||
install_yay
|
|
||||||
|
|
||||||
echo "==> Lese Paketliste: $PACKAGES_FILE"
|
|
||||||
read_packages
|
|
||||||
|
|
||||||
install_pacman
|
|
||||||
install_aur
|
|
||||||
install_npm
|
|
||||||
|
|
||||||
echo "==> Richte Docker ein ..."
|
|
||||||
setup_docker
|
|
||||||
|
|
||||||
echo "Fertig. Die Basis-Systemumgebung ist eingerichtet."
|
|
||||||
}
|
|
||||||
|
|
||||||
main
|
|
||||||
Executable
+47
@@ -0,0 +1,47 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -Eeuo pipefail
|
||||||
|
|
||||||
|
SERVER="buntes-monster"
|
||||||
|
SERVER_IP="192.168.0.4"
|
||||||
|
|
||||||
|
MOUNTS=(
|
||||||
|
"/mnt/anbau:/mnt/anbau"
|
||||||
|
"/mnt/bilder:/mnt/bilder"
|
||||||
|
)
|
||||||
|
|
||||||
|
# Re-run as root when needed.
|
||||||
|
if [[ "${EUID}" -ne 0 ]]; then
|
||||||
|
exec sudo "$0" "$@"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Preserve ownership for the user who invoked sudo.
|
||||||
|
OWNER="${SUDO_USER:-${USER}}"
|
||||||
|
OWNER_UID="$(id -u "$OWNER")"
|
||||||
|
OWNER_GID="$(id -g "$OWNER")"
|
||||||
|
|
||||||
|
for entry in "${MOUNTS[@]}"; do
|
||||||
|
IFS=":" read -r remote_path local_path <<< "$entry"
|
||||||
|
|
||||||
|
# Create the mount point if necessary and give it to the invoking user.
|
||||||
|
install -d \
|
||||||
|
-o "$OWNER_UID" \
|
||||||
|
-g "$OWNER_GID" \
|
||||||
|
-m 0755 \
|
||||||
|
"$local_path"
|
||||||
|
|
||||||
|
# Do not remount an already-mounted location.
|
||||||
|
if mountpoint -q "$local_path"; then
|
||||||
|
echo "Already mounted: $local_path"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Mounting $SERVER:$remote_path at $local_path..."
|
||||||
|
|
||||||
|
mount \
|
||||||
|
-t nfs \
|
||||||
|
-o rw,sync,addr="$SERVER_IP" \
|
||||||
|
"$SERVER:$remote_path" \
|
||||||
|
"$local_path"
|
||||||
|
|
||||||
|
echo "Mounted: $local_path"
|
||||||
|
done
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
{
|
||||||
|
}
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
{
|
||||||
|
}
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
{
|
||||||
|
}
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
{
|
||||||
|
"appearance": {
|
||||||
|
"transparency": {
|
||||||
|
"enabled": true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"background": {
|
||||||
|
"wallpaperEnabled": true
|
||||||
|
},
|
||||||
|
"dashboard": {
|
||||||
|
"showWeather": true
|
||||||
|
},
|
||||||
|
"general": {
|
||||||
|
"apps": {
|
||||||
|
"audio": [
|
||||||
|
"supersonic-desktop"
|
||||||
|
],
|
||||||
|
"explorer": [
|
||||||
|
"dolphin"
|
||||||
|
],
|
||||||
|
"playback": [
|
||||||
|
"celluloid"
|
||||||
|
],
|
||||||
|
"terminal": [
|
||||||
|
"kitty"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"launcher": {
|
||||||
|
"showOnHover": true,
|
||||||
|
"useFuzzy": {
|
||||||
|
"apps": true
|
||||||
|
},
|
||||||
|
"vimKeybinds": true
|
||||||
|
},
|
||||||
|
"paths": {
|
||||||
|
"wallpaperDir": "~/nextcloud/Photos/Wallpapers"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
return {
|
||||||
|
-- Supported values: "noctalia" or "caelestia".
|
||||||
|
shell = "noctalia",
|
||||||
|
}
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
general {
|
|
||||||
lock_cmd = pidof hyprlock || hyprlock # avoid starting multiple hyprlock instances.
|
|
||||||
before_sleep_cmd = loginctl lock-session # lock before suspend.
|
|
||||||
after_sleep_cmd = hyprctl dispatch dpms on # to avoid having to press a key twice to turn on the display.
|
|
||||||
}
|
|
||||||
|
|
||||||
listener {
|
|
||||||
timeout = 300 # 5.0min.
|
|
||||||
on-timeout = brightnessctl -s set 10 # set monitor backlight to minimum, avoid 0 on OLED monitor.
|
|
||||||
on-resume = brightnessctl -r # monitor backlight restore.
|
|
||||||
}
|
|
||||||
|
|
||||||
# turn off keyboard backlight, comment out this section if you dont have a keyboard backlight.
|
|
||||||
listener {
|
|
||||||
timeout = 300 # 5.0min.
|
|
||||||
on-timeout = brightnessctl -sd rgb:kbd_backlight set 0 # turn off keyboard backlight.
|
|
||||||
on-resume = brightnessctl -rd rgb:kbd_backlight # turn on keyboard backlight.
|
|
||||||
}
|
|
||||||
|
|
||||||
listener {
|
|
||||||
timeout = 900 # 15min
|
|
||||||
on-timeout = loginctl lock-session # lock screen when timeout has passed
|
|
||||||
}
|
|
||||||
|
|
||||||
listener {
|
|
||||||
timeout = 1800 # 30min
|
|
||||||
on-timeout = hyprctl dispatch dpms off # screen off when timeout has passed
|
|
||||||
on-resume = hyprctl dispatch dpms on && brightnessctl -r # screen on when activity is detected after timeout has fired.
|
|
||||||
}
|
|
||||||
|
|
||||||
listener {
|
|
||||||
timeout = 2700 # 45min
|
|
||||||
on-timeout = systemctl suspend # suspend pc
|
|
||||||
}
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
-- Generated by HyprMod
|
|
||||||
|
|
||||||
-- Settings
|
|
||||||
hl.config({
|
|
||||||
general = {
|
|
||||||
border_size = 5,
|
|
||||||
col = {
|
|
||||||
active_border = "0xcbe0e89b",
|
|
||||||
inactive_border = "0xff0e0543",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
+44
-728
@@ -1,25 +1,26 @@
|
|||||||
-- Central theme (basic/.config/themes): single source of truth for colors.
|
|
||||||
-- Consumers must use `theme.*` roles, never hardcoded hex, so a future
|
|
||||||
-- non-Catppuccin theme only adds a new directory. (HyprMod's
|
|
||||||
-- hyprland-gui.conf may additionally override borders at runtime.)
|
|
||||||
local theme = dofile(os.getenv("HOME") .. "/.config/themes/current/theme.lua")
|
|
||||||
local var_color_active_border = theme.border_active
|
|
||||||
local var_color_inactive_border = theme.border_inactive
|
|
||||||
local var_color_decoration_shadow = theme.shadow
|
|
||||||
local var_mainMod = "SUPER"
|
|
||||||
local var_terminal = "kitty"
|
|
||||||
local var_fileManager = "dolphin"
|
|
||||||
local var_menu = "wofi --show drun"
|
|
||||||
local var_screenshot_folder = "~/Bilder/Screenshots/"
|
|
||||||
|
|
||||||
require("env")
|
local config_home = os.getenv("XDG_CONFIG_HOME") or os.getenv("HOME") .. "/.config"
|
||||||
|
|
||||||
|
local fid_env = io.open(config_home .. "/hypr/env.lua")
|
||||||
|
local env = {}
|
||||||
|
if fid_env then
|
||||||
|
env = require("env")
|
||||||
|
else
|
||||||
|
env = require("env_example")
|
||||||
|
end
|
||||||
|
|
||||||
|
if env.shell ~= "noctalia" and env.shell ~= "caelestia" then
|
||||||
|
error("Unsupported shell '" .. tostring(env.shell) .. "' in ~/.config/hypr/env.lua; choose 'noctalia' or 'caelestia'")
|
||||||
|
end
|
||||||
|
|
||||||
hl.exec_cmd("bash ~/.config/hypr/env.sh")
|
hl.exec_cmd("bash ~/.config/hypr/env.sh")
|
||||||
|
|
||||||
-- ###############
|
-- ###############
|
||||||
-- ## MONITORS ###
|
-- ## MONITORS ###
|
||||||
-- ###############
|
-- ###############
|
||||||
|
|
||||||
require("monitor_setup")
|
-- load default monitor config
|
||||||
|
require("modules.monitor_setup_default")
|
||||||
|
|
||||||
-- unscale XWayland
|
-- unscale XWayland
|
||||||
hl.config({
|
hl.config({
|
||||||
@@ -33,723 +34,38 @@ hl.config({
|
|||||||
-- ##################
|
-- ##################
|
||||||
|
|
||||||
hl.on("hyprland.start", function()
|
hl.on("hyprland.start", function()
|
||||||
hl.exec_cmd("waybar &")
|
-- start selected shell
|
||||||
end)
|
if env.shell == "caelestia" then
|
||||||
|
hl.exec_cmd("caelestia shell -d")
|
||||||
hl.on("hyprland.start", function()
|
else -- default: "noctalia"
|
||||||
hl.exec_cmd("hyprpaper &")
|
hl.exec_cmd("noctalia &")
|
||||||
hl.exec_cmd("sleep 1; waypaper --restore &")
|
end
|
||||||
hl.exec_cmd("swaync &")
|
|
||||||
hl.exec_cmd("hypridle &")
|
|
||||||
hl.exec_cmd("nextcloud &")
|
|
||||||
hl.exec_cmd("sh ~/.config/hypr/scripts/portal-host-override.sh")
|
hl.exec_cmd("sh ~/.config/hypr/scripts/portal-host-override.sh")
|
||||||
hl.exec_cmd("sh ~/.config/hypr/scripts/ensure-mime-defaults.sh")
|
hl.exec_cmd("sh ~/.config/hypr/scripts/ensure-mime-defaults.sh")
|
||||||
end)
|
end)
|
||||||
|
|
||||||
-- ############################
|
require("modules.environment_variables")
|
||||||
-- ## ENVIRONMENT VARIABLES ###
|
require("modules.look_and_feel")
|
||||||
-- ############################
|
require("modules.input")
|
||||||
|
require("modules.keybinds")
|
||||||
-- See https://wiki.hypr.land/Configuring/Environment-variables/
|
require("modules.windows_and_workspaces")
|
||||||
hl.env("XCURSOR_SIZE", "24")
|
|
||||||
hl.env("HYPRCURSOR_SIZE", "24")
|
|
||||||
hl.env("XDG_CURRENT_DESKTOP", "Hyprland")
|
|
||||||
hl.env("XDG_SESSION_DESKTOP", "Hyprland")
|
|
||||||
hl.env("XDG_SESSION_TYPE", "wayland")
|
|
||||||
hl.env("XDG_MENU_PREFIX", "plasma-")
|
|
||||||
hl.env("GTK_USE_PORTAL", "1")
|
|
||||||
hl.env("GTK_THEME", os.getenv("THEME_GTK") or "Adwaita:dark")
|
|
||||||
hl.env("QT_WAYLAND_DISABLE_WINDOWDECORATION", "1")
|
|
||||||
hl.env("QT_QPA_PLATFORMTHEME", "kde")
|
|
||||||
|
|
||||||
-- ##################
|
|
||||||
-- ## PERMISSIONS ###
|
|
||||||
-- ##################
|
|
||||||
|
|
||||||
-- ####################
|
|
||||||
-- ## COLOR SCHEMES ###
|
|
||||||
-- ####################
|
|
||||||
|
|
||||||
-- (Colors come from the central theme via `theme` above; no per-file copies.)
|
|
||||||
|
|
||||||
-- ####################
|
|
||||||
-- ## LOOK AND FEEL ###
|
|
||||||
-- ####################
|
|
||||||
|
|
||||||
-- Refer to https://wiki.hypr.land/Configuring/Variables/
|
|
||||||
|
|
||||||
-- https://wiki.hypr.land/Configuring/Variables/#general
|
|
||||||
hl.config({
|
|
||||||
general = {
|
|
||||||
gaps_in = 3,
|
|
||||||
gaps_out = 4,
|
|
||||||
border_size = 3,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
-- https://wiki.hypr.land/Configuring/Variables/#variable-types for info about colors
|
|
||||||
hl.config({
|
|
||||||
general = {
|
|
||||||
col = {
|
|
||||||
active_border = var_color_active_border,
|
|
||||||
inactive_border = var_color_inactive_border,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
-- Set to true enable resizing windows by clicking and dragging on borders and gaps
|
|
||||||
hl.config({
|
|
||||||
general = {
|
|
||||||
resize_on_border = true,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
-- Please see https://wiki.hypr.land/Configuring/Tearing/ before you turn this on
|
|
||||||
hl.config({
|
|
||||||
general = {
|
|
||||||
allow_tearing = false,
|
|
||||||
layout = "dwindle",
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
-- https://wiki.hypr.land/Configuring/Variables/#decoration
|
|
||||||
hl.config({
|
|
||||||
decoration = {
|
|
||||||
rounding = 5,
|
|
||||||
rounding_power = 2,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
-- Change transparency of focused and unfocused windows
|
|
||||||
hl.config({
|
|
||||||
decoration = {
|
|
||||||
active_opacity = 1.0,
|
|
||||||
inactive_opacity = 1.0,
|
|
||||||
shadow = {
|
|
||||||
enabled = true,
|
|
||||||
range = 10,
|
|
||||||
render_power = 3,
|
|
||||||
color = var_color_decoration_shadow,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
-- https://wiki.hypr.land/Configuring/Variables/#blur
|
|
||||||
hl.config({
|
|
||||||
decoration = {
|
|
||||||
blur = {
|
|
||||||
enabled = true,
|
|
||||||
size = 10,
|
|
||||||
passes = 2,
|
|
||||||
vibrancy = 0.1696,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
-- https://wiki.hypr.land/Configuring/Variables/#animations
|
|
||||||
hl.config({
|
|
||||||
animations = {
|
|
||||||
enabled = true,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
-- Default curves, see https://wiki.hypr.land/Configuring/Animations/#curves
|
|
||||||
|
|
||||||
-- NAME, X0, Y0, X1, Y1
|
|
||||||
hl.curve("easeOutQuint", { type = "bezier", points = { { 0.23, 1 }, { 0.32, 1 } } })
|
|
||||||
hl.curve("easeInOutCubic", { type = "bezier", points = { { 0.65, 0.05 }, { 0.36, 1 } } })
|
|
||||||
hl.curve("linear", { type = "bezier", points = { { 0, 0 }, { 1, 1 } } })
|
|
||||||
hl.curve("almostLinear", { type = "bezier", points = { { 0.5, 0.5 }, { 0.75, 1 } } })
|
|
||||||
hl.curve("quick", { type = "bezier", points = { { 0.15, 0 }, { 0.1, 1 } } })
|
|
||||||
|
|
||||||
-- Default animations, see https://wiki.hypr.land/Configuring/Animations/
|
|
||||||
|
|
||||||
-- NAME, ONOFF, SPEED, CURVE, [STYLE]
|
|
||||||
hl.animation({
|
|
||||||
leaf = "global",
|
|
||||||
enabled = true,
|
|
||||||
speed = 10,
|
|
||||||
bezier = "default",
|
|
||||||
})
|
|
||||||
hl.animation({
|
|
||||||
leaf = "border",
|
|
||||||
enabled = true,
|
|
||||||
speed = 5.39,
|
|
||||||
bezier = "easeOutQuint",
|
|
||||||
})
|
|
||||||
hl.animation({
|
|
||||||
leaf = "windows",
|
|
||||||
enabled = true,
|
|
||||||
speed = 4.79,
|
|
||||||
bezier = "easeOutQuint",
|
|
||||||
})
|
|
||||||
hl.animation({
|
|
||||||
leaf = "windowsIn",
|
|
||||||
enabled = true,
|
|
||||||
speed = 4.1,
|
|
||||||
bezier = "easeOutQuint",
|
|
||||||
style = "popin 87%",
|
|
||||||
})
|
|
||||||
hl.animation({
|
|
||||||
leaf = "windowsOut",
|
|
||||||
enabled = true,
|
|
||||||
speed = 1.49,
|
|
||||||
bezier = "linear",
|
|
||||||
style = "popin 87%",
|
|
||||||
})
|
|
||||||
hl.animation({
|
|
||||||
leaf = "fadeIn",
|
|
||||||
enabled = true,
|
|
||||||
speed = 1.73,
|
|
||||||
bezier = "almostLinear",
|
|
||||||
})
|
|
||||||
hl.animation({
|
|
||||||
leaf = "fadeOut",
|
|
||||||
enabled = true,
|
|
||||||
speed = 1.46,
|
|
||||||
bezier = "almostLinear",
|
|
||||||
})
|
|
||||||
hl.animation({
|
|
||||||
leaf = "fade",
|
|
||||||
enabled = true,
|
|
||||||
speed = 3.03,
|
|
||||||
bezier = "quick",
|
|
||||||
})
|
|
||||||
hl.animation({
|
|
||||||
leaf = "layers",
|
|
||||||
enabled = true,
|
|
||||||
speed = 3.81,
|
|
||||||
bezier = "easeOutQuint",
|
|
||||||
})
|
|
||||||
hl.animation({
|
|
||||||
leaf = "layersIn",
|
|
||||||
enabled = true,
|
|
||||||
speed = 4,
|
|
||||||
bezier = "easeOutQuint",
|
|
||||||
style = "fade",
|
|
||||||
})
|
|
||||||
hl.animation({
|
|
||||||
leaf = "layersOut",
|
|
||||||
enabled = true,
|
|
||||||
speed = 1.5,
|
|
||||||
bezier = "linear",
|
|
||||||
style = "fade",
|
|
||||||
})
|
|
||||||
hl.animation({
|
|
||||||
leaf = "fadeLayersIn",
|
|
||||||
enabled = true,
|
|
||||||
speed = 1.79,
|
|
||||||
bezier = "almostLinear",
|
|
||||||
})
|
|
||||||
hl.animation({
|
|
||||||
leaf = "fadeLayersOut",
|
|
||||||
enabled = true,
|
|
||||||
speed = 1.39,
|
|
||||||
bezier = "almostLinear",
|
|
||||||
})
|
|
||||||
hl.animation({
|
|
||||||
leaf = "workspaces",
|
|
||||||
enabled = true,
|
|
||||||
speed = 1.94,
|
|
||||||
bezier = "almostLinear",
|
|
||||||
style = "fade",
|
|
||||||
})
|
|
||||||
hl.animation({
|
|
||||||
leaf = "workspacesIn",
|
|
||||||
enabled = true,
|
|
||||||
speed = 1.21,
|
|
||||||
bezier = "almostLinear",
|
|
||||||
style = "fade",
|
|
||||||
})
|
|
||||||
hl.animation({
|
|
||||||
leaf = "workspacesOut",
|
|
||||||
enabled = true,
|
|
||||||
speed = 1.94,
|
|
||||||
bezier = "almostLinear",
|
|
||||||
style = "fade",
|
|
||||||
})
|
|
||||||
hl.animation({
|
|
||||||
leaf = "zoomFactor",
|
|
||||||
enabled = true,
|
|
||||||
speed = 7,
|
|
||||||
bezier = "quick",
|
|
||||||
})
|
|
||||||
|
|
||||||
-- Ref https://wiki.hypr.land/Configuring/Workspace-Rules/
|
|
||||||
|
|
||||||
-- "Smart gaps" / "No gaps when only"
|
|
||||||
|
|
||||||
-- uncomment all if you wish to use that.
|
|
||||||
hl.workspace_rule({
|
|
||||||
workspace = "w[tv1]",
|
|
||||||
gaps_out = 0,
|
|
||||||
gaps_in = 0,
|
|
||||||
})
|
|
||||||
hl.workspace_rule({
|
|
||||||
workspace = "f[1]",
|
|
||||||
gaps_out = 0,
|
|
||||||
gaps_in = 0,
|
|
||||||
})
|
|
||||||
hl.window_rule({
|
|
||||||
name = "no-gaps-wtv1",
|
|
||||||
match = {
|
|
||||||
float = false,
|
|
||||||
workspace = "w[tv1]",
|
|
||||||
},
|
|
||||||
border_size = 0,
|
|
||||||
rounding = 0,
|
|
||||||
})
|
|
||||||
hl.window_rule({
|
|
||||||
name = "no-gaps-f1",
|
|
||||||
match = {
|
|
||||||
float = false,
|
|
||||||
workspace = "f[1]",
|
|
||||||
},
|
|
||||||
border_size = 0,
|
|
||||||
rounding = 0,
|
|
||||||
})
|
|
||||||
|
|
||||||
-- See https://wiki.hypr.land/Configuring/Dwindle-Layout/ for more
|
|
||||||
hl.config({
|
|
||||||
dwindle = {
|
|
||||||
preserve_split = true,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
-- See https://wiki.hypr.land/Configuring/Master-Layout/ for more
|
|
||||||
hl.config({
|
|
||||||
master = {
|
|
||||||
new_status = "master",
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
-- https://wiki.hypr.land/Configuring/Variables/#misc
|
|
||||||
hl.config({
|
|
||||||
misc = {
|
|
||||||
force_default_wallpaper = -1,
|
|
||||||
disable_hyprland_logo = false,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
-- ############
|
|
||||||
-- ## INPUT ###
|
|
||||||
-- ############
|
|
||||||
|
|
||||||
-- https://wiki.hypr.land/Configuring/Variables/#input
|
|
||||||
hl.config({
|
|
||||||
input = {
|
|
||||||
kb_layout = "de",
|
|
||||||
kb_variant = "",
|
|
||||||
kb_model = "",
|
|
||||||
kb_options = "grp:alt_shift_toggle",
|
|
||||||
kb_rules = "",
|
|
||||||
follow_mouse = 1,
|
|
||||||
numlock_by_default = true,
|
|
||||||
sensitivity = 0,
|
|
||||||
touchpad = {
|
|
||||||
natural_scroll = true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
-- See https://wiki.hypr.land/Configuring/Gestures
|
|
||||||
hl.gesture({
|
|
||||||
fingers = 3,
|
|
||||||
direction = "horizontal",
|
|
||||||
action = "workspace",
|
|
||||||
})
|
|
||||||
|
|
||||||
-- Example per-device config
|
|
||||||
|
|
||||||
-- See https://wiki.hypr.land/Configuring/Keywords/#per-device-input-configs for more
|
|
||||||
hl.device({
|
|
||||||
name = "epic-mouse-v1",
|
|
||||||
sensitivity = -0.5,
|
|
||||||
})
|
|
||||||
|
|
||||||
-- ##################
|
|
||||||
-- ## KEYBINDINGS ###
|
|
||||||
-- ##################
|
|
||||||
|
|
||||||
-- See https://wiki.hypr.land/Configuring/Keywords/
|
|
||||||
|
|
||||||
-- Example binds, see https://wiki.hypr.land/Configuring/Binds/ for more
|
|
||||||
hl.bind(var_mainMod .. " + RETURN", hl.dsp.exec_cmd(var_terminal), { description = "Open terminal (kitty)" })
|
|
||||||
hl.bind(var_mainMod .. " + Q", hl.dsp.window.close(), { description = "Close focused window" })
|
|
||||||
hl.bind(var_mainMod .. " + ESCAPE", hl.dsp.exec_cmd("hyprshutdown"), { description = "Shutdown Hyprland" })
|
|
||||||
hl.bind(
|
|
||||||
var_mainMod .. " + SHIFT + ESCAPE",
|
|
||||||
hl.dsp.exec_cmd("command -v hyprshutdown >/dev/null 2>&1 && hyprshutdown || hyprctl dispatch exit"),
|
|
||||||
{ description = "Exit Hyprland" }
|
|
||||||
)
|
|
||||||
hl.bind(
|
|
||||||
var_mainMod .. " + CTRL + ESCAPE",
|
|
||||||
hl.dsp.exec_cmd("hyprshutdown -t 'Shutting down...' --post-cmd 'shutdown -P 0'"),
|
|
||||||
{ description = "Power off the system" }
|
|
||||||
)
|
|
||||||
hl.bind(
|
|
||||||
var_mainMod .. " + ALT + ESCAPE",
|
|
||||||
hl.dsp.exec_cmd("hyprshutdown -t 'Restarting...' --post-cmd 'reboot'"),
|
|
||||||
{ description = "Reboot the system" }
|
|
||||||
)
|
|
||||||
hl.bind(var_mainMod .. " + E", hl.dsp.exec_cmd(var_fileManager), { description = "Open file manager (dolphin)" })
|
|
||||||
hl.bind(var_mainMod .. " + V", hl.dsp.window.float({ action = "toggle" }), { description = "Toggle floating window" })
|
|
||||||
hl.bind(var_mainMod .. " + SPACE", hl.dsp.exec_cmd(var_menu), { description = "Open app launcher (wofi)" })
|
|
||||||
hl.bind(
|
|
||||||
var_mainMod .. " + SHIFT + SPACE",
|
|
||||||
hl.dsp.exec_cmd("nwg-drawer"),
|
|
||||||
{ description = "Open app drawer (nwg-drawer)" }
|
|
||||||
)
|
|
||||||
hl.bind(var_mainMod .. " + P", hl.dsp.window.pseudo(), { description = "Toggle pseudo-tiling" })
|
|
||||||
hl.bind(var_mainMod .. " + SHIFT + J", hl.dsp.layout("togglesplit"), { description = "Toggle split layout" })
|
|
||||||
hl.bind(var_mainMod .. " + I", hl.dsp.exec_cmd("firefox &"), { description = "Open Firefox" })
|
|
||||||
hl.bind(
|
|
||||||
var_mainMod .. " + n",
|
|
||||||
hl.dsp.exec_cmd("~/.local/bin/hyprltm-net"),
|
|
||||||
{ description = "Network manager (hyprltm)" }
|
|
||||||
)
|
|
||||||
|
|
||||||
-- Move focus with mainMod or Vim-style
|
|
||||||
hl.bind(var_mainMod .. " + CTRL + h", hl.dsp.focus({ direction = "left" }), { description = "Focus window left" })
|
|
||||||
hl.bind(var_mainMod .. " + CTRL + l", hl.dsp.focus({ direction = "right" }), { description = "Focus window right" })
|
|
||||||
hl.bind(var_mainMod .. " + CTRL + k", hl.dsp.focus({ direction = "up" }), { description = "Focus window up" })
|
|
||||||
hl.bind(var_mainMod .. " + CTRL + j", hl.dsp.focus({ direction = "down" }), { description = "Focus window down" })
|
|
||||||
|
|
||||||
-- Move windows with mainMod or Vim-style
|
|
||||||
hl.bind(var_mainMod .. " + SHIFT + h", hl.dsp.window.move({ direction = "left" }), { description = "Move window left" })
|
|
||||||
hl.bind(
|
|
||||||
var_mainMod .. " + SHIFT + l",
|
|
||||||
hl.dsp.window.move({ direction = "right" }),
|
|
||||||
{ description = "Move window right" }
|
|
||||||
)
|
|
||||||
hl.bind(var_mainMod .. " + SHIFT + k", hl.dsp.window.move({ direction = "up" }), { description = "Move window up" })
|
|
||||||
hl.bind(var_mainMod .. " + SHIFT + j", hl.dsp.window.move({ direction = "down" }), { description = "Move window down" })
|
|
||||||
|
|
||||||
-- Resize focused window with mainMod + Arrows
|
|
||||||
hl.bind(
|
|
||||||
var_mainMod .. " + left",
|
|
||||||
hl.dsp.window.resize({ x = -10, y = 0, relative = true }),
|
|
||||||
{ description = "Resize window left" }
|
|
||||||
)
|
|
||||||
hl.bind(
|
|
||||||
var_mainMod .. " + right",
|
|
||||||
hl.dsp.window.resize({ x = 10, y = 0, relative = true }),
|
|
||||||
{ description = "Resize window right" }
|
|
||||||
)
|
|
||||||
hl.bind(
|
|
||||||
var_mainMod .. " + up",
|
|
||||||
hl.dsp.window.resize({ x = 0, y = -10, relative = true }),
|
|
||||||
{ description = "Resize window up" }
|
|
||||||
)
|
|
||||||
hl.bind(
|
|
||||||
var_mainMod .. " + down",
|
|
||||||
hl.dsp.window.resize({ x = 0, y = 10, relative = true }),
|
|
||||||
{ description = "Resize window down" }
|
|
||||||
)
|
|
||||||
|
|
||||||
-- Switch workspaces with mainMod + [0-9]
|
|
||||||
hl.bind(var_mainMod .. " + 1", hl.dsp.focus({ workspace = 1 }), { description = "Switch to workspace 1" })
|
|
||||||
hl.bind(var_mainMod .. " + 2", hl.dsp.focus({ workspace = 2 }), { description = "Switch to workspace 2" })
|
|
||||||
hl.bind(var_mainMod .. " + 3", hl.dsp.focus({ workspace = 3 }), { description = "Switch to workspace 3" })
|
|
||||||
hl.bind(var_mainMod .. " + 4", hl.dsp.focus({ workspace = 4 }), { description = "Switch to workspace 4" })
|
|
||||||
hl.bind(var_mainMod .. " + 5", hl.dsp.focus({ workspace = 5 }), { description = "Switch to workspace 5" })
|
|
||||||
hl.bind(var_mainMod .. " + 6", hl.dsp.focus({ workspace = 6 }), { description = "Switch to workspace 6" })
|
|
||||||
hl.bind(var_mainMod .. " + 7", hl.dsp.focus({ workspace = 7 }), { description = "Switch to workspace 7" })
|
|
||||||
hl.bind(var_mainMod .. " + 8", hl.dsp.focus({ workspace = 8 }), { description = "Switch to workspace 8" })
|
|
||||||
hl.bind(var_mainMod .. " + 9", hl.dsp.focus({ workspace = 9 }), { description = "Switch to workspace 9" })
|
|
||||||
hl.bind(var_mainMod .. " + 0", hl.dsp.focus({ workspace = 10 }), { description = "Switch to workspace 10" })
|
|
||||||
hl.bind("XF86AudioRaiseVolume", hl.dsp.exec_cmd("wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+"), {
|
|
||||||
repeating = true,
|
|
||||||
description = "Volume up",
|
|
||||||
})
|
|
||||||
hl.bind("XF86AudioLowerVolume", hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"), {
|
|
||||||
locked = true,
|
|
||||||
description = "Volume down",
|
|
||||||
})
|
|
||||||
|
|
||||||
-- Move active window to a workspace with mainMod + SHIFT + [0-9]
|
|
||||||
hl.bind(
|
|
||||||
var_mainMod .. " + SHIFT + 1",
|
|
||||||
hl.dsp.window.move({ workspace = 1 }),
|
|
||||||
{ description = "Move window to workspace 1" }
|
|
||||||
)
|
|
||||||
hl.bind(
|
|
||||||
var_mainMod .. " + SHIFT + 2",
|
|
||||||
hl.dsp.window.move({ workspace = 2 }),
|
|
||||||
{ description = "Move window to workspace 2" }
|
|
||||||
)
|
|
||||||
hl.bind(
|
|
||||||
var_mainMod .. " + SHIFT + 3",
|
|
||||||
hl.dsp.window.move({ workspace = 3 }),
|
|
||||||
{ description = "Move window to workspace 3" }
|
|
||||||
)
|
|
||||||
hl.bind(
|
|
||||||
var_mainMod .. " + SHIFT + 4",
|
|
||||||
hl.dsp.window.move({ workspace = 4 }),
|
|
||||||
{ description = "Move window to workspace 4" }
|
|
||||||
)
|
|
||||||
hl.bind(
|
|
||||||
var_mainMod .. " + SHIFT + 5",
|
|
||||||
hl.dsp.window.move({ workspace = 5 }),
|
|
||||||
{ description = "Move window to workspace 5" }
|
|
||||||
)
|
|
||||||
hl.bind(
|
|
||||||
var_mainMod .. " + SHIFT + 6",
|
|
||||||
hl.dsp.window.move({ workspace = 6 }),
|
|
||||||
{ description = "Move window to workspace 6" }
|
|
||||||
)
|
|
||||||
hl.bind(
|
|
||||||
var_mainMod .. " + SHIFT + 7",
|
|
||||||
hl.dsp.window.move({ workspace = 7 }),
|
|
||||||
{ description = "Move window to workspace 7" }
|
|
||||||
)
|
|
||||||
hl.bind(
|
|
||||||
var_mainMod .. " + SHIFT + 8",
|
|
||||||
hl.dsp.window.move({ workspace = 8 }),
|
|
||||||
{ description = "Move window to workspace 8" }
|
|
||||||
)
|
|
||||||
hl.bind(
|
|
||||||
var_mainMod .. " + SHIFT + 9",
|
|
||||||
hl.dsp.window.move({ workspace = 9 }),
|
|
||||||
{ description = "Move window to workspace 9" }
|
|
||||||
)
|
|
||||||
hl.bind(
|
|
||||||
var_mainMod .. " + SHIFT + 0",
|
|
||||||
hl.dsp.window.move({ workspace = 10 }),
|
|
||||||
{ description = "Move window to workspace 10" }
|
|
||||||
)
|
|
||||||
|
|
||||||
-- # Example special workspace (scratchpad)
|
|
||||||
|
|
||||||
-- bind = $mainMod, S, togglespecialworkspace, magic
|
|
||||||
|
|
||||||
-- bind = $mainMod SHIFT, S, movetoworkspace, special:magic
|
|
||||||
|
|
||||||
-- Scroll through existing workspaces with mainMod + scroll
|
|
||||||
hl.bind(
|
|
||||||
var_mainMod .. " + mouse_down",
|
|
||||||
hl.dsp.focus({ workspace = "e+1" }),
|
|
||||||
{ description = "Next workspace (scroll down)" }
|
|
||||||
)
|
|
||||||
hl.bind(
|
|
||||||
var_mainMod .. " + mouse_up",
|
|
||||||
hl.dsp.focus({ workspace = "e-1" }),
|
|
||||||
{ description = "Previous workspace (scroll up)" }
|
|
||||||
)
|
|
||||||
|
|
||||||
-- Move/resize windows with mainMod + LMB/RMB and dragging
|
|
||||||
hl.bind(var_mainMod .. " + mouse:272", hl.dsp.window.drag(), {
|
|
||||||
mouse = true,
|
|
||||||
description = "Move window with mouse",
|
|
||||||
})
|
|
||||||
hl.bind(var_mainMod .. " + mouse:273", hl.dsp.window.resize(), {
|
|
||||||
mouse = true,
|
|
||||||
description = "Resize window with mouse",
|
|
||||||
})
|
|
||||||
|
|
||||||
-- Laptop multimedia keys for volume and LCD brightness
|
|
||||||
hl.bind("XF86AudioRaiseVolume", hl.dsp.exec_cmd("wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"), {
|
|
||||||
repeating = true,
|
|
||||||
locked = true,
|
|
||||||
description = "Volume up (repeat)",
|
|
||||||
})
|
|
||||||
hl.bind("XF86AudioLowerVolume", hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"), {
|
|
||||||
repeating = true,
|
|
||||||
locked = true,
|
|
||||||
description = "Volume down (repeat)",
|
|
||||||
})
|
|
||||||
hl.bind("XF86AudioMute", hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"), {
|
|
||||||
repeating = true,
|
|
||||||
locked = true,
|
|
||||||
description = "Mute audio",
|
|
||||||
})
|
|
||||||
hl.bind("XF86AudioMicMute", hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"), {
|
|
||||||
repeating = true,
|
|
||||||
locked = true,
|
|
||||||
description = "Mute microphone",
|
|
||||||
})
|
|
||||||
hl.bind("XF86MonBrightnessUp", hl.dsp.exec_cmd("brightnessctl -e4 -n2 set 5%+"), {
|
|
||||||
repeating = true,
|
|
||||||
locked = true,
|
|
||||||
description = "Brightness up",
|
|
||||||
})
|
|
||||||
hl.bind("XF86MonBrightnessDown", hl.dsp.exec_cmd("brightnessctl -e4 -n2 set 5%-"), {
|
|
||||||
repeating = true,
|
|
||||||
locked = true,
|
|
||||||
description = "Brightness down",
|
|
||||||
})
|
|
||||||
|
|
||||||
-- Requires playerctl
|
|
||||||
hl.bind("XF86AudioNext", hl.dsp.exec_cmd("playerctl next"), {
|
|
||||||
locked = true,
|
|
||||||
description = "Next track",
|
|
||||||
})
|
|
||||||
hl.bind("XF86AudioPause", hl.dsp.exec_cmd("playerctl play-pause"), {
|
|
||||||
locked = true,
|
|
||||||
description = "Play/Pause",
|
|
||||||
})
|
|
||||||
hl.bind("XF86AudioPlay", hl.dsp.exec_cmd("playerctl play-pause"), {
|
|
||||||
locked = true,
|
|
||||||
description = "Play/Pause",
|
|
||||||
})
|
|
||||||
hl.bind("XF86AudioPrev", hl.dsp.exec_cmd("playerctl previous"), {
|
|
||||||
locked = true,
|
|
||||||
description = "Previous track",
|
|
||||||
})
|
|
||||||
|
|
||||||
-- Screenshots
|
|
||||||
hl.bind("PRINT", hl.dsp.exec_cmd("hyprshot -m region --output-folder " .. var_screenshot_folder), {
|
|
||||||
locked = true,
|
|
||||||
description = "Screenshot region",
|
|
||||||
})
|
|
||||||
hl.bind("CTRL + PRINT", hl.dsp.exec_cmd("hyprshot -m window --output-folder " .. var_screenshot_folder), {
|
|
||||||
locked = true,
|
|
||||||
description = "Screenshot window",
|
|
||||||
})
|
|
||||||
hl.bind("SHIFT + PRINT", hl.dsp.exec_cmd("hyprshot -m active --output-folder " .. var_screenshot_folder), {
|
|
||||||
locked = true,
|
|
||||||
description = "Screenshot active monitor",
|
|
||||||
})
|
|
||||||
|
|
||||||
-- Screenlock
|
|
||||||
hl.bind("CTRL + ALT + L", hl.dsp.exec_cmd("hyprlock"), { locked = true, description = "Lock screen" })
|
|
||||||
hl.bind(var_mainMod .. " + L", hl.dsp.exec_cmd("hyprlock"), { locked = true, description = "Lock screen" })
|
|
||||||
|
|
||||||
-- Keybind overview popup
|
|
||||||
hl.bind(
|
|
||||||
var_mainMod .. " + K",
|
|
||||||
hl.dsp.exec_cmd("sh ~/.config/hypr/scripts/show-keybinds.sh"),
|
|
||||||
{ description = "Show keybind overview" }
|
|
||||||
)
|
|
||||||
|
|
||||||
hl.bind(var_mainMod .. " + W", hl.dsp.exec_cmd("waypaper"), { description = "Wallpaper select" })
|
|
||||||
|
|
||||||
-- #############################
|
|
||||||
-- ## WINDOWS AND WORKSPACES ###
|
|
||||||
-- #############################
|
|
||||||
|
|
||||||
-- See https://wiki.hypr.land/Configuring/Window-Rules/ for more
|
|
||||||
|
|
||||||
-- See https://wiki.hypr.land/Configuring/Workspace-Rules/ for workspace rules
|
|
||||||
|
|
||||||
-- Example windowrules that are useful
|
|
||||||
|
|
||||||
-- Ignore maximize requests from all apps. You'll probably like this.
|
|
||||||
hl.window_rule({
|
|
||||||
name = "suppress-maximize-events",
|
|
||||||
match = {
|
|
||||||
class = ".*",
|
|
||||||
},
|
|
||||||
suppress_event = "maximize",
|
|
||||||
})
|
|
||||||
|
|
||||||
-- Fix some dragging issues with XWayland
|
|
||||||
hl.window_rule({
|
|
||||||
name = "fix-xwayland-drags",
|
|
||||||
match = {
|
|
||||||
class = "^$",
|
|
||||||
title = "^$",
|
|
||||||
xwayland = true,
|
|
||||||
float = true,
|
|
||||||
fullscreen = false,
|
|
||||||
pin = false,
|
|
||||||
},
|
|
||||||
no_focus = true,
|
|
||||||
})
|
|
||||||
|
|
||||||
-- Hyprland-run windowrule
|
|
||||||
hl.config({
|
|
||||||
decoration = {
|
|
||||||
blur = {
|
|
||||||
size = 8,
|
|
||||||
passes = 2,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
hl.window_rule({
|
|
||||||
name = "move-hyprland-run",
|
|
||||||
match = {
|
|
||||||
class = "hyprland-run",
|
|
||||||
},
|
|
||||||
move = "20 monitor_h-120",
|
|
||||||
float = true,
|
|
||||||
})
|
|
||||||
hl.window_rule({
|
|
||||||
name = "waypaper-float",
|
|
||||||
match = {
|
|
||||||
class = ".*[Ww]aypaper.*",
|
|
||||||
},
|
|
||||||
float = true,
|
|
||||||
size = "1280 800",
|
|
||||||
center = true,
|
|
||||||
dim_around = true,
|
|
||||||
})
|
|
||||||
hl.window_rule({
|
|
||||||
name = "opacity-kitty-dolphin",
|
|
||||||
match = {
|
|
||||||
class = ".*(kitty|dolphin).*",
|
|
||||||
},
|
|
||||||
opacity = "0.80 0.70",
|
|
||||||
})
|
|
||||||
hl.layer_rule({
|
|
||||||
match = {
|
|
||||||
namespace = "waybar",
|
|
||||||
},
|
|
||||||
blur = true,
|
|
||||||
})
|
|
||||||
hl.layer_rule({
|
|
||||||
match = {
|
|
||||||
namespace = "waybar",
|
|
||||||
},
|
|
||||||
blur_popups = true,
|
|
||||||
})
|
|
||||||
-- Central theme: blur behind the wofi popups (SUPER+SPACE drun, SUPER+K
|
|
||||||
-- keybind help), whose window itself is translucent (@bg_translucent).
|
|
||||||
hl.layer_rule({
|
|
||||||
match = {
|
|
||||||
namespace = "wofi",
|
|
||||||
},
|
|
||||||
blur = true,
|
|
||||||
})
|
|
||||||
hl.layer_rule({
|
|
||||||
match = {
|
|
||||||
namespace = "wofi",
|
|
||||||
},
|
|
||||||
blur_popups = true,
|
|
||||||
})
|
|
||||||
hl.window_rule({
|
|
||||||
name = "no-rounding-fullscreen",
|
|
||||||
match = {
|
|
||||||
fullscreen = 1,
|
|
||||||
},
|
|
||||||
rounding = 0,
|
|
||||||
border_size = 0,
|
|
||||||
})
|
|
||||||
|
|
||||||
-- windowrule {
|
|
||||||
|
|
||||||
-- name = no-rounding-steam-games
|
|
||||||
|
|
||||||
-- match:class = ^steam_app_.*$
|
|
||||||
|
|
||||||
-- rounding = 0
|
|
||||||
|
|
||||||
-- border_size = 0
|
|
||||||
|
|
||||||
-- }
|
|
||||||
|
|
||||||
-- windowrule {
|
|
||||||
|
|
||||||
-- name = no-rounding-gamescope
|
|
||||||
|
|
||||||
-- match:class = ^gamescope$
|
|
||||||
|
|
||||||
-- rounding = 0
|
|
||||||
|
|
||||||
-- border_size = 0
|
|
||||||
|
|
||||||
-- }
|
|
||||||
|
|
||||||
-- HyprMod managed settings
|
-- HyprMod managed settings
|
||||||
|
local fid_gui = io.open(config_home .. "/hypr/hyprland-buntes-monster-gui.lua")
|
||||||
|
if fid_gui then
|
||||||
|
fid_gui:close()
|
||||||
|
require("hyprland-buntes-monster-gui")
|
||||||
|
end
|
||||||
|
|
||||||
|
-- For Noctalia Color templates. Noctalia-only: under Caelestia this would
|
||||||
|
-- otherwise push Noctalia's Catppuccin border colors into the compositor.
|
||||||
|
if env.shell == "noctalia" then
|
||||||
|
require("noctalia").apply_theme()
|
||||||
|
end
|
||||||
|
|
||||||
|
-- HyprMod managed settings
|
||||||
|
local fid_gui2 = io.open(config_home .. "/hypr/hyprland-gui.lua")
|
||||||
|
if fid_gui2 then
|
||||||
|
fid_gui2:close()
|
||||||
require("hyprland-gui")
|
require("hyprland-gui")
|
||||||
|
end
|
||||||
|
|||||||
@@ -1,114 +0,0 @@
|
|||||||
# sample hyprlock.conf
|
|
||||||
# for more configuration options, refer https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock
|
|
||||||
#
|
|
||||||
# rendered text in all widgets supports pango markup (e.g. <b> or <i> tags)
|
|
||||||
# ref. https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock/#general-remarks
|
|
||||||
#
|
|
||||||
# shortcuts to clear password buffer: ESC, Ctrl+U, Ctrl+Backspace
|
|
||||||
#
|
|
||||||
# you can get started by copying this config to ~/.config/hypr/hyprlock.conf
|
|
||||||
#
|
|
||||||
|
|
||||||
# Central theme: palette variables ($sapphire, $text, ...) come from
|
|
||||||
# basic/.config/themes via ~/.config/themes/current/hypr.conf.
|
|
||||||
# Edit colors there, never hardcoded values here.
|
|
||||||
source = ~/.config/themes/current/hypr.conf
|
|
||||||
|
|
||||||
$font = Monospace
|
|
||||||
|
|
||||||
general {
|
|
||||||
hide_cursor = false
|
|
||||||
}
|
|
||||||
|
|
||||||
# uncomment to enable fingerprint authentication
|
|
||||||
# auth {
|
|
||||||
# fingerprint {
|
|
||||||
# enabled = true
|
|
||||||
# ready_message = Scan fingerprint to unlock
|
|
||||||
# present_message = Scanning...
|
|
||||||
# retry_delay = 250 # in milliseconds
|
|
||||||
# }
|
|
||||||
# }
|
|
||||||
|
|
||||||
animations {
|
|
||||||
enabled = true
|
|
||||||
bezier = linear, 1, 1, 0, 0
|
|
||||||
animation = fadeIn, 1, 5, linear
|
|
||||||
animation = fadeOut, 1, 5, linear
|
|
||||||
animation = inputFieldDots, 1, 2, linear
|
|
||||||
}
|
|
||||||
|
|
||||||
background {
|
|
||||||
monitor =
|
|
||||||
path = screenshot
|
|
||||||
blur_passes = 3
|
|
||||||
}
|
|
||||||
|
|
||||||
input-field {
|
|
||||||
monitor =
|
|
||||||
size = 20%, 5%
|
|
||||||
outline_thickness = 3
|
|
||||||
inner_color = rgba(0, 0, 0, 0.0) # no fill
|
|
||||||
|
|
||||||
outer_color = $sapphire $lavender 45deg
|
|
||||||
check_color = $sapphire $peach 120deg
|
|
||||||
fail_color = $maroon $red 40deg
|
|
||||||
|
|
||||||
font_color = $subtext0
|
|
||||||
fade_on_empty = false
|
|
||||||
rounding = 15
|
|
||||||
|
|
||||||
font_family = $font
|
|
||||||
placeholder_text = Input password...
|
|
||||||
fail_text = $PAMFAIL
|
|
||||||
|
|
||||||
# uncomment to use a letter instead of a dot to indicate the typed password
|
|
||||||
# dots_text_format = *
|
|
||||||
# dots_size = 0.4
|
|
||||||
dots_spacing = 0.3
|
|
||||||
|
|
||||||
# uncomment to use an input indicator that does not show the password length (similar to swaylock's input indicator)
|
|
||||||
# hide_input = true
|
|
||||||
|
|
||||||
position = 0, -20
|
|
||||||
halign = center
|
|
||||||
valign = center
|
|
||||||
}
|
|
||||||
|
|
||||||
# TIME
|
|
||||||
label {
|
|
||||||
monitor =
|
|
||||||
text = $TIME # ref. https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock/#variable-substitution
|
|
||||||
color = $text
|
|
||||||
font_size = 90
|
|
||||||
font_family = $font
|
|
||||||
|
|
||||||
position = -30, 0
|
|
||||||
halign = right
|
|
||||||
valign = top
|
|
||||||
}
|
|
||||||
|
|
||||||
# DATE
|
|
||||||
label {
|
|
||||||
monitor =
|
|
||||||
text = cmd[update:60000] date +"%A, %d %B %Y" # update every 60 seconds
|
|
||||||
color = $subtext0
|
|
||||||
font_size = 25
|
|
||||||
font_family = $font
|
|
||||||
|
|
||||||
position = -30, -150
|
|
||||||
halign = right
|
|
||||||
valign = top
|
|
||||||
}
|
|
||||||
|
|
||||||
label {
|
|
||||||
monitor =
|
|
||||||
text = $LAYOUT[en,ru]
|
|
||||||
color = $subtext0
|
|
||||||
font_size = 24
|
|
||||||
onclick = hyprctl switchxkblayout all next
|
|
||||||
|
|
||||||
position = 250, -20
|
|
||||||
halign = center
|
|
||||||
valign = center
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
|
||||||
|
-- See https://wiki.hypr.land/Configuring/Environment-variables/
|
||||||
|
hl.env("XCURSOR_SIZE", "24")
|
||||||
|
hl.env("HYPRCURSOR_SIZE", "24")
|
||||||
|
hl.env("XDG_CURRENT_DESKTOP", "Hyprland")
|
||||||
|
hl.env("XDG_SESSION_DESKTOP", "Hyprland")
|
||||||
|
hl.env("XDG_SESSION_TYPE", "wayland")
|
||||||
|
hl.env("XDG_MENU_PREFIX", "plasma-")
|
||||||
|
hl.env("GTK_USE_PORTAL", "1")
|
||||||
|
hl.env("GTK_THEME", os.getenv("THEME_GTK") or "Adwaita:dark")
|
||||||
|
hl.env("QT_WAYLAND_DISABLE_WINDOWDECORATION", "1")
|
||||||
|
hl.env("QT_QPA_PLATFORMTHEME", "kde")
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
|
||||||
|
|
||||||
|
-- https://wiki.hypr.land/Configuring/Variables/#input
|
||||||
|
hl.config({
|
||||||
|
input = {
|
||||||
|
kb_layout = "de",
|
||||||
|
kb_variant = "",
|
||||||
|
kb_model = "",
|
||||||
|
kb_options = "grp:alt_shift_toggle",
|
||||||
|
kb_rules = "",
|
||||||
|
follow_mouse = 1,
|
||||||
|
numlock_by_default = true,
|
||||||
|
sensitivity = 0,
|
||||||
|
touchpad = {
|
||||||
|
natural_scroll = true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
-- See https://wiki.hypr.land/Configuring/Gestures
|
||||||
|
hl.gesture({
|
||||||
|
fingers = 3,
|
||||||
|
direction = "horizontal",
|
||||||
|
action = "workspace",
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Example per-device config
|
||||||
|
|
||||||
|
-- See https://wiki.hypr.land/Configuring/Keywords/#per-device-input-configs for more
|
||||||
|
hl.device({
|
||||||
|
name = "epic-mouse-v1",
|
||||||
|
sensitivity = -0.5,
|
||||||
|
})
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
-- keybind_registry.lua — wrap hl.bind so every keybind records a runnable
|
||||||
|
-- action alongside its chord/description.
|
||||||
|
--
|
||||||
|
-- Hyprland's Lua API registers binds through hl.bind(keys, dispatcher, opts),
|
||||||
|
-- and `hyprctl binds -j` reports those as `dispatcher: "__lua"` with an opaque
|
||||||
|
-- registry reference — the underlying command is not recoverable from the
|
||||||
|
-- compositor afterwards. This module captures the action at registration time:
|
||||||
|
--
|
||||||
|
-- exec(cmd) -> a tagged placeholder for the exec_cmd dispatcher (the final
|
||||||
|
-- command string is resolved here, so concatenations like
|
||||||
|
-- "hyprshot ... " .. var.screenshot_folder work automatically)
|
||||||
|
-- bind(...) -> same signature/behavior as hl.bind; converts the exec
|
||||||
|
-- placeholder back into a real dispatcher and records the row
|
||||||
|
-- write(path)-> dump the registry as "keys\x1fdescription\x1fcmd" TSV so the
|
||||||
|
-- show-keybinds picker can execute the selected entry
|
||||||
|
--
|
||||||
|
-- Pure dispatcher binds (hl.dsp.window.close(), hl.dsp.focus(...), ...) pass
|
||||||
|
-- through unchanged and are recorded with an empty cmd (informational only).
|
||||||
|
|
||||||
|
local registry = {}
|
||||||
|
|
||||||
|
local M = {}
|
||||||
|
|
||||||
|
--- Tag a shell command so bind() knows to turn it into an exec_cmd dispatcher.
|
||||||
|
function M.exec(cmd)
|
||||||
|
return { __cmd = cmd }
|
||||||
|
end
|
||||||
|
|
||||||
|
--- Register a keybind like hl.bind, but record it in the registry first.
|
||||||
|
--- @param keys string final key string (e.g. "SUPER + Q")
|
||||||
|
--- @param action any M.exec(cmd) or a real dispatcher from hl.dsp.*
|
||||||
|
--- @param opts? table hl.bind options (description, flags, ...)
|
||||||
|
function M.bind(keys, action, opts)
|
||||||
|
opts = opts or {}
|
||||||
|
local dsp = action
|
||||||
|
local cmd = ""
|
||||||
|
if type(action) == "table" and action.__cmd ~= nil then
|
||||||
|
cmd = action.__cmd
|
||||||
|
dsp = hl.dsp.exec_cmd(cmd)
|
||||||
|
end
|
||||||
|
table.insert(registry, { keys = keys, description = opts.description or "", cmd = cmd })
|
||||||
|
return hl.bind(keys, dsp, opts)
|
||||||
|
end
|
||||||
|
|
||||||
|
--- Dump the registry as "keys\x1fdescription\x1fcmd" lines (one per bind).
|
||||||
|
function M.write(path)
|
||||||
|
local f, err = io.open(path, "w")
|
||||||
|
if not f then
|
||||||
|
return nil, err
|
||||||
|
end
|
||||||
|
for _, b in ipairs(registry) do
|
||||||
|
f:write(b.keys, "\x1f", b.description, "\x1f", b.cmd, "\n")
|
||||||
|
end
|
||||||
|
f:close()
|
||||||
|
return registry
|
||||||
|
end
|
||||||
|
|
||||||
|
--- Access the raw registry rows ({keys, description, cmd}).
|
||||||
|
function M.get()
|
||||||
|
return registry
|
||||||
|
end
|
||||||
|
|
||||||
|
return M
|
||||||
@@ -0,0 +1,248 @@
|
|||||||
|
local var = require("modules.variables")
|
||||||
|
local command = require("modules.shell_commands")
|
||||||
|
local env = require("env")
|
||||||
|
-- bind/exec wrap hl.bind so each keybind also records a runnable command for
|
||||||
|
-- the show-keybinds picker (see modules/keybind_registry.lua).
|
||||||
|
local reg = require("modules.keybind_registry")
|
||||||
|
local bind = reg.bind
|
||||||
|
local exec = reg.exec
|
||||||
|
-- See https://wiki.hypr.land/Configuring/Keywords/
|
||||||
|
|
||||||
|
-- Example binds, see https://wiki.hypr.land/Configuring/Binds/ for more
|
||||||
|
bind(var.mainMod .. " + RETURN", exec(var.terminal), { description = "Open terminal" })
|
||||||
|
bind(var.mainMod .. " + ALT + RETURN", exec(var.terminal_tmux), { description = "Open tmux in terminal" })
|
||||||
|
bind(var.mainMod .. " + Q", hl.dsp.window.close(), { description = "Close focused window" })
|
||||||
|
bind(
|
||||||
|
var.mainMod .. " + ESCAPE",
|
||||||
|
exec(command.session),
|
||||||
|
{ description = "Session menu (logout/reboot/shutdown)" }
|
||||||
|
)
|
||||||
|
bind(var.mainMod .. " + SHIFT + ESCAPE", exec(command.logout), { description = "Session: logout" })
|
||||||
|
bind(var.mainMod .. " + CTRL + ESCAPE", exec(command.shutdown), { description = "Session: power off" })
|
||||||
|
bind(var.mainMod .. " + ALT + ESCAPE", exec(command.reboot), { description = "Session: reboot" })
|
||||||
|
bind(var.mainMod .. " + E", exec(var.fileManager), { description = "Open file manager" })
|
||||||
|
bind(var.mainMod .. " + V", hl.dsp.window.float({ action = "toggle" }), { description = "Floating window toggle" })
|
||||||
|
bind(var.mainMod .. " + SPACE", exec(command.menu), { description = "Open app launcher" })
|
||||||
|
bind(var.mainMod .. " + P", hl.dsp.window.pseudo(), { description = "Pseudo-tiling toggle" })
|
||||||
|
bind(var.mainMod .. " + SHIFT + J", hl.dsp.layout("togglesplit"), { description = "Split layout toggle" })
|
||||||
|
bind(var.mainMod .. " + I", exec(var.internet_explorer), { description = "Open internet explorer" })
|
||||||
|
bind(var.mainMod .. " + n", exec("nm-connection-editor"), { description = "Open network manager" })
|
||||||
|
bind(var.mainMod .. " + comma", exec(command.settings), { description = "Open settings" })
|
||||||
|
bind(var.mainMod .. " + S", exec(command.control_center), { description = "Open start menu" })
|
||||||
|
bind(var.mainMod .. " + ALT + H", exec("hyprmod"), {description = "Open hyprmod (hyprland config GUI)"})
|
||||||
|
bind(var.mainMod .. " + period", exec(command.emoji), { description = "Open emoji picker" })
|
||||||
|
bind(var.mainMod .. " + ALT + S", exec(var.systemmonitor), {description = "Open systemmonitor"})
|
||||||
|
|
||||||
|
bind(var.mainMod .. " + TAB", function()
|
||||||
|
hl.plugin.hyprtasking.toggle("cursor")
|
||||||
|
end, { description = "Workspace: overview" })
|
||||||
|
|
||||||
|
-- Move focus with mainMod or Vim-style
|
||||||
|
bind(var.mainMod .. " + CTRL + h", hl.dsp.focus({ direction = "left" }), { description = "Window: focus left" })
|
||||||
|
bind(var.mainMod .. " + CTRL + l", hl.dsp.focus({ direction = "right" }), { description = "Window: focus right" })
|
||||||
|
bind(var.mainMod .. " + CTRL + k", hl.dsp.focus({ direction = "up" }), { description = "Window: focus up" })
|
||||||
|
bind(var.mainMod .. " + CTRL + j", hl.dsp.focus({ direction = "down" }), { description = "Window: focus down" })
|
||||||
|
|
||||||
|
-- Move windows with mainMod or Vim-style
|
||||||
|
bind(var.mainMod .. " + SHIFT + h", hl.dsp.window.move({ direction = "left" }), { description = "Window: move left" })
|
||||||
|
bind(
|
||||||
|
var.mainMod .. " + SHIFT + l",
|
||||||
|
hl.dsp.window.move({ direction = "right" }),
|
||||||
|
{ description = "Window: move right" }
|
||||||
|
)
|
||||||
|
bind(var.mainMod .. " + SHIFT + k", hl.dsp.window.move({ direction = "up" }), { description = "Window: move up" })
|
||||||
|
bind(var.mainMod .. " + SHIFT + j", hl.dsp.window.move({ direction = "down" }), { description = "Window: move down" })
|
||||||
|
|
||||||
|
-- Resize focused window with mainMod + Arrows
|
||||||
|
bind(
|
||||||
|
var.mainMod .. " + left",
|
||||||
|
hl.dsp.window.resize({ x = -10, y = 0, relative = true }),
|
||||||
|
{ description = "Window: resize left" }
|
||||||
|
)
|
||||||
|
bind(
|
||||||
|
var.mainMod .. " + right",
|
||||||
|
hl.dsp.window.resize({ x = 10, y = 0, relative = true }),
|
||||||
|
{ description = "Window: resize right" }
|
||||||
|
)
|
||||||
|
bind(
|
||||||
|
var.mainMod .. " + up",
|
||||||
|
hl.dsp.window.resize({ x = 0, y = -10, relative = true }),
|
||||||
|
{ description = "Window: resize up" }
|
||||||
|
)
|
||||||
|
bind(
|
||||||
|
var.mainMod .. " + down",
|
||||||
|
hl.dsp.window.resize({ x = 0, y = 10, relative = true }),
|
||||||
|
{ description = "Window: resize down" }
|
||||||
|
)
|
||||||
|
|
||||||
|
-- Switch workspaces with mainMod + [0-9]
|
||||||
|
bind(var.mainMod .. " + 1", hl.dsp.focus({ workspace = 1 }), { description = "Workspace: switch to 1" })
|
||||||
|
bind(var.mainMod .. " + 2", hl.dsp.focus({ workspace = 2 }), { description = "Workspace: Switch to 2" })
|
||||||
|
bind(var.mainMod .. " + 3", hl.dsp.focus({ workspace = 3 }), { description = "Workspace: Switch to 3" })
|
||||||
|
bind(var.mainMod .. " + 4", hl.dsp.focus({ workspace = 4 }), { description = "Workspace: Switch to 4" })
|
||||||
|
bind(var.mainMod .. " + 5", hl.dsp.focus({ workspace = 5 }), { description = "Workspace: Switch to 5" })
|
||||||
|
bind(var.mainMod .. " + 6", hl.dsp.focus({ workspace = 6 }), { description = "Workspace: Switch to 6" })
|
||||||
|
bind(var.mainMod .. " + 7", hl.dsp.focus({ workspace = 7 }), { description = "Workspace: Switch to 7" })
|
||||||
|
bind(var.mainMod .. " + 8", hl.dsp.focus({ workspace = 8 }), { description = "Workspace: Switch to 8" })
|
||||||
|
bind(var.mainMod .. " + 9", hl.dsp.focus({ workspace = 9 }), { description = "Workspace: Switch to 9" })
|
||||||
|
bind(var.mainMod .. " + 0", hl.dsp.focus({ workspace = 10 }), { description = "Workspace: Switch to 10" })
|
||||||
|
|
||||||
|
-- Move active window to a workspace with mainMod + SHIFT + [0-9]
|
||||||
|
bind(
|
||||||
|
var.mainMod .. " + SHIFT + 1",
|
||||||
|
hl.dsp.window.move({ workspace = 1 }),
|
||||||
|
{ description = "Window: move to workspace 1" }
|
||||||
|
)
|
||||||
|
bind(
|
||||||
|
var.mainMod .. " + SHIFT + 2",
|
||||||
|
hl.dsp.window.move({ workspace = 2 }),
|
||||||
|
{ description = "Window: move to workspace 2" }
|
||||||
|
)
|
||||||
|
bind(
|
||||||
|
var.mainMod .. " + SHIFT + 3",
|
||||||
|
hl.dsp.window.move({ workspace = 3 }),
|
||||||
|
{ description = "Window: move to workspace 3" }
|
||||||
|
)
|
||||||
|
bind(
|
||||||
|
var.mainMod .. " + SHIFT + 4",
|
||||||
|
hl.dsp.window.move({ workspace = 4 }),
|
||||||
|
{ description = "Window: move to workspace 4" }
|
||||||
|
)
|
||||||
|
bind(
|
||||||
|
var.mainMod .. " + SHIFT + 5",
|
||||||
|
hl.dsp.window.move({ workspace = 5 }),
|
||||||
|
{ description = "Window: move to workspace 5" }
|
||||||
|
)
|
||||||
|
bind(
|
||||||
|
var.mainMod .. " + SHIFT + 6",
|
||||||
|
hl.dsp.window.move({ workspace = 6 }),
|
||||||
|
{ description = "Window: move to workspace 6" }
|
||||||
|
)
|
||||||
|
bind(
|
||||||
|
var.mainMod .. " + SHIFT + 7",
|
||||||
|
hl.dsp.window.move({ workspace = 7 }),
|
||||||
|
{ description = "Window: move to workspace 7" }
|
||||||
|
)
|
||||||
|
bind(
|
||||||
|
var.mainMod .. " + SHIFT + 8",
|
||||||
|
hl.dsp.window.move({ workspace = 8 }),
|
||||||
|
{ description = "Window: move to workspace 8" }
|
||||||
|
)
|
||||||
|
bind(
|
||||||
|
var.mainMod .. " + SHIFT + 9",
|
||||||
|
hl.dsp.window.move({ workspace = 9 }),
|
||||||
|
{ description = "Window: move to workspace 9" }
|
||||||
|
)
|
||||||
|
bind(
|
||||||
|
var.mainMod .. " + SHIFT + 0",
|
||||||
|
hl.dsp.window.move({ workspace = 10 }),
|
||||||
|
{ description = "Window: move to workspace 10" }
|
||||||
|
)
|
||||||
|
|
||||||
|
-- # Example special workspace (scratchpad)
|
||||||
|
|
||||||
|
-- bind = $mainMod, S, togglespecialworkspace, magic
|
||||||
|
|
||||||
|
-- bind = $mainMod SHIFT, S, movetoworkspace, special:magic
|
||||||
|
|
||||||
|
-- Scroll through existing workspaces with mainMod + scroll
|
||||||
|
bind(
|
||||||
|
var.mainMod .. " + mouse_down",
|
||||||
|
hl.dsp.focus({ workspace = "e+1" }),
|
||||||
|
{ description = "Workspace: next (scroll down)" }
|
||||||
|
)
|
||||||
|
bind(
|
||||||
|
var.mainMod .. " + mouse_up",
|
||||||
|
hl.dsp.focus({ workspace = "e-1" }),
|
||||||
|
{ description = "Workspace: previous (scroll up)" }
|
||||||
|
)
|
||||||
|
|
||||||
|
-- Move/resize windows with mainMod + LMB/RMB and dragging
|
||||||
|
bind(var.mainMod .. " + mouse:272", hl.dsp.window.drag(), {
|
||||||
|
mouse = true,
|
||||||
|
description = "Window: move with mouse",
|
||||||
|
})
|
||||||
|
bind(var.mainMod .. " + mouse:273", hl.dsp.window.resize(), {
|
||||||
|
mouse = true,
|
||||||
|
description = "Window: resize with mouse",
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Laptop multimedia keys for volume and LCD brightness
|
||||||
|
bind("XF86AudioRaiseVolume", exec("wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"), {
|
||||||
|
repeating = true,
|
||||||
|
locked = true,
|
||||||
|
description = "Media: volume up (repeat)",
|
||||||
|
})
|
||||||
|
bind("XF86AudioLowerVolume", exec("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"), {
|
||||||
|
repeating = true,
|
||||||
|
locked = true,
|
||||||
|
description = "Media: volume down (repeat)",
|
||||||
|
})
|
||||||
|
bind("XF86AudioMute", exec("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"), {
|
||||||
|
repeating = true,
|
||||||
|
locked = true,
|
||||||
|
description = "Media: mute audio",
|
||||||
|
})
|
||||||
|
bind("XF86AudioMicMute", exec("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"), {
|
||||||
|
repeating = true,
|
||||||
|
locked = true,
|
||||||
|
description = "Media: mute microphone",
|
||||||
|
})
|
||||||
|
bind("XF86MonBrightnessUp", exec("brightnessctl -e4 -n2 set 5%+"), {
|
||||||
|
repeating = true,
|
||||||
|
locked = true,
|
||||||
|
description = "Brightness up",
|
||||||
|
})
|
||||||
|
bind("XF86MonBrightnessDown", exec("brightnessctl -e4 -n2 set 5%-"), {
|
||||||
|
repeating = true,
|
||||||
|
locked = true,
|
||||||
|
description = "Brightness down",
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Requires playerctl
|
||||||
|
bind("XF86AudioNext", exec("playerctl next"), {
|
||||||
|
locked = true,
|
||||||
|
description = "Media: next track",
|
||||||
|
})
|
||||||
|
bind("XF86AudioPause", exec("playerctl play-pause"), {
|
||||||
|
locked = true,
|
||||||
|
description = "Media: play/pause",
|
||||||
|
})
|
||||||
|
bind("XF86AudioPlay", exec("playerctl play-pause"), {
|
||||||
|
locked = true,
|
||||||
|
description = "Media: play/pause",
|
||||||
|
})
|
||||||
|
bind("XF86AudioPrev", exec("playerctl previous"), {
|
||||||
|
locked = true,
|
||||||
|
description = "Media: previous track",
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Screenshots
|
||||||
|
bind("PRINT", exec("hyprshot -m region --output-folder " .. var.screenshot_folder), {
|
||||||
|
locked = true,
|
||||||
|
description = "Screenshot region",
|
||||||
|
})
|
||||||
|
bind("CTRL + PRINT", exec("hyprshot -m window --output-folder " .. var.screenshot_folder), {
|
||||||
|
locked = true,
|
||||||
|
description = "Screenshot window",
|
||||||
|
})
|
||||||
|
bind("SHIFT + PRINT", exec("hyprshot -m active --output-folder " .. var.screenshot_folder), {
|
||||||
|
locked = true,
|
||||||
|
description = "Screenshot active monitor",
|
||||||
|
})
|
||||||
|
|
||||||
|
bind(var.mainMod .. " + L", exec(command.lock), { locked = true, description = "Lock screen" })
|
||||||
|
bind(var.mainMod .. " + K", exec(command.keybinds_show), { description = "Keybinds: show overview" })
|
||||||
|
bind(var.mainMod .. " + W", exec(command.wallpaper_select), { description = "Wallpaper select" })
|
||||||
|
|
||||||
|
-- Caelestia extras
|
||||||
|
if env.shell == "caelestia" then
|
||||||
|
bind(var.mainMod .. " + SHIFT + V", exec(command.clipboard), { description = "Clipboard history" })
|
||||||
|
bind(var.mainMod .. " + SHIFT + K", exec(command.show_all), { description = "Toggle utilities" })
|
||||||
|
bind("CTRL + ALT + C", exec(command.clear_notifications), { description = "Clear notifications" })
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Persist the registry for the show-keybinds picker
|
||||||
|
-- (scripts/show-keybinds.sh reads this TSV to resolve selected commands).
|
||||||
|
-- Runs on every config load/reload, keeping the picker in sync with the binds.
|
||||||
|
reg.write("/tmp/hypr-keybinds.tsv")
|
||||||
@@ -0,0 +1,260 @@
|
|||||||
|
|
||||||
|
local var = require("modules.variables")
|
||||||
|
|
||||||
|
-- Refer to https://wiki.hypr.land/Configuring/Variables/
|
||||||
|
|
||||||
|
-- https://wiki.hypr.land/Configuring/Variables/#general
|
||||||
|
hl.config({
|
||||||
|
general = {
|
||||||
|
gaps_in = 3,
|
||||||
|
gaps_out = 4,
|
||||||
|
border_size = 3,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
-- https://wiki.hypr.land/Configuring/Variables/#variable-types for info about colors
|
||||||
|
hl.config({
|
||||||
|
general = {
|
||||||
|
col = {
|
||||||
|
active_border = var.color_active_border,
|
||||||
|
inactive_border = var.color_inactive_border,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Set to true enable resizing windows by clicking and dragging on borders and gaps
|
||||||
|
hl.config({
|
||||||
|
general = {
|
||||||
|
resize_on_border = true,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Please see https://wiki.hypr.land/Configuring/Tearing/ before you turn this on
|
||||||
|
hl.config({
|
||||||
|
general = {
|
||||||
|
allow_tearing = false,
|
||||||
|
layout = "dwindle",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
-- https://wiki.hypr.land/Configuring/Variables/#decoration
|
||||||
|
hl.config({
|
||||||
|
decoration = {
|
||||||
|
rounding = 5,
|
||||||
|
rounding_power = 2,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Change transparency of focused and unfocused windows
|
||||||
|
hl.config({
|
||||||
|
decoration = {
|
||||||
|
active_opacity = 1.0,
|
||||||
|
inactive_opacity = 1.0,
|
||||||
|
shadow = {
|
||||||
|
enabled = true,
|
||||||
|
range = 10,
|
||||||
|
render_power = 3,
|
||||||
|
color = var.color_decoration_shadow,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
-- https://wiki.hypr.land/Configuring/Variables/#blur
|
||||||
|
hl.config({
|
||||||
|
decoration = {
|
||||||
|
blur = {
|
||||||
|
enabled = true,
|
||||||
|
size = 10,
|
||||||
|
passes = 2,
|
||||||
|
vibrancy = 0.1696,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
-- https://wiki.hypr.land/Configuring/Variables/#animations
|
||||||
|
hl.config({
|
||||||
|
animations = {
|
||||||
|
enabled = true,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Default curves, see https://wiki.hypr.land/Configuring/Animations/#curves
|
||||||
|
|
||||||
|
-- NAME, X0, Y0, X1, Y1
|
||||||
|
hl.curve("easeOutQuint", { type = "bezier", points = { { 0.23, 1 }, { 0.32, 1 } } })
|
||||||
|
hl.curve("easeInOutCubic", { type = "bezier", points = { { 0.65, 0.05 }, { 0.36, 1 } } })
|
||||||
|
hl.curve("linear", { type = "bezier", points = { { 0, 0 }, { 1, 1 } } })
|
||||||
|
hl.curve("almostLinear", { type = "bezier", points = { { 0.5, 0.5 }, { 0.75, 1 } } })
|
||||||
|
hl.curve("quick", { type = "bezier", points = { { 0.15, 0 }, { 0.1, 1 } } })
|
||||||
|
|
||||||
|
-- Default animations, see https://wiki.hypr.land/Configuring/Animations/
|
||||||
|
|
||||||
|
-- NAME, ONOFF, SPEED, CURVE, [STYLE]
|
||||||
|
hl.animation({
|
||||||
|
leaf = "global",
|
||||||
|
enabled = true,
|
||||||
|
speed = 10,
|
||||||
|
bezier = "default",
|
||||||
|
})
|
||||||
|
hl.animation({
|
||||||
|
leaf = "border",
|
||||||
|
enabled = true,
|
||||||
|
speed = 5.39,
|
||||||
|
bezier = "easeOutQuint",
|
||||||
|
})
|
||||||
|
hl.animation({
|
||||||
|
leaf = "windows",
|
||||||
|
enabled = true,
|
||||||
|
speed = 4.79,
|
||||||
|
bezier = "easeOutQuint",
|
||||||
|
})
|
||||||
|
hl.animation({
|
||||||
|
leaf = "windowsIn",
|
||||||
|
enabled = true,
|
||||||
|
speed = 4.1,
|
||||||
|
bezier = "easeOutQuint",
|
||||||
|
style = "popin 87%",
|
||||||
|
})
|
||||||
|
hl.animation({
|
||||||
|
leaf = "windowsOut",
|
||||||
|
enabled = true,
|
||||||
|
speed = 1.49,
|
||||||
|
bezier = "linear",
|
||||||
|
style = "popin 87%",
|
||||||
|
})
|
||||||
|
hl.animation({
|
||||||
|
leaf = "fadeIn",
|
||||||
|
enabled = true,
|
||||||
|
speed = 1.73,
|
||||||
|
bezier = "almostLinear",
|
||||||
|
})
|
||||||
|
hl.animation({
|
||||||
|
leaf = "fadeOut",
|
||||||
|
enabled = true,
|
||||||
|
speed = 1.46,
|
||||||
|
bezier = "almostLinear",
|
||||||
|
})
|
||||||
|
hl.animation({
|
||||||
|
leaf = "fade",
|
||||||
|
enabled = true,
|
||||||
|
speed = 3.03,
|
||||||
|
bezier = "quick",
|
||||||
|
})
|
||||||
|
hl.animation({
|
||||||
|
leaf = "layers",
|
||||||
|
enabled = true,
|
||||||
|
speed = 3.81,
|
||||||
|
bezier = "easeOutQuint",
|
||||||
|
})
|
||||||
|
hl.animation({
|
||||||
|
leaf = "layersIn",
|
||||||
|
enabled = true,
|
||||||
|
speed = 4,
|
||||||
|
bezier = "easeOutQuint",
|
||||||
|
style = "fade",
|
||||||
|
})
|
||||||
|
hl.animation({
|
||||||
|
leaf = "layersOut",
|
||||||
|
enabled = true,
|
||||||
|
speed = 1.5,
|
||||||
|
bezier = "linear",
|
||||||
|
style = "fade",
|
||||||
|
})
|
||||||
|
hl.animation({
|
||||||
|
leaf = "fadeLayersIn",
|
||||||
|
enabled = true,
|
||||||
|
speed = 1.79,
|
||||||
|
bezier = "almostLinear",
|
||||||
|
})
|
||||||
|
hl.animation({
|
||||||
|
leaf = "fadeLayersOut",
|
||||||
|
enabled = true,
|
||||||
|
speed = 1.39,
|
||||||
|
bezier = "almostLinear",
|
||||||
|
})
|
||||||
|
hl.animation({
|
||||||
|
leaf = "workspaces",
|
||||||
|
enabled = true,
|
||||||
|
speed = 1.94,
|
||||||
|
bezier = "almostLinear",
|
||||||
|
style = "slide",
|
||||||
|
})
|
||||||
|
hl.animation({
|
||||||
|
leaf = "workspacesIn",
|
||||||
|
enabled = true,
|
||||||
|
speed = 1.21,
|
||||||
|
bezier = "almostLinear",
|
||||||
|
style = "slide",
|
||||||
|
})
|
||||||
|
hl.animation({
|
||||||
|
leaf = "workspacesOut",
|
||||||
|
enabled = true,
|
||||||
|
speed = 1.94,
|
||||||
|
bezier = "almostLinear",
|
||||||
|
style = "slide",
|
||||||
|
})
|
||||||
|
hl.animation({
|
||||||
|
leaf = "zoomFactor",
|
||||||
|
enabled = true,
|
||||||
|
speed = 7,
|
||||||
|
bezier = "quick",
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Ref https://wiki.hypr.land/Configuring/Workspace-Rules/
|
||||||
|
|
||||||
|
-- "Smart gaps" / "No gaps when only"
|
||||||
|
|
||||||
|
-- uncomment all if you wish to use that.
|
||||||
|
hl.workspace_rule({
|
||||||
|
workspace = "w[tv1]",
|
||||||
|
gaps_out = 0,
|
||||||
|
gaps_in = 0,
|
||||||
|
})
|
||||||
|
hl.workspace_rule({
|
||||||
|
workspace = "f[1]",
|
||||||
|
gaps_out = 0,
|
||||||
|
gaps_in = 0,
|
||||||
|
})
|
||||||
|
hl.window_rule({
|
||||||
|
name = "no-gaps-wtv1",
|
||||||
|
match = {
|
||||||
|
float = false,
|
||||||
|
workspace = "w[tv1]",
|
||||||
|
},
|
||||||
|
border_size = 0,
|
||||||
|
rounding = 0,
|
||||||
|
})
|
||||||
|
hl.window_rule({
|
||||||
|
name = "no-gaps-f1",
|
||||||
|
match = {
|
||||||
|
float = false,
|
||||||
|
workspace = "f[1]",
|
||||||
|
},
|
||||||
|
border_size = 0,
|
||||||
|
rounding = 0,
|
||||||
|
})
|
||||||
|
|
||||||
|
-- See https://wiki.hypr.land/Configuring/Dwindle-Layout/ for more
|
||||||
|
hl.config({
|
||||||
|
dwindle = {
|
||||||
|
preserve_split = true,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
-- See https://wiki.hypr.land/Configuring/Master-Layout/ for more
|
||||||
|
hl.config({
|
||||||
|
master = {
|
||||||
|
new_status = "master",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
-- https://wiki.hypr.land/Configuring/Variables/#misc
|
||||||
|
hl.config({
|
||||||
|
misc = {
|
||||||
|
force_default_wallpaper = -1,
|
||||||
|
disable_hyprland_logo = false,
|
||||||
|
-- Both *_enables_dpms default to false, so a display left in DPMS-off
|
||||||
|
-- is unrecoverable without a TTY switch. A keypress should wake it.
|
||||||
|
key_press_enables_dpms = true,
|
||||||
|
},
|
||||||
|
})
|
||||||
@@ -1 +0,0 @@
|
|||||||
monitor=,preferred,auto,1.0
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
monitor=,preferred,auto,1.0
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
-- monitor=,preferred,auto,1.0
|
|
||||||
|
|
||||||
hl.monitor({
|
|
||||||
output = "",
|
|
||||||
disabled = false,
|
|
||||||
mode = "preferred",
|
|
||||||
position = "auto",
|
|
||||||
scale = 1.0,
|
|
||||||
})
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
# monitorv2 {
|
|
||||||
# output = DP-2
|
|
||||||
# mode = highres highrr
|
|
||||||
# position = 0x0
|
|
||||||
# scale = 1.2
|
|
||||||
# bitdepth = 10
|
|
||||||
# cm = hdr
|
|
||||||
# supports_wide_color = 1
|
|
||||||
# supports_hdr = 1
|
|
||||||
# sdr_min_luminance = 0.005
|
|
||||||
# sdr_max_luminance = 200
|
|
||||||
# min_luminance = 0.002
|
|
||||||
# max_luminance = 200
|
|
||||||
# max_avg_luminance = 150
|
|
||||||
# }
|
|
||||||
|
|
||||||
monitor = DP-2, preferred, auto-left, 1.5
|
|
||||||
monitor = DP-3, preferred, auto-right, 1.0
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
hl.monitor({
|
|
||||||
output = "DP-2",
|
|
||||||
disabled = false,
|
|
||||||
mode = "preferred",
|
|
||||||
position = "auto-left",
|
|
||||||
scale = 1.5,
|
|
||||||
})
|
|
||||||
hl.monitor({
|
|
||||||
output = "DP-3",
|
|
||||||
disabled = false,
|
|
||||||
mode = "preferred",
|
|
||||||
position = "auto-right",
|
|
||||||
scale = 1.0,
|
|
||||||
})
|
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
|
||||||
|
|
||||||
|
-- Default
|
||||||
|
hl.monitor({
|
||||||
|
output = "",
|
||||||
|
disabled = false,
|
||||||
|
mode = "preferred",
|
||||||
|
position = "auto",
|
||||||
|
scale = 1.0,
|
||||||
|
})
|
||||||
|
|
||||||
|
-- -- Buntes Monster
|
||||||
|
-- hl.monitor({
|
||||||
|
-- output = "DP-2",
|
||||||
|
-- disabled = false,
|
||||||
|
-- mode = "preferred",
|
||||||
|
-- position = "auto-left",
|
||||||
|
-- scale = 1.5,
|
||||||
|
-- })
|
||||||
|
-- hl.monitor({
|
||||||
|
-- output = "DP-3",
|
||||||
|
-- disabled = false,
|
||||||
|
-- mode = "preferred",
|
||||||
|
-- position = "auto-right",
|
||||||
|
-- scale = 1.0,
|
||||||
|
-- })
|
||||||
|
|
||||||
|
-- -- Archtop
|
||||||
|
-- hl.monitor({
|
||||||
|
-- output = "",
|
||||||
|
-- disabled = false,
|
||||||
|
-- mode = "preferred",
|
||||||
|
-- position = "auto",
|
||||||
|
-- scale = 1.0,
|
||||||
|
-- })
|
||||||
|
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
local env = require("env")
|
||||||
|
|
||||||
|
local commands = {
|
||||||
|
session = "",
|
||||||
|
logout = "",
|
||||||
|
shutdown = "",
|
||||||
|
reboot = "",
|
||||||
|
menu = "",
|
||||||
|
settings = "",
|
||||||
|
control_center = "",
|
||||||
|
lock = "",
|
||||||
|
wallpaper_select = "",
|
||||||
|
keybinds_show = "sh ~/.config/hypr/scripts/show-keybinds.sh",
|
||||||
|
clipboard = "",
|
||||||
|
clipboard_delete = "",
|
||||||
|
emoji = "",
|
||||||
|
show_all = "",
|
||||||
|
clear_notifications = "",
|
||||||
|
}
|
||||||
|
|
||||||
|
-- Noctalia
|
||||||
|
if env.shell == "noctalia" then
|
||||||
|
commands.session = "noctalia msg panel-toggle session"
|
||||||
|
commands.logout = "command -v noctalia >/dev/null 2>&1 && noctalia msg session logout || hyprctl dispatch exit"
|
||||||
|
commands.shutdown = "noctalia msg session shutdown"
|
||||||
|
commands.reboot = "noctalia msg session reboot"
|
||||||
|
commands.menu = "noctalia msg panel-toggle launcher"
|
||||||
|
commands.settings = "noctalia msg settings-toggle"
|
||||||
|
commands.control_center = "noctalia msg panel-toggle control-center"
|
||||||
|
commands.wallpaper_select = "noctalia msg panel-toggle wallpaper"
|
||||||
|
commands.lock = "noctalia msg session lock"
|
||||||
|
commands.emoji = "noctalia msg panel-toggle launcher '/emo '"
|
||||||
|
|
||||||
|
-- Caelesia
|
||||||
|
elseif env.shell == "caelestia" then
|
||||||
|
commands.session = "caelestia shell drawers toggle session"
|
||||||
|
commands.logout = "hyprctl dispatch exit"
|
||||||
|
commands.shutdown = "systemctl poweroff"
|
||||||
|
commands.reboot = "systemctl reboot"
|
||||||
|
commands.menu = "caelestia shell drawers toggle launcher"
|
||||||
|
commands.settings = "caelestia shell drawers toggle dashboard"
|
||||||
|
commands.control_center = "caelestia shell drawers toggle sidebar"
|
||||||
|
commands.wallpaper_select = 'caelestia shell drawers toggle launcher && sleep 0.1 && wtype ">wallpaper "'
|
||||||
|
commands.clipboard = "caelestia clipboard"
|
||||||
|
commands.clipboard_delete = "caelestia clipboard -d"
|
||||||
|
commands.emoji = "caelestia emoji -p"
|
||||||
|
commands.show_all = "caelestia shell drawers toggle utilities"
|
||||||
|
commands.clear_notifications = "caelestia shell notifs clear"
|
||||||
|
commands.lock = "caelestia shell lock lock"
|
||||||
|
end
|
||||||
|
|
||||||
|
return commands
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
|
||||||
|
local theme = dofile(os.getenv("HOME") .. "/.config/themes/current/theme.lua")
|
||||||
|
-- local var_color_active_border = theme.border_active
|
||||||
|
-- local var_color_inactive_border = theme.border_inactive
|
||||||
|
-- local var_color_decoration_shadow = theme.shadow
|
||||||
|
-- local var_mainMod = "SUPER"
|
||||||
|
-- local var_terminal = "kitty"
|
||||||
|
-- local var_fileManager = "dolphin"
|
||||||
|
-- local var_menu = "noctalia msg panel-toggle launcher"
|
||||||
|
-- local var_screenshot_folder = "~/Bilder/Screenshots/"
|
||||||
|
|
||||||
|
local terminal = "kitty"
|
||||||
|
|
||||||
|
return {
|
||||||
|
color_active_border = theme.border_active,
|
||||||
|
color_inactive_border = theme.border_inactive,
|
||||||
|
color_decoration_shadow = theme.shadow,
|
||||||
|
mainMod = "SUPER",
|
||||||
|
terminal = terminal,
|
||||||
|
terminal_tmux = terminal .. " -e tmux",
|
||||||
|
fileManager = terminal .. " -e yazi", -- "dolphin",
|
||||||
|
screenshot_folder = "~/Bilder/Screenshots/",
|
||||||
|
internet_explorer = "firefox",
|
||||||
|
systemmonitor = terminal .. " -e btop",
|
||||||
|
}
|
||||||
@@ -0,0 +1,115 @@
|
|||||||
|
-- See https://wiki.hypr.land/Configuring/Window-Rules/ for more
|
||||||
|
|
||||||
|
-- See https://wiki.hypr.land/Configuring/Workspace-Rules/ for workspace rules
|
||||||
|
|
||||||
|
-- Example windowrules that are useful
|
||||||
|
|
||||||
|
-- Ignore maximize requests from all apps. You'll probably like this.
|
||||||
|
hl.window_rule({
|
||||||
|
name = "suppress-maximize-events",
|
||||||
|
match = {
|
||||||
|
class = ".*",
|
||||||
|
},
|
||||||
|
suppress_event = "maximize",
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Fix some dragging issues with XWayland
|
||||||
|
hl.window_rule({
|
||||||
|
name = "fix-xwayland-drags",
|
||||||
|
match = {
|
||||||
|
class = "^$",
|
||||||
|
title = "^$",
|
||||||
|
xwayland = true,
|
||||||
|
float = true,
|
||||||
|
fullscreen = false,
|
||||||
|
pin = false,
|
||||||
|
},
|
||||||
|
no_focus = true,
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Hyprland-run windowrule
|
||||||
|
hl.config({
|
||||||
|
decoration = {
|
||||||
|
blur = {
|
||||||
|
size = 8,
|
||||||
|
passes = 2,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
hl.window_rule({
|
||||||
|
name = "move-hyprland-run",
|
||||||
|
match = {
|
||||||
|
class = "hyprland-run",
|
||||||
|
},
|
||||||
|
move = "20 monitor_h-120",
|
||||||
|
float = true,
|
||||||
|
})
|
||||||
|
hl.window_rule({
|
||||||
|
name = "keybinds-float",
|
||||||
|
match = {
|
||||||
|
class = "keybinds",
|
||||||
|
},
|
||||||
|
float = true,
|
||||||
|
size = "900 700",
|
||||||
|
center = true,
|
||||||
|
dim_around = true,
|
||||||
|
})
|
||||||
|
hl.window_rule({
|
||||||
|
name = "opacity-kitty-dolphin",
|
||||||
|
match = {
|
||||||
|
class = ".*(kitty|dolphin).*",
|
||||||
|
},
|
||||||
|
opacity = "0.90 0.80",
|
||||||
|
})
|
||||||
|
hl.window_rule({
|
||||||
|
match = {
|
||||||
|
class = ".*keybinds.*",
|
||||||
|
},
|
||||||
|
opacity = "0.75 0.50",
|
||||||
|
})
|
||||||
|
-- Noctalia shell surfaces: blur bars/panels/dock/notifications and let
|
||||||
|
-- Noctalia run its own animations (no Hyprland layer animation on top).
|
||||||
|
hl.layer_rule({
|
||||||
|
name = "noctalia",
|
||||||
|
match = {
|
||||||
|
namespace = "^noctalia-(bar-.+|notification|dock|panel|attached-panel|osd|window-switcher)$",
|
||||||
|
},
|
||||||
|
no_anim = true,
|
||||||
|
ignore_alpha = 0.5,
|
||||||
|
blur = true,
|
||||||
|
blur_popups = true,
|
||||||
|
})
|
||||||
|
hl.layer_rule({
|
||||||
|
name = "caelestia",
|
||||||
|
match = {
|
||||||
|
namespace = "^caelestia-.*$",
|
||||||
|
},
|
||||||
|
no_anim = true,
|
||||||
|
ignore_alpha = 0.5,
|
||||||
|
blur = true,
|
||||||
|
blur_popups = true,
|
||||||
|
})
|
||||||
|
hl.window_rule({
|
||||||
|
name = "noctalia-settings",
|
||||||
|
match = {
|
||||||
|
class = "dev.noctalia.Noctalia",
|
||||||
|
},
|
||||||
|
float = true,
|
||||||
|
size = "1080 920",
|
||||||
|
})
|
||||||
|
hl.window_rule({
|
||||||
|
name = "no-rounding-fullscreen",
|
||||||
|
match = {
|
||||||
|
fullscreen = 1,
|
||||||
|
},
|
||||||
|
rounding = 0,
|
||||||
|
border_size = 0,
|
||||||
|
})
|
||||||
|
|
||||||
|
hl.window_rule({
|
||||||
|
name = "floating-windows",
|
||||||
|
float = true,
|
||||||
|
match = { class = "(imv|.*hyprmod|.*[Bb]itwarden.*|ktouch)" },
|
||||||
|
size = "1080 920",
|
||||||
|
})
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
-- Generated by Noctalia
|
||||||
|
|
||||||
|
local primary = "rgb(cba6f7)"
|
||||||
|
local surface = "rgb(1e1e2e)"
|
||||||
|
local on_surface = "rgb(cdd6f4)"
|
||||||
|
local secondary = "rgb(fab387)"
|
||||||
|
local on_secondary = "rgb(11111b)"
|
||||||
|
local error = "rgb(f38ba8)"
|
||||||
|
local on_error = "rgb(11111b)"
|
||||||
|
|
||||||
|
local function apply_theme()
|
||||||
|
hl.config({
|
||||||
|
general = {
|
||||||
|
col = {
|
||||||
|
active_border = primary,
|
||||||
|
inactive_border = surface,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
group = {
|
||||||
|
col = {
|
||||||
|
border_active = secondary,
|
||||||
|
border_inactive = surface,
|
||||||
|
border_locked_active = error,
|
||||||
|
border_locked_inactive = surface,
|
||||||
|
},
|
||||||
|
|
||||||
|
groupbar = {
|
||||||
|
col = {
|
||||||
|
active = secondary,
|
||||||
|
inactive = surface,
|
||||||
|
locked_active = error,
|
||||||
|
locked_inactive = surface,
|
||||||
|
},
|
||||||
|
text_color = on_secondary,
|
||||||
|
text_color_inactive = on_surface,
|
||||||
|
text_color_locked_active = on_error,
|
||||||
|
text_color_locked_inactive = on_surface,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
end
|
||||||
|
|
||||||
|
return {
|
||||||
|
colors = {
|
||||||
|
primary = primary,
|
||||||
|
surface = surface,
|
||||||
|
on_surface = on_surface,
|
||||||
|
secondary = secondary,
|
||||||
|
on_secondary = on_secondary,
|
||||||
|
error = error,
|
||||||
|
on_error = on_error,
|
||||||
|
},
|
||||||
|
apply_theme = apply_theme
|
||||||
|
}
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
#!/usr/bin/env sh
|
|
||||||
|
|
||||||
|
|
||||||
set -eu # Exit immediately if a command exits with a non-zero status, and treat unset variables as an error.
|
|
||||||
|
|
||||||
CONF_SOURCE="$HOME/.config/hypr/env.conf.template"
|
|
||||||
CONF_TARGET="$HOME/.config/hypr/env.conf"
|
|
||||||
SH_SOURCE="$HOME/.config/hypr/env.sh.template"
|
|
||||||
SH_TARGET="$HOME/.config/hypr/env.sh"
|
|
||||||
|
|
||||||
|
|
||||||
if [ ! -f "$CONF_TARGET" ]; then
|
|
||||||
cp "$CONF_SOURCE" "$CONF_TARGET"
|
|
||||||
echo "Created $CONF_TARGET from template $CONF_SOURCE"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -f "$SH_TARGET" ]; then
|
|
||||||
cp "$SH_SOURCE" "$SH_TARGET"
|
|
||||||
echo "Created $SH_TARGET from template $SH_SOURCE"
|
|
||||||
fi
|
|
||||||
@@ -1,53 +1,99 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# show-keybinds.sh — floating keybind overview popup.
|
# show-keybinds.sh — fuzzy, executable keybind picker.
|
||||||
#
|
#
|
||||||
# Reads the live keybind list from `hyprctl binds -j` and shows it in a wofi
|
# SUPER+K opens a floating kitty (class `keybinds`, see
|
||||||
# popup (single column, sorted A-Z, fuzzy-searchable, closes on Esc).
|
# windows_and_workspaces.lua) running fzf over the keybind list:
|
||||||
# Pressing Enter on a row executes that keybind's action via the compositor's
|
# - start typing immediately: the fzf prompt is focused on open
|
||||||
# Lua state (hl.dispatch on the bind's stored dispatcher).
|
# - arrow keys browse the (filtered) list
|
||||||
|
# - Enter executes the selected entry's command, then the picker closes
|
||||||
|
# - Esc closes without action
|
||||||
#
|
#
|
||||||
# Note: this config uses the Lua API (hl.bind), so `hyprctl binds -j` reports
|
# Display data is read live from `hyprctl binds -j`. The command behind each
|
||||||
# key + modmask + an opaque Lua registry reference instead of a readable
|
# entry cannot come from hyprctl — Lua-registered binds report as opaque
|
||||||
# dispatcher. The human-readable action comes from the `description` option
|
# `__lua` dispatchers there — so modules/keybind_registry.lua records every
|
||||||
# added to each hl.bind(...) call - keep those descriptions up to date when
|
# command at bind time and writes /tmp/hypr-keybinds.tsv on config load
|
||||||
# you change a bind.
|
# ("keys\x1fdescription\x1fcmd" lines). Entries without a recorded command
|
||||||
|
# (pure dispatchers like window.close) are informational only: Enter closes.
|
||||||
#
|
#
|
||||||
# Usage: show-keybinds.sh [--print]
|
# Usage: show-keybinds.sh [--print | --internal-pick FILE]
|
||||||
# --print print the formatted list to stdout instead of opening wofi
|
# --print print the formatted list to stdout (debug/testing)
|
||||||
# (handy for debugging / testing the formatting pipeline)
|
# --internal-pick F run fzf over picker file F and execute the selection
|
||||||
|
# (spawned by the default mode inside the kitty window)
|
||||||
|
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
|
readonly SEP=$'\x1f'
|
||||||
# modmask bits reported by hyprctl (XKB modifiers), pairwise bit:name in
|
# modmask bits reported by hyprctl (XKB modifiers), pairwise bit:name in
|
||||||
# display order. See https://wiki.hypr.land/Configuring/Binds/
|
# display order. See https://wiki.hypr.land/Configuring/Binds/
|
||||||
readonly MOD_ORDER=(64 SUPER 8 ALT 4 CTRL 1 SHIFT 2 CAPS 16 MOD2 32 MOD3 128 MOD5)
|
readonly MOD_ORDER=(64 SUPER 8 ALT 4 CTRL 1 SHIFT 2 CAPS 16 MOD2 32 MOD3 128 MOD5)
|
||||||
|
readonly SIDECAR=/tmp/hypr-keybinds.tsv
|
||||||
|
|
||||||
# chord -> Lua registry ref of the dispatcher to run on selection
|
# --internal-pick mode: runs INSIDE the floating kitty. fzf over the picker
|
||||||
declare -A dispatch_for
|
# list (lines are "cmd\x1fdisplay"), then execute the chosen command and let
|
||||||
|
# the window close.
|
||||||
|
if [[ "${1:-}" == "--internal-pick" ]]; then
|
||||||
|
pick_file="${2:-}"
|
||||||
|
if [[ -z "$pick_file" || ! -s "$pick_file" ]]; then
|
||||||
|
echo "show-keybinds: --internal-pick needs an existing picker list file" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
# `|| rc=$?` keeps `set -e` from aborting before cleanup when fzf is
|
||||||
|
# cancelled (e.g. Esc) or filters to no match.
|
||||||
|
rc=0
|
||||||
|
sel="$(fzf --delimiter "$SEP" --with-nth 2.. --cycle --info=inline \
|
||||||
|
--prompt 'keybinds> ' --header 'type to filter · Enter executes · Esc closes' \
|
||||||
|
<"$pick_file")" || rc=$?
|
||||||
|
rm -f "$pick_file"
|
||||||
|
if ((rc != 0)) || [[ -z "$sel" ]]; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
cmd="${sel%%"$SEP"*}"
|
||||||
|
if [[ -n "$cmd" ]]; then
|
||||||
|
# Detach into its own session so the command outlives the picker
|
||||||
|
# window (kitty/pty teardown would otherwise signal its process group).
|
||||||
|
setsid -f sh -c "$cmd" >/dev/null 2>&1 </dev/null
|
||||||
|
fi
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
if ! hyprctl binds -j >/dev/null 2>&1; then
|
# ---------------------------------------------------------------------------
|
||||||
echo "hyprctl binds failed - are you inside a Hyprland session?" >&2
|
# Gather rows: prefer the sidecar (has commands); fall back to live `hyprctl
|
||||||
|
# binds -j` (display only, e.g. right after a fresh clone without a reload).
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
have_sidecar=0
|
||||||
|
if [[ -s "$SIDECAR" ]]; then
|
||||||
|
have_sidecar=1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ((! have_sidecar)) && ! hyprctl binds -j >/dev/null 2>&1; then
|
||||||
|
echo "show-keybinds: nothing to show: no keybind registry ($SIDECAR) and no Hyprland session" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
rows=()
|
rows=()
|
||||||
|
cmds=()
|
||||||
|
keys=()
|
||||||
|
|
||||||
# modmask\x1fkey\x1fdescription\x1fsubmap\x1farg
|
if ((have_sidecar)); then
|
||||||
# Fields are joined with the unit separator (0x1f): tabs are IFS-whitespace
|
while IFS="$SEP" read -r key description cmd; do
|
||||||
# and `read` would collapse consecutive tabs, eating empty middle fields
|
key="${key//mouse:272/LMB}"
|
||||||
# like the (usually empty) submap. \x1f is not whitespace, so every field
|
key="${key//mouse:273/RMB}"
|
||||||
# keeps its position.
|
if [[ -z "$description" ]]; then
|
||||||
while IFS=$'\x1f' read -r modmask key description submap arg; do
|
description="(no description)"
|
||||||
raw_key="$key"
|
fi
|
||||||
|
rows+=("$(printf '%-26s %s' "$key" "$description")")
|
||||||
# Humanize mouse-button binds.
|
cmds+=("$cmd")
|
||||||
|
keys+=("$key")
|
||||||
|
done <"$SIDECAR"
|
||||||
|
else
|
||||||
|
while IFS="$SEP" read -r modmask key description submap; do
|
||||||
case "$key" in
|
case "$key" in
|
||||||
mouse:272) key="LMB" ;;
|
mouse:272) key="LMB" ;;
|
||||||
mouse:273) key="RMB" ;;
|
mouse:273) key="RMB" ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# Build the chord, e.g. "SUPER + SHIFT + Q".
|
|
||||||
chord=""
|
chord=""
|
||||||
|
# Rebuild "SUPER + SHIFT + Q" from the modmask bits.
|
||||||
i=0
|
i=0
|
||||||
while ((i < ${#MOD_ORDER[@]})); do
|
while ((i < ${#MOD_ORDER[@]})); do
|
||||||
bit=${MOD_ORDER[i]}
|
bit=${MOD_ORDER[i]}
|
||||||
@@ -68,56 +114,49 @@ while IFS=$'\x1f' read -r modmask key description submap arg; do
|
|||||||
else
|
else
|
||||||
rows+=("$(printf '%-26s %s' "$chord" "(no description)")")
|
rows+=("$(printf '%-26s %s' "$chord" "(no description)")")
|
||||||
fi
|
fi
|
||||||
|
cmds+=("")
|
||||||
# Remember how to run this row. Mouse drag/resize need a real pointer
|
keys+=("$chord")
|
||||||
# gesture, so they stay display-only. First occurrence of a chord wins
|
done < <(hyprctl binds -j | jq -r '.[] | [(.modmask | tostring), .key, .description, .submap] | join("\u001f")')
|
||||||
# (media keys are often bound twice with different flags).
|
|
||||||
case "$raw_key" in
|
|
||||||
mouse:272 | mouse:273) ;;
|
|
||||||
*)
|
|
||||||
if [[ -n "$arg" && -z "${dispatch_for[$chord]+x}" ]]; then
|
|
||||||
dispatch_for[$chord]="$arg"
|
|
||||||
fi
|
fi
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done < <(hyprctl binds -j | jq -r '.[] | [(.modmask | tostring), .key, .description, .submap, .arg] | join("\u001f")')
|
|
||||||
|
|
||||||
if ((${#rows[@]} == 0)); then
|
if ((${#rows[@]} == 0)); then
|
||||||
echo "No keybinds found." >&2
|
echo "show-keybinds: no keybinds found." >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Drop duplicate chords (e.g. media keys bound twice with different flags),
|
# Drop duplicate chords (e.g. media keys bound twice with different flags),
|
||||||
# then sort alphabetically (A-Z).
|
# keeping the first occurrence; carry the matching cmd along. Then sort by
|
||||||
mapfile -t rows < <(printf '%s\n' "${rows[@]}" | awk '{ c = $0; sub(/ {2,}.*/, "", c); if (!seen[c]++) print }' | LC_ALL=C sort -f)
|
# the display column A-Z.
|
||||||
|
declare -A seen=()
|
||||||
|
lines=()
|
||||||
|
for i in "${!rows[@]}"; do
|
||||||
|
if [[ -z "${seen[${keys[$i]}]:-}" ]]; then
|
||||||
|
seen["${keys[$i]}"]=1
|
||||||
|
lines+=("${cmds[$i]}$SEP${rows[$i]}")
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
mapfile -t lines < <(printf '%s\n' "${lines[@]}" | LC_ALL=C sort -f -t "$SEP" -k2.29,2)
|
||||||
|
|
||||||
if [[ "${1:-}" == "--print" ]]; then
|
if [[ "${1:-}" == "--print" ]]; then
|
||||||
printf '%s\n' "${rows[@]}"
|
printf '%s\n' "${lines[@]}" | cut -d "$SEP" -f2-
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! command -v wofi >/dev/null 2>&1; then
|
# ---------------------------------------------------------------------------
|
||||||
printf '%s\n' "${rows[@]}"
|
# Default mode: floating kitty + fzf. Rows go through a temp file; the inner
|
||||||
|
# --internal-pick run removes it when done, stale leftovers get cleaned on the
|
||||||
|
# next invocation.
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
rm -f /tmp/keybinds.??????.list 2>/dev/null || true
|
||||||
|
list="$(mktemp /tmp/keybinds.XXXXXX.list)"
|
||||||
|
printf '%s\n' "${lines[@]}" >"$list"
|
||||||
|
|
||||||
|
if command -v kitty >/dev/null 2>&1; then
|
||||||
|
kitty --override font_size=16 --class keybinds --title Keybinds "$0" \
|
||||||
|
--internal-pick "$list"
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
sel=""
|
# No kitty: fall back to a plain printout.
|
||||||
if ! sel=$(printf '%s\n' "${rows[@]}" | wofi \
|
printf '%s\n' "${lines[@]}" | cut -d "$SEP" -f2-
|
||||||
--dmenu \
|
rm -f "$list"
|
||||||
--prompt "Keybinds" \
|
|
||||||
--location center \
|
|
||||||
--width 860 \
|
|
||||||
--lines 22 \
|
|
||||||
--cache-file /dev/null \
|
|
||||||
--insensitive \
|
|
||||||
--no-custom-entry \
|
|
||||||
--hide-scroll); then
|
|
||||||
exit 0 # popup dismissed (Esc) - not an error
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Re-derive the chord from the selected row (everything before the first
|
|
||||||
# double space) and run its stored dispatcher in the compositor's Lua state.
|
|
||||||
sel_chord="${sel%% *}"
|
|
||||||
if [[ -n "${dispatch_for[$sel_chord]+x}" ]]; then
|
|
||||||
hyprctl eval "hl.dispatch(debug.getregistry()[${dispatch_for[$sel_chord]}])" >/dev/null 2>&1 || true
|
|
||||||
fi
|
|
||||||
|
|||||||
@@ -14,3 +14,4 @@ italic_font auto
|
|||||||
bold_italic_font auto
|
bold_italic_font auto
|
||||||
font_size 10.0
|
font_size 10.0
|
||||||
|
|
||||||
|
include themes/noctalia.conf
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
color0 #45475a
|
||||||
|
color1 #f38ba8
|
||||||
|
color2 #a6e3a1
|
||||||
|
color3 #f9e2af
|
||||||
|
color4 #89b4fa
|
||||||
|
color5 #f5c2e7
|
||||||
|
color6 #94e2d5
|
||||||
|
color7 #a6adc8
|
||||||
|
color8 #585b70
|
||||||
|
color9 #f37799
|
||||||
|
color10 #89d88b
|
||||||
|
color11 #ebd391
|
||||||
|
color12 #74a8fc
|
||||||
|
color13 #f2aede
|
||||||
|
color14 #6bd7ca
|
||||||
|
color15 #bac2de
|
||||||
|
|
||||||
|
cursor #f5e0dc
|
||||||
|
cursor_text_color #1e1e2e
|
||||||
|
background #1e1e2e
|
||||||
|
foreground #cdd6f4
|
||||||
|
selection_foreground #cdd6f4
|
||||||
|
selection_background #585b70
|
||||||
|
active_border_color #cba6f7
|
||||||
|
inactive_border_color #313244
|
||||||
|
url_color #cba6f7
|
||||||
|
|
||||||
|
active_tab_foreground #11111b
|
||||||
|
active_tab_background #cba6f7
|
||||||
|
inactive_tab_foreground #a3b4eb
|
||||||
|
inactive_tab_background #313244
|
||||||
|
cursor_trail_color #a3b4eb
|
||||||
@@ -0,0 +1,153 @@
|
|||||||
|
[bar.default]
|
||||||
|
background_opacity = 0.50999998860061169
|
||||||
|
capsule = true
|
||||||
|
center = [ "session", "launcher", "control-center", "wallpaper" ]
|
||||||
|
end = [
|
||||||
|
"tray",
|
||||||
|
"notifications",
|
||||||
|
"network",
|
||||||
|
"bluetooth",
|
||||||
|
"volume",
|
||||||
|
"brightness",
|
||||||
|
"temp",
|
||||||
|
"cpu",
|
||||||
|
"sysmon",
|
||||||
|
"battery",
|
||||||
|
"clock"
|
||||||
|
]
|
||||||
|
margin_ends = 0
|
||||||
|
panel_overlap = 0
|
||||||
|
position = "bottom"
|
||||||
|
radius = 0
|
||||||
|
start = [ "workspaces", "media" ]
|
||||||
|
thickness = 28
|
||||||
|
|
||||||
|
[desktop_widgets]
|
||||||
|
enabled = false
|
||||||
|
schema_version = 2
|
||||||
|
widget_order = []
|
||||||
|
|
||||||
|
[desktop_widgets.grid]
|
||||||
|
cell_size = 16
|
||||||
|
major_interval = 4
|
||||||
|
visible = true
|
||||||
|
|
||||||
|
[desktop_widgets.widget]
|
||||||
|
|
||||||
|
[dock]
|
||||||
|
background_opacity = 0.67999998480081558
|
||||||
|
|
||||||
|
[idle]
|
||||||
|
behavior_order = [ "backlight-dim", "kbd-off", "lock", "screen-off", "suspend" ]
|
||||||
|
|
||||||
|
[idle.behavior.backlight-dim]
|
||||||
|
action = "command"
|
||||||
|
command = "brightnessctl -s set 10"
|
||||||
|
enabled = true
|
||||||
|
resume_command = "brightnessctl -r"
|
||||||
|
timeout = 300.0
|
||||||
|
|
||||||
|
[idle.behavior.kbd-off]
|
||||||
|
action = "command"
|
||||||
|
command = "brightnessctl -sd rgb:kbd_backlight set 0"
|
||||||
|
enabled = true
|
||||||
|
resume_command = "brightnessctl -rd rgb:kbd_backlight"
|
||||||
|
timeout = 300.0
|
||||||
|
|
||||||
|
[idle.behavior.lock]
|
||||||
|
action = "lock"
|
||||||
|
enabled = true
|
||||||
|
timeout = 900.0
|
||||||
|
|
||||||
|
[idle.behavior.screen-off]
|
||||||
|
action = "screen_off"
|
||||||
|
enabled = false
|
||||||
|
timeout = 1800.0
|
||||||
|
|
||||||
|
[idle.behavior.suspend]
|
||||||
|
action = "lock_and_suspend"
|
||||||
|
enabled = true
|
||||||
|
timeout = 2700.0
|
||||||
|
|
||||||
|
[keybinds]
|
||||||
|
down = [ "Down", "Ctrl+j" ]
|
||||||
|
left = [ "Left", "Ctrl+h" ]
|
||||||
|
right = [ "Right", "Ctrl+l" ]
|
||||||
|
up = [ "Up", "Ctrl+k" ]
|
||||||
|
|
||||||
|
[location]
|
||||||
|
auto_locate = true
|
||||||
|
|
||||||
|
[lockscreen_widgets]
|
||||||
|
enabled = false
|
||||||
|
schema_version = 2
|
||||||
|
widget_order = [ "lockscreen-login-box@eDP-1" ]
|
||||||
|
|
||||||
|
[lockscreen_widgets.grid]
|
||||||
|
cell_size = 16
|
||||||
|
major_interval = 4
|
||||||
|
visible = true
|
||||||
|
|
||||||
|
[lockscreen_widgets.widget."lockscreen-login-box@eDP-1"]
|
||||||
|
box_height = 196.0
|
||||||
|
box_width = 810.0
|
||||||
|
cx = 960.0
|
||||||
|
cy = 898.0
|
||||||
|
output = "eDP-1"
|
||||||
|
placement_height = 1080.0
|
||||||
|
placement_width = 1920.0
|
||||||
|
rotation = 0.0
|
||||||
|
type = "login_box"
|
||||||
|
|
||||||
|
[lockscreen_widgets.widget."lockscreen-login-box@eDP-1".settings]
|
||||||
|
background_color = "surface_variant"
|
||||||
|
background_opacity = 0.88
|
||||||
|
background_radius = 12.0
|
||||||
|
center_password_text = false
|
||||||
|
input_opacity = 1.0
|
||||||
|
input_radius = 6.0
|
||||||
|
layout = "regular"
|
||||||
|
show_caps_lock = true
|
||||||
|
show_keyboard_layout = true
|
||||||
|
show_login_button = true
|
||||||
|
show_media = true
|
||||||
|
show_session_buttons = true
|
||||||
|
show_unlock_hint = true
|
||||||
|
show_weather = true
|
||||||
|
|
||||||
|
[shell]
|
||||||
|
font_family = "JetBrainsMono Nerd Font Mono"
|
||||||
|
telemetry_enabled = true
|
||||||
|
|
||||||
|
[shell.panel]
|
||||||
|
launcher_placement = "attached"
|
||||||
|
transparency_mode = "glass"
|
||||||
|
|
||||||
|
[theme]
|
||||||
|
builtin = "Catppuccin"
|
||||||
|
mode = "dark"
|
||||||
|
|
||||||
|
[theme.templates]
|
||||||
|
builtin_ids = [ "gtk3", "gtk4", "hyprland", "kitty" ]
|
||||||
|
enable_builtin_templates = true
|
||||||
|
|
||||||
|
[wallpaper]
|
||||||
|
directory = "/home/mathias/nextcloud/Photos/Wallpapers"
|
||||||
|
|
||||||
|
[wallpaper.default]
|
||||||
|
path = "/home/mathias/nextcloud/Photos/Wallpapers/eigen/20180318-4825-Teneriffa_LaPalma-2.jpg"
|
||||||
|
|
||||||
|
[wallpaper.last]
|
||||||
|
path = "/home/mathias/nextcloud/Photos/Wallpapers/eigen/20180318-4825-Teneriffa_LaPalma-2.jpg"
|
||||||
|
|
||||||
|
[wallpaper.monitors.eDP-1]
|
||||||
|
path = "/home/mathias/nextcloud/Photos/Wallpapers/eigen/20180318-4825-Teneriffa_LaPalma-2.jpg"
|
||||||
|
|
||||||
|
[widget.clock]
|
||||||
|
format = "{:%Y-%m-%d|%H:%M}"
|
||||||
|
|
||||||
|
[widget.network]
|
||||||
|
show_label = false
|
||||||
|
|
||||||
|
[widget.sysmon]
|
||||||
|
stat = "gpu_usage"
|
||||||
@@ -1,157 +0,0 @@
|
|||||||
// Managed by dotfiles: hypr/.config/rofi/themes/hyprltm-net.rasi
|
|
||||||
// (stowed to ~/.config/rofi/themes/hyprltm-net.rasi).
|
|
||||||
// Third-party layout from hyprltm-net 0.5.0 (Djalel Oukid), kept structurally
|
|
||||||
// identical: all colors resolve through @theme "ltmnight" (ltmnight.rasi),
|
|
||||||
// which maps onto the central theme (basic/.config/themes).
|
|
||||||
// Do not add hex colors here — the palette lives in ltmnight.rasi.
|
|
||||||
// __ __ __ ________ ___ _ __ __
|
|
||||||
// / / / /_ ______ _____/ / /_ __/ |/ / / | / /___/ /_
|
|
||||||
// / /_/ / / / / __ \/ ___/ / / / / /|_/ /_____ / |/ / _ / __/
|
|
||||||
// / __ / /_/ / /_/ / / / /___ / / / / / /_____ / /| / __/ /_
|
|
||||||
// /_/ /_/\__, / .___/_/ /_____//_/ /_/ /_/ /_/ |_/\___/\__/
|
|
||||||
// /____/_/
|
|
||||||
|
|
||||||
// Copyright © 2025-2026 Djalel Oukid (sniper1720)
|
|
||||||
|
|
||||||
@theme "ltmnight"
|
|
||||||
|
|
||||||
window {
|
|
||||||
background-color: @background;
|
|
||||||
border: 2px;
|
|
||||||
border-color: @primary-fixed;
|
|
||||||
padding: 0;
|
|
||||||
border-radius: 10px;
|
|
||||||
width: 50%;
|
|
||||||
location: 0;
|
|
||||||
x-offset: 0;
|
|
||||||
y-offset: 0;
|
|
||||||
transparency: "real";
|
|
||||||
}
|
|
||||||
|
|
||||||
mainbox {
|
|
||||||
enabled: true;
|
|
||||||
spacing: 0em;
|
|
||||||
padding: 10px;
|
|
||||||
orientation: vertical;
|
|
||||||
children: [ inputbar, message, listview ];
|
|
||||||
background-color: transparent;
|
|
||||||
}
|
|
||||||
|
|
||||||
inputbar {
|
|
||||||
enabled: true;
|
|
||||||
spacing: 0.5em;
|
|
||||||
padding: 8px 15px;
|
|
||||||
margin: 0 0 10px 0;
|
|
||||||
background-color: @selection;
|
|
||||||
border: 0px 0px 2px 0px;
|
|
||||||
border-color: @primary-fixed;
|
|
||||||
border-radius: 8px;
|
|
||||||
}
|
|
||||||
|
|
||||||
prompt {
|
|
||||||
enabled: true;
|
|
||||||
expand: false;
|
|
||||||
text-color: @prompt;
|
|
||||||
padding: 0px 5px;
|
|
||||||
background-color: transparent;
|
|
||||||
str: "";
|
|
||||||
}
|
|
||||||
|
|
||||||
entry {
|
|
||||||
enabled: true;
|
|
||||||
background-color: transparent;
|
|
||||||
text-color: @on-primary-fixed;
|
|
||||||
caret-color: @ltmnight8;
|
|
||||||
placeholder: "";
|
|
||||||
placeholder-color: @placeholder;
|
|
||||||
expand: true;
|
|
||||||
}
|
|
||||||
|
|
||||||
listview {
|
|
||||||
background-color: transparent;
|
|
||||||
border: 0;
|
|
||||||
padding: 5px;
|
|
||||||
cycle: true;
|
|
||||||
layout: vertical;
|
|
||||||
spacing: 2px;
|
|
||||||
scrollbar: false;
|
|
||||||
columns: 1;
|
|
||||||
dynamic: true;
|
|
||||||
fixed-height:false;
|
|
||||||
}
|
|
||||||
|
|
||||||
element {
|
|
||||||
enabled: true;
|
|
||||||
padding: 5px 10px;
|
|
||||||
margin: 2px 0;
|
|
||||||
background-color: transparent;
|
|
||||||
text-color: @foreground;
|
|
||||||
border: 0;
|
|
||||||
border-radius: 5px;
|
|
||||||
orientation: horizontal;
|
|
||||||
children: [ element-text ];
|
|
||||||
vertical-align: 0.5;
|
|
||||||
}
|
|
||||||
|
|
||||||
element-icon {
|
|
||||||
background-color: transparent;
|
|
||||||
size: 0px;
|
|
||||||
margin: 0px;
|
|
||||||
enabled: false;
|
|
||||||
}
|
|
||||||
|
|
||||||
element-text {
|
|
||||||
background-color: transparent;
|
|
||||||
text-color: inherit;
|
|
||||||
highlight-color: @ltmnight6;
|
|
||||||
expand: true;
|
|
||||||
vertical-align: 0.5;
|
|
||||||
format: "{text}";
|
|
||||||
}
|
|
||||||
|
|
||||||
element selected {
|
|
||||||
background-color: @selection;
|
|
||||||
text-color: @on-selection;
|
|
||||||
border-radius: 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
element urgent {
|
|
||||||
background-color: @error;
|
|
||||||
text-color: @on-error;
|
|
||||||
}
|
|
||||||
|
|
||||||
element active {
|
|
||||||
background-color: @primary;
|
|
||||||
text-color: @on-primary;
|
|
||||||
}
|
|
||||||
|
|
||||||
scrollbar {
|
|
||||||
handle-color: @ltmnight8;
|
|
||||||
background-color: @primary-fixed;
|
|
||||||
width: 4px;
|
|
||||||
padding: 0;
|
|
||||||
border-radius: 0px;
|
|
||||||
}
|
|
||||||
|
|
||||||
case-indicator {
|
|
||||||
enabled: false;
|
|
||||||
}
|
|
||||||
|
|
||||||
message {
|
|
||||||
enabled: true;
|
|
||||||
margin: 10px 0px 10px 0px;
|
|
||||||
padding: 10px;
|
|
||||||
border: 1px;
|
|
||||||
border-radius: 8px;
|
|
||||||
border-color: @message-border;
|
|
||||||
background-color: @message-background;
|
|
||||||
children: [ textbox ];
|
|
||||||
}
|
|
||||||
|
|
||||||
textbox {
|
|
||||||
background-color: @message-background;
|
|
||||||
text-color: @message-text;
|
|
||||||
vertical-align: 0.5;
|
|
||||||
horizontal-align: 0.0;
|
|
||||||
highlight: none;
|
|
||||||
}
|
|
||||||
@@ -1,67 +0,0 @@
|
|||||||
// ltmnight Palette for Rofi — now mapped onto the CENTRAL theme
|
|
||||||
// (basic/.config/themes → ~/.config/themes/current/rofi.rasi, Catppuccin Mocha).
|
|
||||||
// Tracked in dotfiles: hypr/.config/rofi/themes/ltmnight.rasi
|
|
||||||
// (stowed to ~/.config/rofi/themes/ltmnight.rasi).
|
|
||||||
//
|
|
||||||
// Only the palette values changed to Mocha; every variable NAME below is
|
|
||||||
// unchanged, so hyprltm-net.rasi (@theme "ltmnight") and hyprltm-net's
|
|
||||||
// core.sh -theme-str overrides (@on-primary-fixed, @error-message, ...)
|
|
||||||
// keep working untouched. The two translucency values use #RRGGBBAA hex
|
|
||||||
// because rasi has no alpha() function — keep them in sync with @base /
|
|
||||||
// @surface0 from the central theme if you ever switch flavors.
|
|
||||||
|
|
||||||
@import "/home/mathias/.config/themes/current/rofi.rasi"
|
|
||||||
|
|
||||||
* {
|
|
||||||
ltmnight0: @base; /* Background */
|
|
||||||
ltmnight1: @surface0; /* Current Line / Secondary Background */
|
|
||||||
ltmnight2: @text; /* Foreground Text */
|
|
||||||
ltmnight3: @overlay1; /* Comment / Faded Foreground */
|
|
||||||
ltmnight4: @red; /* Red / Errors */
|
|
||||||
ltmnight5: @peach; /* Orange / Warnings */
|
|
||||||
ltmnight6: @yellow; /* Yellow / Warnings */
|
|
||||||
ltmnight7: @green; /* Green / Success */
|
|
||||||
ltmnight8: @sapphire; /* Cyan / Info */
|
|
||||||
ltmnight9: @mauve; /* Purple / Accents */
|
|
||||||
ltmnight10: @pink; /* Pink / Accents */
|
|
||||||
ltmnight11: @overlay0; /* Gray / Placeholders */
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Rofi Color Mappings to ltmnight Palette
|
|
||||||
background: #1e1e2ee6; /* @base at 90% */
|
|
||||||
foreground: @ltmnight2;
|
|
||||||
|
|
||||||
primary: @ltmnight9;
|
|
||||||
accent: @ltmnight10;
|
|
||||||
on-primary: @ltmnight2;
|
|
||||||
|
|
||||||
primary-fixed: @ltmnight1;
|
|
||||||
on-primary-fixed: @ltmnight2;
|
|
||||||
|
|
||||||
selection: #31324480; /* @surface0 at 50% */
|
|
||||||
on-selection: @ltmnight2;
|
|
||||||
|
|
||||||
error: @ltmnight4;
|
|
||||||
on-error: @ltmnight2;
|
|
||||||
|
|
||||||
surface: #1e1e2ee6; /* @base at 90% */
|
|
||||||
on-surface: @ltmnight2;
|
|
||||||
|
|
||||||
outline: @ltmnight3;
|
|
||||||
shadow: rgba(0, 0, 0, 0.5);
|
|
||||||
|
|
||||||
highlight: @ltmnight6;
|
|
||||||
|
|
||||||
prompt: @ltmnight11;
|
|
||||||
placeholder: @ltmnight11;
|
|
||||||
|
|
||||||
message-background: transparent;
|
|
||||||
message-border: @ltmnight8;
|
|
||||||
message-text: @ltmnight8;
|
|
||||||
|
|
||||||
error-message: @ltmnight4;
|
|
||||||
warning-message: @ltmnight5;
|
|
||||||
success-message: @ltmnight7;
|
|
||||||
info-message: @ltmnight8;
|
|
||||||
}
|
|
||||||
@@ -1,230 +0,0 @@
|
|||||||
// -*- mode: jsonc -*-
|
|
||||||
{
|
|
||||||
"custom/gpu": {
|
|
||||||
"format": "{text}",
|
|
||||||
"tooltip": false,
|
|
||||||
"exec": "~/.config/waybar/scripts/gpu-info.sh",
|
|
||||||
"exec-interval": 1,
|
|
||||||
"return-type": "json"
|
|
||||||
},
|
|
||||||
// "layer": "top", // Waybar at top layer
|
|
||||||
"position": "bottom", // Waybar position (top|bottom|left|right)
|
|
||||||
"height": 30, // Waybar height (to be removed for auto height)
|
|
||||||
// "width": 800, // Waybar width
|
|
||||||
"spacing": 4, // Gaps between modules (4px)
|
|
||||||
// Choose the order of the modules
|
|
||||||
"modules-left": [
|
|
||||||
"hyprland/workspaces"
|
|
||||||
//"hyprland/mode",
|
|
||||||
//"hyprland/scratchpad",
|
|
||||||
//"custom/media"
|
|
||||||
],
|
|
||||||
"modules-center": [
|
|
||||||
"hyprland/window"
|
|
||||||
],
|
|
||||||
"modules-right": [
|
|
||||||
"mpd",
|
|
||||||
"idle_inhibitor",
|
|
||||||
"pulseaudio",
|
|
||||||
//"network",
|
|
||||||
//"power-profiles-daemon",
|
|
||||||
"cpu",
|
|
||||||
"memory",
|
|
||||||
"temperature",
|
|
||||||
"backlight",
|
|
||||||
"keyboard-state",
|
|
||||||
//"hyprland/language",
|
|
||||||
"battery",
|
|
||||||
//"battery#bat2",
|
|
||||||
"custom/gpu",
|
|
||||||
"clock",
|
|
||||||
"tray",
|
|
||||||
"custom/power"
|
|
||||||
],
|
|
||||||
// Modules configuration
|
|
||||||
"hyprland/workspaces": {
|
|
||||||
"disable-scroll": true,
|
|
||||||
"all-outputs": true,
|
|
||||||
"warp-on-scroll": true,
|
|
||||||
"format": "{name}: {icon}",
|
|
||||||
"format-icons": {
|
|
||||||
// "1": "",
|
|
||||||
// "2": "",
|
|
||||||
// "3": "",
|
|
||||||
// "4": "",
|
|
||||||
// "5": "",
|
|
||||||
// "urgent": "",
|
|
||||||
"active": "",
|
|
||||||
"default": ""
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"keyboard-state": {
|
|
||||||
"numlock": true,
|
|
||||||
"capslock": true,
|
|
||||||
"format": "{name} {icon}",
|
|
||||||
"format-icons": {
|
|
||||||
"locked": "",
|
|
||||||
"unlocked": ""
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"hyprland/mode": {
|
|
||||||
"format": "<span style=\"italic\">{}</span>"
|
|
||||||
},
|
|
||||||
"hyprland/scratchpad": {
|
|
||||||
"format": "{icon} {count}",
|
|
||||||
"show-empty": false,
|
|
||||||
"format-icons": ["", ""],
|
|
||||||
"tooltip": true,
|
|
||||||
"tooltip-format": "{app}: {title}"
|
|
||||||
},
|
|
||||||
"mpd": {
|
|
||||||
"format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ",
|
|
||||||
"format-disconnected": "Disconnected ",
|
|
||||||
"format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
|
|
||||||
"unknown-tag": "N/A",
|
|
||||||
"interval": 5,
|
|
||||||
"consume-icons": {
|
|
||||||
"on": " "
|
|
||||||
},
|
|
||||||
"random-icons": {
|
|
||||||
"off": "<span color=\"#f53c3c\"></span> ",
|
|
||||||
"on": " "
|
|
||||||
},
|
|
||||||
"repeat-icons": {
|
|
||||||
"on": " "
|
|
||||||
},
|
|
||||||
"single-icons": {
|
|
||||||
"on": "1 "
|
|
||||||
},
|
|
||||||
"state-icons": {
|
|
||||||
"paused": "",
|
|
||||||
"playing": ""
|
|
||||||
},
|
|
||||||
"tooltip-format": "MPD (connected)",
|
|
||||||
"tooltip-format-disconnected": "MPD (disconnected)"
|
|
||||||
},
|
|
||||||
"idle_inhibitor": {
|
|
||||||
"format": "{icon}",
|
|
||||||
"format-icons": {
|
|
||||||
"activated": "",
|
|
||||||
"deactivated": ""
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"tray": {
|
|
||||||
// "icon-size": 21,
|
|
||||||
"spacing": 10//,
|
|
||||||
// "icons": {
|
|
||||||
// "blueman": "bluetooth",
|
|
||||||
// "TelegramDesktop": "$HOME/.local/share/icons/hicolor/16x16/apps/telegram.png"
|
|
||||||
// }
|
|
||||||
},
|
|
||||||
"clock": {
|
|
||||||
"format": "{:%Y-%m-%d %H:%M}",
|
|
||||||
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
|
|
||||||
"on-click": "~/.config/waybar/scripts/copy-date.sh"
|
|
||||||
//"format-alt": "{:%Y-%m-%d}"
|
|
||||||
},
|
|
||||||
"cpu": {
|
|
||||||
"interval": 1,
|
|
||||||
"format": "cpu:{usage:02}%@{avg_frequency:4.2f}MHz",
|
|
||||||
"tooltip": false
|
|
||||||
},
|
|
||||||
"memory": {
|
|
||||||
"interval": 1,
|
|
||||||
"format": "mem:{:02}%"
|
|
||||||
},
|
|
||||||
"temperature": {
|
|
||||||
// "thermal-zone": 2,
|
|
||||||
// "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
|
|
||||||
"critical-threshold": 80,
|
|
||||||
// "format-critical": "{temperatureC}°C {icon}",
|
|
||||||
"format": "{temperatureC}°C {icon}",
|
|
||||||
"format-icons": ["", "", ""]
|
|
||||||
},
|
|
||||||
"backlight": {
|
|
||||||
// "device": "acpi_video1",
|
|
||||||
"format": "{percent}% {icon}",
|
|
||||||
"format-icons": ["", "", "", "", "", "", "", "", ""]
|
|
||||||
},
|
|
||||||
"battery": {
|
|
||||||
"states": {
|
|
||||||
// "good": 95,
|
|
||||||
"warning": 30,
|
|
||||||
"critical": 15
|
|
||||||
},
|
|
||||||
"format": "{capacity}% {icon}",
|
|
||||||
"format-full": "{capacity}% {icon}",
|
|
||||||
"format-charging": "{capacity}% ",
|
|
||||||
"format-plugged": "{capacity}% ",
|
|
||||||
"format-alt": "{time} {icon}",
|
|
||||||
// "format-good": "", // An empty format will hide the module
|
|
||||||
// "format-full": "",
|
|
||||||
"format-icons": ["", "", "", "", ""]
|
|
||||||
},
|
|
||||||
"battery#bat2": {
|
|
||||||
"bat": "BAT2"
|
|
||||||
},
|
|
||||||
"power-profiles-daemon": {
|
|
||||||
"format": "{icon}",
|
|
||||||
"tooltip-format": "Power profile: {profile}\nDriver: {driver}",
|
|
||||||
"tooltip": true,
|
|
||||||
"format-icons": {
|
|
||||||
"default": "",
|
|
||||||
"performance": "",
|
|
||||||
"balanced": "",
|
|
||||||
"power-saver": ""
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"network": {
|
|
||||||
// "interface": "wlp2*", // (Optional) To force the use of this interface
|
|
||||||
"format-wifi": "{essid} ({signalStrength}%) ",
|
|
||||||
"format-ethernet": "{ipaddr}/{cidr} ",
|
|
||||||
"tooltip-format": "{ifname} via {gwaddr} ",
|
|
||||||
"format-linked": "{ifname} (No IP) ",
|
|
||||||
"format-disconnected": "Disconnected ⚠",
|
|
||||||
"format-alt": "{ifname}: {ipaddr}/{cidr}"
|
|
||||||
},
|
|
||||||
"pulseaudio": {
|
|
||||||
// "scroll-step": 1, // %, can be a float
|
|
||||||
"format": "{volume}% {icon} {format_source}",
|
|
||||||
"format-bluetooth": "{volume}% {icon} {format_source}",
|
|
||||||
"format-bluetooth-muted": " {icon} {format_source}",
|
|
||||||
"format-muted": " {format_source}",
|
|
||||||
"format-source": "{volume}% ",
|
|
||||||
"format-source-muted": "",
|
|
||||||
"format-icons": {
|
|
||||||
"headphone": "",
|
|
||||||
"hands-free": "",
|
|
||||||
"headset": "",
|
|
||||||
"phone": "",
|
|
||||||
"portable": "",
|
|
||||||
"car": "",
|
|
||||||
"default": ["", "", ""]
|
|
||||||
},
|
|
||||||
"on-click": "pavucontrol"
|
|
||||||
},
|
|
||||||
"custom/media": {
|
|
||||||
"format": "{icon} {text}",
|
|
||||||
"return-type": "json",
|
|
||||||
"max-length": 40,
|
|
||||||
"format-icons": {
|
|
||||||
"spotify": "",
|
|
||||||
"default": "🎜"
|
|
||||||
},
|
|
||||||
"escape": true,
|
|
||||||
"exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
|
|
||||||
// "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
|
|
||||||
},
|
|
||||||
"custom/power": {
|
|
||||||
"format" : "⏻ ",
|
|
||||||
"tooltip": false,
|
|
||||||
"menu": "on-click",
|
|
||||||
"menu-file": "$HOME/.config/waybar/power_menu.xml", // Menu file in resources folder
|
|
||||||
"menu-actions": {
|
|
||||||
"shutdown": "shutdown",
|
|
||||||
"reboot": "reboot",
|
|
||||||
"suspend": "systemctl suspend",
|
|
||||||
"hibernate": "systemctl hibernate"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
../../../basic/.config/themes/themes/catppuccin-mocha/theme.css
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
DATE=$(date +"%Y-%m-%d_%H%M")
|
|
||||||
echo -n "$DATE" | wl-copy
|
|
||||||
notify-send "Date copied" "$DATE"
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
# GPU monitoring for waybar (AMD radeontop + sysfs temp)
|
|
||||||
|
|
||||||
GPU_DATA=$(timeout 1 radeontop -d - -l 1 2>/dev/null | tail -1)
|
|
||||||
|
|
||||||
if [ -z "$GPU_DATA" ]; then
|
|
||||||
echo "{\"text\": \"gpu:--\", \"tooltip\": \"Reading...\"}"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
GPU=$(echo "$GPU_DATA" | grep -oP 'gpu \K[0-9.]+' | head -1)
|
|
||||||
GPU_INT=${GPU%.*}
|
|
||||||
|
|
||||||
VRAM=$(echo "$GPU_DATA" | grep -oP 'vram [\d.]+% \K[\d.]+' | head -1)
|
|
||||||
VRAM_INT=${VRAM%.*}
|
|
||||||
|
|
||||||
SCLK=$(echo "$GPU_DATA" | grep -oP 'sclk [\d.]+% \K[\d.]+' | head -1)
|
|
||||||
MCLK=$(echo "$GPU_DATA" | grep -oP 'mclk [\d.]+% \K[\d.]+' | head -1)
|
|
||||||
|
|
||||||
TEMP=$(( $(cat /sys/class/hwmon/hwmon2/temp1_input) / 1000 ))
|
|
||||||
POWER=$(( $(cat /sys/class/hwmon/hwmon2/power1_average) / 1000 ))
|
|
||||||
|
|
||||||
echo "{\"text\": \"gpu:${GPU_INT}% ${VRAM_INT}MB ${TEMP}C\", \"tooltip\": \"GPU: ${GPU}%\\nVRAM: ${VRAM}MB\\nTemp: ${TEMP}C\\nPower: ${POWER}W\\nSCLK: ${SCLK}GHz\\nMCLK: ${MCLK}GHz\"}"
|
|
||||||
@@ -1,233 +0,0 @@
|
|||||||
/* Central theme: roles + palette imported from basic/.config/themes
|
|
||||||
* (mocha.css is a symlink into the current theme's theme.css).
|
|
||||||
* This file must use @role/@palette names only — never hardcoded colors —
|
|
||||||
* so a future theme only swaps the central files. */
|
|
||||||
@import url("mocha.css");
|
|
||||||
|
|
||||||
* {
|
|
||||||
font-family: "JetBrainsMono Nerd Font", FontAwesome, sans-serif;
|
|
||||||
font-size: 13px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ---------- Waybar Container ---------- */
|
|
||||||
window#waybar {
|
|
||||||
background-color: @bg_dim;
|
|
||||||
color: @fg;
|
|
||||||
border-bottom: 1px solid @border;
|
|
||||||
box-shadow: 0 10px 30px rgba(0,0,0,0.30);
|
|
||||||
|
|
||||||
transition-property: background-color, opacity;
|
|
||||||
transition-duration: .5s;
|
|
||||||
}
|
|
||||||
|
|
||||||
window#waybar.hidden {
|
|
||||||
opacity: 0.35;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ---------- Buttons / Workspaces ---------- */
|
|
||||||
button {
|
|
||||||
box-shadow: inset 0 -2px transparent;
|
|
||||||
border: none;
|
|
||||||
border-radius: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
button:hover {
|
|
||||||
background: inherit;
|
|
||||||
box-shadow: inset 0 -2px @accent;
|
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button {
|
|
||||||
padding: 0 8px;
|
|
||||||
margin: 4px 3px;
|
|
||||||
background-color: @surface;
|
|
||||||
color: @fg_dim;
|
|
||||||
border: 1px solid @border;
|
|
||||||
border-radius: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button:hover {
|
|
||||||
background: @border;
|
|
||||||
color: @fg;
|
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button.focused,
|
|
||||||
#workspaces button.active {
|
|
||||||
background-color: @accent;
|
|
||||||
color: @bg_deep;
|
|
||||||
border: 1px solid @accent;
|
|
||||||
box-shadow: inset 0 -2px @accent2;
|
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button.urgent {
|
|
||||||
background-color: @urgent;
|
|
||||||
border-color: @urgent;
|
|
||||||
color: @bg_deep;
|
|
||||||
}
|
|
||||||
|
|
||||||
#window,
|
|
||||||
#workspaces {
|
|
||||||
margin: 0 4px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modules-left > widget:first-child > #workspaces {
|
|
||||||
margin-left: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modules-right > widget:last-child > #workspaces {
|
|
||||||
margin-right: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ---------- Common “Chip” module style ---------- */
|
|
||||||
#clock,
|
|
||||||
#battery,
|
|
||||||
#cpu,
|
|
||||||
#memory,
|
|
||||||
#disk,
|
|
||||||
#temperature,
|
|
||||||
#backlight,
|
|
||||||
#network,
|
|
||||||
#pulseaudio,
|
|
||||||
#wireplumber,
|
|
||||||
#custom-media,
|
|
||||||
#custom-gpu,
|
|
||||||
#tray,
|
|
||||||
#mode,
|
|
||||||
#idle_inhibitor,
|
|
||||||
#scratchpad,
|
|
||||||
#power-profiles-daemon,
|
|
||||||
#mpd,
|
|
||||||
#language,
|
|
||||||
#keyboard-state,
|
|
||||||
#privacy,
|
|
||||||
#privacy-item {
|
|
||||||
padding: 0 10px;
|
|
||||||
color: @fg;
|
|
||||||
background-color: @surface;
|
|
||||||
border: 1px solid @border;
|
|
||||||
border-radius: 10px;
|
|
||||||
margin: 4px 4px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#pulseaudio:hover,
|
|
||||||
#wireplumber:hover,
|
|
||||||
#network:hover,
|
|
||||||
#clock:hover {
|
|
||||||
background-color: @border;
|
|
||||||
}
|
|
||||||
|
|
||||||
#clock {
|
|
||||||
border-color: @accent;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Battery */
|
|
||||||
#battery.charging,
|
|
||||||
#battery.plugged {
|
|
||||||
background-color: @ok;
|
|
||||||
border-color: @ok;
|
|
||||||
color: @bg_deep;
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes blink {
|
|
||||||
to {
|
|
||||||
background-color: @urgent;
|
|
||||||
border-color: @urgent;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#battery.critical:not(.charging) {
|
|
||||||
background-color: @urgent;
|
|
||||||
border-color: @urgent;
|
|
||||||
color: @bg_deep;
|
|
||||||
animation-name: blink;
|
|
||||||
animation-duration: 0.6s;
|
|
||||||
animation-timing-function: steps(10);
|
|
||||||
animation-iteration-count: infinite;
|
|
||||||
animation-direction: alternate;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Network */
|
|
||||||
#network.disconnected {
|
|
||||||
background-color: @urgent;
|
|
||||||
border-color: @urgent;
|
|
||||||
color: @bg_deep;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Audio */
|
|
||||||
#pulseaudio:hover {
|
|
||||||
background-color: @border;
|
|
||||||
}
|
|
||||||
|
|
||||||
#pulseaudio.muted {
|
|
||||||
background-color: @surface;
|
|
||||||
border-color: @border;
|
|
||||||
color: @fg_muted;
|
|
||||||
}
|
|
||||||
|
|
||||||
#wireplumber.muted {
|
|
||||||
background-color: @urgent;
|
|
||||||
border-color: @urgent;
|
|
||||||
color: @bg_deep;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Temperature */
|
|
||||||
#temperature.critical {
|
|
||||||
background-color: @urgent;
|
|
||||||
border-color: @urgent;
|
|
||||||
color: @bg_deep;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Tray */
|
|
||||||
#tray > .passive {
|
|
||||||
-gtk-icon-effect: dim;
|
|
||||||
}
|
|
||||||
|
|
||||||
#tray > .needs-attention {
|
|
||||||
-gtk-icon-effect: highlight;
|
|
||||||
background-color: @urgent;
|
|
||||||
border-radius: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Idle inhibitor */
|
|
||||||
#idle_inhibitor.activated {
|
|
||||||
background-color: @accent;
|
|
||||||
border-color: @accent;
|
|
||||||
color: @bg_deep;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Scratchpad */
|
|
||||||
#scratchpad {
|
|
||||||
background: @surface;
|
|
||||||
}
|
|
||||||
|
|
||||||
#scratchpad.empty {
|
|
||||||
background-color: transparent;
|
|
||||||
border-color: transparent;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Privacy */
|
|
||||||
#privacy {
|
|
||||||
padding: 0;
|
|
||||||
background-color: transparent;
|
|
||||||
border-color: transparent;
|
|
||||||
}
|
|
||||||
|
|
||||||
#privacy-item {
|
|
||||||
padding: 0 6px;
|
|
||||||
color: @fg;
|
|
||||||
}
|
|
||||||
|
|
||||||
#privacy-item.screenshare {
|
|
||||||
background-color: @warn;
|
|
||||||
border-color: @warn;
|
|
||||||
color: @bg_deep;
|
|
||||||
}
|
|
||||||
#privacy-item.audio-in {
|
|
||||||
background-color: @ok;
|
|
||||||
border-color: @ok;
|
|
||||||
color: @bg_deep;
|
|
||||||
}
|
|
||||||
#privacy-item.audio-out {
|
|
||||||
background-color: @accent;
|
|
||||||
border-color: @accent;
|
|
||||||
color: @bg_deep;
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
/* Central theme: roles imported from basic/.config/themes.
|
|
||||||
* NOTE: waypaper loads this file via Gtk.CssProvider.load_from_data, so a
|
|
||||||
* relative @import would resolve against the process working directory and
|
|
||||||
* NOT against this file's location. The import MUST stay an absolute path.
|
|
||||||
* This file must use @role names only — never hardcoded colors.
|
|
||||||
* Makes the currently selected wallpaper unmissable: thick accent border
|
|
||||||
* (same role as the Hyprland active border) + tinted fill + outer glow.
|
|
||||||
* Selector `.highlighted-button` is the official waypaper hook
|
|
||||||
* (see waypaper docs: "Custom styles and colors"). */
|
|
||||||
@import url("/home/mathias/.config/themes/current/theme.css");
|
|
||||||
|
|
||||||
.highlighted-button {
|
|
||||||
background-image: none;
|
|
||||||
box-shadow: none;
|
|
||||||
background-color: alpha(@accent, 0.25);
|
|
||||||
border: 3px solid @accent;
|
|
||||||
border-radius: 8px;
|
|
||||||
box-shadow: 0 0 0 2px alpha(@accent, 0.6), 0 0 14px alpha(@accent, 0.9);
|
|
||||||
}
|
|
||||||
|
|
||||||
.highlighted-button > image,
|
|
||||||
.highlighted-button:hover > image {
|
|
||||||
-gtk-icon-effect: highlight;
|
|
||||||
}
|
|
||||||
|
|
||||||
button:hover {
|
|
||||||
border-color: @accent;
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
../../../basic/.config/themes/themes/catppuccin-mocha/theme.css
|
|
||||||
@@ -1,69 +0,0 @@
|
|||||||
/* Central theme: roles + palette imported from basic/.config/themes
|
|
||||||
* (mocha.css is a symlink into the current theme's theme.css, so this
|
|
||||||
* resolves identically in the repo and once stowed — unlike a
|
|
||||||
* ../themes/... relative hop, which differs between the two).
|
|
||||||
* This file styles every wofi popup: SUPER+SPACE app launcher (drun) and
|
|
||||||
* SUPER+K keybind help (dmenu). Use @role/@palette names only. */
|
|
||||||
@import url("mocha.css");
|
|
||||||
|
|
||||||
window {
|
|
||||||
margin: 0px;
|
|
||||||
background-color: @bg_translucent;
|
|
||||||
border: 2px solid @accent;
|
|
||||||
border-radius: 12px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#input {
|
|
||||||
margin: 8px;
|
|
||||||
padding: 6px 10px;
|
|
||||||
background-color: @surface;
|
|
||||||
color: @fg;
|
|
||||||
border: 1px solid @border;
|
|
||||||
border-radius: 8px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#input:focus {
|
|
||||||
border-color: @accent;
|
|
||||||
}
|
|
||||||
|
|
||||||
#inner-box {
|
|
||||||
margin: 8px;
|
|
||||||
background-color: transparent;
|
|
||||||
}
|
|
||||||
|
|
||||||
#outer-box {
|
|
||||||
margin: 0px;
|
|
||||||
padding: 4px;
|
|
||||||
background-color: transparent;
|
|
||||||
}
|
|
||||||
|
|
||||||
#scroll {
|
|
||||||
margin: 0px;
|
|
||||||
background-color: transparent;
|
|
||||||
}
|
|
||||||
|
|
||||||
#entry {
|
|
||||||
padding: 6px 10px;
|
|
||||||
margin: 2px 0px;
|
|
||||||
background-color: transparent;
|
|
||||||
color: @fg;
|
|
||||||
border-radius: 8px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#entry:selected {
|
|
||||||
background-color: @accent;
|
|
||||||
}
|
|
||||||
|
|
||||||
#entry:selected #text {
|
|
||||||
color: @bg_deep;
|
|
||||||
}
|
|
||||||
|
|
||||||
#text {
|
|
||||||
margin: 2px 6px;
|
|
||||||
color: @fg;
|
|
||||||
}
|
|
||||||
|
|
||||||
#img {
|
|
||||||
margin-right: 8px;
|
|
||||||
background-color: transparent;
|
|
||||||
}
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
scripts
|
|
||||||
.stow-ignore
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
# ---------------------------------------------------------------------------
|
|
||||||
# Hyprland compositor package list for hypr/setup.sh
|
|
||||||
#
|
|
||||||
# Wayland compositor, its ecosystem tools (lockscreen, idle, wallpaper,
|
|
||||||
# notification center, screenshot, launcher) and supporting utilities.
|
|
||||||
# `hyprltm` (network manager) is installed via a post-install hook in
|
|
||||||
# setup.sh since it is not available as a standard pacman/aur package.
|
|
||||||
#
|
|
||||||
# - Lines starting with '#' and blank lines are ignored.
|
|
||||||
# - Use "@pacman", "@aur" or "@npm" markers to switch section.
|
|
||||||
# - The default section is @pacman.
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
|
|
||||||
@pacman
|
|
||||||
hyprland
|
|
||||||
hyprlauncher
|
|
||||||
xdg-desktop-portal-hyprland
|
|
||||||
hyprpolkitagent
|
|
||||||
pantheon-shortcut-overlay
|
|
||||||
waybar
|
|
||||||
hyprpaper
|
|
||||||
wev
|
|
||||||
hyprlock
|
|
||||||
hypridle
|
|
||||||
nwg-drawer
|
|
||||||
wl-clipboard
|
|
||||||
swaync
|
|
||||||
hyprshot
|
|
||||||
rofi
|
|
||||||
hyprshutdown
|
|
||||||
wofi
|
|
||||||
|
|
||||||
@aur
|
|
||||||
waypaper
|
|
||||||
@@ -1,119 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
||||||
PACKAGES_FILE="$SCRIPT_DIR/packages.txt"
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# Read packages.txt, split into pacman / aur / npm sections.
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
read_packages() {
|
|
||||||
local section="pacman"
|
|
||||||
local current
|
|
||||||
current=""
|
|
||||||
while IFS= read -r line || [[ -n "$line" ]]; do
|
|
||||||
current="${line%%#*}"
|
|
||||||
current="${current##*( )}"
|
|
||||||
current="${current%%*( )}"
|
|
||||||
[[ -z "$current" ]] && continue
|
|
||||||
case "$current" in
|
|
||||||
@pacman) section="pacman" ;;
|
|
||||||
@aur) section="aur" ;;
|
|
||||||
@npm) section="npm" ;;
|
|
||||||
*)
|
|
||||||
case "$section" in
|
|
||||||
pacman) pacman_pkgs+=("$current") ;;
|
|
||||||
aur) aur_pkgs+=("$current") ;;
|
|
||||||
npm) npm_pkgs+=("$current") ;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done < "$PACKAGES_FILE"
|
|
||||||
}
|
|
||||||
|
|
||||||
declare -a pacman_pkgs=() aur_pkgs=() npm_pkgs=()
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# Install sections.
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
install_pacman() {
|
|
||||||
if ((${#pacman_pkgs[@]})); then
|
|
||||||
echo "==> Installiere Pacman-Pakete: ${pacman_pkgs[*]}"
|
|
||||||
yay -S --needed "${pacman_pkgs[@]}"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
install_aur() {
|
|
||||||
if ((${#aur_pkgs[@]})); then
|
|
||||||
echo "==> Installiere AUR-Pakete: ${aur_pkgs[*]}"
|
|
||||||
yay -S --needed "${aur_pkgs[@]}"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
install_npm() {
|
|
||||||
if ((${#npm_pkgs[@]})); then
|
|
||||||
echo "==> Installiere globale npm-Pakete: ${npm_pkgs[*]}"
|
|
||||||
npm install -g "${npm_pkgs[@]}"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# Post-install: hyprltm (network manager) via upstream script.
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
install_hyprltm() {
|
|
||||||
if command -v hyprltm >/dev/null 2>&1; then
|
|
||||||
echo "hyprltm bereits installiert; fahre fort."
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
echo "Installiere hyprltm (Network Manager) ..."
|
|
||||||
curl -s https://raw.githubusercontent.com/hyprltm/hyprltm-net/main/setup.sh | bash
|
|
||||||
}
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# Post-install: ensure fish PATH includes ~/.local/bin (for hyprltm).
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
add_fish_local_bin_path() {
|
|
||||||
local fish_config="$HOME/.config/fish/config.fish"
|
|
||||||
if [[ -f "$fish_config" ]] && grep -q '\$HOME/.local/bin' "$fish_config"; then
|
|
||||||
echo "fish ~/.local/bin PATH bereits gesetzt; fahre fort."
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
echo "Fuege ~/.local/bin zum fish-PATH hinzu ..."
|
|
||||||
echo 'fish_add_path -m $HOME/.local/bin' >> "$fish_config"
|
|
||||||
}
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# Post-install: run Hyprland environment & desktop integration scripts.
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
run_hypr_scripts() {
|
|
||||||
local scripts_dir="$SCRIPT_DIR/../.config/hypr/scripts"
|
|
||||||
|
|
||||||
echo "==> Fuehre ensure-env.sh aus ..."
|
|
||||||
bash "$scripts_dir/ensure-env.sh"
|
|
||||||
|
|
||||||
echo "==> Fuehre portal-host-override.sh aus ..."
|
|
||||||
bash "$scripts_dir/portal-host-override.sh"
|
|
||||||
|
|
||||||
echo "==> Fuehre fix_dolphin_file_associations.sh aus ..."
|
|
||||||
bash "$scripts_dir/fix_dolphin_file_associations.sh"
|
|
||||||
}
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# Main
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
main() {
|
|
||||||
echo "==> Lese Paketliste: $PACKAGES_FILE"
|
|
||||||
read_packages
|
|
||||||
|
|
||||||
install_pacman
|
|
||||||
install_aur
|
|
||||||
install_npm
|
|
||||||
|
|
||||||
install_hyprltm
|
|
||||||
add_fish_local_bin_path
|
|
||||||
run_hypr_scripts
|
|
||||||
|
|
||||||
echo "Fertig. Hyprland und das Compositor-Okosystem sind eingerichtet."
|
|
||||||
}
|
|
||||||
|
|
||||||
main
|
|
||||||
@@ -0,0 +1,86 @@
|
|||||||
|
# Notizen
|
||||||
|
|
||||||
|
## Buntes-Monster mit NFS verbinden
|
||||||
|
|
||||||
|
### Server-Seite (Buntes-Monster)
|
||||||
|
|
||||||
|
`nfs-utils` installieren
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sudo pacman -S nfs-utils
|
||||||
|
```
|
||||||
|
|
||||||
|
Datei `/etc/exports` bearbeiten: Zeilen anfügen:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
/mnt/anbau 192.168.0.0/24(rw,sync,no_subtree_check)
|
||||||
|
/mnt/bilder 192.168.0.0/24(rw,sync,no_subtree_check)
|
||||||
|
```
|
||||||
|
|
||||||
|
Apply exports configuration
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sudo exportfs -rav
|
||||||
|
```
|
||||||
|
|
||||||
|
Or restart the NFS service to reload
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sudo systemctl restart nfs-server
|
||||||
|
```
|
||||||
|
|
||||||
|
Enable NFS Service at Boot
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sudo systemctl enable --now nfs-server
|
||||||
|
```
|
||||||
|
|
||||||
|
### Server-Seite
|
||||||
|
|
||||||
|
`nfs-utils` installieren
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sudo pacman -S nfs-utils
|
||||||
|
```
|
||||||
|
|
||||||
|
`/etc/fstab`: Zeilen hinzufügen:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
buntes-monster:/mnt/anbau /mnt/anbau nfs rw,sync,addr=192.168.0.4 0 0
|
||||||
|
buntes-monster:/mnt/bilder /mnt/bilder nfs rw,sync,addr=192.168.0.4 0 0
|
||||||
|
```
|
||||||
|
|
||||||
|
(Annahmen: IP buntes-monster: 192.168.0.4)
|
||||||
|
|
||||||
|
Eiträge hinzufügen. Danach Mounts laden:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sudo mount -a
|
||||||
|
```
|
||||||
|
|
||||||
|
## FSTAB
|
||||||
|
|
||||||
|
`fstab` bearbeiten füt automatische Mounts:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sudo nvim /etc/fstab
|
||||||
|
```
|
||||||
|
|
||||||
|
Eiträge hinzufügen. Danach Mounts laden:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sudo mount -a
|
||||||
|
```
|
||||||
|
|
||||||
|
### hidrive
|
||||||
|
|
||||||
|
```bash
|
||||||
|
mathias2784@sftp.hidrive.strato.com:/users/mathias2784 /mnt/hidrive fuse.sshfs defaults,_netdev,IdentityFile=/home/mathias/.ssh/id_ed25519,allow_other 0 0
|
||||||
|
```
|
||||||
|
|
||||||
|
### NAS
|
||||||
|
|
||||||
|
```bash
|
||||||
|
//192.168.0.14/Mathias /mnt/nas/mathias cifs credentials=/home/mathias/.nascred,uid=1000,gid=1000,iocharset=utf8,vers=3.1.1,rsize=65536,wsize=65536,cache=strict,noatime 0 0
|
||||||
|
//192.168.0.14/Gemeinsam /mnt/nas/gemeinsam cifs credentials=/home/mathias/.nascred,uid=1000,gid=1000,iocharset=utf8,vers=3.1.1,rsize=65536,wsize=65536,cache=strict,noatime 0 0
|
||||||
|
```
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# System package list for basic/setup.sh
|
# System package list for setup/basic/setup.sh
|
||||||
#
|
#
|
||||||
# Every other dotfile branch depends on these foundational packages
|
# Every other dotfile branch depends on these foundational packages
|
||||||
# (base system, display manager, audio stack, AUR helper).
|
# (base system, display manager, audio stack, AUR helper).
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
SETUP_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
PACKAGES_FILE="$SETUP_DIR/packages.txt"
|
||||||
|
|
||||||
|
# shellcheck source=../lib/common.sh
|
||||||
|
source "$SETUP_DIR/../lib/common.sh"
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Docker: Dienst aktivieren/starten, Benutzer in die docker-Gruppe aufnehmen
|
||||||
|
# und den Dienst verifizieren. (docker selbst wird ueber setup/basic/packages.txt
|
||||||
|
# als Pacman-Paket installiert.)
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
setup_docker() {
|
||||||
|
if ! command -v docker >/dev/null 2>&1; then
|
||||||
|
echo "Warnung: docker nicht installiert; ueberspringe Docker-Setup."
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "==> Aktiviere und starte Docker-Dienst ..."
|
||||||
|
sudo systemctl enable --now docker
|
||||||
|
|
||||||
|
# Bei Aufruf via `sudo <script>` ist SUDO_USER der eigentliche Benutzer.
|
||||||
|
local target_user="${SUDO_USER:-$USER}"
|
||||||
|
echo "==> Stelle sicher, dass $target_user in der docker-Gruppe ist ..."
|
||||||
|
if [[ "$target_user" == "root" ]] || id -nG "$target_user" 2>/dev/null | grep -qw docker; then
|
||||||
|
echo "Benutzer $target_user ist bereits in der docker-Gruppe."
|
||||||
|
else
|
||||||
|
sudo usermod -aG docker "$target_user"
|
||||||
|
echo "Benutzer $target_user zur docker-Gruppe hinzugefuegt; wirksam nach dem naechsten Login."
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "==> Pruefe Docker-Dienst ..."
|
||||||
|
if systemctl is-active --quiet docker; then
|
||||||
|
echo "Docker-Dienst laeuft (Socket: /var/run/docker.sock)."
|
||||||
|
else
|
||||||
|
echo "Warnung: Docker-Dienst laeuft nicht; pruefe mit: systemctl status docker"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Main
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
main() {
|
||||||
|
local -a pacman_pkgs=() aur_pkgs=() npm_pkgs=()
|
||||||
|
|
||||||
|
echo "==> Aktiviere multilib ..."
|
||||||
|
enable_multilib
|
||||||
|
|
||||||
|
echo "==> System aktualisieren ..."
|
||||||
|
sudo pacman -Syu
|
||||||
|
|
||||||
|
echo "==> Sicherstelle yay ..."
|
||||||
|
ensure_yay
|
||||||
|
|
||||||
|
echo "==> Lese Paketliste: $PACKAGES_FILE"
|
||||||
|
read_packages "$PACKAGES_FILE" pacman_pkgs aur_pkgs npm_pkgs
|
||||||
|
|
||||||
|
install_all_pkgs pacman_pkgs aur_pkgs npm_pkgs
|
||||||
|
|
||||||
|
echo "==> Richte Docker ein ..."
|
||||||
|
setup_docker
|
||||||
|
|
||||||
|
echo "Fertig. Die Basis-Systemumgebung ist eingerichtet."
|
||||||
|
}
|
||||||
|
|
||||||
|
main
|
||||||
@@ -1,11 +1,11 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# Refresh vendored upstream port files (basic/scripts/fetch-ports.sh).
|
# Refresh vendored upstream port files (setup/fetch-ports.sh).
|
||||||
#
|
#
|
||||||
# This script is intentionally NOT stowed (basic/.stow-ignore) and NOT run
|
# This script lives outside the stow packages (setup/) and is NOT run
|
||||||
# by the test harness: it contacts the network. Run it manually when you
|
# by the test harness: it contacts the network. Run it manually when you
|
||||||
# want to pull newer upstream Catppuccin ports into the central theme:
|
# want to pull newer upstream Catppuccin ports into the central theme:
|
||||||
#
|
#
|
||||||
# bash basic/scripts/fetch-ports.sh
|
# bash setup/fetch-ports.sh
|
||||||
#
|
#
|
||||||
# The central palette (theme.lua / theme.css roles / hypr.conf) remains the
|
# The central palette (theme.lua / theme.css roles / hypr.conf) remains the
|
||||||
# source of truth; after fetching, re-apply the provenance headers and the
|
# source of truth; after fetching, re-apply the provenance headers and the
|
||||||
@@ -14,19 +14,13 @@
|
|||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
DEST="$SCRIPT_DIR/../.config/themes/themes/catppuccin-mocha"
|
DEST="$SCRIPT_DIR/../basic/.config/themes/themes/catppuccin-mocha"
|
||||||
|
|
||||||
# Pinned upstream revisions (bump deliberately, then run this script).
|
# Pinned upstream revisions (bump deliberately, then run this script).
|
||||||
KITTY_PIN="main"
|
KITTY_PIN="main"
|
||||||
WAYBAR_PIN="main"
|
|
||||||
ROFI_PIN="main"
|
|
||||||
|
|
||||||
curl -fsSL "https://raw.githubusercontent.com/catppuccin/kitty/${KITTY_PIN}/themes/mocha.conf" \
|
curl -fsSL "https://raw.githubusercontent.com/catppuccin/kitty/${KITTY_PIN}/themes/mocha.conf" \
|
||||||
-o "$DEST/kitty.conf"
|
-o "$DEST/kitty.conf"
|
||||||
curl -fsSL "https://raw.githubusercontent.com/catppuccin/waybar/${WAYBAR_PIN}/themes/mocha.css" \
|
|
||||||
-o "$DEST/theme.css"
|
|
||||||
curl -fsSL "https://raw.githubusercontent.com/catppuccin/rofi/${ROFI_PIN}/themes/catppuccin-mocha.rasi" \
|
|
||||||
-o "$DEST/rofi.rasi"
|
|
||||||
|
|
||||||
echo "ports refreshed into $DEST"
|
echo "ports refreshed into $DEST"
|
||||||
echo "reminder: re-apply file headers + theme.css role aliases, then run scripts/sync-theme.sh"
|
echo "reminder: re-apply file headers + theme.css role aliases, then run scripts/sync-theme.sh"
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Hyprland compositor package list for setup/hypr/setup.sh
|
||||||
|
#
|
||||||
|
# Wayland compositor, screenshot tool and supporting utilities. Both desktop
|
||||||
|
# shell frontends are installed: Noctalia and Caelestia. Select the one started
|
||||||
|
# by Hyprland in hypr/.config/hypr/env.lua.
|
||||||
|
#
|
||||||
|
# Caelestia requires the upstream `quickshell-git` build. The explicit
|
||||||
|
# `aur/` source prefix below is intentional: yay's --aur mode alone can still
|
||||||
|
# select a repository provider. Do not substitute `noctalia-qs`; although it
|
||||||
|
# provides `quickshell-git`, that fork is incompatible with Caelestia's
|
||||||
|
# Quickshell pragmas.
|
||||||
|
#
|
||||||
|
# - Lines starting with '#' and blank lines are ignored.
|
||||||
|
# - Use "@pacman", "@aur" or "@npm" markers to switch section.
|
||||||
|
# - The default section is @pacman.
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@pacman
|
||||||
|
hyprland
|
||||||
|
hypridle
|
||||||
|
hyprpm
|
||||||
|
xdg-desktop-portal-hyprland
|
||||||
|
hyprpolkitagent
|
||||||
|
pantheon-shortcut-overlay
|
||||||
|
wev
|
||||||
|
wl-clipboard
|
||||||
|
hyprshot
|
||||||
|
brightnessctl
|
||||||
|
noctalia
|
||||||
|
wtype
|
||||||
|
|
||||||
|
@aur
|
||||||
|
hyprmod
|
||||||
|
caelestia-shell
|
||||||
|
caelestia-cli
|
||||||
|
aur/quickshell-git
|
||||||
|
hyprsaver
|
||||||
|
python-terminaltexteffects
|
||||||
@@ -0,0 +1,99 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
SETUP_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
PACKAGES_FILE="$SETUP_DIR/packages.txt"
|
||||||
|
|
||||||
|
# shellcheck source=../lib/common.sh
|
||||||
|
source "$SETUP_DIR/../lib/common.sh"
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Create the local shell selection from the tracked example exactly once.
|
||||||
|
# env.lua is ignored by Git so each machine can keep its own choice.
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
ensure_shell_config() {
|
||||||
|
local config_dir example_file config_file
|
||||||
|
|
||||||
|
config_dir="$(repo_root)/hypr/.config/hypr"
|
||||||
|
example_file="$config_dir/env.example.lua"
|
||||||
|
config_file="$config_dir/env.lua"
|
||||||
|
|
||||||
|
if [[ -e "$config_file" || -L "$config_file" ]]; then
|
||||||
|
echo "==> Behalte lokale Shell-Auswahl: $config_file"
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "==> Erstelle lokale Shell-Auswahl aus env.example.lua ..."
|
||||||
|
cp "$example_file" "$config_file"
|
||||||
|
}
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Keep Caelestia on upstream Quickshell.
|
||||||
|
#
|
||||||
|
# noctalia-qs can satisfy pacman's virtual quickshell-git dependency, but its
|
||||||
|
# parser is not compatible with Caelestia. The explicit aur/quickshell-git
|
||||||
|
# target bypasses that provider, then setup verifies that /usr/bin/qs really
|
||||||
|
# belongs to quickshell-git.
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
warn_about_quickshell_provider() {
|
||||||
|
if pacman -Q noctalia-qs >/dev/null 2>&1; then
|
||||||
|
log "noctalia-qs ist installiert; die AUR-Transaktion ersetzt es durch quickshell-git."
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
verify_quickshell_runtime() {
|
||||||
|
local owner
|
||||||
|
|
||||||
|
if pacman -Q noctalia-qs >/dev/null 2>&1; then
|
||||||
|
echo "Fehler: noctalia-qs ist weiterhin installiert; Caelestia benoetigt AUR quickshell-git." >&2
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! pacman -Q quickshell-git >/dev/null 2>&1; then
|
||||||
|
echo "Fehler: AUR-Paket quickshell-git wurde nicht installiert." >&2
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
owner="$(pacman -Qoq /usr/bin/qs 2>/dev/null || true)"
|
||||||
|
if [[ "$owner" != "quickshell-git" ]]; then
|
||||||
|
echo "Fehler: /usr/bin/qs gehoert zu '$owner' statt zu quickshell-git." >&2
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
log "Quickshell-Runtime geprueft: quickshell-git"
|
||||||
|
}
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Post-install: run Hyprland environment & desktop integration scripts.
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
run_hypr_scripts() {
|
||||||
|
local scripts_dir
|
||||||
|
scripts_dir="$(repo_root)/hypr/.config/hypr/scripts"
|
||||||
|
|
||||||
|
echo "==> Fuehre portal-host-override.sh aus ..."
|
||||||
|
bash "$scripts_dir/portal-host-override.sh"
|
||||||
|
|
||||||
|
echo "==> Fuehre fix_dolphin_file_associations.sh aus ..."
|
||||||
|
bash "$scripts_dir/fix_dolphin_file_associations.sh"
|
||||||
|
}
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Main
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
main() {
|
||||||
|
local -a pacman_pkgs=() aur_pkgs=() npm_pkgs=()
|
||||||
|
|
||||||
|
echo "==> Lese Paketliste: $PACKAGES_FILE"
|
||||||
|
read_packages "$PACKAGES_FILE" pacman_pkgs aur_pkgs npm_pkgs
|
||||||
|
|
||||||
|
warn_about_quickshell_provider
|
||||||
|
install_all_pkgs pacman_pkgs aur_pkgs npm_pkgs
|
||||||
|
verify_quickshell_runtime
|
||||||
|
|
||||||
|
ensure_shell_config
|
||||||
|
run_hypr_scripts
|
||||||
|
|
||||||
|
echo "Fertig. Hyprland und das Compositor-Okosystem sind eingerichtet."
|
||||||
|
}
|
||||||
|
|
||||||
|
main
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Kreation package list for setup/kreation/setup.sh
|
||||||
|
#
|
||||||
|
# DAW, video and audio-plugin runtime.
|
||||||
|
#
|
||||||
|
# - Lines starting with '#' and blank lines are ignored.
|
||||||
|
# - Use "@pacman", "@aur" or "@npm" markers to switch section.
|
||||||
|
# - The default section is @pacman.
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@pacman
|
||||||
|
reaper
|
||||||
|
guitarix
|
||||||
|
kdenlive
|
||||||
|
yabridge
|
||||||
|
yabridgectl
|
||||||
|
obs-studio
|
||||||
|
surge-xt
|
||||||
|
lsp-plugins
|
||||||
|
calf
|
||||||
|
dragonfly-reverb
|
||||||
|
darktable
|
||||||
|
gimp
|
||||||
|
|
||||||
|
@aur
|
||||||
|
numaplayer
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
SETUP_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
PACKAGES_FILE="$SETUP_DIR/packages.txt"
|
||||||
|
|
||||||
|
# shellcheck source=../lib/common.sh
|
||||||
|
source "$SETUP_DIR/../lib/common.sh"
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Main
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
main() {
|
||||||
|
local -a pacman_pkgs=() aur_pkgs=() npm_pkgs=()
|
||||||
|
|
||||||
|
echo "==> Lese Paketliste: $PACKAGES_FILE"
|
||||||
|
read_packages "$PACKAGES_FILE" pacman_pkgs aur_pkgs npm_pkgs
|
||||||
|
|
||||||
|
install_all_pkgs pacman_pkgs aur_pkgs npm_pkgs
|
||||||
|
|
||||||
|
echo "Fertig. Kreation-Pakete (DAW, Video, Plugins) sind eingerichtet."
|
||||||
|
}
|
||||||
|
|
||||||
|
main
|
||||||
@@ -0,0 +1,126 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# setup/lib/common.sh
|
||||||
|
#
|
||||||
|
# Shared helpers for the setup/install scripts under setup/.
|
||||||
|
# Source this file; do not execute it directly:
|
||||||
|
#
|
||||||
|
# SETUP_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
# # shellcheck source=../lib/common.sh
|
||||||
|
# source "$SETUP_DIR/../lib/common.sh"
|
||||||
|
#
|
||||||
|
# Conventions:
|
||||||
|
# - The caller owns `set -euo pipefail` and PACKAGES_FILE.
|
||||||
|
# - Package lists use @pacman (default) / @aur / @npm section markers;
|
||||||
|
# '#' starts a comment, blank lines are ignored.
|
||||||
|
# - Set NPM_USE_SUDO=1 before calling install_npm_pkgs when the global
|
||||||
|
# npm root is root-owned (Arch installs npm to /usr/lib/node_modules).
|
||||||
|
|
||||||
|
# Print the repository root (setup/lib/ -> repo root).
|
||||||
|
repo_root() {
|
||||||
|
cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd
|
||||||
|
}
|
||||||
|
|
||||||
|
log() {
|
||||||
|
echo "==> $*"
|
||||||
|
}
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Read a packages.txt file, split into pacman / aur / npm sections.
|
||||||
|
# Usage: read_packages <file> <pacman_array> <aur_array> <npm_array>
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
read_packages() {
|
||||||
|
local file="$1" pacman_ref="$2" aur_ref="$3" npm_ref="$4"
|
||||||
|
local section="pacman"
|
||||||
|
local line current
|
||||||
|
local -n _pacman="$pacman_ref" _aur="$aur_ref" _npm="$npm_ref"
|
||||||
|
while IFS= read -r line || [[ -n "$line" ]]; do
|
||||||
|
current="${line%%#*}"
|
||||||
|
current="${current##*( )}"
|
||||||
|
current="${current%%*( )}"
|
||||||
|
[[ -z "$current" ]] && continue
|
||||||
|
case "$current" in
|
||||||
|
@pacman) section="pacman" ;;
|
||||||
|
@aur) section="aur" ;;
|
||||||
|
@npm) section="npm" ;;
|
||||||
|
*)
|
||||||
|
case "$section" in
|
||||||
|
pacman) _pacman+=("$current") ;;
|
||||||
|
aur) _aur+=("$current") ;;
|
||||||
|
npm) _npm+=("$current") ;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done < "$file"
|
||||||
|
}
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Install sections (arrays passed by nameref).
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
install_pacman_pkgs() {
|
||||||
|
local -n _pkgs="$1"
|
||||||
|
if ((${#_pkgs[@]})); then
|
||||||
|
log "Installiere Pacman-Pakete: ${_pkgs[*]}"
|
||||||
|
yay -S --needed "${_pkgs[@]}"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
install_aur_pkgs() {
|
||||||
|
local -n _pkgs="$1"
|
||||||
|
if ((${#_pkgs[@]})); then
|
||||||
|
log "Installiere AUR-Pakete: ${_pkgs[*]}"
|
||||||
|
# --aur selects yay's AUR mode. For names that a repository package
|
||||||
|
# can also provide, use an explicit aur/<package> target in the list.
|
||||||
|
yay -S --aur --needed "${_pkgs[@]}"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
install_npm_pkgs() {
|
||||||
|
local -n _pkgs="$1"
|
||||||
|
if ((${#_pkgs[@]})); then
|
||||||
|
log "Installiere globale npm-Pakete: ${_pkgs[*]}"
|
||||||
|
if [[ "${NPM_USE_SUDO:-0}" == "1" ]]; then
|
||||||
|
sudo npm install -g "${_pkgs[@]}"
|
||||||
|
else
|
||||||
|
npm install -g "${_pkgs[@]}"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Install all three sections at once.
|
||||||
|
install_all_pkgs() {
|
||||||
|
install_pacman_pkgs "$1"
|
||||||
|
install_aur_pkgs "$2"
|
||||||
|
install_npm_pkgs "$3"
|
||||||
|
}
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Enable multilib in /etc/pacman.conf (with a safety backup).
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
enable_multilib() {
|
||||||
|
sudo sed -i.bak '/^#\[multilib\]/,+1 s/^#//' /etc/pacman.conf
|
||||||
|
}
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Ensure yay (AUR helper) is installed.
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
ensure_yay() {
|
||||||
|
if pacman -Q yay &>/dev/null; then
|
||||||
|
echo "yay bereits installiert; fahre fort."
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
if pacman -Si yay &>/dev/null; then
|
||||||
|
echo "Installiere yay mit pacman ..."
|
||||||
|
sudo pacman -S --needed yay
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
echo "installiere yay via git ..."
|
||||||
|
sudo pacman -S --needed base-devel git
|
||||||
|
local tmp
|
||||||
|
tmp="$(mktemp -d)"
|
||||||
|
git clone https://aur.archlinux.org/yay.git "$tmp/yay"
|
||||||
|
(
|
||||||
|
cd "$tmp/yay"
|
||||||
|
makepkg -si
|
||||||
|
)
|
||||||
|
rm -rf "$tmp"
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Terminal package list for term/setup.sh
|
# Terminal package list for setup/term/setup.sh
|
||||||
#
|
#
|
||||||
# Maintenance:
|
# Maintenance:
|
||||||
# - Add / remove packages on separate lines.
|
# - Add / remove packages on separate lines.
|
||||||
@@ -37,6 +37,10 @@ fzf
|
|||||||
locate
|
locate
|
||||||
ttf-jetbrains-mono-nerd
|
ttf-jetbrains-mono-nerd
|
||||||
ttf-font-awesome
|
ttf-font-awesome
|
||||||
|
btop
|
||||||
|
yt-dlp
|
||||||
|
ffmpeg
|
||||||
|
jc
|
||||||
|
|
||||||
@aur
|
@aur
|
||||||
opencode
|
opencode
|
||||||
Executable → Regular
+12
-60
@@ -1,63 +1,15 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
SETUP_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
PACKAGES_FILE="$SCRIPT_DIR/packages.txt"
|
PACKAGES_FILE="$SETUP_DIR/packages.txt"
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# shellcheck source=../lib/common.sh
|
||||||
# Read packages.txt, split into pacman / aur / npm sections.
|
source "$SETUP_DIR/../lib/common.sh"
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
read_packages() {
|
|
||||||
local section="pacman"
|
|
||||||
local current
|
|
||||||
current=""
|
|
||||||
while IFS= read -r line || [[ -n "$line" ]]; do
|
|
||||||
current="${line%%#*}"
|
|
||||||
current="${current##*( )}"
|
|
||||||
current="${current%%*( )}"
|
|
||||||
[[ -z "$current" ]] && continue
|
|
||||||
case "$current" in
|
|
||||||
@pacman) section="pacman" ;;
|
|
||||||
@aur) section="aur" ;;
|
|
||||||
@npm) section="npm" ;;
|
|
||||||
*)
|
|
||||||
case "$section" in
|
|
||||||
pacman) pacman_pkgs+=("$current") ;;
|
|
||||||
aur) aur_pkgs+=("$current") ;;
|
|
||||||
npm) npm_pkgs+=("$current") ;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done < "$PACKAGES_FILE"
|
|
||||||
}
|
|
||||||
|
|
||||||
declare -a pacman_pkgs=() aur_pkgs=() npm_pkgs=()
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# Install sections.
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
install_pacman() {
|
|
||||||
if ((${#pacman_pkgs[@]})); then
|
|
||||||
echo "==> Installiere Pacman-Pakete: ${pacman_pkgs[*]}"
|
|
||||||
yay -S --needed "${pacman_pkgs[@]}"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
install_aur() {
|
|
||||||
if ((${#aur_pkgs[@]})); then
|
|
||||||
echo "==> Installiere AUR-Pakete: ${aur_pkgs[*]}"
|
|
||||||
yay -S --needed "${aur_pkgs[@]}"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
install_npm() {
|
|
||||||
if ((${#npm_pkgs[@]})); then
|
|
||||||
echo "==> Installiere globale npm-Pakete: ${npm_pkgs[*]}"
|
|
||||||
# Arch installiert npm nach /usr/lib/node_modules (root-owned),
|
# Arch installiert npm nach /usr/lib/node_modules (root-owned),
|
||||||
# daher braucht der globale Install sudo.
|
# daher braucht der globale Install sudo.
|
||||||
sudo npm install -g "${npm_pkgs[@]}"
|
NPM_USE_SUDO=1
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Post-install configuration.
|
# Post-install configuration.
|
||||||
@@ -131,14 +83,14 @@ add_yazi_git_plugin() {
|
|||||||
# Main
|
# Main
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
main() {
|
main() {
|
||||||
# Hinweis: multilib, yay und das System-Update werden von
|
local -a pacman_pkgs=() aur_pkgs=() npm_pkgs=()
|
||||||
# basic/setup.sh uebernommen (laeuft vor term im Makefile).
|
|
||||||
echo "==> Lese Paketliste: $PACKAGES_FILE"
|
|
||||||
read_packages
|
|
||||||
|
|
||||||
install_pacman
|
# Hinweis: multilib, yay und das System-Update werden von
|
||||||
install_aur
|
# setup/basic/setup.sh uebernommen (laeuft vor term im Makefile).
|
||||||
install_npm
|
echo "==> Lese Paketliste: $PACKAGES_FILE"
|
||||||
|
read_packages "$PACKAGES_FILE" pacman_pkgs aur_pkgs npm_pkgs
|
||||||
|
|
||||||
|
install_all_pkgs pacman_pkgs aur_pkgs npm_pkgs
|
||||||
|
|
||||||
set_fish_default_shell
|
set_fish_default_shell
|
||||||
install_tmuxifier
|
install_tmuxifier
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Standalone desktop utility package list for utils/setup.sh
|
# Standalone desktop utility package list for setup/utils/setup.sh
|
||||||
#
|
#
|
||||||
# Programs that are not core to every branch, but are expected on a full
|
# Programs that are not core to every branch, but are expected on a full
|
||||||
# desktop: office / web / mail / native-app replacements (Wine), the
|
# desktop: office / web / mail / native-app replacements (Wine), the
|
||||||
@@ -11,6 +11,7 @@
|
|||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
@pacman
|
@pacman
|
||||||
|
firefox
|
||||||
nextcloud-client
|
nextcloud-client
|
||||||
thunderbird
|
thunderbird
|
||||||
ktouch
|
ktouch
|
||||||
@@ -20,3 +21,12 @@ wine-mono
|
|||||||
wine-gecko
|
wine-gecko
|
||||||
winetricks
|
winetricks
|
||||||
rbw
|
rbw
|
||||||
|
nfs-utils
|
||||||
|
code
|
||||||
|
imv
|
||||||
|
bitwarden
|
||||||
|
|
||||||
|
@aur
|
||||||
|
supersonic-desktop
|
||||||
|
subtui
|
||||||
|
localsend
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
SETUP_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
PACKAGES_FILE="$SETUP_DIR/packages.txt"
|
||||||
|
|
||||||
|
# shellcheck source=../lib/common.sh
|
||||||
|
source "$SETUP_DIR/../lib/common.sh"
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Main
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
main() {
|
||||||
|
local -a pacman_pkgs=() aur_pkgs=() npm_pkgs=()
|
||||||
|
|
||||||
|
echo "==> Lese Paketliste: $PACKAGES_FILE"
|
||||||
|
read_packages "$PACKAGES_FILE" pacman_pkgs aur_pkgs npm_pkgs
|
||||||
|
|
||||||
|
install_all_pkgs pacman_pkgs aur_pkgs npm_pkgs
|
||||||
|
|
||||||
|
echo "Fertig. Standalone Utilities sind eingerichtet."
|
||||||
|
}
|
||||||
|
|
||||||
|
main
|
||||||
@@ -46,3 +46,8 @@ fi
|
|||||||
if command -v fastfetch >/dev/null 2>&1; then
|
if command -v fastfetch >/dev/null 2>&1; then
|
||||||
fastfetch --config ~/.config/fastfetch/config.jsonc
|
fastfetch --config ~/.config/fastfetch/config.jsonc
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Added by LM Studio CLI (lms)
|
||||||
|
export PATH="$PATH:/home/mathias/.lmstudio/bin"
|
||||||
|
# End of LM Studio CLI section
|
||||||
|
|
||||||
|
|||||||
@@ -42,36 +42,11 @@
|
|||||||
"key": "├─",
|
"key": "├─",
|
||||||
"keyColor": "green"
|
"keyColor": "green"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"type": "brightness",
|
|
||||||
"key": "├─",
|
|
||||||
"keyColor": "green"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "battery",
|
|
||||||
"key": "├─",
|
|
||||||
"keyColor": "green"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "poweradapter",
|
|
||||||
"key": "├─",
|
|
||||||
"keyColor": "green"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"type": "gamepad",
|
"type": "gamepad",
|
||||||
"key": "├─",
|
"key": "├─",
|
||||||
"keyColor": "green"
|
"keyColor": "green"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"type": "bluetooth",
|
|
||||||
"key": "├─",
|
|
||||||
"keyColor": "green"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "sound",
|
|
||||||
"key": "╰─",
|
|
||||||
"keyColor": "green"
|
|
||||||
},
|
|
||||||
"break",
|
"break",
|
||||||
|
|
||||||
{
|
{
|
||||||
@@ -104,21 +79,6 @@
|
|||||||
"key": "├─",
|
"key": "├─",
|
||||||
"keyColor": "yellow"
|
"keyColor": "yellow"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"type": "theme",
|
|
||||||
"key": "├─",
|
|
||||||
"keyColor": "yellow"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "icons",
|
|
||||||
"key": "├─",
|
|
||||||
"keyColor": "yellow"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "wallpaper",
|
|
||||||
"key": "╰─",
|
|
||||||
"keyColor": "yellow"
|
|
||||||
},
|
|
||||||
"break",
|
"break",
|
||||||
|
|
||||||
{
|
{
|
||||||
@@ -137,21 +97,11 @@
|
|||||||
"key": "├─",
|
"key": "├─",
|
||||||
"keyColor": "blue"
|
"keyColor": "blue"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"type": "packages",
|
|
||||||
"key": "├─",
|
|
||||||
"keyColor": "blue"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"type": "uptime",
|
"type": "uptime",
|
||||||
"key": "├─",
|
"key": "├─",
|
||||||
"keyColor": "blue"
|
"keyColor": "blue"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"type": "media",
|
|
||||||
"key": "├─",
|
|
||||||
"keyColor": "blue"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"type": "localip",
|
"type": "localip",
|
||||||
"key": "├─",
|
"key": "├─",
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ end
|
|||||||
|
|
||||||
|
|
||||||
# Added by LM Studio CLI (lms)
|
# Added by LM Studio CLI (lms)
|
||||||
set -gx PATH $PATH /home/mathias/.lmstudio/bin
|
set -gx PATH $PATH $HOME/.lmstudio/bin
|
||||||
# End of LM Studio CLI section
|
# End of LM Studio CLI section
|
||||||
|
|
||||||
export EDITOR=nvim
|
export EDITOR=nvim
|
||||||
@@ -141,3 +141,16 @@ export HSA_OVERRIDE_GFX_VERSION=11.0.0
|
|||||||
export HIP_VISIBLE_DEVICES=0
|
export HIP_VISIBLE_DEVICES=0
|
||||||
|
|
||||||
fish_add_path -m $HOME/.local/bin
|
fish_add_path -m $HOME/.local/bin
|
||||||
|
|
||||||
|
|
||||||
|
# My shortcuts
|
||||||
|
alias fdh="fd -H"
|
||||||
|
alias fdhi="fd -HI"
|
||||||
|
alias rgh="rg --hidden"
|
||||||
|
alias rghi="rg --hidden --no-ignore"
|
||||||
|
|
||||||
|
export PATH="$HOME/.cargo/bin:$PATH"
|
||||||
|
# Added by LM Studio CLI (lms)
|
||||||
|
|
||||||
|
set -gx PATH $PATH /home/mathias/.lmstudio/bin
|
||||||
|
# End of LM Studio CLI section
|
||||||
|
|||||||
@@ -207,6 +207,13 @@ A feature-rich Neovim setup optimized for Python, JSON, and CSV development.
|
|||||||
- **Linting**: ESLint LSP (fix with `<leader>fx`, or use `<leader>fA` for fix-all actions)
|
- **Linting**: ESLint LSP (fix with `<leader>fx`, or use `<leader>fA` for fix-all actions)
|
||||||
- **Formatting**: Prettier via `<leader>lf`
|
- **Formatting**: Prettier via `<leader>lf`
|
||||||
|
|
||||||
|
### HTML (.html)
|
||||||
|
- **Auto-close tags**: typing `<div` + `>` inserts `</div>` automatically (`nvim-ts-autotag`)
|
||||||
|
- **Auto-rename tags**: `ciw` on an opening tag renames the matching closing tag
|
||||||
|
- **Enter between tags**: expands to indented lines via Treesitter indenting
|
||||||
|
- **Also applies to**: `.vue`, `.tsx`, `.jsx`, `.svelte`, `.astro`, `.xml`, `.php`, `.hbs`
|
||||||
|
- **Requires** the Treesitter parser for the filetype (already auto-installed for html/vue/tsx)
|
||||||
|
|
||||||
### CSV (.csv)
|
### CSV (.csv)
|
||||||
- **Treesitter**: Syntax highlighting
|
- **Treesitter**: Syntax highlighting
|
||||||
- **No wrap**: Full row visibility
|
- **No wrap**: Full row visibility
|
||||||
|
|||||||
@@ -17,11 +17,22 @@ return {
|
|||||||
css = { "prettier" },
|
css = { "prettier" },
|
||||||
scss = { "prettier" },
|
scss = { "prettier" },
|
||||||
yaml = { "prettier" },
|
yaml = { "prettier" },
|
||||||
markdown = { "prettier" },
|
markdown = { "prettier_markdown" },
|
||||||
sh = { "shfmt" },
|
sh = { "shfmt" },
|
||||||
bash = { "shfmt" },
|
bash = { "shfmt" },
|
||||||
rust = { "rustfmt" },
|
rust = { "rustfmt" },
|
||||||
},
|
},
|
||||||
|
formatters = {
|
||||||
|
prettier_markdown = {
|
||||||
|
inherit = "prettier",
|
||||||
|
prepend_args = {
|
||||||
|
"--prose-wrap",
|
||||||
|
"always",
|
||||||
|
"--print-width",
|
||||||
|
"80",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
vim.keymap.set({ "n", "v" }, "<leader>lf", function()
|
vim.keymap.set({ "n", "v" }, "<leader>lf", function()
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
--[[
|
||||||
|
TS-AUTOTAG.LUA
|
||||||
|
|
||||||
|
Auto-close and auto-rename HTML/XML-style tags via Treesitter.
|
||||||
|
|
||||||
|
Why this exists: nvim-autopairs (see autopairs.lua) only handles brackets,
|
||||||
|
quotes and endwise pairs -- it never creates a closing tag. Its only
|
||||||
|
HTML-aware rule fires on <CR> when a close tag ALREADY exists after the
|
||||||
|
cursor, so it can re-indent a pair but cannot create one. This plugin
|
||||||
|
fills that gap: typing `<div` + `>` yields `<div></div>` with the cursor
|
||||||
|
in between, and `ciw` on an opening tag renames its closing counterpart.
|
||||||
|
|
||||||
|
Requires the matching Treesitter parsers. `html`, `vue`, `tsx` and
|
||||||
|
`javascript` are already in treesitter.lua's `ensure_installed` list, and
|
||||||
|
the plugin no-ops in filetypes whose parser is missing, so a fresh machine
|
||||||
|
just needs a restart after the parsers are installed.
|
||||||
|
]]
|
||||||
|
|
||||||
|
return {
|
||||||
|
"windwp/nvim-ts-autotag",
|
||||||
|
-- Load events recommended upstream. BufReadPre/BufNewFile is sufficient
|
||||||
|
-- because the plugin only acts once a filetype's parser is available.
|
||||||
|
event = { "BufReadPre", "BufNewFile" },
|
||||||
|
config = function()
|
||||||
|
require("nvim-ts-autotag").setup({
|
||||||
|
opts = {
|
||||||
|
enable_close = true, -- `<div` + `>` -> `<div></div>`
|
||||||
|
enable_rename = true, -- `ciw` on the open tag renames the close tag
|
||||||
|
enable_close_on_slash = false, -- a trailing `</` does not autoclose
|
||||||
|
},
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
}
|
||||||
@@ -63,7 +63,7 @@
|
|||||||
"npm": "@ai-sdk/openai-compatible",
|
"npm": "@ai-sdk/openai-compatible",
|
||||||
"name": "LM Studio (local)",
|
"name": "LM Studio (local)",
|
||||||
"options": {
|
"options": {
|
||||||
"baseURL": "http://192.168.0.4:1234/v1"
|
"baseURL": "http://127.0.0.1:1234"
|
||||||
},
|
},
|
||||||
"models": {
|
"models": {
|
||||||
"qwen3.5-35b-a3b": {
|
"qwen3.5-35b-a3b": {
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
"$schema" = 'https://starship.rs/config-schema.json'
|
"$schema" = 'https://starship.rs/config-schema.json'
|
||||||
|
palette = "noctalia"
|
||||||
|
|
||||||
format = """
|
format = """
|
||||||
[](red)\
|
[](red)\
|
||||||
@@ -29,7 +30,6 @@ $character"""
|
|||||||
|
|
||||||
right_format = "$cmd_duration"
|
right_format = "$cmd_duration"
|
||||||
|
|
||||||
palette = 'catppuccin_mocha'
|
|
||||||
|
|
||||||
[os]
|
[os]
|
||||||
disabled = false
|
disabled = false
|
||||||
@@ -202,3 +202,46 @@ base = "#1e1e2e"
|
|||||||
mantle = "#181825"
|
mantle = "#181825"
|
||||||
crust = "#11111b"
|
crust = "#11111b"
|
||||||
|
|
||||||
|
# >>> NOCTALIA STARSHIP PALETTE >>>
|
||||||
|
# Noctalia Starship Palette
|
||||||
|
# Generated by Noctalia - do not edit manually
|
||||||
|
|
||||||
|
[palettes.noctalia]
|
||||||
|
# Standard colors
|
||||||
|
blue = "#89b4fa"
|
||||||
|
red = "#f38ba8"
|
||||||
|
green = "#a6e3a1"
|
||||||
|
yellow = "#f9e2af"
|
||||||
|
cyan = "#94e2d5"
|
||||||
|
magenta = "#f5c2e7"
|
||||||
|
white = "#a6adc8"
|
||||||
|
black = "#45475a"
|
||||||
|
|
||||||
|
# Extended palette (Catppuccin-compatible names)
|
||||||
|
rosewater = "#ebd391"
|
||||||
|
flamingo = "#f37799"
|
||||||
|
pink = "#f2aede"
|
||||||
|
mauve = "#f5c2e7"
|
||||||
|
maroon = "#f37799"
|
||||||
|
peach = "#ebd391"
|
||||||
|
teal = "#94e2d5"
|
||||||
|
sky = "#6bd7ca"
|
||||||
|
sapphire = "#74a8fc"
|
||||||
|
lavender = "#f2aede"
|
||||||
|
|
||||||
|
# Text shades
|
||||||
|
text = "#cdd6f4"
|
||||||
|
subtext1 = "#a6adc8"
|
||||||
|
subtext0 = "#585b70"
|
||||||
|
|
||||||
|
# Surface shades
|
||||||
|
overlay2 = "#585b70"
|
||||||
|
overlay1 = "#585b70"
|
||||||
|
overlay0 = "#45475a"
|
||||||
|
surface2 = "#45475a"
|
||||||
|
surface1 = "#45475a"
|
||||||
|
surface0 = "#1e1e2e"
|
||||||
|
base = "#1e1e2e"
|
||||||
|
mantle = "#1e1e2e"
|
||||||
|
crust = "#1e1e2e"
|
||||||
|
# <<< NOCTALIA STARSHIP PALETTE <<<
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ set -g @plugin 'jimeh/tmuxifier'
|
|||||||
|
|
||||||
# Persist sessions across reboots and restore them when tmux starts.
|
# Persist sessions across reboots and restore them when tmux starts.
|
||||||
set -g @continuum-save-interval '5'
|
set -g @continuum-save-interval '5'
|
||||||
set -g @continuum-restore 'on'
|
# set -g @continuum-restore 'on'
|
||||||
# set -g @resurrect-capture-pane-contents 'on'
|
# set -g @resurrect-capture-pane-contents 'on'
|
||||||
|
|
||||||
# Central theme (basic/.config/themes): flavor comes from $CATPPUCCIN_FLAVOR
|
# Central theme (basic/.config/themes): flavor comes from $CATPPUCCIN_FLAVOR
|
||||||
|
|||||||
@@ -157,7 +157,6 @@ files = [
|
|||||||
{ name = "dockerfile", text = "", fg = "#89b4fa" },
|
{ name = "dockerfile", text = "", fg = "#89b4fa" },
|
||||||
{ name = ".git-blame-ignore-revs", text = "", fg = "#fab387" },
|
{ name = ".git-blame-ignore-revs", text = "", fg = "#fab387" },
|
||||||
{ name = ".nvmrc", text = "", fg = "#a6e3a1" },
|
{ name = ".nvmrc", text = "", fg = "#a6e3a1" },
|
||||||
{ name = "hyprpaper.conf", text = "", fg = "#74c7ec" },
|
|
||||||
{ name = ".prettierignore", text = "", fg = "#89b4fa" },
|
{ name = ".prettierignore", text = "", fg = "#89b4fa" },
|
||||||
{ name = "rakefile", text = "", fg = "#313244" },
|
{ name = "rakefile", text = "", fg = "#313244" },
|
||||||
{ name = "code_of_conduct", text = "", fg = "#f38ba8" },
|
{ name = "code_of_conduct", text = "", fg = "#f38ba8" },
|
||||||
@@ -284,9 +283,7 @@ files = [
|
|||||||
{ name = "commitlint.config.js", text = "", fg = "#94e2d5" },
|
{ name = "commitlint.config.js", text = "", fg = "#94e2d5" },
|
||||||
{ name = ".gitmodules", text = "", fg = "#fab387" },
|
{ name = ".gitmodules", text = "", fg = "#fab387" },
|
||||||
{ name = "gradle-wrapper.properties", text = "", fg = "#585b70" },
|
{ name = "gradle-wrapper.properties", text = "", fg = "#585b70" },
|
||||||
{ name = "hypridle.conf", text = "", fg = "#74c7ec" },
|
|
||||||
{ name = "vercel.json", text = "▲", fg = "#f5e0dc" },
|
{ name = "vercel.json", text = "▲", fg = "#f5e0dc" },
|
||||||
{ name = "hyprlock.conf", text = "", fg = "#74c7ec" },
|
|
||||||
{ name = "go.sum", text = "", fg = "#74c7ec" },
|
{ name = "go.sum", text = "", fg = "#74c7ec" },
|
||||||
{ name = "kdenlive-layoutsrc", text = "", fg = "#89b4fa" },
|
{ name = "kdenlive-layoutsrc", text = "", fg = "#89b4fa" },
|
||||||
{ name = "gruntfile.babel.js", text = "", fg = "#fab387" },
|
{ name = "gruntfile.babel.js", text = "", fg = "#fab387" },
|
||||||
|
|||||||
@@ -9,3 +9,17 @@ id = "git"
|
|||||||
group = "git"
|
group = "git"
|
||||||
url = "*/"
|
url = "*/"
|
||||||
run = "git"
|
run = "git"
|
||||||
|
|
||||||
|
[opener]
|
||||||
|
imv = [
|
||||||
|
{ run = "imv %s", orphan = true, spread = false, desc = "imv" },
|
||||||
|
]
|
||||||
|
mpv = [
|
||||||
|
{ run = "mpv %s", orphan = true, spread = false, desc = "mpv" },
|
||||||
|
]
|
||||||
|
|
||||||
|
[open]
|
||||||
|
prepend_rules = [
|
||||||
|
{ mime = "image/*", use = "imv" },
|
||||||
|
{ mime = "video/*", use = "mpv" },
|
||||||
|
]
|
||||||
|
|||||||
@@ -1,3 +1 @@
|
|||||||
scripts
|
|
||||||
.stow-ignore
|
|
||||||
.config/tmux/plugins
|
.config/tmux/plugins
|
||||||
+29
-40
@@ -10,7 +10,7 @@
|
|||||||
# - `stow --simulate` to prove every stow target resolves
|
# - `stow --simulate` to prove every stow target resolves
|
||||||
# 2. REAL SMOKE (guarded by RUN_SMOKE=1)
|
# 2. REAL SMOKE (guarded by RUN_SMOKE=1)
|
||||||
# - resolves every @pacman entry against the repo DB
|
# - resolves every @pacman entry against the repo DB
|
||||||
# - exercises term/setup.sh (pacman + npm) and re-runs it to prove
|
# - exercises setup/term/setup.sh (pacman + npm) and re-runs it to prove
|
||||||
# idempotency
|
# idempotency
|
||||||
# - verifies stow actually creates symlinks into $HOME
|
# - verifies stow actually creates symlinks into $HOME
|
||||||
# AUR + kreation/buntes-monster only run with RUN_FULL=1.
|
# AUR + kreation/buntes-monster only run with RUN_FULL=1.
|
||||||
@@ -78,9 +78,7 @@ done
|
|||||||
# 1b. stow --simulate for every package the Makefile stows.
|
# 1b. stow --simulate for every package the Makefile stows.
|
||||||
while IFS= read -r pkg; do
|
while IFS= read -r pkg; do
|
||||||
[[ -z "$pkg" ]] && continue
|
[[ -z "$pkg" ]] && continue
|
||||||
if stow --simulate --ignore='.stow-ignore' --ignore='scripts' \
|
if stow --simulate --dir="$REPO" --target="$REPO" "$pkg" 2>"$ERR_LOG"; then
|
||||||
--ignore='\.config/tmux/plugins' \
|
|
||||||
--dir="$REPO" --target="$REPO" "$pkg" 2>"$ERR_LOG"; then
|
|
||||||
say_ok "stow --simulate $pkg resolves"
|
say_ok "stow --simulate $pkg resolves"
|
||||||
else
|
else
|
||||||
say_fail "stow --simulate $pkg (non-existent package or conflict)"
|
say_fail "stow --simulate $pkg (non-existent package or conflict)"
|
||||||
@@ -141,7 +139,7 @@ NOOP
|
|||||||
echo "[stub] chsh $*"
|
echo "[stub] chsh $*"
|
||||||
exit 0
|
exit 0
|
||||||
NOOP
|
NOOP
|
||||||
# The AUR section is stripped for the smoke, so term/setup.sh only ever
|
# The AUR section is stripped for the smoke, so setup/term/setup.sh only ever
|
||||||
# passes repo packages (+ npm) here; route yay through pacman directly.
|
# passes repo packages (+ npm) here; route yay through pacman directly.
|
||||||
# --noconfirm is needed because the container isn't interactive.
|
# --noconfirm is needed because the container isn't interactive.
|
||||||
cat > "$HOME/bin/yay" <<'NOOP'
|
cat > "$HOME/bin/yay" <<'NOOP'
|
||||||
@@ -154,16 +152,11 @@ NOOP
|
|||||||
export PATH="$HOME/bin:$PATH"
|
export PATH="$HOME/bin:$PATH"
|
||||||
|
|
||||||
# 2c. setup.sh package parsing sanity (mirrors read_packages) for each
|
# 2c. setup.sh package parsing sanity (mirrors read_packages) for each
|
||||||
# package dir: basic/term/utils/hypr. term/ and hypr/ keep their scripts
|
# setup/$d target. All setup scripts + package lists live in setup/
|
||||||
# inside scripts/ so stowing the top-level dir only creates .config/ links.
|
# (outside the stow packages) and share setup/lib/common.sh.
|
||||||
for d in basic term utils hypr; do
|
for d in basic term utils hypr kreation; do
|
||||||
if [[ "$d" == "term" || "$d" == "hypr" ]]; then
|
SETUP_PATH="setup/$d/setup.sh"
|
||||||
SETUP_PATH="$d/scripts/setup.sh"
|
PKG_PATH="setup/$d/packages.txt"
|
||||||
PKG_PATH="$d/scripts/packages.txt"
|
|
||||||
else
|
|
||||||
SETUP_PATH="$d/setup.sh"
|
|
||||||
PKG_PATH="$d/packages.txt"
|
|
||||||
fi
|
|
||||||
if ( cd "$REPO" && bash -n "$SETUP_PATH" ); then
|
if ( cd "$REPO" && bash -n "$SETUP_PATH" ); then
|
||||||
say_ok "$SETUP_PATH syntax OK"
|
say_ok "$SETUP_PATH syntax OK"
|
||||||
else
|
else
|
||||||
@@ -189,12 +182,8 @@ NOOP
|
|||||||
# AUR-only name (e.g. `rd`) fails here before any install happens.
|
# AUR-only name (e.g. `rd`) fails here before any install happens.
|
||||||
header "package resolvability (@pacman entries)"
|
header "package resolvability (@pacman entries)"
|
||||||
resolv_fail=0
|
resolv_fail=0
|
||||||
for d in basic term utils hypr; do
|
for d in basic term utils hypr kreation; do
|
||||||
if [[ "$d" == "term" || "$d" == "hypr" ]]; then
|
PKG_PATH="setup/$d/packages.txt"
|
||||||
PKG_PATH="$d/scripts/packages.txt"
|
|
||||||
else
|
|
||||||
PKG_PATH="$d/packages.txt"
|
|
||||||
fi
|
|
||||||
while IFS= read -r pkg; do
|
while IFS= read -r pkg; do
|
||||||
[[ -z "$pkg" ]] && continue
|
[[ -z "$pkg" ]] && continue
|
||||||
if pacman -S --print-format '%n' "$pkg" >/dev/null 2>&1; then
|
if pacman -S --print-format '%n' "$pkg" >/dev/null 2>&1; then
|
||||||
@@ -214,44 +203,46 @@ NOOP
|
|||||||
done
|
done
|
||||||
|
|
||||||
# 2d. If network allowed and not skipped, actually install the pacman
|
# 2d. If network allowed and not skipped, actually install the pacman
|
||||||
# and npm sections of term/setup.sh (mirrors `make term` without AUR;
|
# and npm sections of setup/term/setup.sh (mirrors `make term` without
|
||||||
# the @aur section stays RUN_FULL-gated since it needs yay/AUR builds).
|
# AUR; the @aur section stays RUN_FULL-gated since it needs yay/AUR builds).
|
||||||
if [[ "${SKIP_NET:-0}" != "1" ]]; then
|
if [[ "${SKIP_NET:-0}" != "1" ]]; then
|
||||||
header "make term (pacman + npm packages, AUR skipped)"
|
header "make term (pacman + npm packages, AUR skipped)"
|
||||||
# Patch packages.txt: keep @pacman and @npm (@npm runs via sudo npm
|
# Patch packages.txt: keep @pacman and @npm (@npm runs via sudo npm
|
||||||
# in the container), drop @aur so we don't hit AUR builds.
|
# in the container), drop @aur so we don't hit AUR builds.
|
||||||
cp "$REPO/term/scripts/packages.txt" "$HOME/packages.txt.full"
|
cp "$REPO/setup/term/packages.txt" "$HOME/packages.txt.full"
|
||||||
awk '
|
awk '
|
||||||
/^@aur$/{s="skip"}; /^@npm$/{s="npm"}; /^@pacman$/{s="pacman"}
|
/^@aur$/{s="skip"}; /^@npm$/{s="npm"}; /^@pacman$/{s="pacman"}
|
||||||
{ if (s!="skip" && NF>0 && $1 !~ /^#/) print }
|
{ if (s!="skip" && NF>0 && $1 !~ /^#/) print }
|
||||||
' "$REPO/term/scripts/packages.txt" > "$HOME/packages.txt.term-smoke"
|
' "$REPO/setup/term/packages.txt" > "$HOME/packages.txt.term-smoke"
|
||||||
# pacman-only list for verify_packages.sh (npm packages are not in
|
# pacman-only list for verify_packages.sh (npm packages are not in
|
||||||
# the pacman DB).
|
# the pacman DB).
|
||||||
awk '
|
awk '
|
||||||
/^@aur$/{s="skip"}; /^@npm$/{s="skip"}; /^@pacman$/{s="pacman"}
|
/^@aur$/{s="skip"}; /^@npm$/{s="skip"}; /^@pacman$/{s="pacman"}
|
||||||
{ if (s!="skip" && NF>0 && $1 !~ /^#/) print }
|
{ if (s!="skip" && NF>0 && $1 !~ /^#/) print }
|
||||||
' "$REPO/term/scripts/packages.txt" > "$HOME/packages.txt.term-only"
|
' "$REPO/setup/term/packages.txt" > "$HOME/packages.txt.term-only"
|
||||||
# set a scratch HOME for setup.sh so it doesn't touch the real one.
|
# Stage a scratch copy of the term setup incl. setup/lib/common.sh
|
||||||
mkdir -p "$HOME/term"
|
# (setup.sh sources it via a path relative to its own location).
|
||||||
cp "$REPO/term/scripts/setup.sh" "$HOME/term/setup.sh"
|
mkdir -p "$HOME/smoke/term" "$HOME/smoke/lib"
|
||||||
cp "$HOME/packages.txt.term-smoke" "$HOME/term/packages.txt"
|
cp "$REPO/setup/term/setup.sh" "$HOME/smoke/term/setup.sh"
|
||||||
|
cp "$REPO/setup/lib/common.sh" "$HOME/smoke/lib/common.sh"
|
||||||
|
cp "$HOME/packages.txt.term-smoke" "$HOME/smoke/term/packages.txt"
|
||||||
# chsh is stubbed via $HOME/bin so even `chsh` works without a pty.
|
# chsh is stubbed via $HOME/bin so even `chsh` works without a pty.
|
||||||
setup_ok=0
|
setup_ok=0
|
||||||
if ( cd "$HOME/term" && bash setup.sh ) ; then
|
if ( cd "$HOME/smoke/term" && bash setup.sh ) ; then
|
||||||
say_ok "term/setup.sh (pacman+npm) completed"
|
say_ok "setup/term/setup.sh (pacman+npm) completed"
|
||||||
setup_ok=1
|
setup_ok=1
|
||||||
else
|
else
|
||||||
say_fail "term/setup.sh (pacman+npm) failed (exit $?)"
|
say_fail "setup/term/setup.sh (pacman+npm) failed (exit $?)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 2d1. Idempotency probe: a second run must also succeed. Catches
|
# 2d1. Idempotency probe: a second run must also succeed. Catches
|
||||||
# steps that break on re-runs over an already-populated state (e.g.
|
# steps that break on re-runs over an already-populated state (e.g.
|
||||||
# `ya pkg add` failing with "already exists").
|
# `ya pkg add` failing with "already exists").
|
||||||
if [[ "$setup_ok" == "1" ]]; then
|
if [[ "$setup_ok" == "1" ]]; then
|
||||||
if ( cd "$HOME/term" && bash setup.sh ) ; then
|
if ( cd "$HOME/smoke/term" && bash setup.sh ) ; then
|
||||||
say_ok "term/setup.sh re-run: idempotent"
|
say_ok "setup/term/setup.sh re-run: idempotent"
|
||||||
else
|
else
|
||||||
say_fail "term/setup.sh re-run failed (exit $?) - not idempotent"
|
say_fail "setup/term/setup.sh re-run failed (exit $?) - not idempotent"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo " skipping idempotency probe (first run did not complete)"
|
echo " skipping idempotency probe (first run did not complete)"
|
||||||
@@ -279,15 +270,13 @@ NOOP
|
|||||||
|
|
||||||
# 2e. stow --actual into $HOME to prove real symlinks are created.
|
# 2e. stow --actual into $HOME to prove real symlinks are created.
|
||||||
header "stow real symlinks into \$HOME"
|
header "stow real symlinks into \$HOME"
|
||||||
# term/setup.sh may have just re-created the yazi plugin (`ya pkg add`)
|
# setup/term/setup.sh may have just re-created the yazi plugin (`ya pkg add`)
|
||||||
# as real files. The repo vendors the same plugin under term/.config/yazi,
|
# as real files. The repo vendors the same plugin under term/.config/yazi,
|
||||||
# so drop the duplicate first, letting stow take ownership of that config.
|
# so drop the duplicate first, letting stow take ownership of that config.
|
||||||
rm -rf "$HOME/.config/yazi"
|
rm -rf "$HOME/.config/yazi"
|
||||||
for pkg in term hypr kreation local_ai; do
|
for pkg in term hypr kreation local_ai; do
|
||||||
if [[ -d "$REPO/$pkg" ]]; then
|
if [[ -d "$REPO/$pkg" ]]; then
|
||||||
if stow --ignore='.stow-ignore' --ignore='scripts' \
|
if stow --dir="$REPO" --target="$HOME" "$pkg" 2>"$ERR_LOG"; then
|
||||||
--ignore='\.config/tmux/plugins' \
|
|
||||||
--dir="$REPO" --target="$HOME" "$pkg" 2>"$ERR_LOG"; then
|
|
||||||
say_ok "stow $pkg into \$HOME"
|
say_ok "stow $pkg into \$HOME"
|
||||||
else
|
else
|
||||||
say_fail "stow $pkg into \$HOME"
|
say_fail "stow $pkg into \$HOME"
|
||||||
|
|||||||
+98
-23
@@ -31,7 +31,9 @@ say_pass() { printf 'ok: %s\n' "$*"; PASS=$((PASS+1)); }
|
|||||||
# Exclusions: never lint tpm or general vendored plugin trees, whose third-party
|
# Exclusions: never lint tpm or general vendored plugin trees, whose third-party
|
||||||
# scripts may legitimately fail `bash -n` and are not written/maintained here.
|
# scripts may legitimately fail `bash -n` and are not written/maintained here.
|
||||||
EXCLUDE_VENDOR='(/tpm/|/plugins/|/plugins$)'
|
EXCLUDE_VENDOR='(/tpm/|/plugins/|/plugins$)'
|
||||||
mapfile -t SCRIPTS < <(git ls-files '*.sh' 2>/dev/null | grep -vE "$EXCLUDE_VENDOR")
|
mapfile -t SCRIPTS < <(git ls-files '*.sh' 2>/dev/null | grep -vE "$EXCLUDE_VENDOR" | while IFS= read -r script; do
|
||||||
|
[[ -f "$script" ]] && printf '%s\n' "$script"
|
||||||
|
done)
|
||||||
if [[ ${#SCRIPTS[@]} -eq 0 ]]; then
|
if [[ ${#SCRIPTS[@]} -eq 0 ]]; then
|
||||||
mapfile -t SCRIPTS < <(find . -name '*.sh' \
|
mapfile -t SCRIPTS < <(find . -name '*.sh' \
|
||||||
-not -path './.git/*' -not -path '*/.git/*' \
|
-not -path './.git/*' -not -path '*/.git/*' \
|
||||||
@@ -77,19 +79,14 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# 4. packages.txt parsing sanity (mirrors each setup.sh read_packages).
|
# 4. packages.txt parsing sanity (mirrors setup/lib/common.sh read_packages).
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
echo "== Checking packages.txt markers =="
|
echo "== Checking packages.txt markers =="
|
||||||
for pkgdir in term basic utils hypr; do
|
for pkgdir in term basic utils hypr kreation; do
|
||||||
# term/ and hypr/ keep packages.txt + setup.sh inside scripts/ so stowing
|
# Setup scripts + package lists live in setup/ (outside the stow
|
||||||
# the top-level dir only creates .config/ symlinks.
|
# packages), sharing one parser in setup/lib/common.sh.
|
||||||
if [[ "$pkgdir" == "term" || "$pkgdir" == "hypr" ]]; then
|
PKG_FILE="setup/$pkgdir/packages.txt"
|
||||||
PKG_FILE="$pkgdir/scripts/packages.txt"
|
SETUP_FILE="setup/$pkgdir/setup.sh"
|
||||||
SETUP_FILE="$pkgdir/scripts/setup.sh"
|
|
||||||
else
|
|
||||||
PKG_FILE="$pkgdir/packages.txt"
|
|
||||||
SETUP_FILE="$pkgdir/setup.sh"
|
|
||||||
fi
|
|
||||||
if ! [[ -f "$PKG_FILE" ]]; then
|
if ! [[ -f "$PKG_FILE" ]]; then
|
||||||
say_fail "$PKG_FILE missing"
|
say_fail "$PKG_FILE missing"
|
||||||
continue
|
continue
|
||||||
@@ -99,12 +96,15 @@ for pkgdir in term basic utils hypr; do
|
|||||||
else
|
else
|
||||||
say_fail "$PKG_FILE missing @pacman marker"
|
say_fail "$PKG_FILE missing @pacman marker"
|
||||||
fi
|
fi
|
||||||
# every @aur/@npm marker must be matched by a real consumer in setup.sh
|
# every @aur/@npm marker must be matched by a real consumer: either the
|
||||||
|
# thin setup.sh itself or the shared setup/lib/common.sh it sources.
|
||||||
for marker in '@aur' '@npm'; do
|
for marker in '@aur' '@npm'; do
|
||||||
if grep -q "^$marker" "$PKG_FILE"; then
|
if grep -q "^$marker" "$PKG_FILE"; then
|
||||||
grep -q "$marker" "$SETUP_FILE" \
|
if grep -q "$marker" "$SETUP_FILE" || grep -q "$marker" "setup/lib/common.sh"; then
|
||||||
&& say_pass "$PKG_FILE $marker handled by $SETUP_FILE" \
|
say_pass "$PKG_FILE $marker handled by $SETUP_FILE (via common.sh)"
|
||||||
|| say_fail "$PKG_FILE uses $marker but $SETUP_FILE does not handle it"
|
else
|
||||||
|
say_fail "$PKG_FILE uses $marker but neither $SETUP_FILE nor setup/lib/common.sh handles it"
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
say_pass "$PKG_FILE has no $marker section"
|
say_pass "$PKG_FILE has no $marker section"
|
||||||
fi
|
fi
|
||||||
@@ -112,12 +112,87 @@ for pkgdir in term basic utils hypr; do
|
|||||||
done
|
done
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# 5. Makefile <-> install script name consistency.
|
# 5. Keep Caelestia on the upstream AUR Quickshell runtime.
|
||||||
# Catches typos such as `_install_skripte_install_basic_pcks.sh`
|
# ---------------------------------------------------------------------------
|
||||||
|
echo "== Checking Quickshell package selection =="
|
||||||
|
PACKAGE_FILES=()
|
||||||
|
for pkgdir in term basic utils hypr kreation; do
|
||||||
|
PACKAGE_FILES+=("setup/$pkgdir/packages.txt")
|
||||||
|
done
|
||||||
|
|
||||||
|
has_package() {
|
||||||
|
local target="$1" file
|
||||||
|
shift
|
||||||
|
for file in "$@"; do
|
||||||
|
if awk -v target="$target" '
|
||||||
|
{
|
||||||
|
sub(/#.*/, "")
|
||||||
|
gsub(/^[[:space:]]+|[[:space:]]+$/, "")
|
||||||
|
sub(/^[^/]+\//, "")
|
||||||
|
}
|
||||||
|
$0 == target { found = 1 }
|
||||||
|
END { exit(found ? 0 : 1) }
|
||||||
|
' "$file"; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
has_aur_package() {
|
||||||
|
local target="$1" file
|
||||||
|
shift
|
||||||
|
for file in "$@"; do
|
||||||
|
if awk -v target="$target" '
|
||||||
|
{
|
||||||
|
sub(/#.*/, "")
|
||||||
|
gsub(/^[[:space:]]+|[[:space:]]+$/, "")
|
||||||
|
}
|
||||||
|
$0 == "@aur" { in_aur = 1; next }
|
||||||
|
/^@/ { in_aur = 0; next }
|
||||||
|
in_aur && $0 == target { found = 1 }
|
||||||
|
END { exit(found ? 0 : 1) }
|
||||||
|
' "$file"; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
if has_package quickshell "${PACKAGE_FILES[@]}" && has_package quickshell-git "${PACKAGE_FILES[@]}"; then
|
||||||
|
say_fail "package lists declare both quickshell and quickshell-git"
|
||||||
|
else
|
||||||
|
say_pass "no mutually exclusive quickshell packages declared"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if has_package noctalia-qs "${PACKAGE_FILES[@]}"; then
|
||||||
|
say_fail "package lists must not install noctalia-qs for Caelestia"
|
||||||
|
else
|
||||||
|
say_pass "incompatible noctalia-qs provider is not declared"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if has_aur_package aur/quickshell-git "${PACKAGE_FILES[@]}"; then
|
||||||
|
say_pass "quickshell-git is explicitly selected from the AUR"
|
||||||
|
else
|
||||||
|
say_fail "quickshell-git must use the explicit aur/quickshell-git target"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if awk '
|
||||||
|
/^[[:space:]]*yay[[:space:]]+-S/ && /--aur/ && /--needed/ { found = 1 }
|
||||||
|
END { exit(found ? 0 : 1) }
|
||||||
|
' setup/lib/common.sh; then
|
||||||
|
say_pass "AUR package installation uses yay --aur mode"
|
||||||
|
else
|
||||||
|
say_fail "AUR package installation does not use yay --aur mode"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# 6. Makefile <-> setup script name consistency.
|
||||||
|
# Catches typos such as `setup/basic/setuo.sh`
|
||||||
# (missing '/') in Makefile targets.
|
# (missing '/') in Makefile targets.
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
echo "== Checking Makefile references install scripts that exist =="
|
echo "== Checking Makefile references setup scripts that exist =="
|
||||||
# Pull out every `*_install_*_pcks.sh` token mentioned in the Makefile.
|
# Pull out every `setup/...sh` token mentioned in the Makefile.
|
||||||
while IFS= read -r tok; do
|
while IFS= read -r tok; do
|
||||||
[[ -z "$tok" ]] && continue
|
[[ -z "$tok" ]] && continue
|
||||||
if [[ -e "$REPO_ROOT/$tok" ]]; then
|
if [[ -e "$REPO_ROOT/$tok" ]]; then
|
||||||
@@ -125,10 +200,10 @@ while IFS= read -r tok; do
|
|||||||
else
|
else
|
||||||
say_fail "Makefile references missing script: $tok"
|
say_fail "Makefile references missing script: $tok"
|
||||||
fi
|
fi
|
||||||
done < <(grep -P '^\t' Makefile | grep -oE '[_A-Za-z0-9/-]*install_[A-Za-z0-9_-]*\.sh' | sort -u)
|
done < <(grep -P '^\t' Makefile | grep -oE 'setup/[_A-Za-z0-9./-]+\.sh' | sort -u)
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# 6. Makefile <-> stow package name consistency.
|
# 7. Makefile <-> stow package name consistency.
|
||||||
# Catches bugs such as `stow nvim` when the actual package dir is `term/`.
|
# Catches bugs such as `stow nvim` when the actual package dir is `term/`.
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
echo "== Checking Makefile stow targets reference real package dirs =="
|
echo "== Checking Makefile stow targets reference real package dirs =="
|
||||||
@@ -158,7 +233,7 @@ while IFS= read -r pkg; do
|
|||||||
done < <(grep -P '^\t' Makefile | grep -E '\bstow\b' | awk '{print $NF}' | sort -u)
|
done < <(grep -P '^\t' Makefile | grep -E '\bstow\b' | awk '{print $NF}' | sort -u)
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# 7. Central theme drift guard: no hardcoded theme colors outside
|
# 8. Central theme drift guard: no hardcoded theme colors outside
|
||||||
# basic/.config/themes (plus declared mirrors). See
|
# basic/.config/themes (plus declared mirrors). See
|
||||||
# basic/.config/themes/scripts/sync-theme.sh.
|
# basic/.config/themes/scripts/sync-theme.sh.
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|||||||
+1
-1
@@ -55,7 +55,7 @@ trap cleanup EXIT
|
|||||||
|
|
||||||
for pkg in "${PACKAGES[@]}"; do
|
for pkg in "${PACKAGES[@]}"; do
|
||||||
echo "--- stow --simulate: $pkg ---"
|
echo "--- stow --simulate: $pkg ---"
|
||||||
if stow --simulate --verbose=1 --ignore='.stow-ignore' --ignore='scripts' --ignore='\.config/tmux/plugins' --dir="$REPO_ROOT" --target="$REPO_ROOT" "$pkg" >/dev/null 2>"$ERR_LOG"; then
|
if stow --simulate --verbose=1 --dir="$REPO_ROOT" --target="$REPO_ROOT" "$pkg" >/dev/null 2>"$ERR_LOG"; then
|
||||||
echo "ok: stow --simulate '$pkg' resolved without conflicts"
|
echo "ok: stow --simulate '$pkg' resolved without conflicts"
|
||||||
else
|
else
|
||||||
echo "FAIL: stow --simulate '$pkg'"
|
echo "FAIL: stow --simulate '$pkg'"
|
||||||
|
|||||||
@@ -56,15 +56,9 @@ declare -A BINS=(
|
|||||||
[locate]="locate --version"
|
[locate]="locate --version"
|
||||||
# Hyprland compositor & ecosystem
|
# Hyprland compositor & ecosystem
|
||||||
[hyprland]="hyprctl version"
|
[hyprland]="hyprctl version"
|
||||||
[waybar]="waybar --version"
|
|
||||||
[hyprlock]="hyprlock --version"
|
|
||||||
[hypridle]="hypridle --version"
|
|
||||||
[hyprpaper]="hyprpaper -v"
|
|
||||||
[rofi]="rofi -v"
|
|
||||||
[swaync]="swaync --version"
|
|
||||||
[nwg-drawer]="nwg-drawer --version"
|
|
||||||
[wl-clipboard]="wl-copy --version"
|
[wl-clipboard]="wl-copy --version"
|
||||||
[hyprshot]="hyprshot --version"
|
[hyprshot]="hyprshot --version"
|
||||||
|
[brightnessctl]="brightnessctl --version"
|
||||||
[wpaperd]="wpaperd --version"
|
[wpaperd]="wpaperd --version"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -1,74 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
||||||
PACKAGES_FILE="$SCRIPT_DIR/packages.txt"
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# Read packages.txt, split into pacman / aur / npm sections.
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
read_packages() {
|
|
||||||
local section="pacman"
|
|
||||||
local current
|
|
||||||
current=""
|
|
||||||
while IFS= read -r line || [[ -n "$line" ]]; do
|
|
||||||
current="${line%%#*}"
|
|
||||||
current="${current##*( )}"
|
|
||||||
current="${current%%*( )}"
|
|
||||||
[[ -z "$current" ]] && continue
|
|
||||||
case "$current" in
|
|
||||||
@pacman) section="pacman" ;;
|
|
||||||
@aur) section="aur" ;;
|
|
||||||
@npm) section="npm" ;;
|
|
||||||
*)
|
|
||||||
case "$section" in
|
|
||||||
pacman) pacman_pkgs+=("$current") ;;
|
|
||||||
aur) aur_pkgs+=("$current") ;;
|
|
||||||
npm) npm_pkgs+=("$current") ;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done < "$PACKAGES_FILE"
|
|
||||||
}
|
|
||||||
|
|
||||||
declare -a pacman_pkgs=() aur_pkgs=() npm_pkgs=()
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# Install sections.
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
install_pacman() {
|
|
||||||
if ((${#pacman_pkgs[@]})); then
|
|
||||||
echo "==> Installiere Pacman-Pakete: ${pacman_pkgs[*]}"
|
|
||||||
yay -S --needed "${pacman_pkgs[@]}"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
install_aur() {
|
|
||||||
if ((${#aur_pkgs[@]})); then
|
|
||||||
echo "==> Installiere AUR-Pakete: ${aur_pkgs[*]}"
|
|
||||||
yay -S --needed "${aur_pkgs[@]}"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
install_npm() {
|
|
||||||
if ((${#npm_pkgs[@]})); then
|
|
||||||
echo "==> Installiere globale npm-Pakete: ${npm_pkgs[*]}"
|
|
||||||
npm install -g "${npm_pkgs[@]}"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# Main
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
main() {
|
|
||||||
echo "==> Lese Paketliste: $PACKAGES_FILE"
|
|
||||||
read_packages
|
|
||||||
|
|
||||||
install_pacman
|
|
||||||
install_aur
|
|
||||||
install_npm
|
|
||||||
|
|
||||||
echo "Fertig. Standalone Utilities sind eingerichtet."
|
|
||||||
}
|
|
||||||
|
|
||||||
main
|
|
||||||
Reference in New Issue
Block a user