From 737c7db0a2d2b36eb79c5312aa652487174b3563 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20Nied=C5=BAwiedzi=C5=84ski?= Date: Fri, 28 Feb 2025 12:25:43 +0100 Subject: [PATCH] remove unused files --- flake.nix | 1 - machines/srv3/services/yggdrasil.nix | 12 --- machines/srv3/services/yggdrasil/default.nix | 33 ------- machines/t14/default.nix | 1 - machines/t14/yggdrasil.nix | 27 ------ modules/audio.nix | 12 --- modules/obsidian-livesync.nix | 96 -------------------- modules/work-gp.nix | 20 ---- 8 files changed, 202 deletions(-) delete mode 100644 machines/srv3/services/yggdrasil.nix delete mode 100644 machines/srv3/services/yggdrasil/default.nix delete mode 100644 machines/t14/yggdrasil.nix delete mode 100755 modules/audio.nix delete mode 100644 modules/obsidian-livesync.nix delete mode 100644 modules/work-gp.nix diff --git a/flake.nix b/flake.nix index 5c1d444..9755f7c 100644 --- a/flake.nix +++ b/flake.nix @@ -58,7 +58,6 @@ ]; t14 = nixosSystem "x86_64-linux" "t14" [ ./modules/gnome.nix - ./modules/work-gp.nix inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t14-amd-gen2 inputs.home-manager.nixosModules.default inputs.nix-index-database.nixosModules.nix-index diff --git a/machines/srv3/services/yggdrasil.nix b/machines/srv3/services/yggdrasil.nix deleted file mode 100644 index 0d0291f..0000000 --- a/machines/srv3/services/yggdrasil.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - services.yggdrasil = { - enable = true; - persistentKeys = true; - config = { - Peers = [ - "tcp://51.75.44.73:50001" - "tcp://176.223.130.120:22632" - ]; - }; - }; -} diff --git a/machines/srv3/services/yggdrasil/default.nix b/machines/srv3/services/yggdrasil/default.nix deleted file mode 100644 index 6b7cfc0..0000000 --- a/machines/srv3/services/yggdrasil/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ ... }: -let - port = 22; -in -{ - - services.yggdrasil = { - enable = true; - persistentKeys = true; - settings = { - Listen = [ - "tls://0.0.0.0:${toString port}" - ]; - Peers = []; - AllowedPublicKeys = [ - "af868e700b6caa8debe0f912ea14b7f7c98a09418d2bf13f56e7a9a5ec73b5a8" #srv4 - "e499a4996d79d1e083a61cf024cecdf02cb51a4cd5c27dfbd82bf76b9fa9c904" #t14 - "2a0b4bb6616f881b094a6336961212c4194b19e438b1822ba151538afdc1e64c" #oppo - ]; - MulticastInterfaces = [ - { - Regex = ".*"; - Beacon = false; - Listen = false; - Password = ""; - } - ]; - }; - }; - - networking.firewall.allowedTCPPorts = [ port ]; - -} diff --git a/machines/t14/default.nix b/machines/t14/default.nix index 29c7b89..2fd3551 100644 --- a/machines/t14/default.nix +++ b/machines/t14/default.nix @@ -5,7 +5,6 @@ }: { imports = [ # Include the results of the hardware scan. - # ./yggdrasil.nix ../base.nix ../../modules/media-drive.nix ../../modules/tailscale.nix diff --git a/machines/t14/yggdrasil.nix b/machines/t14/yggdrasil.nix deleted file mode 100644 index d1a3652..0000000 --- a/machines/t14/yggdrasil.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ ... }: -{ - - services.yggdrasil = { - enable = true; - persistentKeys = true; - settings = { - Listen = []; - Peers = [ - "tls://patrykn.ddns.net:1919" - ]; - AllowedPublicKeys = [ - "af868e700b6caa8debe0f912ea14b7f7c98a09418d2bf13f56e7a9a5ec73b5a8" #srv4 - "d77a4325c4d60157017e3656de31ad067b3bae754a7f0f3b2fd78679a622dc4e" #srv3 - ]; - MulticastInterfaces = [ - { - Regex = ".*"; - Beacon = false; - Listen = false; - Password = ""; - } - ]; - }; - }; - -} diff --git a/modules/audio.nix b/modules/audio.nix deleted file mode 100755 index 5b8a74c..0000000 --- a/modules/audio.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, ... }: -{ - hardware.pulseaudio = { - enable = true; - configFile = ./pulseaudio.pa; - }; - - environment.systemPackages = with pkgs; [ - pulsemixer - pamixer - ]; -} diff --git a/modules/obsidian-livesync.nix b/modules/obsidian-livesync.nix deleted file mode 100644 index e576eb0..0000000 --- a/modules/obsidian-livesync.nix +++ /dev/null @@ -1,96 +0,0 @@ -{ config, lib, pkgs, ... }: -let - cfg = config.services.obsidian-livesync; - couchdb-port = config.services.couchdb.port or 5984; -in -{ - options = { - services.obsidian-livesync = { - enable = lib.mkEnableOption "Obsidian Livesync Host"; - - domain = lib.mkOption { - type = lib.types.str; - description = "This option is required and must be set by the user."; - }; - - adminsFile = lib.mkOption { - type = lib.types.path; - description = "File with authentication data"; - example = '' - [admins] - admin = strongPassword - ''; - }; - - couchdb.databaseDir = lib.mkOption { - description = "Specifies location of CouchDB database files (*.couch named). This location should be writable and readable for the user the CouchDB service runs as (couchdb by default)."; - default = "/srv/couchdb"; - type = lib.types.path; - }; - }; - }; - - config = lib.mkIf cfg.enable { - services.couchdb = { - enable = true; - configFile = cfg.adminsFile; - extraConfig = '' - [couchdb] - database_dir = ${cfg.couchdb.databaseDir} - single_node=true - max_document_size = 50000000 - uri_file = ${config.services.couchdb.uriFile} - view_index_dir = ${config.services.couchdb.viewIndexDir} - - [log] - file = ${config.services.couchdb.logFile} - - [chttpd] - require_valid_user = true - max_http_request_size = 4294967296 - enable_cors = true - port = ${toString config.services.couchdb.port} - bind_address = ${config.services.couchdb.bindAddress} - - [chttpd_auth] - require_valid_user = true - authentication_redirect = /_utils/session.html - - [httpd] - WWW-Authenticate = Basic realm="couchdb" - enable_cors = true - bind_address = 127.0.0.1 - - [cors] - #origins = app://obsidian.md,capacitor://localhost,http://localhost - #credentials = true - ''; - }; - - services.nginx = { - enable = true; - virtualHosts.${cfg.domain} = { - enableACME = true; - forceSSL = true; - locations."/" = { - proxyPass = "http://127.0.0.1:${toString couchdb-port}"; - extraConfig = '' - proxy_set_header Host "$host"; - proxy_set_header X-Real-IP "$remote_addr"; - proxy_set_header X-Forwarded-For "$proxy_add_x_forwarded_for"; - proxy_set_header X-Forwarded-Proto "$scheme"; - add_header Access-Control-Allow-Origin "$http_origin" always; - add_header Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS" always; - add_header Access-Control-Allow-Headers "Content-Type, Authorization" always; - add_header Access-Control-Allow-Credentials "true" always; - add_header Access-Control-Max-Age 86400 always; - - if ($request_method = OPTIONS) { - return 204; - } - ''; - }; - }; - }; - }; -} diff --git a/modules/work-gp.nix b/modules/work-gp.nix deleted file mode 100644 index 580cafe..0000000 --- a/modules/work-gp.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ pkgs, ... }: -{ - environment.systemPackages = with pkgs; [ - vesktop - discord - ]; - home-manager.users.pn.xdg.configFile = { - "discord/settings.json" = { - text = ''{ - "SKIP_HOST_UPDATE": true - }''; - enable = true; - }; - }; - - virtualisation.libvirtd.enable = true; - programs.virt-manager.enable = true; - - users.users.pn.extraGroups = [ "libvirtd" ]; -}