From c4aade597a7d20bcd910d5bbcbd1e6983ade17a1 Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 15 Feb 2025 14:43:35 -0500 Subject: [PATCH 1/3] add some pkgs and enable adb --- home/yt/ytnix.nix | 13 ++++++++++++- hosts/ytnix/default.nix | 4 ++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index 70f5aef..699a60a 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -94,7 +94,6 @@ unzip lm_sensors sshfs - python312Packages.python-lsp-server gopls anki trezorctl @@ -129,6 +128,18 @@ qbittorrent # vscodium nil + pkg-config + gtk2 + gtk2-x11 + android-tools + (python313.withPackages ( + p: with p; [ + python-lsp-server + pip + virtualenv + wxpython + ] + )) ]; programs.waybar.enable = true; diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index cd3a38e..d29295d 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -143,6 +143,7 @@ "libvirtd" "docker" "disk" + "adbusers" ]; environment.systemPackages = with pkgs; [ @@ -329,6 +330,7 @@ xorg.libXtst xorg.libxkbfile xorg.libxshmfence + python312Packages.wxpython ]; }; programs.evolution.enable = true; @@ -407,4 +409,6 @@ enable = true; binfmt = true; }; + + programs.adb.enable = true; } From 955c38bc63a8079fd208d5418b4ae7f7991df48e Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 18 Feb 2025 00:02:18 -0500 Subject: [PATCH 2/3] bunch of random stuff --- home/yt/common.nix | 3 ++- home/yt/ytnix.nix | 5 ++++- hosts/chunk/garage.nix | 2 +- hosts/ytnix/default.nix | 19 ++++++++++++++++--- 4 files changed, 23 insertions(+), 6 deletions(-) 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; } From 6a2020e24ba26c5e379593b941d5db50f5de949d Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 18 Feb 2025 00:03:56 -0500 Subject: [PATCH 3/3] flake update Signed-off-by: cy --- flake.lock | 80 +++++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/flake.lock b/flake.lock index 33c8825..77c6ac6 100644 --- a/flake.lock +++ b/flake.lock @@ -173,11 +173,11 @@ }, "crane_2": { "locked": { - "lastModified": 1739053031, - "narHash": "sha256-LrMDRuwAlRFD2T4MgBSRd1s2VtOE+Vl1oMCNu3RpPE0=", + "lastModified": 1739815359, + "narHash": "sha256-mjB72/7Fgk5bsIIKA4G9LkIb/u0Ci+VdOyQSgBuQtjo=", "owner": "ipetkov", "repo": "crane", - "rev": "112e6591b2d6313b1bd05a80a754a8ee42432a7e", + "rev": "282159b2b0588b87a9dbcc40decc91dd5bed5c89", "type": "github" }, "original": { @@ -578,11 +578,11 @@ ] }, "locked": { - "lastModified": 1739470101, - "narHash": "sha256-NxNe32VB4XI/xIXrsKmIfrcgtEx5r/5s52pL3CpEcA4=", + "lastModified": 1739845242, + "narHash": "sha256-rNMXpDubNWGLTs45MuoH9YHtXfXye/fn2u4YMSTPt9I=", "owner": "nix-community", "repo": "home-manager", - "rev": "5031c6d2978109336637977c165f82aa49fa16a7", + "rev": "5cfbf5cc37a3bd1da07ae84eea1b828909c4456b", "type": "github" }, "original": { @@ -699,11 +699,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1739445948, - "narHash": "sha256-mmfFqhYjKP7nke1cs3x+bjP6GOG8A82Zxvrc9IfYwEA=", + "lastModified": 1739846668, + "narHash": "sha256-B0+90JxZ7m+NVTb82Y8/R5OvKJrJhFDO2LtIxM7JNfw=", "ref": "refs/heads/main", - "rev": "406f4fed35fe495457a0f6487a7be3b025cab1c4", - "revCount": 17410, + "rev": "0069c59eda80e89ef4e42f7629cb15b051b6cadd", + "revCount": 17430, "type": "git", "url": "https://git.lix.systems/lix-project/lix" }, @@ -779,11 +779,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1739496005, - "narHash": "sha256-qr7v18JupLdyjUhC3zczdYzUEC4zzsxGjxsVGgYzwYg=", + "lastModified": 1739852863, + "narHash": "sha256-z26CrSpjFXVVa5RU2ORpfqcUpO1Uow4V7KV+pM/5Gok=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "e072f4a57cad4fb92e656fd69a340c8d372cacac", + "rev": "c045be9425cfdd7769a4e96cab35a7f8b9db7468", "type": "github" }, "original": { @@ -812,11 +812,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1739432365, - "narHash": "sha256-uQm3OhhgUQHA5eV+0v/qAFmFHly8yHg2P+BVVy/3DcY=", + "lastModified": 1739820990, + "narHash": "sha256-v+MmVqFyjzL9xzyRzfX+1qMIGgoHcW73P9b8RrM922k=", "owner": "YaLTeR", "repo": "niri", - "rev": "4c98b874862c2e6df7f71bdf36df0ba527690fbb", + "rev": "44c9797844ca7ce8a708d5034f1259ce3fc6bd2a", "type": "github" }, "original": { @@ -932,11 +932,11 @@ ] }, "locked": { - "lastModified": 1739178399, - "narHash": "sha256-DCe+29pX+CCGCVoYWXXoHUidXI1AAmvpOfu/xHHPGVo=", + "lastModified": 1739790836, + "narHash": "sha256-ksegG5wSllKmBqId/BtHVje9E5s0I+uCWgiFeLv2RzM=", "owner": "nix-community", "repo": "nix-ld", - "rev": "530547e81232969a07af94dcfcfa3bfe58371812", + "rev": "36420e7b304b5071da5eedd176c0a567fd821861", "type": "github" }, "original": { @@ -1043,11 +1043,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1739357830, - "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", + "lastModified": 1739758141, + "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", + "rev": "c618e28f70257593de75a7044438efc1c1fc0791", "type": "github" }, "original": { @@ -1107,11 +1107,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1739478914, - "narHash": "sha256-qljqSeAWOFbd6HNg8Ey28RdZYdVN8bMb6HJK7uqCKZ0=", + "lastModified": 1739822428, + "narHash": "sha256-eVH9Ggf0eojNMoRkksP7SfOMpI8ITLNfmoZrKyfQ8hU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6f9b8ea84c04411c48ab5aab4620ab204936d9fc", + "rev": "a3a07ac733f5aa4a1b1800d4a4042b65c6a9865f", "type": "github" }, "original": { @@ -1144,11 +1144,11 @@ ] }, "locked": { - "lastModified": 1739469954, - "narHash": "sha256-faUXxkM3yYm++fpEw02tbAgPJprVB0xOtrU87BEQkuI=", + "lastModified": 1739751913, + "narHash": "sha256-H72wNdLOl9CzfimXjDdKWnV0Mr8lpVF4m3HZ2m+fuck=", "owner": "nix-community", "repo": "nixvim", - "rev": "7f29e4b2ae34c1ba5fe650d74c8f28b0d1fa21ee", + "rev": "3a66c8a33001d8bd79388c6b15eb1039f43f4192", "type": "github" }, "original": { @@ -1206,11 +1206,11 @@ ] }, "locked": { - "lastModified": 1736549395, - "narHash": "sha256-XzwkB62Tt5UYoL1jXiHzgk/qz2fUpGHExcSIbyGTtI0=", + "lastModified": 1739557722, + "narHash": "sha256-XikzLpPUDYiNyJ4w2SfRShdbSkIgE3btYdxCGInmtc4=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "a53af7f1514ef4cce8620a9d6a50f238cdedec8b", + "rev": "1f3e1f38dedbbb8aad77e184fb54ec518e2d9522", "type": "github" }, "original": { @@ -1330,11 +1330,11 @@ ] }, "locked": { - "lastModified": 1739500069, - "narHash": "sha256-eCxWMqMsP2KQkleWWhs9KzFvxgd9v0F0iq7Piw6XDAs=", + "lastModified": 1739845646, + "narHash": "sha256-UGQVBU/yDn6u0kAE4z1PYrOaaf3wl+gAAv5rui2TkFQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "cd3e0a87bf9edadb0f311ba1eb677bbae7a08b81", + "rev": "ab2cd2b8b25ab3f65b8ce4aa701a6d69fbb0210f", "type": "github" }, "original": { @@ -1400,11 +1400,11 @@ ] }, "locked": { - "lastModified": 1738953846, - "narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=", + "lastModified": 1739829690, + "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4f09b473c936d41582dd744e19f34ec27592c5fd", + "rev": "3d0579f5cc93436052d94b73925b48973a104204", "type": "github" }, "original": { @@ -1426,11 +1426,11 @@ ] }, "locked": { - "lastModified": 1739497746, - "narHash": "sha256-Bfok+AZ/iTOmJNndwR7wOZbsuL5/gks3GH2qvWTxpGs=", + "lastModified": 1739843309, + "narHash": "sha256-BLsy1soiTtyN3nKH3dgpwFJ31a29Njpi6+xD6tsVBo4=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "6113f471097e12ff293e86b36e74aee21c55204e", + "rev": "6f6ffc8ebcfd2d48477ec2e78d9767a7bfdd9d79", "type": "github" }, "original": {