Compare commits

...

2 Commits

Author SHA1 Message Date
2888384d29 update bezier curve 2026-03-06 15:52:33 +00:00
ff0f717e75 updated keybindings 2026-03-06 15:52:25 +00:00
2 changed files with 76 additions and 70 deletions

134
README.md
View File

@@ -2,6 +2,12 @@
Dotfiles and scripts for Arch Linux (Manjaro), targeting Wayland (Hyprland / Sway) with an i3 fallback. Dotfiles and scripts for Arch Linux (Manjaro), targeting Wayland (Hyprland / Sway) with an i3 fallback.
## IMPORTANT TODO
Inside `scripts/wofi/styles.css`, I have the colour css set to `/home/adamf/scripts/wofi/colors.css`, which is clearly ugly and not nice but it was quick to do.
Wofi is called in hypr/hyprland.conf and sway/swayconfig with the command `wofi --style /home/adamf/scripts/wofi/styles.css`. This is also not ideal but I couldn't find a way to get it to work with a relative path. I'm unsure when hyprland working directory is.
## Setup ## Setup
```bash ```bash
@@ -108,65 +114,65 @@ All window managers and tmux use vim-style <kbd>h</kbd><kbd>j</kbd><kbd>k</kbd><
### Shared across WMs ### Shared across WMs
| Key | Action | | Key | Action |
| --- | --- | | ------------------------ | ------------------------------------------ |
| `$mod + Return` | Terminal (kitty) | | `$mod + Return` | Terminal (kitty) |
| `$mod + Shift + q` | Kill window | | `$mod + Shift + q` | Kill window |
| `$mod + d` | Launcher (wofi / dmenu) | | `$mod + d` | Launcher (wofi / dmenu) |
| `$mod + h/j/k/l` | Focus left/down/up/right | | `$mod + h/j/k/l` | Focus left/down/up/right |
| `$mod + Shift + h/j/k/l` | Move window left/down/up/right | | `$mod + Shift + h/j/k/l` | Move window left/down/up/right |
| `$mod + g` / `$mod + v` | Split horizontal / vertical | | `$mod + g` / `$mod + v` | Split horizontal / vertical |
| `$mod + f` | Fullscreen | | `$mod + f` | Fullscreen |
| `$mod + Shift + Space` | Toggle floating | | `$mod + Shift + Space` | Toggle floating |
| `$mod + 1-8` | Switch workspace | | `$mod + 1-8` | Switch workspace |
| `$mod + Shift + 1-8` | Move window to workspace | | `$mod + Shift + 1-8` | Move window to workspace |
| `$mod + Ctrl + 1-8` | Move window silently | | `$mod + Ctrl + 1-8` | Move window silently |
| `$mod + -` | Scratchpad show | | `$mod + -` | Scratchpad show |
| `$mod + Shift + -` | Move to scratchpad | | `$mod + Shift + -` | Move to scratchpad |
| `$mod + b` | Previous workspace | | `$mod + b` | Previous workspace |
| `$mod + 9` | Lock screen | | `$mod + 9` | Lock screen |
| `$mod + 0` | System menu (lock/suspend/reboot/shutdown) | | `$mod + 0` | System menu (lock/suspend/reboot/shutdown) |
| `$mod + r` | Resize mode (hjkl) | | `$mod + r` | Resize mode (hjkl) |
| `$mod + m` | Toggle bar | | `$mod + m` | Toggle bar |
| `$mod + Shift + c` | Reload config | | `$mod + Shift + c` | Reload config |
| `$mod + Ctrl + m` | PulseAudio control | | `$mod + Ctrl + m` | PulseAudio control |
| `$mod + F2` | Browser (Waterfox) | | `$mod + F2` | Browser (Waterfox) |
| `$mod + F3` | File manager (ranger) | | `$mod + F3` | File manager (ranger) |
| `$mod + F5` | Music (mocp) | | `$mod + F5` | Music (mocp) |
| `Print` | Screenshot | | `Print` | Screenshot |
### System menu (`$mod + 0`) ### System menu (`$mod + 0`)
| Key | Action | | Key | Action |
| --- | --- | | ---------------- | ------------ |
| `l` | Lock | | `l` | Lock |
| `s` | Suspend | | `s` | Suspend |
| `h` | Hibernate | | `h` | Hibernate |
| `r` | Reboot | | `r` | Reboot |
| `Shift + s` | Power off | | `Shift + s` | Power off |
| `e` | Exit session | | `e` | Exit session |
| `Return` / `Esc` | Cancel | | `Return` / `Esc` | Cancel |
### tmux ### tmux
Prefix is <kbd>Ctrl</kbd> + <kbd>f</kbd>. Prefix is <kbd>Ctrl</kbd> + <kbd>f</kbd>.
| Key | Action | | Key | Action |
| --- | --- | | ------------------------- | --------------------------- |
| `Prefix + g` | Split horizontal | | `Prefix + g` | Split horizontal |
| `Prefix + v` | Split vertical | | `Prefix + v` | Split vertical |
| `Prefix + h/j/k/l` | Select pane | | `Prefix + h/j/k/l` | Select pane |
| `Prefix + Ctrl + H/J/K/L` | Resize pane | | `Prefix + Ctrl + H/J/K/L` | Resize pane |
| `Prefix + 1-0` | Select window 1-10 | | `Prefix + 1-0` | Select window 1-10 |
| `Alt + 1-0` | Create window 1-10 | | `Alt + 1-0` | Create window 1-10 |
| `Prefix + !/@ etc.` | Move pane to window 1-10 | | `Prefix + !/@ etc.` | Move pane to window 1-10 |
| `Prefix + w` | Choose window | | `Prefix + w` | Choose window |
| `Prefix + q` | Kill pane | | `Prefix + q` | Kill pane |
| `Prefix + [` / `]` | Copy mode / Paste | | `Prefix + [` / `]` | Copy mode / Paste |
| `Prefix + r` | Refresh | | `Prefix + r` | Refresh |
| `Prefix + R` | Reload config | | `Prefix + R` | Reload config |
| `Prefix + Ctrl + s` | Save session (resurrect) | | `Prefix + Ctrl + s` | Save session (resurrect) |
| `Prefix + Ctrl + r` | Restore session (resurrect) | | `Prefix + Ctrl + r` | Restore session (resurrect) |
## Colorscheme ## Colorscheme
@@ -189,21 +195,21 @@ killall waybar && waybar & # Waybar
Generated files (committed so configs work after a fresh clone): Generated files (committed so configs work after a fresh clone):
| File | Format | Used by | | File | Format | Used by |
| --- | --- | --- | | ------------------- | --------------------------- | ---------------------------- |
| `hypr/colors.conf` | `$color_name = rgb(HEXVAL)` | `hyprland.conf` (source) | | `hypr/colors.conf` | `$color_name = rgb(HEXVAL)` | `hyprland.conf` (source) |
| `sway/colors.conf` | `set $color_name #HEXVAL` | `swayconfig` (include) | | `sway/colors.conf` | `set $color_name #HEXVAL` | `swayconfig` (include) |
| `i3/colors.conf` | `set $color_name #HEXVAL` | `i3config` (include) | | `i3/colors.conf` | `set $color_name #HEXVAL` | `i3config` (include) |
| `waybar/colors.css` | CSS custom properties | `waybar/style.css` (@import) | | `waybar/colors.css` | CSS custom properties | `waybar/style.css` (@import) |
| `wofi/colors.css` | CSS custom properties | `wofi/style.css` (@import) | | `wofi/colors.css` | CSS custom properties | `wofi/style.css` (@import) |
## Scripts ## Scripts
All in `sh/`, added to `$PATH` via the shell config above. All in `sh/`, added to `$PATH` via the shell config above.
| Script | Description | | Script | Description |
| --- | --- | | ------------------ | --------------------------------------------- |
| `sharefile <file>` | Upload a file to 0x0.st | | `sharefile <file>` | Upload a file to 0x0.st |
| `getfile <id>` | Download a file from 0x0.st | | `getfile <id>` | Download a file from 0x0.st |
| `waybar-history` | Stream the last zsh history entry to waybar | | `waybar-history` | Stream the last zsh history entry to waybar |
| `gen-colors` | Regenerate color fragments from `colors.conf` | | `gen-colors` | Regenerate color fragments from `colors.conf` |

View File

@@ -88,14 +88,14 @@ decoration {
animations { animations {
enabled = true enabled = true
bezier = myBezier, 0.05, 0.9, 0.1, 1.05 bezier = myBezier, 0.645, 0.045, 0.355, 1.000
animation = windows, 1, 7, myBezier animation = windows, 1, 7, myBezier
animation = windowsOut, 1, 7, default, popin 80% animation = windowsOut, 1, 7, myBezier
animation = border, 1, 10, default animation = border, 1, 10, myBezier
animation = borderangle, 1, 8, default animation = borderangle, 1, 8, myBezier
animation = fade, 1, 7, default animation = fade, 1, 7, myBezier
animation = workspaces, 1, 6, default animation = workspaces, 1, 6, myBezier
} }
master { master {