aciceri/nixfleet
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Compare commits

base: aciceri:173f1d32ad7c9c223f556fa180e537f6e372d7a8
Branches Tags
aciceri:master
aciceri:update-flake-lock
aciceri:aaa
aciceri:wip
aciceri:test
..
compare: aciceri:ae7d2a397401874ac4bc0daee18d2b278286c24e
Branches Tags
aciceri:master
aciceri:update-flake-lock
aciceri:aaa
aciceri:wip
aciceri:test

No commits in common. "173f1d32ad7c9c223f556fa180e537f6e372d7a8" and "ae7d2a397401874ac4bc0daee18d2b278286c24e" have entirely different histories.
173f1d32ad ... ae7d2a3974

7 changed files with 41 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

68
flake.lock generated
View file

@ -40,11 +40,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711464622, "lastModified": 1710336635,
"narHash": "sha256-P9joXeVMV4FzNy9Y31bnCgKP7xu1Cw+EV8mghAK8N10=", "narHash": "sha256-tEc3mD8LNujcm94BigiJZTGulCCGOhpXoNebQGzezLA=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "d3875adaaa70a52c127f2519a2e86eb4dbcf34b0", "rev": "845e682dc294373370efd5b6db99c48a65070a89",
"revCount": 167, "revCount": 165,
"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": 1711443855, "lastModified": 1710320774,
"narHash": "sha256-jPEUYELo7ACEiFU7jKDdQ+yC5OkqG2UcHk1/N+N7f3E=", "narHash": "sha256-TrLaYznIzUGy4vIRw4hDDlOKuF/vDD1J49cLtkxvgAI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "81d4eb044fac45daf51281a046d413a40f05d103", "rev": "c68aeff603f1b5c4cc7a57b876cf5e7101f2f21c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -170,11 +170,11 @@
"extra-package-combobulate": { "extra-package-combobulate": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1710138842, "lastModified": 1710175386,
"narHash": "sha256-9Vr5q9z7HmLCxBJW/4/5JAzri/MWB6FNA4BPeV5Ko1s=", "narHash": "sha256-rww0/6304xZWTFRo1BVcfSDdXOXtlgmfZOxAoOIjYsk=",
"owner": "mickeynp", "owner": "mickeynp",
"repo": "combobulate", "repo": "combobulate",
"rev": "f6e092d94ab184b3445fe3d6c0a501f9d7df764a", "rev": "ee82c568ad639605518f62f82fae4bcc0dfdbb81",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -186,11 +186,11 @@
"extra-package-copilot": { "extra-package-copilot": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1709987182, "lastModified": 1710320315,
"narHash": "sha256-BLIyJ9z4yI2Iv5eqrmULJ5VXoGnlXSVJx+5lVQyIoO8=", "narHash": "sha256-YY/6vODg2MSPMi+61Ii5aQiDQS5B6YPMP1VP1dDNOLs=",
"owner": "zerolfx", "owner": "zerolfx",
"repo": "copilot.el", "repo": "copilot.el",
"rev": "4e203efaa1f4047c800a026ba496d3bda8b67119", "rev": "57d5e670786ca8156772c6dcb38e6ff67c5efd62",
"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": 1705596103, "lastModified": 1694965545,
"narHash": "sha256-jEUmhfLE7cFan4/PF4qBiEOLsjM3Q4iSDTlM+0CYwZg=", "narHash": "sha256-HijDb+2ojDk1Evv/KEIrZ/xW+QXz6IJoUllniTsE3hs=",
"owner": "antifuchs", "owner": "aciceri",
"repo": "nix-ts-mode", "repo": "nix-ts-mode",
"rev": "0ef4e663add03d026a1804f57ac7d5453a635b15", "rev": "8da9a76cd014d56ee734553a32c9e006e375bce4",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "antifuchs", "owner": "aciceri",
"ref": "improve-indented-string-indentation", "ref": "improved",
"repo": "nix-ts-mode", "repo": "nix-ts-mode",
"type": "github" "type": "github"
} }
@ -307,11 +307,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1701473968, "lastModified": 1709336216,
"narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -552,11 +552,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1708547820, "lastModified": 1710309369,
"narHash": "sha256-xU/KC1PWqq5zL9dQ9wYhcdgxAwdeF/dJCLPH3PNZEBg=", "narHash": "sha256-pQo1vDEEyULfvTQeqZixryrDVpGICzGBtj4uIfP4cs0=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "hercules-ci-effects", "repo": "hercules-ci-effects",
"rev": "0ca27bd58e4d5be3135a4bef66b582e57abe8f4a", "rev": "9cc7ed20043adf381f1b8354c54ba667b527d538",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -908,11 +908,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1711124224, "lastModified": 1710162809,
"narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=", "narHash": "sha256-i2R2bcnQp+85de67yjgZVvJhd6rRnJbSYNpGmB6Leb8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "56528ee42526794d413d6f244648aaee4a7b56c0", "rev": "ddcd7598b2184008c97e6c9c6a21c5f37590b8d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -972,11 +972,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1711163522, "lastModified": 1710272261,
"narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -988,11 +988,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1703637592, "lastModified": 1709961763,
"narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8", "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
hmModules/btop/default.nix
View file

@ -1,10 +1,6 @@
{config, ...}: { {
programs.btop = { programs.btop = {
enable = true; enable = true;
settings = { settings.update_ms = 100;
update_ms = 100;
theme_background = false;
color_theme = "${config.programs.btop.package}/share/btop/themes/dracula.theme";
};
}; };
} }

1
hmModules/shell/default.nix
View file

@ -27,6 +27,7 @@
programs.ssh = { programs.ssh = {
enable = true; enable = true;
controlMaster = "auto"; controlMaster = "auto";
controlPersist = "10m";
}; };
# programs.starship = { # programs.starship = {

2
hosts/default.nix
View file

@ -160,7 +160,7 @@
vpnExtra = { vpnExtra = {
oneplus6t = { oneplus6t = {
ip = "10.100.0.4"; ip = "10.100.0.4";
publicKey = "cXHPaJXeA/JB7DKlZXR86zYcz1OEVPMOvAmDhBQF91E="; publicKey = "O6/tKaA8Hs7OEqi15hV4RwviR6vyCTMYv6ZlhsI+tnI=";
}; };
}; };
}; };

1
hosts/picard/default.nix
View file

@ -39,7 +39,6 @@
# "macos-ventura" # "macos-ventura"
# "sunshine" # "sunshine"
"mount-rock5b" "mount-rock5b"
"adb"
] ]
++ [ ++ [
./disko.nix ./disko.nix

8
modules/syncthing/default.nix
View file

@ -29,12 +29,6 @@
"tcp://kirk.fleet" "tcp://kirk.fleet"
]; ];
}; };
onplus6t = {
id = "76BJ2ZE-FPFDWUZ-3UZIENZ-TS6YBGG-EZSF6UE-GLHRBQ2-KTHTRMI-3JWNRAT";
addresses = [
"tcp://oneplus6t.fleet"
];
};
}; };
folders = { folders = {
org = { org = {
@ -45,7 +39,7 @@
kirk = "/home/${config.ccr.username}/org"; kirk = "/home/${config.ccr.username}/org";
} }
.${config.networking.hostName}; .${config.networking.hostName};
devices = ["picard" "sisko" "kirk" "onplus6t"]; devices = ["picard" "sisko" "kirk"];
}; };
sync = { sync = {
path = path =

6
modules/transmission/default.nix
View file

@ -21,10 +21,8 @@
upload-slots-per-torrent = 1000; upload-slots-per-torrent = 1000;
speed-limit-up = 10000; alt-speed-up = 10000;
speed-limit-down = 10000; alt-speed-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