diff options
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/flake.nix | 10 | ||||
| -rw-r--r-- | nix/modules/configuration.nix | 4 | ||||
| -rw-r--r-- | nix/modules/home/default.nix | 1 | ||||
| -rw-r--r-- | nix/modules/home/pantalaimon.nix | 17 | ||||
| -rw-r--r-- | nix/modules/nginx.nix | 10 |
5 files changed, 31 insertions, 11 deletions
diff --git a/nix/flake.nix b/nix/flake.nix index bab8574..3c56a49 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -53,11 +53,6 @@ ]; }; }); - - pkgs = import nixpkgs { - inherit system; - overlays = [ nix-topology.overlays.default ]; - }; in { nixosConfigurations = builtins.listToAttrs (mkConfigs [ "affinity" @@ -67,7 +62,10 @@ ]); topology."${system}" = import nix-topology { - inherit pkgs; + pkgs = import nixpkgs { + inherit system; + overlays = [ nix-topology.overlays.default ]; + }; modules = [ ./topology/default.nix { nixosConfigurations = self.nixosConfigurations; } diff --git a/nix/modules/configuration.nix b/nix/modules/configuration.nix index 1d175dc..6f8f314 100644 --- a/nix/modules/configuration.nix +++ b/nix/modules/configuration.nix @@ -310,6 +310,10 @@ }; }; + nixpkgs.config.permittedInsecurePackages = [ + "olm-3.2.16" + ]; + nix.settings.experimental-features = "nix-command flakes"; time.timeZone = config.monorepo.vars.timeZone; i18n.defaultLocale = "en_CA.UTF-8"; diff --git a/nix/modules/home/default.nix b/nix/modules/home/default.nix index 13966da..06c43dc 100644 --- a/nix/modules/home/default.nix +++ b/nix/modules/home/default.nix @@ -20,6 +20,7 @@ ./mpd.nix ./mako.nix ./user.nix + ./pantalaimon.nix ]; options = { diff --git a/nix/modules/home/pantalaimon.nix b/nix/modules/home/pantalaimon.nix new file mode 100644 index 0000000..4645687 --- /dev/null +++ b/nix/modules/home/pantalaimon.nix @@ -0,0 +1,17 @@ +{ lib, config, ... }: +{ + services.pantalaimon = { + enable = lib.mkDefault config.monorepo.profiles.graphics.enable; + settings = { + Default = { + LogLevel = "Debug"; + SSL = true; + }; + local-matrix = { + Homeserver = "https://social.nullring.xyz"; + ListenAddress = "127.0.0.1"; + ListenPort = "8008"; + }; + }; + }; +} diff --git a/nix/modules/nginx.nix b/nix/modules/nginx.nix index bcc213a..18becfe 100644 --- a/nix/modules/nginx.nix +++ b/nix/modules/nginx.nix @@ -37,11 +37,11 @@ ''; virtualHosts = { - "ret2pop.net" = { - # addSSL = true; - # enableACME = true; - root = "/home/preston/ret2pop-website/"; - }; + "ret2pop.nullring.xyz" = { + # addSSL = true; + # enableACME = true; + root = "/home/preston/ret2pop-website/"; + }; }; }; } |