From c42c5e33633d5a9b98cda933c1acb64d89a64b81 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 19 Oct 2025 18:38:56 +0300 Subject: [PATCH] simpler --- hosts/nixos/harmonica-sd/configuration.nix | 2 -- hosts/nixos/harmonica/configuration.nix | 2 -- hosts/nixos/pochita/configuration.nix | 2 -- hosts/nixos/tartarus/configuration.nix | 3 -- hosts/nixos/ymir/configuration.nix | 3 -- modules/nixos/system/concentration.nix | 34 ---------------------- modules/nixos/system/default.nix | 2 -- modules/nixos/system/security.nix | 12 -------- 8 files changed, 60 deletions(-) delete mode 100644 modules/nixos/system/concentration.nix delete mode 100644 modules/nixos/system/security.nix diff --git a/hosts/nixos/harmonica-sd/configuration.nix b/hosts/nixos/harmonica-sd/configuration.nix index 238d2c8..e3b2acd 100644 --- a/hosts/nixos/harmonica-sd/configuration.nix +++ b/hosts/nixos/harmonica-sd/configuration.nix @@ -14,8 +14,6 @@ osbmModules = { enableKDE = false; enableFonts = false; - blockYoutube = false; - blockTwitter = false; enableTailscale = true; }; diff --git a/hosts/nixos/harmonica/configuration.nix b/hosts/nixos/harmonica/configuration.nix index 61ae7e1..32838b7 100644 --- a/hosts/nixos/harmonica/configuration.nix +++ b/hosts/nixos/harmonica/configuration.nix @@ -12,8 +12,6 @@ osbmModules = { enableKDE = false; enableFonts = false; - blockYoutube = false; - blockTwitter = false; }; i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method diff --git a/hosts/nixos/pochita/configuration.nix b/hosts/nixos/pochita/configuration.nix index 048a3eb..c6b4090 100644 --- a/hosts/nixos/pochita/configuration.nix +++ b/hosts/nixos/pochita/configuration.nix @@ -15,8 +15,6 @@ osbmModules = { enableKDE = false; enableFonts = false; - blockYoutube = false; - blockTwitter = false; enableForgejo = true; # enableCaddy = true; # enableCloudflareDyndns = true; diff --git a/hosts/nixos/tartarus/configuration.nix b/hosts/nixos/tartarus/configuration.nix index b39e53d..9034e15 100644 --- a/hosts/nixos/tartarus/configuration.nix +++ b/hosts/nixos/tartarus/configuration.nix @@ -11,9 +11,6 @@ ]; osbmModules = { - blockYoutube = false; - blockTwitter = true; - blockBluesky = false; enableKDE = true; enableAarch64Emulation = true; enableSound = true; diff --git a/hosts/nixos/ymir/configuration.nix b/hosts/nixos/ymir/configuration.nix index 2dfff76..bcaeb00 100644 --- a/hosts/nixos/ymir/configuration.nix +++ b/hosts/nixos/ymir/configuration.nix @@ -10,9 +10,6 @@ ]; osbmModules = { - blockYoutube = false; - blockTwitter = true; - blockBluesky = false; enableKDE = true; enableJellyfin = true; enableAarch64Emulation = true; diff --git a/modules/nixos/system/concentration.nix b/modules/nixos/system/concentration.nix deleted file mode 100644 index bf8831f..0000000 --- a/modules/nixos/system/concentration.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, config, ... }: -let - cfg = config.osbmModules.concentration; - - blockedSites = lib.flatten [ - (lib.optional cfg.blockYoutube [ - "youtube.com" - "www.youtube.com" - "m.youtube.com" - "youtu.be" - ]) - (lib.optional cfg.blockTwitter [ - "twitter.com" - "www.twitter.com" - "x.com" - "www.x.com" - "mobile.twitter.com" - "mobile.x.com" - ]) - (lib.optional cfg.blockBluesky [ - "bsky.app" - "www.bsky.app" - "bluesky.app" - "www.bluesky.app" - ]) - ]; - - hostsEntries = lib.concatMapStrings (site: "127.0.0.1 ${site}\n") blockedSites; -in -{ - config = lib.mkIf (blockedSites != []) { - networking.extraHosts = hostsEntries; - }; -} diff --git a/modules/nixos/system/default.nix b/modules/nixos/system/default.nix index 34c6a5c..ab262cb 100644 --- a/modules/nixos/system/default.nix +++ b/modules/nixos/system/default.nix @@ -7,11 +7,9 @@ ./home-manager.nix ./virtualization.nix ./emulation.nix - ./concentration.nix ./remote-builds.nix ./i18n.nix ./fonts.nix - ./security.nix ./nix-index.nix ]; } diff --git a/modules/nixos/system/security.nix b/modules/nixos/system/security.nix deleted file mode 100644 index 9c78955..0000000 --- a/modules/nixos/system/security.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ lib, config, ... }: -{ - config = lib.mkIf config.osbmModules.security.enable { - # Security hardening - security.sudo.wheelNeedsPassword = lib.mkDefault true; - - # Polkit for privilege escalation - security.polkit.enable = lib.mkDefault true; - - # Additional security settings can be added here - }; -}