Compare commits

..

No commits in common. "11074bfabe6ad5fc37a6df01bcf2409ef3c65734" and "94f93e01bbc7100b2473753415fc6f0154d38d20" have entirely different histories.

6 changed files with 27 additions and 90 deletions

View File

@ -128,11 +128,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1737950601, "lastModified": 1737777799,
"narHash": "sha256-YqqJiLjAY0EWgVOtEv06EIoaNzgrzjpsXGrITNpAc/Y=", "narHash": "sha256-YDDKpj1j9MqGZgrugfu8mQWjpiy4r7fZ1FMJL58NasM=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "0335c7d8263a7af3f1006ca71869aa0c93c07c4a", "rev": "9a96d7b0485be4654b6f2237efeccb1144d1ba54",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -402,11 +402,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737968762, "lastModified": 1737762889,
"narHash": "sha256-xiPARGKwocaMtv+U/rgi+h2g56CZZEmrcl7ldRaslq8=", "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e1ae908bcc30af792b0bb0a52e53b03d2577255e", "rev": "daf04c5950b676f47a794300657f1d3d14c1a120",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -533,11 +533,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1737978223, "lastModified": 1737833872,
"narHash": "sha256-pSPgvZyvNgiZv/6MquETA6KMfhZ5cJM+YnERJmXA8x8=", "narHash": "sha256-BlaTMa00tXeKqsXrz/BOVFK3pMLs9V+Mc7VKk07Mdwg=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "04ac46c54357278fc68f0a95d26347ea0db99496", "rev": "45c3787e75323999d2f43b6f83972f4cb11a81f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -911,11 +911,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1737888199, "lastModified": 1737748251,
"narHash": "sha256-irkiOG7RPkF9DvpRmBxiHzaEfhdsG2k/0CyPq8hV6v4=", "narHash": "sha256-3QzMStWI503I2m7q0gohM3QRdLViBHtaYRwT8B8n/t0=",
"owner": "kaylorben", "owner": "kaylorben",
"repo": "nixcord", "repo": "nixcord",
"rev": "299d571ad0fcd176c0bf429c636084f6940ea124", "rev": "5e8cebecc895070e041fc259a69295a437ef5c0b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1002,11 +1002,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1737885640, "lastModified": 1737672001,
"narHash": "sha256-GFzPxJzTd1rPIVD4IW+GwJlyGwBDV1Tj5FLYwDQQ9sM=", "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4e96537f163fad24ed9eb317798a79afc85b51b7", "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1034,11 +1034,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1737885589, "lastModified": 1737746512,
"narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", "narHash": "sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", "rev": "825479c345a7f806485b7f00dbe3abb50641b083",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -3417,15 +3417,14 @@
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ]
"systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1737974026, "lastModified": 1737778506,
"narHash": "sha256-4HpWhnmSYIzLarr8gUwGId92bRPB8U7KTaGck1j8hhI=", "narHash": "sha256-kdqwOnk0jFb3E01HFqUFAW+NQuBp39uwrpWSXmFAKGs=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "d42d7a91019e158931c752e39392b18e923e5229", "rev": "aeaa9b2fad9d658e8982a140327e345feffe8850",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -3449,18 +3448,18 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_6", "systems": "systems_5",
"tinted-foot": "tinted-foot", "tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty", "tinted-kitty": "tinted-kitty",
"tinted-tmux": "tinted-tmux", "tinted-tmux": "tinted-tmux",
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1737930520, "lastModified": 1737833281,
"narHash": "sha256-CAgB9/o54SXzqWwypA+hL2ETxiHW92Y+Ou4fT581jdk=", "narHash": "sha256-+hCZqNMvcjGinYinsITX+kJvqkEqcWheaNX5WGGcRow=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "6103431cd2f9d4352e5493a4063cf57e307d355c", "rev": "7c1c3259283f2da9c3d15c9096e7b8864f82bd4c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -3543,21 +3542,6 @@
"type": "github" "type": "github"
} }
}, },
"systems_6": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"tinted-foot": { "tinted-foot": {
"flake": false, "flake": false,
"locked": { "locked": {

View File

@ -41,9 +41,6 @@
enable = true; enable = true;
blueman.enable = false; blueman.enable = false;
}; };
autoUpdate.enable = false;
autoCleanup.enable = true;
nvidia = { nvidia = {
enable = false; enable = false;
}; };

View File

@ -43,10 +43,6 @@
enable = true; enable = true;
blueman.enable = true; blueman.enable = true;
}; };
autoUpdate.enable = true;
autoCleanup.enable = true;
nvidia = { nvidia = {
enable = true; enable = true;
mode = "offload"; mode = "offload";

View File

@ -60,3 +60,4 @@
}; };
}; };
} }

View File

@ -1,37 +0,0 @@
{
lib,
config,
inputs,
...
}:
{
options = {
sys.autoUpdate.enable = lib.mkEnableOption "Enable automatic updates";
sys.autoCleanup.enable = lib.mkEnableOption "Enable automatic cleanup";
};
config = lib.mkMerge [
(lib.mkIf config.sys.autoUpdate.enable {
system.autoUpgrade = {
enable = true;
flake = inputs.self.outPath;
flags = [
"--commit-lock-file"
"-L" # print build logs
];
dates = "weekly";
randomizedDelaySec = "45min";
};
})
(lib.mkIf config.sys.autoCleanup.enable {
nix = {
gc ={
automatic = true;
dates = "weekly";
options = "--delete-older-than 5d";
};
settings.auto-optimise-store = true;
};
})
];
}

View File

@ -16,7 +16,6 @@
./settings/style.nix ./settings/style.nix
./settings/default-applications.nix ./settings/default-applications.nix
./settings/logind.nix ./settings/logind.nix
./settings/updates.nix
#./settings/bootloader.nix #./settings/bootloader.nix
./settings/user.nix ./settings/user.nix
@ -47,9 +46,6 @@
blueman.enable = lib.mkDefault true; blueman.enable = lib.mkDefault true;
}; };
autoUpdate.enable = lib.mkDefault true;
autoCleanup.enable = lib.mkDefault false;
nvidia = { nvidia = {
enable = lib.mkDefault false; enable = lib.mkDefault false;
mode = lib.mkDefault "none"; mode = lib.mkDefault "none";