diff --git a/nixos/hosts/silver/hardware.nix b/nixos/hosts/silver/hardware.nix index 016bfa3..347dbae 100644 --- a/nixos/hosts/silver/hardware.nix +++ b/nixos/hosts/silver/hardware.nix @@ -11,8 +11,6 @@ (modulesPath + "/profiles/qemu-guest.nix") ]; - boot.initrd.availableKernelModules = ["virtio-pci"]; - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's # still possible to use this option, but it's recommended to use it in conjunction diff --git a/nixos/hosts/silver/services/default.nix b/nixos/hosts/silver/services/default.nix index 1850d78..f6d83c8 100644 --- a/nixos/hosts/silver/services/default.nix +++ b/nixos/hosts/silver/services/default.nix @@ -1,7 +1,6 @@ {pkgs, ...}: { imports = [ ./vcnotifier.nix - # ./nodemusicbot.nix ./breeze.nix ./min-rip.nix ./gitea.nix diff --git a/nixos/hosts/silver/services/nodemusicbot.nix b/nixos/hosts/silver/services/nodemusicbot.nix deleted file mode 100644 index 136c65e..0000000 --- a/nixos/hosts/silver/services/nodemusicbot.nix +++ /dev/null @@ -1,9 +0,0 @@ -{config, ...}: { - sops.secrets."svc-nodemusicbot-env" = {}; - - virtualisation.oci-containers.containers.nodemusicbot = { - image = "git.min.rip/min/nodemusicbot:latest"; - extraOptions = ["--rm"]; - environmentFiles = [config.sops.secrets."svc-nodemusicbot-env".path]; - }; -} diff --git a/nixos/modules/system/default.nix b/nixos/modules/system/default.nix index 2b91dc0..9bf5988 100644 --- a/nixos/modules/system/default.nix +++ b/nixos/modules/system/default.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{inputs, pkgs, ...}: { imports = [ ./hardening.nix ./limits.nix @@ -25,9 +25,19 @@ nix = { # Make sure flakes are enabled settings.experimental-features = ["nix-command" "flakes"]; + extraOptions = '' + keep-outputs = true + keep-derivations = true - # Use our nixpkgs on legacy Nix tools. - # This way I don't have to `nix-channel --update` to use `nix-shell` - nixPath = ["nixpath=${pkgs.path}"]; + flake-registry = ${builtins.toFile "flake-registry" (builtins.toJSON { + version = 2; + flakes = []; + })} + ''; + nixPath = ["nixpkgs=${pkgs.path}"]; + registry = { + self.flake = inputs.self; + nixpkgs.flake = inputs.nixpkgs; + }; }; }