diff --git a/home/yt/common.nix b/home/yt/common.nix index e919d4b..11d8c7c 100644 --- a/home/yt/common.nix +++ b/home/yt/common.nix @@ -32,11 +32,12 @@ userName = "cy"; userEmail = "cy@cy7.sh"; delta = { - enable = true; + enable = false; options = { navigate = true; }; }; + difftastic.enable = true; extraConfig = { init.defaultBranch = "main"; push.autoSetupRemote = true; # assume -u on first push diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index 699a60a..e658e65 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -132,6 +132,9 @@ gtk2 gtk2-x11 android-tools + frida-tools + mitmproxy + openssl (python313.withPackages ( p: with p; [ python-lsp-server @@ -204,7 +207,7 @@ SCCACHE_S3_USE_SSL = "true"; SCCACHE_CACHE_MULTIARCH = "true"; SCCACHE_LOG_LEVEL = "warn"; - AWS_DEFAULT_REGION = "earth"; + AWS_DEFAULT_REGION = "us-east-1"; AWS_ENDPOINT_URL = "https://s3.cy7.sh"; AWS_ACCESS_KEY_ID = "$(cat /run/secrets/aws/key_id)"; AWS_SECRET_ACCESS_KEY = "$(cat /run/secrets/aws/key_secret)"; diff --git a/hosts/chunk/garage.nix b/hosts/chunk/garage.nix index e6c8af1..0dade9f 100644 --- a/hosts/chunk/garage.nix +++ b/hosts/chunk/garage.nix @@ -6,7 +6,7 @@ settings = { data_dir = "/mnt/garage"; s3_api = { - s3_region = "earth"; + s3_region = "us-east-1"; api_bind_addr = "[::]:3900"; root_domain = "s3.cy7.sh"; }; diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index d29295d..a7e199c 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -93,8 +93,7 @@ }; resolvconf.enable = true; firewall = { - allowedUDPPorts = [ 51820 ]; # for wireguard - trustedInterfaces = [ "wg0" ]; + allowedTCPPorts = [ 8080 ]; # for mitmproxy }; }; programs.nm-applet.enable = true; @@ -330,7 +329,19 @@ xorg.libXtst xorg.libxkbfile xorg.libxshmfence - python312Packages.wxpython + xorg.libXxf86vm + xorg.libSM + gtk3 + pango + gdk-pixbuf + glib + libnotify + SDL2 + libpng + libjpeg8 + libtiff + curl + pcre2 ]; }; programs.evolution.enable = true; @@ -411,4 +422,6 @@ }; programs.adb.enable = true; + services.envfs.enable = true; + programs.kdeconnect.enable = true; }