diff --git a/overlays/default.nix b/overlays/default.nix index d1d372f..a2c0f78 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,10 +1,5 @@ builtins.map (path: import path) [ ./discord.nix ./material-icons.nix - ./mps-youtube.nix - ./picom.nix - ./polybar.nix - ./transcrypt.nix - ./winetricks.nix ./xinit.nix ] diff --git a/overlays/mps-youtube.nix b/overlays/mps-youtube.nix deleted file mode 100644 index c1e5f87..0000000 --- a/overlays/mps-youtube.nix +++ /dev/null @@ -1,10 +0,0 @@ -self: super: { - mps-youtube = super.mps-youtube.overrideAttrs (old: { - src = super.fetchFromGitHub { - owner = "louisabraham"; - repo = "mps-youtube"; - rev = "234bc691f43f6df88d831409b2887fda45270636"; - sha256 = "14gsiacd05fsqb62zfapdll8dn1hbfi9vvh4wvk41qbxrla4p7d7"; - }; - }); -} diff --git a/overlays/patches/transcrypt.patch b/overlays/patches/transcrypt.patch deleted file mode 100644 index aec80dc..0000000 --- a/overlays/patches/transcrypt.patch +++ /dev/null @@ -1,45 +0,0 @@ -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 diff --git a/overlays/picom.nix b/overlays/picom.nix deleted file mode 100644 index 8778aea..0000000 --- a/overlays/picom.nix +++ /dev/null @@ -1,15 +0,0 @@ -self: super: { - picom = super.picom.overrideAttrs (old: { - src = super.fetchFromGitHub { - repo = "picom"; - - owner = "ibhagwan"; - rev = "60eb00ce1b52aee46d343481d0530d5013ab850b"; - sha256 = "1m17znhl42sa6ry31yiy05j5ql6razajzd6s3k2wz4c63rc2fd1w"; - - # owner = "jonaburg"; - # rev = "a8445684fe18946604848efb73ace9457b29bf80"; - # sha256 = "154s67p3lxdv9is3lnc32j48p7v9n18ga1j8ln1dxcnb38c19rj7"; - }; - }); -} diff --git a/overlays/polybar.nix b/overlays/polybar.nix deleted file mode 100644 index 17b201c..0000000 --- a/overlays/polybar.nix +++ /dev/null @@ -1,3 +0,0 @@ -self: super: { - polybar = super.polybar.override { i3Support = true; }; -} diff --git a/overlays/transcrypt.nix b/overlays/transcrypt.nix deleted file mode 100644 index ee1c4d6..0000000 --- a/overlays/transcrypt.nix +++ /dev/null @@ -1,13 +0,0 @@ -self: super: { - transcrypt = super.transcrypt.overrideAttrs (old: rec { - version = "2.1.0"; - - patches = [ ./patches/transcrypt.patch ]; - src = super.fetchFromGitHub { - owner = "elasticdog"; - repo = "transcrypt"; - rev = "v${version}"; - sha256 = "0bpz1hazbhfb6pqi68x55kq6a31bgh6vwij836slmi4jqiwvnh5a"; - }; - }); -} diff --git a/overlays/winetricks.nix b/overlays/winetricks.nix deleted file mode 100644 index b6dcefa..0000000 --- a/overlays/winetricks.nix +++ /dev/null @@ -1,11 +0,0 @@ -self: super: { - winetricks = super.winetricks.overrideAttrs (old: rec { - name = "winetricks-20210528-073e2db"; - src = super.fetchFromGitHub { - repo = "winetricks"; - owner = "Winetricks"; - rev = "073e2db522e7db56f83fab2338d831ac716264cb"; - sha256 = "1fic4wzc3qyw5bki4zx0h9g8yyhh8db806pwm8mz8qv4n7syk4dd"; - }; - }); -}