pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Make autoUpgrade not be the default, enable where wanted

Browse source
This commit is contained in:
Evie Litherland-Smith 2023-07-21 11:10:31 +01:00
parent d2c1486ece
commit f7edaab157
4 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
hosts/Legion/configuration.nix
View file

@ -20,6 +20,7 @@ in {
nameservers = ["192.168.1.230" "127.0.0.1" "9.9.9.9"]; nameservers = ["192.168.1.230" "127.0.0.1" "9.9.9.9"];
}; };
system.autoUpgrade = { system.autoUpgrade = {
enable = true;
dates = "02:00"; dates = "02:00";
allowReboot = true; allowReboot = true;
rebootWindow = { rebootWindow = {

1
hosts/Vanguard/configuration.nix
View file

@ -28,6 +28,7 @@ in {
opengl.driSupport32Bit = true; opengl.driSupport32Bit = true;
steam-hardware.enable = true; steam-hardware.enable = true;
}; };
system.autoUpgrade.enable = true;
environment.systemPackages = with pkgs; [mesa]; environment.systemPackages = with pkgs; [mesa];
programs = { programs = {
xwayland.enable = true; xwayland.enable = true;

5
hosts/common.nix
View file

@ -17,10 +17,7 @@ in {
keep-derivations = true keep-derivations = true
''; '';
}; };
system.autoUpgrade = { system.autoUpgrade.flake = flakeURL;
enable = true;
flake = flakeURL;
};
environment = { environment = {
localBinInPath = true; localBinInPath = true;
shellAliases = { shellAliases = {

35
services/syncthing/default.nix
View file

@ -1,5 +1,12 @@
{lib, ...}: let {lib, ...}: let
defaultDataDir = "/var/lib/syncthing"; defaultDataDir = "/var/lib/syncthing";
deviceGroups = {
all = ["Ion" "Legion" "Monarch" "Northstar" "Ronin" "Vanguard"];
personal = ["Ion" "Legion" "Monarch" "Northstar" "Vanguard"];
work = ["Ion" "Legion" "Ronin"];
desktops = ["Legion" "Northstar" "Vanguard"];
mobile = ["Ion" "Legion" "Monarch" "Ronin"];
};
in { in {
services.syncthing = { services.syncthing = {
enable = true; enable = true;
@ -10,66 +17,64 @@ in {
"Ion".id = "7DD4NPH-6T2ET5A-4FCLFWW-CS6UR2W-IO5XQXC-DM5B2Q4-6X7DGU2-UKKVEAB"; "Ion".id = "7DD4NPH-6T2ET5A-4FCLFWW-CS6UR2W-IO5XQXC-DM5B2Q4-6X7DGU2-UKKVEAB";
"Legion".id = "6OX54CG-EAQMXKA-K7TXB5P-G5A27HB-52JE2FA-XNAYZU6-YMIDBXP-RKPBJQV"; "Legion".id = "6OX54CG-EAQMXKA-K7TXB5P-G5A27HB-52JE2FA-XNAYZU6-YMIDBXP-RKPBJQV";
"Monarch".id = "CJSUZQY-67XBLEZ-VKVHQHI-BLEUZNF-G4237AV-AW44CGH-F3JDKXU-CWT3RQZ"; "Monarch".id = "CJSUZQY-67XBLEZ-VKVHQHI-BLEUZNF-G4237AV-AW44CGH-F3JDKXU-CWT3RQZ";
"Nortstar".id = "W3QZTFS-BB42JYB-NQBZ5IM-H3WLAUQ-M57I2CP-FALWGEX-JI2ZZOC-QWAX2QQ"; # "Nortstar".id = "";
"Ronin".id = "ZOL5YHK-ZZZULIE-UHGVKHW-H5E4BP7-S4CZBOX-OIZVUCV-RZUXOKA-QVBUBAJ"; "Ronin".id = "ZOL5YHK-ZZZULIE-UHGVKHW-H5E4BP7-S4CZBOX-OIZVUCV-RZUXOKA-QVBUBAJ";
"Vanguard".id = "I366QNQ-D3FTDRX-RNOTXMW-YITZXOF-DSCDMQD-63Q72LI-ME2Y4HZ-T34RMQK"; "Vanguard".id = "I366QNQ-D3FTDRX-RNOTXMW-YITZXOF-DSCDMQD-63Q72LI-ME2Y4HZ-T34RMQK";
"Remarkable".id = "GHB6JKS-JOA3HHP-TYHB3IJ-GLV26QW-RWRZAMG-XYFGFB6-QLUHDSH-GNPZVAO";
}; };
folders = { folders = {
"Archive" = { "Archive" = {
id = "hwnqy-xzcdx"; id = "hwnqy-xzcdx";
path = lib.mkDefault (defaultDataDir + "/Archive"); path = lib.mkDefault (defaultDataDir + "/Archive");
ignorePerms = true; ignorePerms = true;
devices = ["Ion" "Legion" "Monarch" "Vanguard"]; devices = deviceGroups.desktops;
}; };
"Books" = { "Books" = {
id = "zjmxy-ycmbq"; id = "zjmxy-ycmbq";
path = lib.mkDefault (defaultDataDir + "/Books"); path = lib.mkDefault (defaultDataDir + "/Books");
ignorePerms = true; ignorePerms = true;
devices = ["Legion" "Monarch" "Nortstar" "Remarkable" "Vanguard"]; devices = deviceGroups.desktops;
}; };
"Comics" = { "Comics" = {
id = "kc2h0-q3wot"; id = "kc2h0-q3wot";
path = lib.mkDefault (defaultDataDir + "/Comics"); path = lib.mkDefault (defaultDataDir + "/Comics");
ignorePerms = true; ignorePerms = true;
devices = ["Ion" "Legion" "Monarch" "Nortstar" "Vanguard"]; devices = deviceGroups.desktops;
}; };
"Documents" = { "Documents" = {
id = "qc6qa-bipsd"; id = "qc6qa-bipsd";
path = lib.mkDefault (defaultDataDir + "/Documents"); path = lib.mkDefault (defaultDataDir + "/Documents");
ignorePerms = true; ignorePerms = true;
devices = ["Legion" "Monarch" "Nortstar" "Vanguard"]; devices = deviceGroups.desktops;
}; };
"Exports" = { "Exports" = {
id = "tof2e-pdtde"; id = "tof2e-pdtde";
path = lib.mkDefault (defaultDataDir + "/Exports"); path = lib.mkDefault (defaultDataDir + "/Exports");
ignorePerms = true; ignorePerms = true;
devices = ["Legion" "Monarch" "Vanguard"]; devices = deviceGroups.desktops;
}; };
"Notes" = { "Notes" = {
id = "4ggjz-5dyop"; id = "4ggjz-5dyop";
path = lib.mkDefault (defaultDataDir + "/Notes"); path = lib.mkDefault (defaultDataDir + "/Notes");
ignorePerms = true; ignorePerms = true;
devices = ["Ion" "Legion" "Monarch" "Nortstar" "Ronin" "Vanguard"]; devices = deviceGroups.all;
}; };
"Pictures" = { "Pictures" = {
id = "ziuj8-rm6dn"; id = "ziuj8-rm6dn";
path = lib.mkDefault (defaultDataDir + "/Pictures"); path = lib.mkDefault (defaultDataDir + "/Pictures");
ignorePerms = true; ignorePerms = true;
devices = ["Ion" "Legion" "Monarch" "Nortstar" "Vanguard"]; devices = deviceGroups.personal;
}; };
"Xochitl" = { "Tasks" = {
id = "dkcbx-kq7hl"; id = "qzdat-3zzhw";
path = lib.mkDefault (defaultDataDir + "/Xochitl"); path = lib.mkDefault "~/.local/share/task";
type = "receiveonly";
ignorePerms = true; ignorePerms = true;
devices = ["Legion" "Remarkable"]; devices = deviceGroups.all;
}; };
"Zotero" = { "Zotero" = {
id = "huyvn-liwc9"; id = "huyvn-liwc9";
path = lib.mkDefault (defaultDataDir + "/Zotero"); path = lib.mkDefault (defaultDataDir + "/Zotero");
ignorePerms = true; ignorePerms = true;
devices = ["Ion" "Legion" "Monarch" "Nortstar" "Ronin" "Vanguard"]; devices = deviceGroups.all;
}; };
}; };
}; };