refactoring

- overlays/{linux,wine-osu}.nix -> packages/{linux-lava,wine-osu}/
- overlays/misc/ -> overlays/patches/
- overlays/misc/0001...patch -> packages/linux-lava/si...patch
- overlays/misc/wine/ -> packages/wine-osu/patches/
- flake.nix:
  - overlays are dynamically read from overlays/
  - define custom packages separately
- packages/*
  - now imported using callPackage
This commit is contained in:
LavaDesu 2021-06-26 23:48:15 +07:00
parent 268a85c2ef
commit d9b73bfd43
Signed by: cilly
GPG key ID: 6500251E087653C9
15 changed files with 210 additions and 200 deletions

View file

@ -0,0 +1,26 @@
diff --git a/startx.cpp b/startx.cpp
index 125c398..296b29f 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -47,10 +47,10 @@ XCOMM so export the new PATH just in case the user changes the shell
export PATH
#endif
-userclientrc=$HOME/.xinitrc
+userclientrc="${XINITRC:-$HOME/.xinitrc}"
sysclientrc=XINITDIR/xinitrc
-userserverrc=$HOME/.xserverrc
+userserverrc="${XSERVERRC:-$HOME/.xserverrc}"
sysserverrc=XINITDIR/xserverrc
defaultclient=XTERM
defaultserver=XSERVER
@@ -270,7 +270,7 @@ if [ x"$enable_xauth" = x1 ] ; then
dummy=0
XCOMM create a file with auth information for the server. ':0' is a dummy.
- xserverauthfile=$HOME/.serverauth.$$
+ xserverauthfile=$XAUTHORITY
trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM
xauth -q -f "$xserverauthfile" << EOF
add :$dummy . $mcookie

View file

@ -0,0 +1,45 @@
diff --git a/transcrypt b/transcrypt
index 610b94f..7cc5035 100755
--- a/transcrypt
+++ b/transcrypt
@@ -282,6 +282,7 @@ save_helper_scripts() {
cat <<-'EOF' >"${GIT_DIR}/crypt/clean"
#!/usr/bin/env bash
+ PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH"
filename=$1
# ignore empty files
if [[ -s $filename ]]; then
@@ -304,6 +305,7 @@ save_helper_scripts() {
cat <<-'EOF' >"${GIT_DIR}/crypt/smudge"
#!/usr/bin/env bash
+ PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH"
tempfile=$(mktemp 2>/dev/null || mktemp -t tmp)
trap 'rm -f "$tempfile"' EXIT
cipher=$(git config --get --local transcrypt.cipher)
@@ -313,6 +315,7 @@ save_helper_scripts() {
cat <<-'EOF' >"${GIT_DIR}/crypt/textconv"
#!/usr/bin/env bash
+ PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH"
filename=$1
# ignore empty files
if [[ -s $filename ]]; then
@@ -324,6 +327,7 @@ save_helper_scripts() {
cat <<-'EOF' >"${GIT_DIR}/crypt/merge"
#!/usr/bin/env bash
+ PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH"
# Look up name of local branch/ref to which changes are being merged
OURS_LABEL=$(git rev-parse --abbrev-ref HEAD)
@@ -459,7 +463,7 @@ save_configuration() {
git config merge.crypt.name 'Merge transcrypt secret files'
# add a git alias for listing encrypted files
- git config alias.ls-crypt "!git -c core.quotePath=false ls-files | git -c core.quotePath=false check-attr --stdin filter | awk 'BEGIN { FS = \":\" }; /crypt$/{ print \$1 }'"
+ git config alias.ls-crypt "!PATH=\"\$(transcrypt-depspathprefix 2>/dev/null)\$PATH\"; git -c core.quotePath=false ls-files | git -c core.quotePath=false check-attr --stdin filter | awk 'BEGIN { FS = \":\" }; /crypt$/{ print \$1 }'"
}
# display the current configuration settings