Compare commits
7 commits
ae7d2a3974
...
173f1d32ad
Author | SHA1 | Date | |
---|---|---|---|
173f1d32ad | |||
145a7214b2 | |||
57f04d95db | |||
ae0468bf73 | |||
d9349d5317 | |||
458c00e499 | |||
c9ef45c958 |
7 changed files with 53 additions and 41 deletions
68
flake.lock
generated
68
flake.lock
generated
|
@ -40,11 +40,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710336635,
|
"lastModified": 1711464622,
|
||||||
"narHash": "sha256-tEc3mD8LNujcm94BigiJZTGulCCGOhpXoNebQGzezLA=",
|
"narHash": "sha256-P9joXeVMV4FzNy9Y31bnCgKP7xu1Cw+EV8mghAK8N10=",
|
||||||
"ref": "refs/heads/master",
|
"ref": "refs/heads/master",
|
||||||
"rev": "845e682dc294373370efd5b6db99c48a65070a89",
|
"rev": "d3875adaaa70a52c127f2519a2e86eb4dbcf34b0",
|
||||||
"revCount": 165,
|
"revCount": 167,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.aciceri.dev/aciceri/emacs.git"
|
"url": "https://git.aciceri.dev/aciceri/emacs.git"
|
||||||
},
|
},
|
||||||
|
@ -122,11 +122,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710320774,
|
"lastModified": 1711443855,
|
||||||
"narHash": "sha256-TrLaYznIzUGy4vIRw4hDDlOKuF/vDD1J49cLtkxvgAI=",
|
"narHash": "sha256-jPEUYELo7ACEiFU7jKDdQ+yC5OkqG2UcHk1/N+N7f3E=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "emacs-overlay",
|
"repo": "emacs-overlay",
|
||||||
"rev": "c68aeff603f1b5c4cc7a57b876cf5e7101f2f21c",
|
"rev": "81d4eb044fac45daf51281a046d413a40f05d103",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -170,11 +170,11 @@
|
||||||
"extra-package-combobulate": {
|
"extra-package-combobulate": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710175386,
|
"lastModified": 1710138842,
|
||||||
"narHash": "sha256-rww0/6304xZWTFRo1BVcfSDdXOXtlgmfZOxAoOIjYsk=",
|
"narHash": "sha256-9Vr5q9z7HmLCxBJW/4/5JAzri/MWB6FNA4BPeV5Ko1s=",
|
||||||
"owner": "mickeynp",
|
"owner": "mickeynp",
|
||||||
"repo": "combobulate",
|
"repo": "combobulate",
|
||||||
"rev": "ee82c568ad639605518f62f82fae4bcc0dfdbb81",
|
"rev": "f6e092d94ab184b3445fe3d6c0a501f9d7df764a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -186,11 +186,11 @@
|
||||||
"extra-package-copilot": {
|
"extra-package-copilot": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710320315,
|
"lastModified": 1709987182,
|
||||||
"narHash": "sha256-YY/6vODg2MSPMi+61Ii5aQiDQS5B6YPMP1VP1dDNOLs=",
|
"narHash": "sha256-BLIyJ9z4yI2Iv5eqrmULJ5VXoGnlXSVJx+5lVQyIoO8=",
|
||||||
"owner": "zerolfx",
|
"owner": "zerolfx",
|
||||||
"repo": "copilot.el",
|
"repo": "copilot.el",
|
||||||
"rev": "57d5e670786ca8156772c6dcb38e6ff67c5efd62",
|
"rev": "4e203efaa1f4047c800a026ba496d3bda8b67119",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -218,16 +218,16 @@
|
||||||
"extra-package-nix-ts-mode": {
|
"extra-package-nix-ts-mode": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1694965545,
|
"lastModified": 1705596103,
|
||||||
"narHash": "sha256-HijDb+2ojDk1Evv/KEIrZ/xW+QXz6IJoUllniTsE3hs=",
|
"narHash": "sha256-jEUmhfLE7cFan4/PF4qBiEOLsjM3Q4iSDTlM+0CYwZg=",
|
||||||
"owner": "aciceri",
|
"owner": "antifuchs",
|
||||||
"repo": "nix-ts-mode",
|
"repo": "nix-ts-mode",
|
||||||
"rev": "8da9a76cd014d56ee734553a32c9e006e375bce4",
|
"rev": "0ef4e663add03d026a1804f57ac7d5453a635b15",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "aciceri",
|
"owner": "antifuchs",
|
||||||
"ref": "improved",
|
"ref": "improve-indented-string-indentation",
|
||||||
"repo": "nix-ts-mode",
|
"repo": "nix-ts-mode",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -307,11 +307,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1709336216,
|
"lastModified": 1701473968,
|
||||||
"narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
|
"narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
|
"rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -552,11 +552,11 @@
|
||||||
"nixpkgs": "nixpkgs_3"
|
"nixpkgs": "nixpkgs_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710309369,
|
"lastModified": 1708547820,
|
||||||
"narHash": "sha256-pQo1vDEEyULfvTQeqZixryrDVpGICzGBtj4uIfP4cs0=",
|
"narHash": "sha256-xU/KC1PWqq5zL9dQ9wYhcdgxAwdeF/dJCLPH3PNZEBg=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "hercules-ci-effects",
|
"repo": "hercules-ci-effects",
|
||||||
"rev": "9cc7ed20043adf381f1b8354c54ba667b527d538",
|
"rev": "0ca27bd58e4d5be3135a4bef66b582e57abe8f4a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -908,11 +908,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710162809,
|
"lastModified": 1711124224,
|
||||||
"narHash": "sha256-i2R2bcnQp+85de67yjgZVvJhd6rRnJbSYNpGmB6Leb8=",
|
"narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ddcd7598b2184008c97e6c9c6a21c5f37590b8d2",
|
"rev": "56528ee42526794d413d6f244648aaee4a7b56c0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -972,11 +972,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710272261,
|
"lastModified": 1711163522,
|
||||||
"narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
|
"narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
|
"rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -988,11 +988,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1709961763,
|
"lastModified": 1703637592,
|
||||||
"narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=",
|
"narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34",
|
"rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -1,6 +1,10 @@
|
||||||
{
|
{config, ...}: {
|
||||||
programs.btop = {
|
programs.btop = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings.update_ms = 100;
|
settings = {
|
||||||
|
update_ms = 100;
|
||||||
|
theme_background = false;
|
||||||
|
color_theme = "${config.programs.btop.package}/share/btop/themes/dracula.theme";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,7 +27,6 @@
|
||||||
programs.ssh = {
|
programs.ssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
controlMaster = "auto";
|
controlMaster = "auto";
|
||||||
controlPersist = "10m";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# programs.starship = {
|
# programs.starship = {
|
||||||
|
|
|
@ -160,7 +160,7 @@
|
||||||
vpnExtra = {
|
vpnExtra = {
|
||||||
oneplus6t = {
|
oneplus6t = {
|
||||||
ip = "10.100.0.4";
|
ip = "10.100.0.4";
|
||||||
publicKey = "O6/tKaA8Hs7OEqi15hV4RwviR6vyCTMYv6ZlhsI+tnI=";
|
publicKey = "cXHPaJXeA/JB7DKlZXR86zYcz1OEVPMOvAmDhBQF91E=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -39,6 +39,7 @@
|
||||||
# "macos-ventura"
|
# "macos-ventura"
|
||||||
# "sunshine"
|
# "sunshine"
|
||||||
"mount-rock5b"
|
"mount-rock5b"
|
||||||
|
"adb"
|
||||||
]
|
]
|
||||||
++ [
|
++ [
|
||||||
./disko.nix
|
./disko.nix
|
||||||
|
|
|
@ -29,6 +29,12 @@
|
||||||
"tcp://kirk.fleet"
|
"tcp://kirk.fleet"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
onplus6t = {
|
||||||
|
id = "76BJ2ZE-FPFDWUZ-3UZIENZ-TS6YBGG-EZSF6UE-GLHRBQ2-KTHTRMI-3JWNRAT";
|
||||||
|
addresses = [
|
||||||
|
"tcp://oneplus6t.fleet"
|
||||||
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
folders = {
|
folders = {
|
||||||
org = {
|
org = {
|
||||||
|
@ -39,7 +45,7 @@
|
||||||
kirk = "/home/${config.ccr.username}/org";
|
kirk = "/home/${config.ccr.username}/org";
|
||||||
}
|
}
|
||||||
.${config.networking.hostName};
|
.${config.networking.hostName};
|
||||||
devices = ["picard" "sisko" "kirk"];
|
devices = ["picard" "sisko" "kirk" "onplus6t"];
|
||||||
};
|
};
|
||||||
sync = {
|
sync = {
|
||||||
path =
|
path =
|
||||||
|
|
|
@ -21,8 +21,10 @@
|
||||||
|
|
||||||
upload-slots-per-torrent = 1000;
|
upload-slots-per-torrent = 1000;
|
||||||
|
|
||||||
alt-speed-up = 10000;
|
speed-limit-up = 10000;
|
||||||
alt-speed-down = 10000;
|
speed-limit-down = 10000;
|
||||||
|
alt-speed-up = 20000;
|
||||||
|
alt-speed-down = 20000;
|
||||||
alt-speed-time-enabled = true;
|
alt-speed-time-enabled = true;
|
||||||
alt-speed-time-begin = 540; # 9AM, minutes after midnight
|
alt-speed-time-begin = 540; # 9AM, minutes after midnight
|
||||||
alt-speed-time-end = 1380; # 11PM
|
alt-speed-time-end = 1380; # 11PM
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue