From 1f59950af862f16a0969b5ecf893ac03cb2ffff6 Mon Sep 17 00:00:00 2001 From: Julia Lange Date: Fri, 29 Nov 2024 00:03:51 -0800 Subject: [PATCH] OSAuto, remove autoUpgrade and Broken XDG Stuff --- nixosModules/automatic/default.nix | 34 +++--------------------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/nixosModules/automatic/default.nix b/nixosModules/automatic/default.nix index 2df5223..a61ce29 100644 --- a/nixosModules/automatic/default.nix +++ b/nixosModules/automatic/default.nix @@ -1,10 +1,9 @@ -{ config, inputs, pkgs, lib, hostname, usernameList, ... }: +{ config, pkgs, lib, hostname, usernameList, ... }: { options = { system.timezone = lib.mkOption { default = "America/Los_Angeles"; }; system.extraFonts = lib.mkOption { default = []; }; - system.doAutoUpgrade = lib.mkEnableOption "Enable auto upgrading system"; system.users.bigWheels = lib.mkOption { default = []; }; }; @@ -16,14 +15,13 @@ boot.loader.efi.canTouchEfiVariables = true; networking.hostName = hostname; - nixpkgs.config.allowUnfree = true; system.stateVersion = "23.05"; time.timeZone = config.system.timezone; - i18n.defaultLocale = "en_US.UTF-8"; - # "Essential" Packages + # Packages & Default Packages + nixpkgs.config.allowUnfree = true; environment.systemPackages = with pkgs; [ git neovim @@ -32,17 +30,6 @@ ]; # 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; users = { @@ -72,20 +59,5 @@ source-han-sans # Pan-CJK font ] ++ 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"; - }; - }; }