Compare commits

..

No commits in common. "e5412509cb8a90e76914a9fa47f03c40214e5790" and "3cabb1a70056cf29f8522b2dc836054972c0a876" have entirely different histories.

3 changed files with 9 additions and 30 deletions

18
flake.lock generated
View File

@ -162,11 +162,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711868868, "lastModified": 1711625603,
"narHash": "sha256-QpZanlbVu6Gb2K96u3vgu0F2BvZD74+fOsIFWcYEXoY=", "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "30f2ec39519f4f5a8a96af808c439e730c15aeab", "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -232,11 +232,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1711819797, "lastModified": 1711233294,
"narHash": "sha256-tNeB6emxj74Y6ctwmsjtMlzUMn458sBmwnD35U5KIM4=", "narHash": "sha256-eEu5y4J145BYDw9o/YEmeJyqh8blgnZwuz9k234zuWc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2b4e3ca0091049c6fbb4908c66b05b77eaef9f0c", "rev": "ac6bdf6181666ebb4f90dd20f31e2fa66ede6b68",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -356,11 +356,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1711855048, "lastModified": 1711249319,
"narHash": "sha256-HxegAPnQJSC4cbEbF4Iq3YTlFHZKLiNTk8147EbLdGg=", "narHash": "sha256-N+Pp3/8H+rd7cO71VNV/ovV/Kwt+XNeUHNhsmyTabdM=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "99b1e37f9fc0960d064a7862eb7adfb92e64fa10", "rev": "405987a66cce9a4a82f321f11b205982a7127c88",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -19,22 +19,6 @@
PROXY_PORT="1337" PROXY_PORT="1337"
${pkgs.openssh}/bin/ssh -D "$PROXY_PORT" -q -N "$@" ${pkgs.openssh}/bin/ssh -D "$PROXY_PORT" -q -N "$@"
''; '';
wrap_sh = let
bubblewrap = pkgs.callPackage ../packages/bubblewrap/default.nix {};
in
pkgs.writeShellScriptBin "wrap.sh" ''
if ${pkgs.coreutils-full}/bin/test $# -ne 1; then
echo "Usage: $0 <directory>"
exit
fi
FULL_PATH=$(${pkgs.coreutils-full}/bin/realpath "$1")
BUBBLEWRAP_DIR="$1" ${bubblewrap}/bin/bwrap \
--bind / / \
--dev /dev \
--overlay-src "$FULL_PATH" \
--tmp-overlay "$FULL_PATH" \
"$SHELL"
'';
in { in {
home.packages = with pkgs; home.packages = with pkgs;
[ [
@ -132,7 +116,6 @@ in {
chromium_discord chromium_discord
chromium_teams chromium_teams
ssh_proxy ssh_proxy
wrap_sh
] ]
++ [ ++ [
inputs.swaysw.packages.${system}.swaysw inputs.swaysw.packages.${system}.swaysw

View File

@ -103,10 +103,6 @@
TMUX_EXE="${pkgs.tmux}/bin/tmux" TMUX_EXE="${pkgs.tmux}/bin/tmux"
systemd-run --scope --user $TMUX_EXE attach-session -t $USER || systemd-run --scope --user $TMUX_EXE new-session -s $USER systemd-run --scope --user $TMUX_EXE attach-session -t $USER || systemd-run --scope --user $TMUX_EXE new-session -s $USER
fi fi
if [[ -n "$BUBBLEWRAP_DIR" ]]; then
RPS1="{{$BUBBLEWRAP_DIR}}"
fi
''; '';
}; };
} }