diff options
Diffstat (limited to 'hm')
| -rw-r--r-- | hm/dotfiles/fastfetch/config.jsonc | 0 | ||||
| -rw-r--r-- | hm/dotfiles/fsel/config.toml | 0 | ||||
| -rw-r--r-- | hm/dotfiles/mako/config | 0 | ||||
| -rw-r--r-- | hm/dotfiles/otter/config.toml | 0 | ||||
| -rw-r--r-- | hm/dotfiles/waybar/config.jsonc | 0 | ||||
| -rw-r--r-- | hm/dotfiles/waybar/style.css | 0 | ||||
| -rw-r--r-- | hm/env/awww.nix | 4 | ||||
| -rw-r--r-- | hm/env/fsel.nix | 2 | ||||
| -rw-r--r-- | hm/env/fuzzel.nix | 4 | ||||
| -rw-r--r-- | hm/env/mako.nix | 7 | ||||
| -rw-r--r-- | hm/env/otter.nix | 7 | ||||
| -rw-r--r-- | hm/env/screenshot.nix | 10 | ||||
| -rw-r--r-- | hm/env/waybar.nix | 6 | ||||
| -rw-r--r-- | hm/soft/browser.nix | 365 | ||||
| -rw-r--r-- | hm/soft/email.nix | 57 | ||||
| -rw-r--r-- | hm/soft/media.nix | 1 |
16 files changed, 201 insertions, 262 deletions
diff --git a/hm/dotfiles/fastfetch/config.jsonc b/hm/dotfiles/fastfetch/config.jsonc deleted file mode 100644 index e69de29..0000000 --- a/hm/dotfiles/fastfetch/config.jsonc +++ /dev/null diff --git a/hm/dotfiles/fsel/config.toml b/hm/dotfiles/fsel/config.toml deleted file mode 100644 index e69de29..0000000 --- a/hm/dotfiles/fsel/config.toml +++ /dev/null diff --git a/hm/dotfiles/mako/config b/hm/dotfiles/mako/config deleted file mode 100644 index e69de29..0000000 --- a/hm/dotfiles/mako/config +++ /dev/null diff --git a/hm/dotfiles/otter/config.toml b/hm/dotfiles/otter/config.toml deleted file mode 100644 index e69de29..0000000 --- a/hm/dotfiles/otter/config.toml +++ /dev/null diff --git a/hm/dotfiles/waybar/config.jsonc b/hm/dotfiles/waybar/config.jsonc deleted file mode 100644 index e69de29..0000000 --- a/hm/dotfiles/waybar/config.jsonc +++ /dev/null diff --git a/hm/dotfiles/waybar/style.css b/hm/dotfiles/waybar/style.css deleted file mode 100644 index e69de29..0000000 --- a/hm/dotfiles/waybar/style.css +++ /dev/null diff --git a/hm/env/awww.nix b/hm/env/awww.nix index a25f4e6..3742e24 100644 --- a/hm/env/awww.nix +++ b/hm/env/awww.nix @@ -5,8 +5,6 @@ in { options.hm.env.awww.enable = lib.mkEnableOption "enables awww"; config = lib.mkIf cfg.enable { - services.swww = { - enable = true; - }; + services.awww.enable = true; }; } diff --git a/hm/env/fsel.nix b/hm/env/fsel.nix index 636cb3c..faa7f24 100644 --- a/hm/env/fsel.nix +++ b/hm/env/fsel.nix @@ -12,7 +12,5 @@ in options.hm.env.fsel.enable = lib.mkEnableOption "enables fsel"; config = lib.mkIf cfg.enable { home.packages = [ inputs.fsel.packages.${pkgs.stdenv.hostPlatform.system}.default ]; - xdg.configFile."fsel/config.toml".source = - config.lib.file.mkOutOfStoreSymlink "../dotfiles/fsel/config.toml"; }; } diff --git a/hm/env/fuzzel.nix b/hm/env/fuzzel.nix index 8d4462f..4dfb0fb 100644 --- a/hm/env/fuzzel.nix +++ b/hm/env/fuzzel.nix @@ -5,8 +5,6 @@ in { options.hm.env.fuzzel.enable = lib.mkEnableOption "enables fuzzel"; config = lib.mkIf cfg.enable { - programs.fuzzel = { - enable = true; - }; + programs.fuzzel.enable = true; }; } diff --git a/hm/env/mako.nix b/hm/env/mako.nix index 3adc5d7..2a22029 100644 --- a/hm/env/mako.nix +++ b/hm/env/mako.nix @@ -5,11 +5,6 @@ in { options.hm.env.mako.enable = lib.mkEnableOption "enables mako notifications"; config = lib.mkIf cfg.enable { - services.mako = { - enable = true; - }; - xdg.configFile."mako/config".source = lib.mkForce ( - config.lib.file.mkOutOfStoreSymlink "../dotfiles/mako/config" - ); + services.mako.enable = true; }; } diff --git a/hm/env/otter.nix b/hm/env/otter.nix index 966bbb7..7e7c72e 100644 --- a/hm/env/otter.nix +++ b/hm/env/otter.nix @@ -12,11 +12,6 @@ in options.hm.env.otter.enable = lib.mkEnableOption "enables otter launcher"; config = lib.mkIf cfg.enable { - programs.otter-launcher = { - enable = true; - }; - xdg.configFile."otter-launcher/config.toml".source = lib.mkForce ( - config.lib.file.mkOutOfStoreSymlink "../dotfiles/otter/config.toml" - ); + programs.otter-launcher.enable = true; }; } diff --git a/hm/env/screenshot.nix b/hm/env/screenshot.nix index eac2fe7..b4d87e6 100644 --- a/hm/env/screenshot.nix +++ b/hm/env/screenshot.nix @@ -3,14 +3,14 @@ lib, pkgs, ... -}: let +}: +let cfg = config.hm.env.screenshot; -in { +in +{ options.hm.env.screenshot.enable = lib.mkEnableOption "enables screenshot utilities"; config = lib.mkIf cfg.enable { - programs.satty = { - enable = true; - }; + programs.satty.enable = true; home.packages = with pkgs; [ wayfreeze grim diff --git a/hm/env/waybar.nix b/hm/env/waybar.nix index 6176216..970c29a 100644 --- a/hm/env/waybar.nix +++ b/hm/env/waybar.nix @@ -16,11 +16,5 @@ in targets = [ "graphical-session.target" ]; }; }; - xdg.configFile."waybar/config.jsonc".source = lib.mkForce ( - config.lib.file.mkOutOfStoreSymlink "../dotfiles/waybar/config.jsonc" - ); - xdg.configFile."waybar/style.css".source = lib.mkForce ( - config.lib.file.mkOutOfStoreSymlink "../dotfiles/waybar/style.css" - ); }; } diff --git a/hm/soft/browser.nix b/hm/soft/browser.nix index a66b733..b53804e 100644 --- a/hm/soft/browser.nix +++ b/hm/soft/browser.nix @@ -1,196 +1,191 @@ { config, lib, - pkgs, ... }: let cfg = config.hm.soft.browser; in { - options.hm.soft.browser = { - librewolf.enable = lib.mkEnableOption "LibreWolf browser"; - brave.enable = lib.mkEnableOption "Brave browser"; + options.hm.soft.browser.librewolf.enable = lib.mkEnableOption "Enables the librewolf browser"; + config = lib.mkIf cfg.librewolf.enable { + programs.librewolf = { + enable = true; + # policies = { + # DisableTelemetry = true; + # DisableFirefoxStudies = true; + # DontCheckDefaultBrowser = true; + # SearchEngines = { + # Remove = [ + # "Google" + # "Bing" + # "Perplexity" + # "Wikipedia (en)" + # "DuckDuckGo" + # "DuckDuckGo Lite" + # "Searx Belgium" + # "MetaGer" + # "Startpage" + # "Mojeek" + # ]; + # PreventInstalls = true; + # }; + # }; + # + # profiles = { + # main = { + # id = 0; + # name = "main"; + # isDefault = true; + # search = { + # force = true; + # default = "OmniSearch"; + # order = [ + # "OmniSearch" + # "SearXNG" + # ]; + # engines = { + # "google".metaData.hidden = true; + # "bing".metaData.hidden = true; + # "ddg".metaData.hidden = true; + # "perplexity".metaData.hidden = true; + # "wikipedia".metaData.hidden = true; + # "policy-DuckDuckGo Lite".metaData.hidden = true; + # "policy-Searx Belgium".metaData.hidden = true; + # "policy-MetaGer".metaData.hidden = true; + # "policy-Startpage".metaData.hidden = true; + # "policy-Mojeek".metaData.hidden = true; + # + # "OmniSearch" = { + # urls = [ { template = "http://127.0.0.1:8087/search?q={searchTerms}"; } ]; + # definedAliases = [ "@o" ]; + # }; + # "SearXNG" = { + # urls = [ { template = "https://sxng.violets-purgatory.dev/search?q={searchTerms}"; } ]; + # icon = "https://sxng.violets-purgatory.dev/favicon.ico"; + # definedAliases = [ "@s" ]; + # }; + # "NixOS Packages" = { + # urls = [ { template = "https://search.nixos.org/packages?channel=unstable&query={searchTerms}"; } ]; + # icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; + # definedAliases = [ "@np" ]; + # }; + # "NixOS Options" = { + # urls = [ { template = "https://search.nixos.org/options?channel=unstable&query={searchTerms}"; } ]; + # icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; + # definedAliases = [ "@no" ]; + # }; + # "Home Manager Options" = { + # urls = [ + # { template = "https://home-manager-options.extranix.com/?query={searchTerms}&release=master"; } + # ]; + # icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; + # definedAliases = [ "@hm" ]; + # }; + # }; + # }; + # extensions = { + # force = true; + # packages = + # (with pkgs.nur.repos.rycee.firefox-addons; [ + # vimium + # sidebery + # buster-captcha-solver + # sponsorblock + # dearrow + # darkreader + # i-dont-care-about-cookies + # keepassxc-browser + # ]) + # }; + # settings = { + # "toolkit.legacyUserProfileCustomizations.stylesheets" = true; + # + # "identity.fxaccounts.enabled" = true; + # "extensions.autoDisableScopes" = 0; + # # --- Privacy & Fingerprinting --- + # "privacy.resistFingerprinting" = true; + # "privacy.fingerprintingProtection" = true; + # "privacy.query_stripping.enabled" = true; + # "privacy.query_stripping.enabled.pbmode" = true; + # "privacy.trackingprotection.enabled" = true; + # "privacy.trackingprotection.socialtracking.enabled" = true; + # "privacy.trackingprotection.emailtracking.enabled" = true; + # "privacy.bounceTrackingProtection.mode" = 1; + # "privacy.annotate_channels.strict_list.enabled" = true; + # "privacy.clearOnShutdown_v2.formdata" = true; + # + # # --- Data Collection & Form Security --- + # "dom.forms.autocomplete.formautofill" = false; + # "signon.management.page.breach-alerts.enabled" = false; + # "browser.translations.enable" = false; + # "browser.region.update.enabled" = false; + # + # # --- Search & URL Bar --- + # "browser.urlbar.shortcuts.bookmarks" = false; + # "browser.urlbar.shortcuts.history" = false; + # "browser.urlbar.shortcuts.tabs" = false; + # "browser.urlbar.shortcuts.actions" = false; + # "browser.urlbar.showSearchTerms.enabled" = false; + # + # # --- Networking & Performance --- + # "network.proxy.type" = 0; + # "network.prefetch-next" = false; + # "network.predictor.enabled" = false; + # "network.http.speculative-parallel-limit" = 0; + # "network.early-hints.preconnect.max_connections" = 0; + # "network.connectivity-service.enabled" = false; + # "network.captive-portal-service.enabled" = false; + # "security.tls.enable_0rtt_data" = false; + # + # # --- Interface & De-clutter --- + # "browser.startup.page" = 3; + # "browser.startup.homepage" = "chrome://browser/content/blanktab.html"; + # "browser.newtabpage.enabled" = false; + # "browser.newtabpage.activity-stream.showSearch" = false; + # "browser.newtabpage.activity-stream.showSponsoredCheckboxes" = false; + # "browser.bookmarks.restore_default_bookmarks" = false; + # "media.hardwaremediakeys.enabled" = false; + # "media.videocontrols.picture-in-picture.video-toggle.enabled" = false; + # "layout.spellcheckDefault" = 0; + # + # # --- Safe Browsing (Privacy Trade-off) --- + # "browser.safebrowsing.downloads.remote.enabled" = false; + # "browser.safebrowsing.downloads.remote.block_potentially_unwanted" = false; + # "browser.safebrowsing.downloads.remote.block_uncommon" = false; + # }; + # userChrome = '' + # #TabsToolbar { visibility: collapse !important; } + # #sidebar-header { display: none !important; } + # #toolbar-menubar { display: none !important; } + # ''; + # }; + # privacy = { + # id = 1; + # name = "I2P"; + # settings = { + # "javascript.enabled" = false; + # "dom.visibility_control.enabled" = false; + # + # "media.peerconnection.enabled" = false; + # "network.proxy.type" = 1; + # + # "network.proxy.http" = "127.0.0.1"; + # "network.proxy.http_port" = 4444; + # + # "network.proxy.ssl" = "127.0.0.1"; + # "network.proxy.ssl_port" = 4444; + # + # "network.proxy.no_proxies_on" = "localhost, 127.0.0.1"; + # + # "network.http.proxy.pipelining" = true; + # "network.proxy.share_proxy_settings" = true; + # + # "network.prefetch-next" = false; + # "network.dns.disablePrefetch" = true; + # }; + # }; + # }; + }; }; - config = lib.mkMerge [ - (lib.mkIf cfg.librewolf.enable { - programs.librewolf = { - enable = true; - policies = { - DisableTelemetry = true; - DisableFirefoxStudies = true; - DontCheckDefaultBrowser = true; - SearchEngines = { - Remove = [ - "Google" - "Bing" - "Perplexity" - "Wikipedia (en)" - "DuckDuckGo" - "DuckDuckGo Lite" - "Searx Belgium" - "MetaGer" - "Startpage" - "Mojeek" - ]; - PreventInstalls = true; - }; - }; - - profiles = { - main = { - id = 0; - name = "main"; - isDefault = true; - search = { - force = true; - default = "OmniSearch"; - order = [ - "OmniSearch" - "SearXNG" - ]; - engines = { - "google".metaData.hidden = true; - "bing".metaData.hidden = true; - "ddg".metaData.hidden = true; - "perplexity".metaData.hidden = true; - "wikipedia".metaData.hidden = true; - "policy-DuckDuckGo Lite".metaData.hidden = true; - "policy-Searx Belgium".metaData.hidden = true; - "policy-MetaGer".metaData.hidden = true; - "policy-Startpage".metaData.hidden = true; - "policy-Mojeek".metaData.hidden = true; - - "OmniSearch" = { - urls = [ { template = "http://127.0.0.1:8087/search?q={searchTerms}"; } ]; - definedAliases = [ "@o" ]; - }; - "SearXNG" = { - urls = [ { template = "https://sxng.violets-purgatory.dev/search?q={searchTerms}"; } ]; - icon = "https://sxng.violets-purgatory.dev/favicon.ico"; - definedAliases = [ "@s" ]; - }; - "NixOS Packages" = { - urls = [ { template = "https://search.nixos.org/packages?channel=unstable&query={searchTerms}"; } ]; - icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; - definedAliases = [ "@np" ]; - }; - "NixOS Options" = { - urls = [ { template = "https://search.nixos.org/options?channel=unstable&query={searchTerms}"; } ]; - icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; - definedAliases = [ "@no" ]; - }; - "Home Manager Options" = { - urls = [ - { template = "https://home-manager-options.extranix.com/?query={searchTerms}&release=master"; } - ]; - icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; - definedAliases = [ "@hm" ]; - }; - }; - }; - extensions = { - force = true; - packages = with pkgs.nur.repos.rycee.firefox-addons; [ - vimium - sidebery - buster-captcha-solver - sponsorblock - dearrow - darkreader - i-dont-care-about-cookies - keepassxc-browser - ]; - }; - settings = { - "toolkit.legacyUserProfileCustomizations.stylesheets" = true; - - "identity.fxaccounts.enabled" = true; - "extensions.autoDisableScopes" = 0; - # --- Privacy & Fingerprinting --- - "privacy.resistFingerprinting" = true; - "privacy.fingerprintingProtection" = true; - "privacy.query_stripping.enabled" = true; - "privacy.query_stripping.enabled.pbmode" = true; - "privacy.trackingprotection.enabled" = true; - "privacy.trackingprotection.socialtracking.enabled" = true; - "privacy.trackingprotection.emailtracking.enabled" = true; - "privacy.bounceTrackingProtection.mode" = 1; - "privacy.annotate_channels.strict_list.enabled" = true; - "privacy.clearOnShutdown_v2.formdata" = true; - - # --- Data Collection & Form Security --- - "dom.forms.autocomplete.formautofill" = false; - "signon.management.page.breach-alerts.enabled" = false; - "browser.translations.enable" = false; - "browser.region.update.enabled" = false; - - # --- Search & URL Bar --- - "browser.urlbar.shortcuts.bookmarks" = false; - "browser.urlbar.shortcuts.history" = false; - "browser.urlbar.shortcuts.tabs" = false; - "browser.urlbar.shortcuts.actions" = false; - "browser.urlbar.showSearchTerms.enabled" = false; - - # --- Networking & Performance --- - "network.proxy.type" = 0; - "network.prefetch-next" = false; - "network.predictor.enabled" = false; - "network.http.speculative-parallel-limit" = 0; - "network.early-hints.preconnect.max_connections" = 0; - "network.connectivity-service.enabled" = false; - "network.captive-portal-service.enabled" = false; - "security.tls.enable_0rtt_data" = false; - - # --- Interface & De-clutter --- - "browser.startup.page" = 3; - "browser.startup.homepage" = "chrome://browser/content/blanktab.html"; - "browser.newtabpage.enabled" = false; - "browser.newtabpage.activity-stream.showSearch" = false; - "browser.newtabpage.activity-stream.showSponsoredCheckboxes" = false; - "browser.bookmarks.restore_default_bookmarks" = false; - "media.hardwaremediakeys.enabled" = false; - "media.videocontrols.picture-in-picture.video-toggle.enabled" = false; - "layout.spellcheckDefault" = 0; - - # --- Safe Browsing (Privacy Trade-off) --- - "browser.safebrowsing.downloads.remote.enabled" = false; - "browser.safebrowsing.downloads.remote.block_potentially_unwanted" = false; - "browser.safebrowsing.downloads.remote.block_uncommon" = false; - }; - userChrome = '' - #TabsToolbar { visibility: collapse !important; } - #sidebar-header { display: none !important; } - #toolbar-menubar { display: none !important; } - ''; - }; - privacy = { - id = 1; - name = "I2P"; - settings = { - "media.peerconnection.enabled" = false; - "network.proxy.type" = 1; - - "network.proxy.http" = "127.0.0.1"; - "network.proxy.http_port" = 4444; - - "network.proxy.ssl" = "127.0.0.1"; - "network.proxy.ssl_port" = 4444; - - "network.proxy.no_proxies_on" = "localhost, 127.0.0.1"; - - "network.http.proxy.pipelining" = true; - "network.proxy.share_proxy_settings" = true; - - "network.prefetch-next" = false; - "network.dns.disablePrefetch" = true; - }; - }; - }; - }; - }) - (lib.mkIf cfg.brave.enable { - home.packages = [ pkgs.brave ]; - }) - ]; } diff --git a/hm/soft/email.nix b/hm/soft/email.nix index 869c4ed..33c8f34 100644 --- a/hm/soft/email.nix +++ b/hm/soft/email.nix @@ -1,53 +1,18 @@ -{ - config, - lib, - pkgs, - ... -}: +{ config, lib, ... }: let cfg = config.hm.soft.email; in { - options.hm.soft.email = { - thunderbird.enable = lib.mkEnableOption "thunderbird config"; - evolution.enable = lib.mkEnableOption "evolution config"; - }; - config = lib.mkMerge [ - { - accounts.email.accounts.disroot = { - primary = true; - address = "adikro@disroot.org"; - userName = "adikro@disroot.org"; - realName = "adi"; - - imap = { - host = "disroot.org"; - port = 993; - tls.enable = true; - }; - smtp = { - host = "disroot.org"; - port = 465; - tls.enable = true; + options.hm.soft.email.thunderbird.enable = lib.mkEnableOption "thunderbird config"; + config = lib.mkIf cfg.thunderbird.enable { + programs.thunderbird = { + enable = true; + profiles.main = { + isDefault = true; + settings = { + "network.proxy.type" = 0; }; - - thunderbird.enable = cfg.thunderbird.enable; }; - } - (lib.mkIf cfg.thunderbird.enable { - programs.thunderbird = { - enable = true; - profiles.main = { - isDefault = true; - settings = { - "network.proxy.type" = 0; - }; - }; - }; - }) - - (lib.mkIf cfg.evolution.enable { - home.packages = [ pkgs.evolution ]; - }) - ]; + }; + }; } diff --git a/hm/soft/media.nix b/hm/soft/media.nix index de70715..350517b 100644 --- a/hm/soft/media.nix +++ b/hm/soft/media.nix @@ -11,6 +11,7 @@ in options.hm.soft.media.enable = lib.mkEnableOption "media cli tools"; config = lib.mkIf cfg.enable { home.packages = with pkgs; [ + stremio-linux-shell czkawka nsxiv pinta |
