merge

2025-02-19 19:27:31 -08:00 · 2023-09-02 11:16:05 -07:00 · 2023-09-02 11:16:05 -07:00 · 52a2783a02
commit 52a2783a02
parent 2ec66505cc b936165ded
2 changed files with 4 additions and 1 deletions
--- a/provision/nixos/hosts/bulwark/configuration.nix
+++ b/provision/nixos/hosts/bulwark/configuration.nix
@ -2,6 +2,7 @@
 {
  imports = [
    ./steam-deck.nix
+    ../../modules 
  ];

  nix = {
@ -112,7 +113,6 @@
    };

  # Enable modules
-  imports = [ ../../modules ];
  modules = {
    services = {
      samba-client.enable = true;
--- a/provision/nixos/hosts/bulwark/steam-deck.nix
+++ b/provision/nixos/hosts/bulwark/steam-deck.nix
@ -63,5 +63,8 @@
        };
      };
    };
+<<<<<<< HEAD
  };
+=======
+>>>>>>> b936165dedb9347725fa93e35ccaecd9bd55aa68
 }