From 796e311a2938df1542f81e715470ed4ccf95962a Mon Sep 17 00:00:00 2001 From: kenji Date: Mon, 5 Jan 2026 12:28:16 -0600 Subject: [PATCH] refactor(general): organized more --- apps/firefox/default.nix | 42 ++++++++++++--------------------------- apps/hyprland/default.nix | 12 +++++------ modules/nixos/default.nix | 27 ++++++++++--------------- modules/nixos/gaming.nix | 5 +++-- modules/nixos/utils.nix | 7 +++++++ 5 files changed, 39 insertions(+), 54 deletions(-) create mode 100644 modules/nixos/utils.nix diff --git a/apps/firefox/default.nix b/apps/firefox/default.nix index a97034b..438d59f 100644 --- a/apps/firefox/default.nix +++ b/apps/firefox/default.nix @@ -44,7 +44,6 @@ ublock-origin bitwarden tridactyl - # pywalfox ]; bookmarks = { @@ -61,12 +60,12 @@ settings = { # --- Privacy & Hardening --- "browser.contentblocking.category" = "strict"; - "privacy.trackingprotection.enabled" = true; - "privacy.resistFingerprinting" = true; # Note: Spoofs timezone and caps FPS to 60 "geo.enabled" = false; "media.peerconnection.enabled" = false; # Prevents WebRTC IP leaks "network.dns.disablePrefetch" = true; "network.prefetch-next" = false; + "privacy.resistFingerprinting" = true; # Note: Spoofs timezone and caps FPS to 60 + "privacy.trackingprotection.enabled" = true; # --- NixOS / Hyprland Integration --- "widget.use-xdg-desktop-portal.file-picker" = 1; # Use native file picker @@ -74,28 +73,28 @@ # --- UI & Behavior --- "accessibility.typeaheadfind" = false; "browser.compactmode.show" = true; - "browser.tabs.closeWindowWithLastTab" = false; - "extensions.pocket.enabled" = false; - "extensions.screenshots.disabled" = true; - "browser.topsites.contile.enabled" = false; "browser.formfill.enable" = false; - "browser.search.suggest.enabled" = false; - "browser.search.suggest.enabled.private" = false; - "browser.urlbar.suggest.searches" = false; - "browser.urlbar.showSearchSuggestionsFirst" = false; "browser.newtabpage.activity-stream.feeds.section.topstories" = false; "browser.newtabpage.activity-stream.feeds.snippets" = false; - "browser.newtabpage.activity-stream.section.highlights.includePocket" = false; "browser.newtabpage.activity-stream.section.highlights.includeBookmarks" = false; "browser.newtabpage.activity-stream.section.highlights.includeDownloads" = false; + "browser.newtabpage.activity-stream.section.highlights.includePocket" = false; "browser.newtabpage.activity-stream.section.highlights.includeVisited" = false; "browser.newtabpage.activity-stream.showSponsored" = false; - "browser.newtabpage.activity-stream.system.showSponsored" = false; "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; + "browser.newtabpage.activity-stream.system.showSponsored" = false; + "browser.search.suggest.enabled" = false; + "browser.search.suggest.enabled.private" = false; + "browser.tabs.closeWindowWithLastTab" = false; + "browser.topsites.contile.enabled" = false; + "browser.urlbar.showSearchSuggestionsFirst" = false; + "browser.urlbar.suggest.searches" = false; + "extensions.pocket.enabled" = false; + "extensions.screenshots.disabled" = true; # --- Homepage & Navigation --- - "browser.startup.homepage" = "https://dash.sakamoto.dev"; "browser.newtabpage.pinned" = myConfig.firefox.newtabpage; + "browser.startup.homepage" = "https://dash.sakamoto.dev"; # --- DNS over HTTPS (Quad9) --- "network.trr.mode" = 2; # Use DoH with system fallback @@ -131,21 +130,6 @@ UrlbarInterventions = false; WhatsNew = false; }; - - # ExtensionSettings = { - # "uBlock0@raymondhill.net" = { - # install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi"; - # installation_mode = "force_installed"; - # }; - # "{446900e4-71c2-419f-a6a7-df9c091e268b}" = { - # install_url = "https://addons.mozilla.org/firefox/downloads/latest/bitwarden-password-manager/latest.xpi"; - # installation_mode = "force_installed"; - # }; - # "tridactyl.vim@cmcaine.co.uk" = { - # install_url = "https://addons.mozilla.org/firefox/downloads/latest/tridactyl-vim/latest.xpi"; - # installation_mode = "force_installed"; - # }; - # }; }; }; } diff --git a/apps/hyprland/default.nix b/apps/hyprland/default.nix index 140c182..0c1e252 100644 --- a/apps/hyprland/default.nix +++ b/apps/hyprland/default.nix @@ -4,18 +4,16 @@ ... }: { imports = [ - ./hypr/binds.nix - ./hypr/general.nix - ./hypr/exec.nix - ./hypr/rules.nix ./hypr/animation.nix - ./hypr/misc.nix + ./hypr/binds.nix + ./hypr/exec.nix + ./hypr/general.nix ./hypr/input.nix ./hypr/layers.nix + ./hypr/misc.nix + ./hypr/rules.nix ./scripts/movement.nix - - # volume stuff ]; wayland.windowManager.hyprland.enable = true; wayland.windowManager.hyprland.systemd.enable = false; # for UWSM support... diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index d7aa88f..ac58f1d 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -1,27 +1,22 @@ {pkgs, ...}: { imports = [ - ./time.nix - ./nix.nix + ./amd.nix ./backlight.nix ./boot.nix - ./amd.nix + ./fonts.nix ./hardware.nix ./home-manager.nix - ./services.nix - ./user.nix - ./version.nix - ./fonts.nix + ./input-method.nix + ./kernel.nix + ./nix.nix + ./power.nix # TODO: this one has to be optional ./programs.nix ./security.nix + ./services.nix + ./time.nix + ./user.nix + ./utils.nix ./variables.nix - ./kernel.nix - ./input-method.nix - ./power.nix # TODO: this one has to be optional - ]; - environment.systemPackages = with pkgs; [ - # FIXME: must be on their own app - git - cloudflared - cachix + ./version.nix ]; } diff --git a/modules/nixos/gaming.nix b/modules/nixos/gaming.nix index 7484c68..8e9c3bd 100644 --- a/modules/nixos/gaming.nix +++ b/modules/nixos/gaming.nix @@ -8,7 +8,7 @@ hardware.steam-hardware.enable = true; hardware.xpadneo.enable = true; # Xbox controllers via Bluetooth hardware.uinput.enable = true; - services.udev.packages = [pkgs.game-devices-udev-rules]; + # services.udev.packages = [pkgs.game-devices-udev-rules]; programs.steam = { enable = true; @@ -24,4 +24,5 @@ programs.gamemode.enable = true; # Fix slow Steam Download speeds services.resolved.enable = true; -} \ No newline at end of file +} + diff --git a/modules/nixos/utils.nix b/modules/nixos/utils.nix new file mode 100644 index 0000000..9160865 --- /dev/null +++ b/modules/nixos/utils.nix @@ -0,0 +1,7 @@ +{pkgs, ...}: { + environment.systemPackages = with pkgs; [ + git + cloudflared + cachix + ]; +}