thunderbottom/flakes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: thunderbottom:40d4792bc802309593b18db98fff29e7e7b4d04f
Branches Tags
thunderbottom:main
thunderbottom:master
...
compare: thunderbottom:1a54eab3fb893595ca15a7719a5ab693eb0b1d1a
Branches Tags
thunderbottom:main
thunderbottom:master

2 Commits
40d4792bc8 ... 1a54eab3fb

Author SHA1 Message Date
Chinmay D. Pai
1a54eab3fb
fix: pass lib to backup module and fixup backup configuration 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2024-09-30 11:16:19 +05:30
Chinmay D. Pai
104d4b6c8d
chore: move lanzaboote to system module and remove nixpkgs-immich input 
* lanzaboote is needed to evaluate nix configuration, even if it's not used
in the system.
* removed nixpkgs-immich since nixpkgs now has immich service

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2024-09-30 11:14:57 +05:30
5 changed files with 7 additions and 15 deletions
Show Stats Expand all files Collapse all files

3
flake.nix
View File

@ -23,11 +23,11 @@
disko.nixosModules.disko disko.nixosModules.disko
srvos.nixosModules.common srvos.nixosModules.common
srvos.nixosModules.mixins-systemd-boot srvos.nixosModules.mixins-systemd-boot
inputs.lanzaboote.nixosModules.lanzaboote
]; ];
systems.hosts.thonkpad.modules = [ systems.hosts.thonkpad.modules = [
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x1-12th-gen inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x1-12th-gen
inputs.lanzaboote.nixosModules.lanzaboote
]; ];
systems.hosts.thonkpad.specialArgs = { systems.hosts.thonkpad.specialArgs = {
inherit userdata; inherit userdata;
@ -101,7 +101,6 @@
nil.inputs.nixpkgs.follows = "nixpkgs"; nil.inputs.nixpkgs.follows = "nixpkgs";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-immich.url = "github:nixos/nixpkgs/d026e3fa1ad0d78d9072d9afdeae515d2d68acae";
nixos-hardware.url = "github:nixos/nixos-hardware"; nixos-hardware.url = "github:nixos/nixos-hardware";
nur.url = "github:nix-community/nur"; nur.url = "github:nix-community/nur";

7
modules/nixos/services/backup/default.nix
View File

@ -3,9 +3,7 @@
lib, lib,
... ...
}: }:
with lib; let with lib; {
inherit (utils.systemdUtils.unitOptions) unitOption;
in {
options.snowflake.services.backups = { options.snowflake.services.backups = {
enable = mkEnableOption "Enable restic backup service"; enable = mkEnableOption "Enable restic backup service";
@ -27,7 +25,7 @@ in {
default = {}; default = {};
type = types.attrsOf ( type = types.attrsOf (
types.submodule ( types.submodule (
{_}: { {lib, ...}: {
options = { options = {
dynamicFilesFrom = mkOption { dynamicFilesFrom = mkOption {
type = types.nullOr types.str; type = types.nullOr types.str;
@ -63,7 +61,6 @@ in {
}; };
timerConfig = mkOption { timerConfig = mkOption {
type = types.attrsOf unitOption;
default = { default = {
OnCalendar = "daily"; OnCalendar = "daily";
}; };

8
modules/nixos/services/immich/default.nix
View File

@ -1,13 +1,9 @@
{ {
config, config,
inputs,
lib, lib,
pkgs,
... ...
}: { }: {
imports = [
"${inputs.nixpkgs-immich}/nixos/modules/services/web-apps/immich.nix"
];
options.snowflake.services.immich = { options.snowflake.services.immich = {
enable = lib.mkEnableOption "Enable immich service"; enable = lib.mkEnableOption "Enable immich service";
@ -24,7 +20,7 @@
lib.mkIf cfg.enable { lib.mkIf cfg.enable {
services.immich = { services.immich = {
enable = true; enable = true;
package = inputs.nixpkgs-immich.legacyPackages.x86_64-linux.immich; package = pkgs.immich;
mediaLocation = "/storage/media/immich-library"; mediaLocation = "/storage/media/immich-library";
port = 9121; port = 9121;
}; };

2
modules/nixos/services/paperless/default.nix
View File

@ -64,7 +64,7 @@
}; };
}; };
snowflake.services.backups.paperless.config = { snowflake.services.backups.config.paperless = {
dynamicFilesFrom = let dynamicFilesFrom = let
path = config.services.paperless.dataDir; path = config.services.paperless.dataDir;
in '' in ''

2
modules/nixos/services/vaultwarden/default.nix
View File

@ -77,7 +77,7 @@
}; };
}; };
snowflake.services.backups.vaultwarden.paths = [ snowflake.services.backups.config.vaultwarden.paths = [
"/var/lib/bitwarden_rs" "/var/lib/bitwarden_rs"
]; ];
}; };