diff --git a/flake.nix b/flake.nix index 6618c30..cbd1b4f 100644 --- a/flake.nix +++ b/flake.nix @@ -103,6 +103,7 @@ ./modules/nixos inputs.home-manager.nixosModules.default inputs.stylix.nixosModules.stylix + inputs.impermanence.nixosModules.impermanence ]; }; diff --git a/hosts/muon/configuration.nix b/hosts/muon/configuration.nix index 8948fa6..5b19ff4 100644 --- a/hosts/muon/configuration.nix +++ b/hosts/muon/configuration.nix @@ -82,6 +82,14 @@ in { }; networking.firewall.allowedTCPPorts = [80]; + # Wildcard DNS: *.word.local -> 127.0.0.1 via NetworkManager's built-in dnsmasq + networking.networkmanager.dns = "dnsmasq"; + # Force resolv.conf to use local dnsmasq so wildcard DNS is actually queried + networking.resolvconf.useLocalResolver = true; + environment.etc."NetworkManager/dnsmasq.d/word-local.conf".text = '' + address=/.word.local/127.0.0.1 + ''; + virtualisation.virtualbox.host.enable = true; users.extraGroups.vboxusers.members = ["user-with-access-to-virtualbox"]; diff --git a/hosts/mups/home.nix b/hosts/mups/home.nix index 4198439..2f77ed0 100644 --- a/hosts/mups/home.nix +++ b/hosts/mups/home.nix @@ -6,8 +6,6 @@ }: { # Modules mods.terminal.zsh.enable = true; - # mods.terminal.development.enable = true; - # mods.terminal.tools.enable = true; # Version of first install home.stateVersion = "24.05"; diff --git a/modules/home/desktop/zen.nix b/modules/home/desktop/zen.nix index a41edc6..dda7170 100644 --- a/modules/home/desktop/zen.nix +++ b/modules/home/desktop/zen.nix @@ -237,6 +237,6 @@ with lib; { }; }; }; - # stylix.targets.zen-browser.profileNames = ["default"]; + stylix.targets.zen-browser.profileNames = ["default"]; }; } diff --git a/modules/nixos/core/network.nix b/modules/nixos/core/network.nix index 1478fbf..5219b13 100644 --- a/modules/nixos/core/network.nix +++ b/modules/nixos/core/network.nix @@ -103,14 +103,6 @@ in 127.0.0.1 word.local ''; - # # Wildcard DNS: *.word.local -> 127.0.0.1 via NetworkManager's built-in dnsmasq - # networking.networkmanager.dns = "dnsmasq"; - # # Force resolv.conf to use local dnsmasq so wildcard DNS is actually queried - # networking.resolvconf.useLocalResolver = true; - # environment.etc."NetworkManager/dnsmasq.d/word-local.conf".text = '' - # address=/.word.local/127.0.0.1 - # ''; - # gateway = # "${pkgs.networkmanager}/bin/nmcli dev show ${interface} | ${pkgs.gnugrep}/bin/fgrep IP4.GATEWAY | ${pkgs.awk}/bin/awk {print $2}"; }; diff --git a/modules/nixos/impermanence.nix b/modules/nixos/impermanence.nix index 3710826..2b65dc8 100644 --- a/modules/nixos/impermanence.nix +++ b/modules/nixos/impermanence.nix @@ -8,10 +8,10 @@ with lib; { options.mods.impermanence.enable = mkEnableOption "enables impermanence"; config = mkIf config.mods.impermanence.enable { - # environment.persistence."/persist" = { - # directories = ["/var/lib/nixos" "/var/lib/systemd/coredump"]; - # files = ["/var/lib/sops-nix/key.txt" "/etc/machine-id"]; - # }; + environment.persistence."/persist" = { + directories = ["/var/lib/nixos" "/var/lib/systemd/coredump"]; + files = ["/var/lib/sops-nix/key.txt" "/etc/machine-id"]; + }; boot.initrd.postResumeCommands = lib.mkAfter # sh