From 6cbfbd78c4df7c850ca2f5a0a7473914e38519e9 Mon Sep 17 00:00:00 2001 From: Christoph Schmatzler Date: Tue, 12 Aug 2025 19:08:49 +0000 Subject: [PATCH] up --- hosts/darwin/shared.nix | 3 +- hosts/nixos/tahani/default.nix | 17 ++- modules/base/home-manager/default.nix | 28 ----- modules/{base => core}/default.nix | 21 +--- modules/home-manager/base/default.nix | 24 ++++ .../base/editors}/neovim/autocmd.nix | 0 .../base/editors}/neovim/default.nix | 0 .../base/editors}/neovim/mappings.nix | 0 .../base/editors}/neovim/options.nix | 0 .../base/editors}/neovim/plugins/conform.nix | 0 .../base/editors}/neovim/plugins/grug-far.nix | 0 .../base/editors}/neovim/plugins/lazygit.nix | 0 .../base/editors}/neovim/plugins/lsp.nix | 0 .../base/editors}/neovim/plugins/mini.nix | 0 .../editors}/neovim/plugins/treesitter.nix | 0 modules/home-manager/base/shell/aliases.nix | 6 + .../base/shell}/fish.nix | 0 .../base/shell}/starship.nix | 0 .../base/shell}/zsh.nix | 0 .../base/tools}/atuin.nix | 0 .../base/tools}/bat.nix | 0 .../base/tools}/eza.nix | 0 .../base/tools}/git.nix | 0 .../base/tools}/lazygit.nix | 0 .../base/tools}/mise.nix | 0 .../base/tools}/ssh.nix | 0 .../base/tools}/zellij.nix | 0 .../base/tools}/zoxide.nix | 0 modules/home-manager/darwin/default.nix | 5 + .../darwin/terminal}/ghostty.nix | 0 modules/home-manager/nixos/default.nix | 5 + .../nixos/terminal}/zellij.nix | 0 modules/networking/firewall.nix | 6 + modules/networking/ssh.nix | 9 ++ modules/networking/tailscale.nix | 3 + modules/nixos/default.nix | 109 ------------------ .../packages.nix => packages/default.nix} | 4 +- modules/{ => platform}/darwin/default.nix | 20 ++-- .../{ => platform}/darwin/dock/default.nix | 0 modules/{ => platform}/darwin/homebrew.nix | 0 modules/{ => platform}/darwin/packages.nix | 0 modules/{ => platform}/darwin/secrets.nix | 0 modules/{ => platform}/darwin/system.nix | 0 modules/platform/nixos/default.nix | 74 ++++++++++++ modules/{ => platform}/nixos/packages.nix | 0 modules/platform/nixos/tailscale.nix | 8 ++ modules/services/adguard.nix | 21 ++++ 47 files changed, 188 insertions(+), 175 deletions(-) delete mode 100644 modules/base/home-manager/default.nix rename modules/{base => core}/default.nix (85%) create mode 100644 modules/home-manager/base/default.nix rename modules/{base/home-manager => home-manager/base/editors}/neovim/autocmd.nix (100%) rename modules/{base/home-manager => home-manager/base/editors}/neovim/default.nix (100%) rename modules/{base/home-manager => home-manager/base/editors}/neovim/mappings.nix (100%) rename modules/{base/home-manager => home-manager/base/editors}/neovim/options.nix (100%) rename modules/{base/home-manager => home-manager/base/editors}/neovim/plugins/conform.nix (100%) rename modules/{base/home-manager => home-manager/base/editors}/neovim/plugins/grug-far.nix (100%) rename modules/{base/home-manager => home-manager/base/editors}/neovim/plugins/lazygit.nix (100%) rename modules/{base/home-manager => home-manager/base/editors}/neovim/plugins/lsp.nix (100%) rename modules/{base/home-manager => home-manager/base/editors}/neovim/plugins/mini.nix (100%) rename modules/{base/home-manager => home-manager/base/editors}/neovim/plugins/treesitter.nix (100%) create mode 100644 modules/home-manager/base/shell/aliases.nix rename modules/{base/home-manager => home-manager/base/shell}/fish.nix (100%) rename modules/{base/home-manager => home-manager/base/shell}/starship.nix (100%) rename modules/{base/home-manager => home-manager/base/shell}/zsh.nix (100%) rename modules/{base/home-manager => home-manager/base/tools}/atuin.nix (100%) rename modules/{base/home-manager => home-manager/base/tools}/bat.nix (100%) rename modules/{base/home-manager => home-manager/base/tools}/eza.nix (100%) rename modules/{base/home-manager => home-manager/base/tools}/git.nix (100%) rename modules/{base/home-manager => home-manager/base/tools}/lazygit.nix (100%) rename modules/{base/home-manager => home-manager/base/tools}/mise.nix (100%) rename modules/{base/home-manager => home-manager/base/tools}/ssh.nix (100%) rename modules/{base/home-manager => home-manager/base/tools}/zellij.nix (100%) rename modules/{base/home-manager => home-manager/base/tools}/zoxide.nix (100%) create mode 100644 modules/home-manager/darwin/default.nix rename modules/{darwin/home-manager => home-manager/darwin/terminal}/ghostty.nix (100%) create mode 100644 modules/home-manager/nixos/default.nix rename modules/{nixos/home-manager => home-manager/nixos/terminal}/zellij.nix (100%) create mode 100644 modules/networking/firewall.nix create mode 100644 modules/networking/ssh.nix create mode 100644 modules/networking/tailscale.nix delete mode 100644 modules/nixos/default.nix rename modules/{base/packages.nix => packages/default.nix} (99%) rename modules/{ => platform}/darwin/default.nix (76%) rename modules/{ => platform}/darwin/dock/default.nix (100%) rename modules/{ => platform}/darwin/homebrew.nix (100%) rename modules/{ => platform}/darwin/packages.nix (100%) rename modules/{ => platform}/darwin/secrets.nix (100%) rename modules/{ => platform}/darwin/system.nix (100%) create mode 100644 modules/platform/nixos/default.nix rename modules/{ => platform}/nixos/packages.nix (100%) create mode 100644 modules/platform/nixos/tailscale.nix create mode 100644 modules/services/adguard.nix diff --git a/hosts/darwin/shared.nix b/hosts/darwin/shared.nix index c2e65e1..87f8138 100644 --- a/hosts/darwin/shared.nix +++ b/hosts/darwin/shared.nix @@ -1,6 +1,5 @@ { imports = [ - ../../modules/base - ../../modules/darwin + ../../modules/platform/darwin ]; } diff --git a/hosts/nixos/tahani/default.nix b/hosts/nixos/tahani/default.nix index 270bcdd..220350b 100644 --- a/hosts/nixos/tahani/default.nix +++ b/hosts/nixos/tahani/default.nix @@ -5,8 +5,7 @@ ... }: { imports = [ - ../../../modules/base - ../../../modules/nixos + ../../../modules/platform/nixos ]; boot = { @@ -51,13 +50,13 @@ nameservers = ["1.1.1.1"]; }; - sops.secrets = { - tahani-syncthing-cert = { - sopsFile = "./secrets/tahani-syncthing-cert"; - format = "binary"; - path = "/home/${user}/.config/syncthing/cert.pem"; - }; - }; + # sops.secrets = { + # tahani-syncthing-cert = { + # sopsFile = "./secrets/tahani-syncthing-cert"; + # format = "binary"; + # path = "/home/${user}/.config/syncthing/cert.pem"; + # }; + # }; services.syncthing = { enable = true; diff --git a/modules/base/home-manager/default.nix b/modules/base/home-manager/default.nix deleted file mode 100644 index 687cdfb..0000000 --- a/modules/base/home-manager/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - imports = [ - ./atuin.nix - ./bat.nix - ./eza.nix - ./fish.nix - ./git.nix - ./lazygit.nix - ./neovim - ./mise.nix - ./ssh.nix - ./starship.nix - ./zellij.nix - ./zoxide.nix - ./zsh.nix - ]; - - programs.home-manager.enable = true; - programs.direnv = { - enable = true; - nix-direnv.enable = true; - }; - - home.shellAliases = { - v = "nvim"; - lg = "lazygit"; - }; -} diff --git a/modules/base/default.nix b/modules/core/default.nix similarity index 85% rename from modules/base/default.nix rename to modules/core/default.nix index 2b5bb0a..fab772c 100644 --- a/modules/base/default.nix +++ b/modules/core/default.nix @@ -1,11 +1,5 @@ -{ - sops-nix, - pkgs, - user, - ... -}: { - imports = [ - ]; +{pkgs, ...}: { + programs.fish.enable = true; nixpkgs = { config = { @@ -27,7 +21,6 @@ settings = { trusted-users = [ "@admin" - "${user}" ]; substituters = [ "https://nix-community.cachix.org" @@ -43,12 +36,4 @@ experimental-features = nix-command flakes ''; }; - - programs.fish.enable = true; - - services = { - tailscale = { - enable = true; - }; - }; -} +} \ No newline at end of file diff --git a/modules/home-manager/base/default.nix b/modules/home-manager/base/default.nix new file mode 100644 index 0000000..def90eb --- /dev/null +++ b/modules/home-manager/base/default.nix @@ -0,0 +1,24 @@ +{ + imports = [ + ./shell/aliases.nix + ./shell/fish.nix + ./shell/starship.nix + ./shell/zsh.nix + ./tools/atuin.nix + ./tools/bat.nix + ./tools/eza.nix + ./tools/git.nix + ./tools/lazygit.nix + ./tools/mise.nix + ./tools/ssh.nix + ./tools/zellij.nix + ./tools/zoxide.nix + ./editors/neovim + ]; + + programs.home-manager.enable = true; + programs.direnv = { + enable = true; + nix-direnv.enable = true; + }; +} \ No newline at end of file diff --git a/modules/base/home-manager/neovim/autocmd.nix b/modules/home-manager/base/editors/neovim/autocmd.nix similarity index 100% rename from modules/base/home-manager/neovim/autocmd.nix rename to modules/home-manager/base/editors/neovim/autocmd.nix diff --git a/modules/base/home-manager/neovim/default.nix b/modules/home-manager/base/editors/neovim/default.nix similarity index 100% rename from modules/base/home-manager/neovim/default.nix rename to modules/home-manager/base/editors/neovim/default.nix diff --git a/modules/base/home-manager/neovim/mappings.nix b/modules/home-manager/base/editors/neovim/mappings.nix similarity index 100% rename from modules/base/home-manager/neovim/mappings.nix rename to modules/home-manager/base/editors/neovim/mappings.nix diff --git a/modules/base/home-manager/neovim/options.nix b/modules/home-manager/base/editors/neovim/options.nix similarity index 100% rename from modules/base/home-manager/neovim/options.nix rename to modules/home-manager/base/editors/neovim/options.nix diff --git a/modules/base/home-manager/neovim/plugins/conform.nix b/modules/home-manager/base/editors/neovim/plugins/conform.nix similarity index 100% rename from modules/base/home-manager/neovim/plugins/conform.nix rename to modules/home-manager/base/editors/neovim/plugins/conform.nix diff --git a/modules/base/home-manager/neovim/plugins/grug-far.nix b/modules/home-manager/base/editors/neovim/plugins/grug-far.nix similarity index 100% rename from modules/base/home-manager/neovim/plugins/grug-far.nix rename to modules/home-manager/base/editors/neovim/plugins/grug-far.nix diff --git a/modules/base/home-manager/neovim/plugins/lazygit.nix b/modules/home-manager/base/editors/neovim/plugins/lazygit.nix similarity index 100% rename from modules/base/home-manager/neovim/plugins/lazygit.nix rename to modules/home-manager/base/editors/neovim/plugins/lazygit.nix diff --git a/modules/base/home-manager/neovim/plugins/lsp.nix b/modules/home-manager/base/editors/neovim/plugins/lsp.nix similarity index 100% rename from modules/base/home-manager/neovim/plugins/lsp.nix rename to modules/home-manager/base/editors/neovim/plugins/lsp.nix diff --git a/modules/base/home-manager/neovim/plugins/mini.nix b/modules/home-manager/base/editors/neovim/plugins/mini.nix similarity index 100% rename from modules/base/home-manager/neovim/plugins/mini.nix rename to modules/home-manager/base/editors/neovim/plugins/mini.nix diff --git a/modules/base/home-manager/neovim/plugins/treesitter.nix b/modules/home-manager/base/editors/neovim/plugins/treesitter.nix similarity index 100% rename from modules/base/home-manager/neovim/plugins/treesitter.nix rename to modules/home-manager/base/editors/neovim/plugins/treesitter.nix diff --git a/modules/home-manager/base/shell/aliases.nix b/modules/home-manager/base/shell/aliases.nix new file mode 100644 index 0000000..1c0793c --- /dev/null +++ b/modules/home-manager/base/shell/aliases.nix @@ -0,0 +1,6 @@ +{ + home.shellAliases = { + v = "nvim"; + lg = "lazygit"; + }; +} \ No newline at end of file diff --git a/modules/base/home-manager/fish.nix b/modules/home-manager/base/shell/fish.nix similarity index 100% rename from modules/base/home-manager/fish.nix rename to modules/home-manager/base/shell/fish.nix diff --git a/modules/base/home-manager/starship.nix b/modules/home-manager/base/shell/starship.nix similarity index 100% rename from modules/base/home-manager/starship.nix rename to modules/home-manager/base/shell/starship.nix diff --git a/modules/base/home-manager/zsh.nix b/modules/home-manager/base/shell/zsh.nix similarity index 100% rename from modules/base/home-manager/zsh.nix rename to modules/home-manager/base/shell/zsh.nix diff --git a/modules/base/home-manager/atuin.nix b/modules/home-manager/base/tools/atuin.nix similarity index 100% rename from modules/base/home-manager/atuin.nix rename to modules/home-manager/base/tools/atuin.nix diff --git a/modules/base/home-manager/bat.nix b/modules/home-manager/base/tools/bat.nix similarity index 100% rename from modules/base/home-manager/bat.nix rename to modules/home-manager/base/tools/bat.nix diff --git a/modules/base/home-manager/eza.nix b/modules/home-manager/base/tools/eza.nix similarity index 100% rename from modules/base/home-manager/eza.nix rename to modules/home-manager/base/tools/eza.nix diff --git a/modules/base/home-manager/git.nix b/modules/home-manager/base/tools/git.nix similarity index 100% rename from modules/base/home-manager/git.nix rename to modules/home-manager/base/tools/git.nix diff --git a/modules/base/home-manager/lazygit.nix b/modules/home-manager/base/tools/lazygit.nix similarity index 100% rename from modules/base/home-manager/lazygit.nix rename to modules/home-manager/base/tools/lazygit.nix diff --git a/modules/base/home-manager/mise.nix b/modules/home-manager/base/tools/mise.nix similarity index 100% rename from modules/base/home-manager/mise.nix rename to modules/home-manager/base/tools/mise.nix diff --git a/modules/base/home-manager/ssh.nix b/modules/home-manager/base/tools/ssh.nix similarity index 100% rename from modules/base/home-manager/ssh.nix rename to modules/home-manager/base/tools/ssh.nix diff --git a/modules/base/home-manager/zellij.nix b/modules/home-manager/base/tools/zellij.nix similarity index 100% rename from modules/base/home-manager/zellij.nix rename to modules/home-manager/base/tools/zellij.nix diff --git a/modules/base/home-manager/zoxide.nix b/modules/home-manager/base/tools/zoxide.nix similarity index 100% rename from modules/base/home-manager/zoxide.nix rename to modules/home-manager/base/tools/zoxide.nix diff --git a/modules/home-manager/darwin/default.nix b/modules/home-manager/darwin/default.nix new file mode 100644 index 0000000..19666f9 --- /dev/null +++ b/modules/home-manager/darwin/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ./terminal/ghostty.nix + ]; +} \ No newline at end of file diff --git a/modules/darwin/home-manager/ghostty.nix b/modules/home-manager/darwin/terminal/ghostty.nix similarity index 100% rename from modules/darwin/home-manager/ghostty.nix rename to modules/home-manager/darwin/terminal/ghostty.nix diff --git a/modules/home-manager/nixos/default.nix b/modules/home-manager/nixos/default.nix new file mode 100644 index 0000000..fc9d310 --- /dev/null +++ b/modules/home-manager/nixos/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ./terminal/zellij.nix + ]; +} \ No newline at end of file diff --git a/modules/nixos/home-manager/zellij.nix b/modules/home-manager/nixos/terminal/zellij.nix similarity index 100% rename from modules/nixos/home-manager/zellij.nix rename to modules/home-manager/nixos/terminal/zellij.nix diff --git a/modules/networking/firewall.nix b/modules/networking/firewall.nix new file mode 100644 index 0000000..88e2f3f --- /dev/null +++ b/modules/networking/firewall.nix @@ -0,0 +1,6 @@ +{ + networking.firewall = { + enable = true; + trustedInterfaces = ["eno1" "tailscale0"]; + }; +} \ No newline at end of file diff --git a/modules/networking/ssh.nix b/modules/networking/ssh.nix new file mode 100644 index 0000000..ab2531c --- /dev/null +++ b/modules/networking/ssh.nix @@ -0,0 +1,9 @@ +{ + services.openssh = { + enable = true; + settings = { + PermitRootLogin = "yes"; + PasswordAuthentication = false; + }; + }; +} \ No newline at end of file diff --git a/modules/networking/tailscale.nix b/modules/networking/tailscale.nix new file mode 100644 index 0000000..715abc6 --- /dev/null +++ b/modules/networking/tailscale.nix @@ -0,0 +1,3 @@ +{ + services.tailscale.enable = true; +} \ No newline at end of file diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix deleted file mode 100644 index faca300..0000000 --- a/modules/nixos/default.nix +++ /dev/null @@ -1,109 +0,0 @@ -{ - pkgs, - nixvim, - user, - sops-nix, - ... -}: let - sshKeys = import ../../shared/ssh-keys.nix; -in { - imports = [ - sops-nix.nixosModules.sops - ]; - - system.stateVersion = "25.11"; - time.timeZone = "UTC"; - - nix = { - gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 30d"; - }; - nixPath = ["nixos-config=/home/${user}/.local/share/src/nixos-config:/etc/nixos"]; - }; - - networking.firewall = { - enable = true; - trustedInterfaces = ["eno1" "tailscale0"]; - }; - - services = { - openssh = { - enable = true; - settings = { - PermitRootLogin = "yes"; - PasswordAuthentication = false; - }; - }; - tailscale = { - enable = true; - port = 41641; - useRoutingFeatures = "server"; - openFirewall = true; - }; - adguardhome = { - enable = true; - port = 10000; - settings = { - dns = { - upstream_dns = [ - "1.1.1.1" - "1.0.0.1" - ]; - }; - filtering = { - protection_enabled = true; - filtering_enabled = true; - safe_search = { - enabled = false; - }; - }; - }; - }; - }; - - users.users = { - ${user} = { - isNormalUser = true; - home = "/home/${user}"; - extraGroups = [ - "wheel" - "sudo" - "network" - "systemd-journal" - "docker" - ]; - shell = pkgs.fish; - openssh.authorizedKeys.keys = sshKeys.keys; - }; - - root = { - openssh.authorizedKeys.keys = sshKeys.keys; - }; - }; - - security.sudo = { - enable = true; - }; - - home-manager = { - users.${user} = { - pkgs, - config, - lib, - ... - }: { - _module.args = {inherit user;}; - imports = [ - nixvim.homeModules.nixvim - ../base/home-manager - ./home-manager/zellij.nix - ]; - home = { - packages = pkgs.callPackage ../base/packages.nix {} ++ pkgs.callPackage ./packages.nix {}; - stateVersion = "25.11"; - }; - }; - }; -} diff --git a/modules/base/packages.nix b/modules/packages/default.nix similarity index 99% rename from modules/base/packages.nix rename to modules/packages/default.nix index e53f31f..5a9c8e1 100644 --- a/modules/base/packages.nix +++ b/modules/packages/default.nix @@ -1,7 +1,6 @@ {pkgs}: with pkgs; [ alejandra - sops delta docker docker-compose @@ -22,6 +21,7 @@ with pkgs; [ prettier python312 ripgrep + sops sqlite tree tree-sitter @@ -29,4 +29,4 @@ with pkgs; [ vivid wget zip -] +] \ No newline at end of file diff --git a/modules/darwin/default.nix b/modules/platform/darwin/default.nix similarity index 76% rename from modules/darwin/default.nix rename to modules/platform/darwin/default.nix index d2b1c83..d05ccdd 100644 --- a/modules/darwin/default.nix +++ b/modules/platform/darwin/default.nix @@ -6,6 +6,8 @@ ... }: { imports = [ + ../../core + ../../networking/tailscale.nix ./secrets.nix ./system.nix ./homebrew.nix @@ -17,10 +19,13 @@ stateVersion = 6; }; - nix.gc.interval = { - Weekday = 0; - Hour = 2; - Minute = 0; + nix = { + settings.trusted-users = ["@admin" "${user}"]; + gc.interval = { + Weekday = 0; + Hour = 2; + Minute = 0; + }; }; users.users.${user} = { @@ -40,12 +45,13 @@ _module.args = {inherit user;}; imports = [ nixvim.homeModules.nixvim - ../base/home-manager - ./home-manager/ghostty.nix + ../../home-manager/base + ../../home-manager/darwin ]; fonts.fontconfig.enable = true; home = { - packages = pkgs.callPackage ../base/packages.nix {} ++ pkgs.callPackage ./packages.nix {}; + packages = pkgs.callPackage ../../packages {} + ++ pkgs.callPackage ./packages.nix {}; stateVersion = "25.11"; }; }; diff --git a/modules/darwin/dock/default.nix b/modules/platform/darwin/dock/default.nix similarity index 100% rename from modules/darwin/dock/default.nix rename to modules/platform/darwin/dock/default.nix diff --git a/modules/darwin/homebrew.nix b/modules/platform/darwin/homebrew.nix similarity index 100% rename from modules/darwin/homebrew.nix rename to modules/platform/darwin/homebrew.nix diff --git a/modules/darwin/packages.nix b/modules/platform/darwin/packages.nix similarity index 100% rename from modules/darwin/packages.nix rename to modules/platform/darwin/packages.nix diff --git a/modules/darwin/secrets.nix b/modules/platform/darwin/secrets.nix similarity index 100% rename from modules/darwin/secrets.nix rename to modules/platform/darwin/secrets.nix diff --git a/modules/darwin/system.nix b/modules/platform/darwin/system.nix similarity index 100% rename from modules/darwin/system.nix rename to modules/platform/darwin/system.nix diff --git a/modules/platform/nixos/default.nix b/modules/platform/nixos/default.nix new file mode 100644 index 0000000..0d26ab4 --- /dev/null +++ b/modules/platform/nixos/default.nix @@ -0,0 +1,74 @@ +{ + pkgs, + nixvim, + user, + sops-nix, + ... +}: let + sshKeys = import ../../../shared/ssh-keys.nix; +in { + imports = [ + ../../core + ../../networking/firewall.nix + ../../networking/ssh.nix + ./tailscale.nix + ../../services/adguard.nix + sops-nix.nixosModules.sops + ]; + + security.sudo.enable = true; + + system.stateVersion = "25.11"; + time.timeZone = "UTC"; + + nix = { + settings.trusted-users = ["${user}"]; + gc.dates = "weekly"; + nixPath = ["nixos-config=/home/${user}/.local/share/src/nixos-config:/etc/nixos"]; + }; + + + + users.users = { + ${user} = { + isNormalUser = true; + home = "/home/${user}"; + extraGroups = [ + "wheel" + "sudo" + "network" + "systemd-journal" + "docker" + ]; + shell = pkgs.fish; + openssh.authorizedKeys.keys = sshKeys.keys; + }; + + root = { + openssh.authorizedKeys.keys = sshKeys.keys; + }; + }; + + + + home-manager = { + users.${user} = { + pkgs, + config, + lib, + ... + }: { + _module.args = {inherit user;}; + imports = [ + nixvim.homeModules.nixvim + ../../home-manager/base + ../../home-manager/nixos + ]; + home = { + packages = pkgs.callPackage ../../packages {} + ++ pkgs.callPackage ./packages.nix {}; + stateVersion = "25.11"; + }; + }; + }; +} diff --git a/modules/nixos/packages.nix b/modules/platform/nixos/packages.nix similarity index 100% rename from modules/nixos/packages.nix rename to modules/platform/nixos/packages.nix diff --git a/modules/platform/nixos/tailscale.nix b/modules/platform/nixos/tailscale.nix new file mode 100644 index 0000000..70d8372 --- /dev/null +++ b/modules/platform/nixos/tailscale.nix @@ -0,0 +1,8 @@ +{ + services.tailscale = { + enable = true; + port = 41641; + useRoutingFeatures = "server"; + openFirewall = true; + }; +} \ No newline at end of file diff --git a/modules/services/adguard.nix b/modules/services/adguard.nix new file mode 100644 index 0000000..05e69ae --- /dev/null +++ b/modules/services/adguard.nix @@ -0,0 +1,21 @@ +{ + services.adguardhome = { + enable = true; + port = 10000; + settings = { + dns = { + upstream_dns = [ + "1.1.1.1" + "1.0.0.1" + ]; + }; + filtering = { + protection_enabled = true; + filtering_enabled = true; + safe_search = { + enabled = false; + }; + }; + }; + }; +} \ No newline at end of file