From 9344f7ec3b0d5edb4d6189e48040c6fef3e6345d Mon Sep 17 00:00:00 2001
From: Tobias Reisinger <tobias@msrg.cc>
Date: Sat, 23 Dec 2023 17:57:52 +0100
Subject: [PATCH] Update configs
Fix call to $EDITOR (and switch sh to bash) in edit
Fix waybar mode (remove to fix layer)
Add hyprland media keys
---
.bin/edit | 14 ++++----------
.config/aliasrc | 3 ++-
.config/home-manager/common.nix | 2 +-
.config/hypr/binds.conf | 5 +++++
.config/waybar/config | 1 -
5 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/.bin/edit b/.bin/edit
index cd31b73..cbe28df 100755
--- a/.bin/edit
+++ b/.bin/edit
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
set -e
@@ -69,19 +69,13 @@ _prepare_for_edit() {
_pre_checks
# Prepare all files for editing and collect the names of the edit files
-all_edit_files=""
+all_edit_files=()
for arg in "$@"; do
edit_file=$(_prepare_for_edit "$arg")
- all_edit_files="$all_edit_files $edit_file"
+ all_edit_files+=("$edit_file")
done
-# Use a subshell to avoid overwriting $@
-(
- for file in $all_edit_files; do
- set -- "$file" "$@"
- done
- $EDITOR "$@"
-)
+$EDITOR "${all_edit_files[@]}"
# Copy all edit files back
for arg in "$@"; do
diff --git a/.config/aliasrc b/.config/aliasrc
index b15fdca..2f5813f 100644
--- a/.config/aliasrc
+++ b/.config/aliasrc
@@ -17,7 +17,7 @@ alias clip='xclip -selection clipboard'
alias cp='cp -iv'
alias dcu='docker compose up -d'
-alias dcul='docker compose up -d && docker compose logs -tf'
+alias dcul='docker compose up -d --force-recreate && docker compose logs -tf'
alias dcp='docker compose pull'
alias df='df -h'
alias dns-flush='sudo systemctl restart systemd-resolved.service && sudo systemd-resolve --flush-caches && sudo resolvectl flush-caches'
@@ -63,6 +63,7 @@ alias sail='bash vendor/bin/sail'
alias sl='ls'
alias sudo='sudo '
+alias taketemp='take $(mktemp -d)'
alias tokei='tokei --hidden'
alias watch='watch -c'
diff --git a/.config/home-manager/common.nix b/.config/home-manager/common.nix
index b165be9..42c5a1d 100644
--- a/.config/home-manager/common.nix
+++ b/.config/home-manager/common.nix
@@ -7,7 +7,7 @@
bat # cat-alternative
direnv # tool to load custom environments
docker-credential-helpers
- dogdns # dns client
+ doggo # dns client
eza # ls-alternative
faas-cli # cli for openfaas
fzf # fuzzy finder
diff --git a/.config/hypr/binds.conf b/.config/hypr/binds.conf
index 0139335..74f74df 100644
--- a/.config/hypr/binds.conf
+++ b/.config/hypr/binds.conf
@@ -16,6 +16,11 @@ bind = $main_mod CTRL, Print, exec, screenshot --no-upload
bind = $main_mod SHIFT, R, exec, autostart-manage run-wayland
+# Binds for Media keys
+bindl = , XF86AudioPlay, exec, playerctl play-pause
+bindl = , XF86AudioPause, exec, playerctl pause
+bindl = , XF86AudioNext, exec, playerctl next
+bindl = , XF86AudioPrev, exec, playerctl prev
# Move focus with mainMod + hjkl keys
bind = $main_mod, h, movefocus, l
diff --git a/.config/waybar/config b/.config/waybar/config
index d96ef05..e215c46 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -3,7 +3,6 @@
"position": "bottom",
"height": 24,
"spacing": 6,
- "mode": "dock",
"modules-left": [
"hyprland/workspaces"
],