migrate firfox chrome and borg

This commit is contained in:
Tyler Starr 2025-03-12 23:13:24 -07:00
parent 89dd6985d8
commit 49f8e7d0a1
8 changed files with 9 additions and 15 deletions

View File

@ -47,7 +47,6 @@
pc.enable = true; pc.enable = true;
}; };
programs = { programs = {
borg.enable = true;
kitty.enable = true; kitty.enable = true;
virt-manager.enable = true; virt-manager.enable = true;
}; };

View File

@ -92,9 +92,6 @@
# Modules # Modules
modules = { modules = {
programs = {
borg.enable = true;
};
services = { services = {
ssh.enable = true; ssh.enable = true;
syncthing = { syncthing = {

View File

@ -7,6 +7,8 @@ in {
./keyd.nix ./keyd.nix
./gnome.nix ./gnome.nix
./peripherals.nix ./peripherals.nix
../programs/chrome.nix
../programs/firefox.nix
]; ];
options.modules.desktop.enable = lib.mkEnableOption "desktop"; options.modules.desktop.enable = lib.mkEnableOption "desktop";

View File

@ -2,6 +2,7 @@
{ {
imports = [ imports = [
../programs/beancount.nix ../programs/beancount.nix
../programs/borg.nix
]; ];
options.modules.extra.enable = lib.mkEnableOption "extra"; options.modules.extra.enable = lib.mkEnableOption "extra";
} }

View File

@ -1,8 +1,7 @@
{ config, pkgs, user, lib, ... }: { config, pkgs, user, lib, ... }:
let cfg = config.modules.programs.borg; let cfg = config.modules.extra;
in { in {
options.modules.programs.borg.enable = lib.mkEnableOption "borg";
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
borgbackup # Deduplicating backup program borgbackup # Deduplicating backup program
@ -21,6 +20,7 @@ in {
rm /tmp/docker_images rm /tmp/docker_images
'') '')
]; ];
services.borgmatic.enable = true; services.borgmatic.enable = true;
}; };
} }

View File

@ -1,7 +1,6 @@
{ config, lib, pkgs, user, ... }: { config, lib, pkgs, user, ... }:
let cfg1 = config.modules.desktop; let cfg = config.modules.programs.chrome;
cfg2 = config.modules.programs.chrome;
in { in {
options.modules.programs.chrome = with lib; { options.modules.programs.chrome = with lib; {
enable = lib.mkOption { enable = lib.mkOption {
@ -10,7 +9,7 @@ in {
}; };
}; };
config = lib.mkIf (cfg1.enable && cfg2.enable) { config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
google-chrome # Web browser developed by Google google-chrome # Web browser developed by Google
]; ];

View File

@ -2,9 +2,6 @@
{ {
imports = [ imports = [
./appgate-sdp.nix ./appgate-sdp.nix
./borg.nix
./chrome.nix
./firefox.nix
./kitty.nix ./kitty.nix
./nvim.nix ./nvim.nix
./virt-manager.nix ./virt-manager.nix

View File

@ -1,7 +1,6 @@
{ config, lib, pkgs, user, ... }: { config, lib, pkgs, user, ... }:
let cfg1 = config.modules.desktop; let cfg = config.modules.programs.firefox;
cfg2 = config.modules.programs.firefox;
in { in {
options.modules.programs.firefox = with lib; { options.modules.programs.firefox = with lib; {
enable = lib.mkOption { enable = lib.mkOption {
@ -10,7 +9,7 @@ in {
}; };
}; };
config = lib.mkIf (cfg1.enable && cfg2.enable) { config = lib.mkIf cfg.enable {
home-manager.users.${user} = { home-manager.users.${user} = {
programs.firefox = { programs.firefox = {
enable = true; enable = true;