Spring cleaning

5 files changed, 18 insertions, 43 deletions

diff --git a/flake.nix b/flake.nix
index f4e1cd8..8a90cec 100644
--- a/flake.nix
+++ b/flake.nix
@@ -56,7 +56,7 @@
       # for `nix flake check`
       checks = (
         forAllSystems (pkgs: {
-          formatting = treefmtEval.${pkgs.system}.config.build.check self;
+          formatting = treefmtEval.${pkgs.stdenv.hostPlatform.system}.config.build.check self;
         })
       );
 
@@ -89,39 +89,6 @@
             inputs.sops-nix.nixosModules.sops
           ];
         };
-        vm-desktop = nixpkgs.lib.nixosSystem {
-          specialArgs = {
-            inherit inputs;
-          };
-          system = "x86_64-linux";
-          modules = [
-            ./modules
-            ./hosts/test_vm
-            ./users/live-user.nix
-            inputs.home-manager.nixosModules.default
-            inputs.sops-nix.nixosModules.sops
-          ];
-        };
-        vm-shell = nixpkgs.lib.nixosSystem {
-          specialArgs = {
-            inherit inputs;
-          };
-          system = "x86_64-linux";
-          modules = [
-            ./modules
-            ./hosts/test_vm
-            ./users/live-user.nix
-            (
-              { lib, ... }:
-              {
-                addons.desktop.hyprland.enable = lib.mkForce false;
-                addons.desktop.xfce.enable = lib.mkForce false;
-              }
-            )
-            inputs.home-manager.nixosModules.default
-            inputs.sops-nix.nixosModules.sops
-          ];
-        };
       };
     };
 }
diff --git a/home-modules/apps/default.nix b/home-modules/apps/default.nix
index ece0543..31766ab 100644
--- a/home-modules/apps/default.nix
+++ b/home-modules/apps/default.nix
@@ -103,7 +103,7 @@ in
     })
     (lib.mkIf cfg.work.enable {
       home.packages = with pkgs; [
-        inputs.tatuin.packages.${pkgs.system}.default
+        inputs.tatuin.packages.${pkgs.stdenv.hostPlatform.system}.default
         todoman
       ];
     })
diff --git a/home-modules/apps/nvim/default.nix b/home-modules/apps/nvim/default.nix
index c99a343..fc73d2d 100644
--- a/home-modules/apps/nvim/default.nix
+++ b/home-modules/apps/nvim/default.nix
@@ -52,7 +52,7 @@ in
         rustup
         nil
         statix
-        nixfmt-rfc-style
+        nixfmt
         # phpactor
         pyright
         nodePackages.intelephense
diff --git a/home-modules/desktop/wayland/default.nix b/home-modules/desktop/wayland/default.nix
index 87ab13b..97f5fef 100644
--- a/home-modules/desktop/wayland/default.nix
+++ b/home-modules/desktop/wayland/default.nix
@@ -1,11 +1,17 @@
-{ pkgs, ... }:
+{
+  pkgs,
+  lib,
+  hostconfig,
+  ...
+}:
 {
   imports = [
     ./waybar.nix
     ./mako.nix
   ];
-  xdg.portal = {
+  xdg.portal = lib.mkIf hostconfig.addons.desktop.wayland.enable {
     enable = true;
+
     extraPortals = [
       pkgs.xdg-desktop-portal-gtk
     ];
diff --git a/hosts/apocalypse/default.nix b/hosts/apocalypse/default.nix
index b2eddc4..d22f2df 100644
--- a/hosts/apocalypse/default.nix
+++ b/hosts/apocalypse/default.nix
@@ -25,7 +25,7 @@
     gpg.enable = true;
 
     remote_builder = {
-      enable = true;
+      enable = false;
       allowedKeyFiles = [ ../../secrets/eli.pub ];
       openFirewall = true;
     };
@@ -76,10 +76,12 @@
 
   services.resolved = {
     enable = true;
-    dnssec = "false";
-    domains = [ "~." ];
-    fallbackDns = [ ];
-    dnsovertls = "opportunistic";
+    settings.Resolve = {
+      DNSSEC = "false";
+      Domains = [ "~." ];
+      FallbackDns = [ "8.8.8.8" ];
+      DNSOverTLS = "opportunistic";
+    };
   };
 
   networking.useDHCP = lib.mkDefault true;