From c9ef45c95871f7cc314a267214155a4ec3534b27 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Tue, 2 Apr 2024 12:42:29 +0200 Subject: [PATCH 1/7] Update `ccrEmacs` input --- flake.lock | 68 +++++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index c731bcf..2457923 100644 --- a/flake.lock +++ b/flake.lock @@ -40,11 +40,11 @@ ] }, "locked": { - "lastModified": 1710336635, - "narHash": "sha256-tEc3mD8LNujcm94BigiJZTGulCCGOhpXoNebQGzezLA=", + "lastModified": 1711464622, + "narHash": "sha256-P9joXeVMV4FzNy9Y31bnCgKP7xu1Cw+EV8mghAK8N10=", "ref": "refs/heads/master", - "rev": "845e682dc294373370efd5b6db99c48a65070a89", - "revCount": 165, + "rev": "d3875adaaa70a52c127f2519a2e86eb4dbcf34b0", + "revCount": 167, "type": "git", "url": "https://git.aciceri.dev/aciceri/emacs.git" }, @@ -122,11 +122,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1710320774, - "narHash": "sha256-TrLaYznIzUGy4vIRw4hDDlOKuF/vDD1J49cLtkxvgAI=", + "lastModified": 1711443855, + "narHash": "sha256-jPEUYELo7ACEiFU7jKDdQ+yC5OkqG2UcHk1/N+N7f3E=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c68aeff603f1b5c4cc7a57b876cf5e7101f2f21c", + "rev": "81d4eb044fac45daf51281a046d413a40f05d103", "type": "github" }, "original": { @@ -170,11 +170,11 @@ "extra-package-combobulate": { "flake": false, "locked": { - "lastModified": 1710175386, - "narHash": "sha256-rww0/6304xZWTFRo1BVcfSDdXOXtlgmfZOxAoOIjYsk=", + "lastModified": 1710138842, + "narHash": "sha256-9Vr5q9z7HmLCxBJW/4/5JAzri/MWB6FNA4BPeV5Ko1s=", "owner": "mickeynp", "repo": "combobulate", - "rev": "ee82c568ad639605518f62f82fae4bcc0dfdbb81", + "rev": "f6e092d94ab184b3445fe3d6c0a501f9d7df764a", "type": "github" }, "original": { @@ -186,11 +186,11 @@ "extra-package-copilot": { "flake": false, "locked": { - "lastModified": 1710320315, - "narHash": "sha256-YY/6vODg2MSPMi+61Ii5aQiDQS5B6YPMP1VP1dDNOLs=", + "lastModified": 1709987182, + "narHash": "sha256-BLIyJ9z4yI2Iv5eqrmULJ5VXoGnlXSVJx+5lVQyIoO8=", "owner": "zerolfx", "repo": "copilot.el", - "rev": "57d5e670786ca8156772c6dcb38e6ff67c5efd62", + "rev": "4e203efaa1f4047c800a026ba496d3bda8b67119", "type": "github" }, "original": { @@ -218,16 +218,16 @@ "extra-package-nix-ts-mode": { "flake": false, "locked": { - "lastModified": 1694965545, - "narHash": "sha256-HijDb+2ojDk1Evv/KEIrZ/xW+QXz6IJoUllniTsE3hs=", - "owner": "aciceri", + "lastModified": 1705596103, + "narHash": "sha256-jEUmhfLE7cFan4/PF4qBiEOLsjM3Q4iSDTlM+0CYwZg=", + "owner": "antifuchs", "repo": "nix-ts-mode", - "rev": "8da9a76cd014d56ee734553a32c9e006e375bce4", + "rev": "0ef4e663add03d026a1804f57ac7d5453a635b15", "type": "github" }, "original": { - "owner": "aciceri", - "ref": "improved", + "owner": "antifuchs", + "ref": "improve-indented-string-indentation", "repo": "nix-ts-mode", "type": "github" } @@ -307,11 +307,11 @@ ] }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1701473968, + "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", "type": "github" }, "original": { @@ -552,11 +552,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1710309369, - "narHash": "sha256-pQo1vDEEyULfvTQeqZixryrDVpGICzGBtj4uIfP4cs0=", + "lastModified": 1708547820, + "narHash": "sha256-xU/KC1PWqq5zL9dQ9wYhcdgxAwdeF/dJCLPH3PNZEBg=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "9cc7ed20043adf381f1b8354c54ba667b527d538", + "rev": "0ca27bd58e4d5be3135a4bef66b582e57abe8f4a", "type": "github" }, "original": { @@ -908,11 +908,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1710162809, - "narHash": "sha256-i2R2bcnQp+85de67yjgZVvJhd6rRnJbSYNpGmB6Leb8=", + "lastModified": 1711124224, + "narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ddcd7598b2184008c97e6c9c6a21c5f37590b8d2", + "rev": "56528ee42526794d413d6f244648aaee4a7b56c0", "type": "github" }, "original": { @@ -972,11 +972,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1710272261, - "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", + "lastModified": 1711163522, + "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", + "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", "type": "github" }, "original": { @@ -988,11 +988,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1709961763, - "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", + "lastModified": 1703637592, + "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", + "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8", "type": "github" }, "original": { From 458c00e4997d379092e11c33de83b1e7c86e65f0 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Tue, 2 Apr 2024 12:42:53 +0200 Subject: [PATCH 2/7] `btop` settings --- hmModules/btop/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hmModules/btop/default.nix b/hmModules/btop/default.nix index dda9306..370fbd2 100644 --- a/hmModules/btop/default.nix +++ b/hmModules/btop/default.nix @@ -1,6 +1,10 @@ -{ +{config, ...}: { programs.btop = { enable = true; - settings.update_ms = 100; + settings = { + update_ms = 100; + theme_background = false; + color_theme = "${config.programs.btop.package}/share/btop/themes/dracula.theme"; + }; }; } From d9349d5317c3a40f87dcb56686eeaafce2a3ff0b Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Tue, 2 Apr 2024 12:43:09 +0200 Subject: [PATCH 3/7] New Android ROM on the OnePlus 6T --- hosts/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/default.nix b/hosts/default.nix index cfc2d6f..3459702 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -160,7 +160,7 @@ vpnExtra = { oneplus6t = { ip = "10.100.0.4"; - publicKey = "O6/tKaA8Hs7OEqi15hV4RwviR6vyCTMYv6ZlhsI+tnI="; + publicKey = "cXHPaJXeA/JB7DKlZXR86zYcz1OEVPMOvAmDhBQF91E="; }; }; }; From ae0468bf73df6e2e10e996d7db0ac0732e23ac79 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Tue, 2 Apr 2024 12:44:14 +0200 Subject: [PATCH 4/7] `syncthing` on the OnePlus 6T --- modules/syncthing/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/syncthing/default.nix b/modules/syncthing/default.nix index 5fdd878..d7597c5 100644 --- a/modules/syncthing/default.nix +++ b/modules/syncthing/default.nix @@ -29,6 +29,12 @@ "tcp://kirk.fleet" ]; }; + onplus6t = { + id = "76BJ2ZE-FPFDWUZ-3UZIENZ-TS6YBGG-EZSF6UE-GLHRBQ2-KTHTRMI-3JWNRAT"; + addresses = [ + "tcp://oneplus6t.fleet" + ]; + }; }; folders = { org = { @@ -39,7 +45,7 @@ kirk = "/home/${config.ccr.username}/org"; } .${config.networking.hostName}; - devices = ["picard" "sisko" "kirk"]; + devices = ["picard" "sisko" "kirk" "onplus6t"]; }; sync = { path = From 57f04d95db31547d65a5365d52286c49fec89e07 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Tue, 2 Apr 2024 12:44:29 +0200 Subject: [PATCH 5/7] Enable `adb` on `picard` --- hosts/picard/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix index 2505601..5e71aa6 100644 --- a/hosts/picard/default.nix +++ b/hosts/picard/default.nix @@ -39,6 +39,7 @@ # "macos-ventura" # "sunshine" "mount-rock5b" + "adb" ] ++ [ ./disko.nix From 145a7214b2cb85308d46628f236c394429d9df93 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Tue, 2 Apr 2024 12:44:40 +0200 Subject: [PATCH 6/7] Disable SSH's `controlPersist`: was giving problems from mobile through the VPN --- hmModules/shell/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hmModules/shell/default.nix b/hmModules/shell/default.nix index f67ddbe..2f239f4 100644 --- a/hmModules/shell/default.nix +++ b/hmModules/shell/default.nix @@ -27,7 +27,6 @@ programs.ssh = { enable = true; controlMaster = "auto"; - controlPersist = "10m"; }; # programs.starship = { From 173f1d32ad7c9c223f556fa180e537f6e372d7a8 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Tue, 2 Apr 2024 12:45:06 +0200 Subject: [PATCH 7/7] `transmission`: always enforce speed limit I believe that the disk is too slow --- modules/transmission/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/transmission/default.nix b/modules/transmission/default.nix index 83d886b..79f12b3 100644 --- a/modules/transmission/default.nix +++ b/modules/transmission/default.nix @@ -21,8 +21,10 @@ upload-slots-per-torrent = 1000; - alt-speed-up = 10000; - alt-speed-down = 10000; + speed-limit-up = 10000; + speed-limit-down = 10000; + alt-speed-up = 20000; + alt-speed-down = 20000; alt-speed-time-enabled = true; alt-speed-time-begin = 540; # 9AM, minutes after midnight alt-speed-time-end = 1380; # 11PM