diff --git a/home-manager/home.nix b/home-manager/home.nix index 69ad57d..aa0cadd 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -9,6 +9,7 @@ outputs.homeManagerModules.shellColors outputs.homeManagerModules.microColors outputs.homeManagerModules.gnomeBindings + outputs.homeManagerModules.disableNews ]; home.username = "oatmealine"; diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index df367ec..281c474 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -5,4 +5,5 @@ shellColors = import ./shell-colors.nix; microColors = import ./micro-colors.nix; gnomeBindings = import ./gnome-bindings.nix; + disableNews = import ./disable-news.nix; } diff --git a/modules/home-manager/disable-news.nix b/modules/home-manager/disable-news.nix new file mode 100644 index 0000000..35c7329 --- /dev/null +++ b/modules/home-manager/disable-news.nix @@ -0,0 +1,13 @@ +# It doesn't even work out of the box with flakes... +# +# +# Include this in the `modules` passed to +# `inputs.home-manager.lib.homeManagerConfiguration`. +{ lib, ... }: { + # disabledModules = [ "misc/news.nix" ]; + config = { + news.display = "silent"; + news.json = lib.mkForce { }; + news.entries = lib.mkForce [ ]; + }; +} \ No newline at end of file diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 1997985..ce5c0b7 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -16,6 +16,7 @@ ./security.nix ./users.nix ./software.nix + ./wireguard.nix ]; nixpkgs.config.allowUnfree = true; diff --git a/nixos/software.nix b/nixos/software.nix index 37f5c76..9041c48 100644 --- a/nixos/software.nix +++ b/nixos/software.nix @@ -1,4 +1,4 @@ -{ pkgs, inputs, ... }: +{ pkgs, ... }: { # Enable sound with pipewire. @@ -32,6 +32,7 @@ doas catppuccin-gtk home-manager + wireguard-tools ]; environment.variables.EDITOR = "micro"; diff --git a/nixos/wireguard.nix b/nixos/wireguard.nix new file mode 100644 index 0000000..eaddf7c --- /dev/null +++ b/nixos/wireguard.nix @@ -0,0 +1,24 @@ +{ ... }: +{ + /* + networking.firewall.checkReversePath = false; + networking.firewall.allowedUDPPorts = [ 51820 ]; + + networking.wg-quick.interfaces.wg0 = { + address = [ "10.100.0.6/32" ]; + privateKeyFile = "/home/oatmealine/wireguard-keys/private"; + + listenPort = 51820; + + peers = [ + { + publicKey = "fOb9kJS1992n5dHu0YvzEMEHkSdc1tDzfRFILQLj6W8="; + allowedIPs = [ "0.0.0.0/0" "::/0" ]; + endpoint = "46.4.96.113:51820"; + # ensure connection is stable under NATs + persistentKeepalive = 25; + } + ]; + }; + */ +} \ No newline at end of file