From 893ea11e1dc05fe1a2a34e66d4ebcfdffda34720 Mon Sep 17 00:00:00 2001 From: aethrvmn Date: Sun, 30 Nov 2025 22:59:43 +0100 Subject: huge restructure of modules --- modules/common/adguard/default.nix | 88 ------------------------- modules/common/default.nix | 49 -------------- modules/common/doas/default.nix | 13 ---- modules/common/fonts/default.nix | 11 ---- modules/common/gnupg/default.nix | 5 -- modules/common/i18n/default.nix | 20 ------ modules/common/nh/default.nix | 9 --- modules/common/pipewire/default.nix | 17 ----- modules/common/searx/default.nix | 126 ------------------------------------ modules/common/ssh/default.nix | 5 -- modules/common/sudo/default.nix | 5 -- modules/common/users/default.nix | 28 -------- 12 files changed, 376 deletions(-) delete mode 100644 modules/common/adguard/default.nix delete mode 100644 modules/common/default.nix delete mode 100644 modules/common/doas/default.nix delete mode 100644 modules/common/fonts/default.nix delete mode 100644 modules/common/gnupg/default.nix delete mode 100644 modules/common/i18n/default.nix delete mode 100644 modules/common/nh/default.nix delete mode 100644 modules/common/pipewire/default.nix delete mode 100644 modules/common/searx/default.nix delete mode 100644 modules/common/ssh/default.nix delete mode 100644 modules/common/sudo/default.nix delete mode 100644 modules/common/users/default.nix (limited to 'modules/common') diff --git a/modules/common/adguard/default.nix b/modules/common/adguard/default.nix deleted file mode 100644 index 9cb7cc2..0000000 --- a/modules/common/adguard/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ config, lib, ... }: -{ - services = { - adguardhome = { - enable = true; - openFirewall = false; - mutableSettings = false; - - settings = { - http = { - address = "127.0.0.1:3000"; - }; - - dns = { - bind_hosts = [ "127.0.0.1" ]; - port = 53; - - upstream_dns = [ - "https://de-fra-dns-001.mullvad.net/dns-query" - "https://gb-lon-dns-001.mullvad.net/dns-query" - "https://gb-lon-dns-301.mullvad.net/dns-query" - ]; - fallback_dns = [ - "9.9.9.9" - "149.112.112.112" - ]; - bootstrap_dns = [ - "9.9.9.9" - "149.112.112.112" - ]; - }; - - filtering = { - rewrites = [ - # searxng - { - domain = "search.internal"; - answer = "127.0.0.1"; - } - # adguard - { - domain = "dns.internal"; - answer = "127.0.0.1"; - } - ]; - - protection_enabled = true; - filtering_enabled = true; - - parental_enabled = false; # Parental control-based DNS requests filtering. - - safe_search = { - enabled = false; # Enforcing "Safe search" option for search engines, when possible. - }; - }; - }; - }; - - nginx ={ - enable = true; - recommendedGzipSettings = true; - recommendedOptimisation = true; - recommendedProxySettings = true; - - virtualHosts = { - "dns.internal" = { - locations."/" = { - proxyPass = "http://127.0.0.1:3000"; - proxyWebsockets = true; - }; - }; - }; - }; - }; - - networking = { - nameservers = [ - "127.0.0.1" - ]; - - hosts = { - "127.0.0.1" = [ - "dns.internal" - "search.internal" - ]; - }; - }; -} diff --git a/modules/common/default.nix b/modules/common/default.nix deleted file mode 100644 index b2c7196..0000000 --- a/modules/common/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ config, pkgs, lib, ... }: -{ - imports =[ - # names are self explanatory - ./adguard - ./doas - ./fonts - ./gnupg - ./i18n - ./nh - ./pipewire - ./searx - ./ssh - ./sudo - ./users - ]; - - nix = { - settings = { - # Enable flakes - experimental-features = [ "nix-command" "flakes" ]; - - # Optimize storage - auto-optimise-store = true; - - # substituters = lib.mkForce [ ]; - # trusted-substituters = lib.mkForce [ ]; - # require-sigs = false; - }; - }; - - # Allow unfree packages - nixpkgs = { - config.allowUnfree = true; - }; - - # List packages installed in system profile. - # These should be tools in case user tools brake. - # To search, run: - # $ nix search - # or - # $ nh search - environment.systemPackages = with pkgs; [ - alacritty - git - helix - xdg-utils - ]; -} diff --git a/modules/common/doas/default.nix b/modules/common/doas/default.nix deleted file mode 100644 index bc528d1..0000000 --- a/modules/common/doas/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - security.doas = { - enable = true; - - extraRules = [ - { - users = [ "aethrvmn" ]; - keepEnv = true; - persist = true; - } - ]; - }; -} diff --git a/modules/common/fonts/default.nix b/modules/common/fonts/default.nix deleted file mode 100644 index d8696e7..0000000 --- a/modules/common/fonts/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ config, pkgs, ... }: -{ - fonts.packages = with pkgs; [ - font-awesome - font-awesome_5 - maple-mono.NF-CN - noto-fonts - noto-fonts-cjk-sans - noto-fonts-color-emoji - ]; -} diff --git a/modules/common/gnupg/default.nix b/modules/common/gnupg/default.nix deleted file mode 100644 index fc6e537..0000000 --- a/modules/common/gnupg/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - programs.gnupg.agent = { - enable = true; - }; -} diff --git a/modules/common/i18n/default.nix b/modules/common/i18n/default.nix deleted file mode 100644 index 786332c..0000000 --- a/modules/common/i18n/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ config, ... }: - -# Locale generation -{ - i18n = { - defaultLocale = "en_US.UTF-8"; - - extraLocaleSettings = { - LC_ADDRESS = "el_GR.UTF-8"; - LC_IDENTIFICATION = "el_GR.UTF-8"; - LC_MEASUREMENT = "el_GR.UTF-8"; - LC_MONETARY = "el_GR.UTF-8"; - LC_NAME = "el_GR.UTF-8"; - LC_NUMERIC = "el_GR.UTF-8"; - LC_PAPER = "el_GR.UTF-8"; - LC_TELEPHONE = "el_GR.UTF-8"; - LC_TIME = "el_GR.UTF-8"; - }; - }; -} diff --git a/modules/common/nh/default.nix b/modules/common/nh/default.nix deleted file mode 100644 index a5e09ac..0000000 --- a/modules/common/nh/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ config, pkgs, ... }: -{ - programs.nh = { - enable = true; - clean.enable = true; - - flake = "/home/aethrvmn/.nix/"; - }; -} diff --git a/modules/common/pipewire/default.nix b/modules/common/pipewire/default.nix deleted file mode 100644 index 3c65b82..0000000 --- a/modules/common/pipewire/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - security.rtkit.enable = true; - - services ={ - pipewire = { - enable = true; - - alsa.enable = true; - audio.enable = true; - jack.enable = true; - pulse.enable = true; - wireplumber.enable = true; - }; - - pulseaudio.enable = false; - }; -} diff --git a/modules/common/searx/default.nix b/modules/common/searx/default.nix deleted file mode 100644 index e8b3873..0000000 --- a/modules/common/searx/default.nix +++ /dev/null @@ -1,126 +0,0 @@ -{ config, pkgs, lib, ... }: -{ - services = { - searx = { - enable = true; - package = pkgs.searxng; - - settings = { - server = { - port = 4000; - bind_address = "127.0.0.1"; - secret_key = "secret_key"; - }; - - general = { - debug = false; - instance_name = "SearXNG"; - donation_url = false; - contact_url = false; - privacypolicy_url = false; - enable_metrics = false; - autocomplete = "startpage"; - }; - - # Search engines - engines = lib.mapAttrsToList (name: value: { inherit name; } // value) { - # main boys - "brave" = { - disabled = false; - weight = 0.7; - }; - "duckduckgo" = { - disabled = false; - weight = 0.7; - }; - "ecosia" = { - disabled = false; - weight = 0.6; - }; - "mojeek" = { - disabled = true; - weight = 0.4; - }; - "qwant" = { - disabled = false; - weight = 0.4; - }; - "startpage" = { - disabled = false; - weight = 1; - }; - "wiby" = { - disabled = false; - weight = 0.4; - }; - - # - "openverse".disabled = false; - - # repos - "bitbucket".disabled = false; - "codeberg".disabled = false; - "gitea.com".disabled = false; - "github".disabled = false; - "gitlab".disabled = false; - "huggingface".disabled = false; - "huggingface datasets".disabled = false; - "huggingface spaces".disabled = false; - "ollama".disabled = false; - "sourcehut".disabled = false; - - # software wikis - "gentoo".disabled = false; - "nixos wiki".disabled = false; - "arch linux wiki".disabled = false; - "free software directory".disabled = false; - - # IT etc - "mankier".disabled = false; - "searchcode code".disabled = false; - - # translate - "mozhi".disabled = false; - "lingva".disabled = false; - "dictzone".disabled = false; - "libretranslate".disabled = false; - - # # scams/don't trusts - "bing".disabled = true; - "yahoo".disabled = true; - "google".disabled = true; - }; - - # Outgoing requests - outgoing = { - request_timeout = 15.0; - max_request_timeout = 25.0; - pool_connections = 100; - pool_maxsize = 15; - useragent_suffix = "me@aethrvmn.gr"; - retries = 5; - }; - - # Enabled plugins - enabled_plugins = [ - "Basic Calculator" - "Hash plugin" - "Tor check plugin" - "Open Access DOI rewrite" - "Hostnames plugin" - "Unit converter plugin" - "Tracker URL remover" - ]; - }; - }; - - nginx.virtualHosts = { - "search.internal" = { - locations."/" = { - proxyPass = "http://127.0.0.1:4000"; - proxyWebsockets = true; - }; - }; - }; - }; -} diff --git a/modules/common/ssh/default.nix b/modules/common/ssh/default.nix deleted file mode 100644 index 70b67e2..0000000 --- a/modules/common/ssh/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - programs.ssh = { - startAgent = true; - }; -} diff --git a/modules/common/sudo/default.nix b/modules/common/sudo/default.nix deleted file mode 100644 index 8ad7bf9..0000000 --- a/modules/common/sudo/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - security.sudo = { - enable = false; - }; -} diff --git a/modules/common/users/default.nix b/modules/common/users/default.nix deleted file mode 100644 index 460fb8a..0000000 --- a/modules/common/users/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ config, pkgs, ... }: - -# User configuration -{ - users = { - defaultUserShell = pkgs.zsh; - - users.aethrvmn = { - isNormalUser = true; - extraGroups = [ - "audio" - "networkmanager" - "video" - "wheel" - ]; - password = "gg"; - - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF3R0qrWQ9omz87lt4YRCdI+QV55KxMqxU+Vz1mUM4ye me@aethrvmn.gr" - ]; - }; - }; - - programs = { - zsh.enable = true; - fish.enable = true; - }; -} -- cgit v1.2.3