OSAuto, remove autoUpgrade and Broken XDG Stuff
This commit is contained in:
parent
8560b319cf
commit
1f59950af8
1 changed files with 3 additions and 31 deletions
|
|
@ -1,10 +1,9 @@
|
||||||
{ config, inputs, pkgs, lib, hostname, usernameList, ... }:
|
{ config, pkgs, lib, hostname, usernameList, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
options = {
|
options = {
|
||||||
system.timezone = lib.mkOption { default = "America/Los_Angeles"; };
|
system.timezone = lib.mkOption { default = "America/Los_Angeles"; };
|
||||||
system.extraFonts = lib.mkOption { default = []; };
|
system.extraFonts = lib.mkOption { default = []; };
|
||||||
system.doAutoUpgrade = lib.mkEnableOption "Enable auto upgrading system";
|
|
||||||
system.users.bigWheels = lib.mkOption { default = []; };
|
system.users.bigWheels = lib.mkOption { default = []; };
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -16,14 +15,13 @@
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|
||||||
networking.hostName = hostname;
|
networking.hostName = hostname;
|
||||||
nixpkgs.config.allowUnfree = true;
|
|
||||||
system.stateVersion = "23.05";
|
system.stateVersion = "23.05";
|
||||||
|
|
||||||
time.timeZone = config.system.timezone;
|
time.timeZone = config.system.timezone;
|
||||||
|
|
||||||
i18n.defaultLocale = "en_US.UTF-8";
|
i18n.defaultLocale = "en_US.UTF-8";
|
||||||
|
|
||||||
# "Essential" Packages
|
# Packages & Default Packages
|
||||||
|
nixpkgs.config.allowUnfree = true;
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
git
|
git
|
||||||
neovim
|
neovim
|
||||||
|
|
@ -32,17 +30,6 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
# XDG Compliance
|
# XDG Compliance
|
||||||
xdg.portal.config.common.default = "*";
|
|
||||||
environment.sessionVariables = {
|
|
||||||
XDG_CONFIG_HOME = "\${HOME}/.config";
|
|
||||||
XDG_CACHE_HOME = "\${HOME}/.cache";
|
|
||||||
XDG_STATE_HOME = "\${HOME}/.local/state";
|
|
||||||
XDG_DATA_HOME = "\${HOME}/.local/share";
|
|
||||||
XDG_BIN_HOME = "\${HOME}/.local/bin";
|
|
||||||
PATH = [
|
|
||||||
"\${HOME}/prog/scripts"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
nix.settings.use-xdg-base-directories = true;
|
nix.settings.use-xdg-base-directories = true;
|
||||||
|
|
||||||
users = {
|
users = {
|
||||||
|
|
@ -72,20 +59,5 @@
|
||||||
source-han-sans # Pan-CJK font
|
source-han-sans # Pan-CJK font
|
||||||
] ++ config.system.extraFonts;
|
] ++ config.system.extraFonts;
|
||||||
};
|
};
|
||||||
|
|
||||||
system.autoUpgrade = lib.mkIf config.system.doAutoUpgrade {
|
|
||||||
enable = true;
|
|
||||||
flake = inputs.self.outPath;
|
|
||||||
flags = [
|
|
||||||
"--update-input"
|
|
||||||
"nixpkgs"
|
|
||||||
"--commit-lock-file"
|
|
||||||
"-L"
|
|
||||||
];
|
|
||||||
operation = "boot";
|
|
||||||
dates = "22:30";
|
|
||||||
randomizedDelaySec = "30min";
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue