diff --git a/home/home.nix b/home/home.nix index 75cab7a..55553b6 100644 --- a/home/home.nix +++ b/home/home.nix @@ -32,15 +32,15 @@ ]; }; - xdg.desktopEntries = { - maestral = { - name = "Maestral"; - icon = "maestral"; - exec = - ''sh -c "QT_QPA_PLATFORM=xcb ${pkgs.maestral-gui}/bin/maestral_qt"''; - type = "Application"; - }; - }; + #xdg.desktopEntries = { + # maestral = { + # name = "Maestral"; + # icon = "maestral"; + # exec = + # ''sh -c "QT_QPA_PLATFORM=xcb ${pkgs.maestral-gui}/bin/maestral_qt"''; + # type = "Application"; + # }; + #}; home.packages = (with pkgs; [ git @@ -52,6 +52,7 @@ #(callPackage ../derivations/nu_plugin_dns.nix { }) xorg.xwininfo jq + dropbox ]) ++ (with unstable; [ xfce.thunar rustdesk-flutter diff --git a/home/scripts.nix b/home/scripts.nix index a31a6c3..0d057e5 100644 --- a/home/scripts.nix +++ b/home/scripts.nix @@ -101,7 +101,7 @@ let autostart = pkgs.writeScriptBin "autostart" '' #!/usr/bin/env bash ${pkgs.coreutils}/bin/sleep 5 - ${pkgs.gtk3}/bin/gtk-launch maestral.desktop + ${pkgs.gtk3}/bin/gtk-launch dropbox.desktop ${pkgs.gtk3}/bin/gtk-launch org.keepassxc.KeePassXC.desktop exit 0 ''; diff --git a/hosts/dlaptop/age.nix b/hosts/dlaptop/age.nix index 35c9c2e..0e062e4 100644 --- a/hosts/dlaptop/age.nix +++ b/hosts/dlaptop/age.nix @@ -4,6 +4,7 @@ age.secrets = { singbox-aus = { file = ../../secrets/singbox-aus.age; owner = "socks"; group = "socks"; }; qqq = { file = ../../secrets/qqq.age; owner = "delta"; group = "users"; }; + cloudflared = { file = ../../secrets/cloudflared.age; owner = "cloudflared"; group = "cloudflared"; }; }; age.identityPaths = [ "/home/delta/.ssh/id_ed25519" ]; diff --git a/hosts/dlaptop/configuration.nix b/hosts/dlaptop/configuration.nix index 6b35e4e..fdd4017 100644 --- a/hosts/dlaptop/configuration.nix +++ b/hosts/dlaptop/configuration.nix @@ -21,6 +21,10 @@ # localStorageDir = ../../secrets/rekeyed/${config.networking.hostName}; # }; + sops = { + age.sshKeyPaths = [ "/home/delta/.ssh/id_ed25519.pub" ]; + }; + hardware.opengl = { @@ -105,6 +109,17 @@ }; }; + services.cloudflared.enable = false; + services.cloudflared.tunnels = { + "dlaptop" = { + default = "http_status:404"; + credentialsFile = "/run/agenix/cloudflared"; + }; + }; + + systemd.services.cloudflared-tunnel-dlaptop.serviceConfig.Restart = lib.mkForce "on-failure"; + systemd.services.cloudflared-tunnel-dlaptop.serviceConfig.RestartSec = lib.mkForce 60; + programs.captive-browser = { browser = ''firejail --ignore="include whitelist-run-common.inc" --private --profile=chromium ${pkgs.bash}/bin/bash -c '${pkgs.coreutils}/bin/env XDG_CONFIG_HOME="$PREV_CONFIG_HOME" ${pkgs.chromium}/bin/chromium --user-data-dir=''${XDG_DATA_HOME:-$HOME/.local/share}/chromium-captive --proxy-server="socks5://$PROXY" --host-resolver-rules="MAP * ~NOTFOUND , EXCLUDE localhost" --no-first-run --new-window --incognito -no-default-browser-check http://cache.nixos.org/' ''; interface = "wlp1s0"; diff --git a/hosts/generic.nix b/hosts/generic.nix index 5b4b4de..fde5d3b 100644 --- a/hosts/generic.nix +++ b/hosts/generic.nix @@ -80,8 +80,8 @@ in { promptInit = '' set TERM "xterm-256color" set fish_greeting - ${pkgs.any-nix-shell}/bin/any-nix-shell fish --info-right | source - #tide configure --auto --style=Lean --prompt_colors='16 colors' --show_time=No --lean_prompt_height='Two lines' --prompt_connection=Disconnected --prompt_spacing=Compact --icons='Few icons' --transient=No + #${pkgs.any-nix-shell}/bin/any-nix-shell fish --info-right | source + any-nix-shell fish --info-right | source ''; }; users.defaultUserShell = pkgs.fish;