refreshed config

7 files changed, 50 insertions, 6 deletions

diff --git a/nixos/hosts/apocalypse/backup.nix b/hosts/apocalypse/backup.nix
index 07386be..3529024 100644
--- a/nixos/hosts/apocalypse/backup.nix
+++ b/hosts/apocalypse/backup.nix
@@ -10,6 +10,10 @@
   instances."remote_vault" = {
     onCalendar = "weekly";
     settings = {
+      snapshot_preserve_min = "1w"; 
+      snapshot_preserve = "2w";
+      target_preserve_min = "1w"; 
+      target_preserve = "4w";
       ssh_identity = "/etc/vault_key"; # NOTE: must be readable by user/group btrbk
       ssh_user = "vaultmanager";
       stream_compress = "lz4";
@@ -17,7 +21,7 @@
         target = "ssh://10.127.9.1/vault/backups/apocalypse";
         subvolume = { 
           "@root" = { 
-            snapshot_create = "always";
+            snapshot_create = "ondemand";
           };  
         };
       };
diff --git a/nixos/hosts/apocalypse/default.nix b/hosts/apocalypse/default.nix
index e57105c..8993dc2 100644
--- a/nixos/hosts/apocalypse/default.nix
+++ b/hosts/apocalypse/default.nix
@@ -1,12 +1,24 @@
- {pkgs, config, lib, ...}: 
+ {lib, ...}: 
  { 
    imports = [
      ./hardware-configuration.nix
-     ../../common
      ./nvidia.nix
      ./backup.nix
      ./firewall.nix
    ];
+  
+  ## Addons for this system
+  addons = { 
+    desktop.hyprland.enable = true; 
+    desktop.xfce.enable = true; 
+
+    virtualisation.guest = false; 
+    virtualisation.host = true; 
+
+    vpn.mullvad.enable = true; 
+    gpg.enable = true;
+  };
+
    boot.loader.grub = { 
         useOSProber = true;
    	device = "nodev";
@@ -18,7 +30,7 @@
    };
  boot.loader.efi.canTouchEfiVariables = true;
  boot.initrd.systemd.enable = true;
- boot.crashDump.enable = false; 
+ boot.crashDump.enable = true; 
  boot.plymouth = {
 	enable = true;
 	theme = "bgrt";
@@ -47,7 +59,7 @@
 
   programs.nix-ld.enable = true;
   services.printing.enable = true;
-  nixpkgs.config.allowUnfree = true; 
+  # nix.config.allowUnfree = true; 
 
 
 	services.resolved = {
@@ -58,7 +70,6 @@
 	  dnsovertls = "opportunistic";
 	};
 
-  
   networking.useDHCP = lib.mkDefault true;
   networking.firewall.checkReversePath = false;  
 
diff --git a/nixos/hosts/apocalypse/firewall.nix b/hosts/apocalypse/firewall.nix
index 5c73966..5c73966 100644
--- a/nixos/hosts/apocalypse/firewall.nix
+++ b/hosts/apocalypse/firewall.nix
diff --git a/nixos/hosts/apocalypse/hardware-configuration.nix b/hosts/apocalypse/hardware-configuration.nix
index d8ae434..d8ae434 100644
--- a/nixos/hosts/apocalypse/hardware-configuration.nix
+++ b/hosts/apocalypse/hardware-configuration.nix
diff --git a/nixos/hosts/apocalypse/nvidia.nix b/hosts/apocalypse/nvidia.nix
index ef95b43..ef95b43 100644
--- a/nixos/hosts/apocalypse/nvidia.nix
+++ b/hosts/apocalypse/nvidia.nix
diff --git a/hosts/full-iso/default.nix b/hosts/full-iso/default.nix
new file mode 100644
index 0000000..d2ca00a
--- /dev/null
+++ b/hosts/full-iso/default.nix
@@ -0,0 +1,12 @@
+{modulesPath, pkgs, ...}: {
+  imports = [
+     (modulesPath + "/installer/cd-dvd/installation-cd-base.nix")
+  ];
+
+  boot.loader.systemd-boot.enable = true; 
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  addons.desktop.hyprland.enable = true; 
+  addons.desktop.xfce.enable = false; 
+  addons.gpg.enable = false; 
+} 
diff --git a/hosts/test_vm/default.nix b/hosts/test_vm/default.nix
new file mode 100644
index 0000000..280cb9a
--- /dev/null
+++ b/hosts/test_vm/default.nix
@@ -0,0 +1,17 @@
+{pkgs, lib, ...}: {
+  
+  boot.loader.systemd-boot.enable = true; 
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  addons.desktop.hyprland.enable = true; 
+  addons.desktop.xfce.enable = true; 
+  addons.virtualisation.guest = true; 
+  virtualisation.vmVariant = {
+    # following configuration is added only when building VM with build-vm
+    virtualisation = {
+      memorySize = 2048; # Use 2048MiB memory.
+      cores = 3;
+      graphics = true;
+    };
+  };
+}