From 99fb4d9338b13a4f206b3dfd221c10dd4b0a8e7e Mon Sep 17 00:00:00 2001 From: Alexandre LUCAZEAU Date: Tue, 31 Oct 2023 15:50:40 +0100 Subject: [PATCH] ADD : hyperland REMOVE : OLD firefox config RENAME : home_firefox to firefox.nix UPDATE : bokkmark firefox --- hosts/lap2nix/home-manager/firefox.nix | 213 +++++++++++--------- hosts/lap2nix/home-manager/home.nix | 2 +- hosts/lap2nix/home-manager/home_firefox.nix | 116 ----------- hosts/lap2nix/nixos/configuration.nix | 1 + hosts/lap2nix/nixos/services.nix | 3 +- 5 files changed, 120 insertions(+), 215 deletions(-) delete mode 100644 hosts/lap2nix/home-manager/home_firefox.nix diff --git a/hosts/lap2nix/home-manager/firefox.nix b/hosts/lap2nix/home-manager/firefox.nix index 6c97799..68a69f8 100644 --- a/hosts/lap2nix/home-manager/firefox.nix +++ b/hosts/lap2nix/home-manager/firefox.nix @@ -1,101 +1,120 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, ... }: +let + nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") { + inherit pkgs; + }; +in { - programs.firefox = { - enable = true; - package = pkgs.wrapFirefox pkgs.firefox-unwrapped { - extraPolicies = { - CaptivePortal = false; - DisableFirefoxStudies = true; - DisablePocket = true; - DisableTelemetry = true; - DisableFirefoxAccounts = false; - NoDefaultBookmarks = true; - OfferToSaveLogins = true; - OfferToSaveLoginsDefault = true; - PasswordManagerEnabled = true; - FirefoxHome = { - Search = true; - Pocket = false; - Snippets = false; - TopSites = false; - Highlights = false; - }; - UserMessaging = { - ExtensionRecommendations = false; - SkipOnboarding = true; - }; - }; - }; - profiles = { - alexandre = { - id = 0; - name = "alexandre"; - search = { - force = true; - default = "Google"; - engines = { - "Nix Packages" = { - urls = [{ - template = "https://search.nixos.org/packages"; - params = [ - { name = "type"; value = "packages"; } - { name = "query"; value = "{searchTerms}"; } - ]; - }]; - icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; - definedAliases = [ "@np" ]; - }; - "NixOS Wiki" = { - urls = [{ template = "https://nixos.wiki/index.php?search={searchTerms}"; }]; - iconUpdateURL = "https://nixos.wiki/favicon.png"; - updateInterval = 24 * 60 * 60 * 1000; - definedAliases = [ "@nw" ]; - }; - "Wikipedia (en)".metaData.alias = "@wiki"; - "Google".metaData.hidden = false; - "Amazon.com".metaData.hidden = true; - "Bing".metaData.hidden = true; - "eBay".metaData.hidden = true; - }; - }; - - bookmarks = [ - { - name = "wikipedia"; - tags = [ "wiki" ]; - keyword = "wiki"; - url = "https://en.wikipedia.org/wiki/Special:Search?search=%s&go=Go"; - } - { - name = "kernel.org"; - url ="https://v2.produhost.net/panel/16148/dashboard"; - } - { - name = "Nix sites"; - toolbar = true; - bookmarks = [ - { - name = "homepage"; - url = "https://nixos.org/"; - } - { - name = "wiki"; - tags = [ "wiki" "nix" ]; - url = "https://nixos.wiki/"; - } - ]; - } - ]; - settings = { - "general.smoothScroll" = true; - }; - - extraConfig = '' - user_pref("full-screen-api.ignore-widgets", true); - user_pref("media.ffmpeg.vaapi.enabled", true); - user_pref("media.rdd-vpx.enabled", true); - ''; - }; + programs.firefox = { + enable = true ; + profiles.default = { + isDefault = true ; + extensions = lib.mkIf config.programs.firefox.enable + (with nur.repos.rycee.firefox-addons; [ + french-dictionary + i-dont-care-about-cookies + ublock-origin + privacy-badger + keepassxc-browser + clearurls + decentraleyes + floccus + ]); + search = { + force = true; + default = "Google"; + engines = { + "Nix Packages" = { + urls = [{ + template = "https://search.nixos.org/packages"; + params = [ + { name = "type"; value = "packages"; } + { name = "query"; value = "{searchTerms}"; } + ]; + }]; + icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; + definedAliases = [ "@np" ]; }; + "NixOS Wiki" = { + urls = [{ template = "https://nixos.wiki/index.php?search={searchTerms}"; }]; + iconUpdateURL = "https://nixos.wiki/favicon.png"; + updateInterval = 24 * 60 * 60 * 1000; + definedAliases = [ "@nw" ]; + }; + "Wikipedia (en)".metaData.alias = "@wiki"; + "Google".metaData.hidden = false; + "Amazon.com".metaData.hidden = true; + "Bing".metaData.hidden = true; + "eBay".metaData.hidden = true; + }; }; + + bookmarks = [ + { + name = "DRI"; + toolbar = true; + bookmarks = [ + { + name = "wiki"; + tags = [ "wiki" ]; + keyword = "wiki"; + url = "https://en.wikipedia.org/wiki/Special:Search?search="; + } + { + name = "AVV"; + url ="https://v2.produhost.net/panel/16148/dashboard"; + } + { + name = "Alexandre"; + url = "https://bbb.produhost.net/b/ale-1a8-984"; + } + { + name = "David"; + url = "https://bbb.produhost.net/b/dav-5aj-hxx"; + } + ]; + } + ]; + + settings = { + settings = { + "browser.contentblocking.category" = "strict" ; + "browser.search.region" = "CH" ; + "browser.startup.homepage" = https://www.google.fr ; + "browser.toolbars.bookmarks.visibility" = "always"; + "dom.security.https_only_mode" = true ; + "dom.security.https_only_mode_ever_enabled" = true ; + "extensions.blocklist.pingCountVersion" = -1 ; + "extensions.databaseSchema" = 35 ; + "extensions.ui.dictionary.hidden" = false ; + "extensions.ui.extension.hidden" = false ; + "extensions.ui.locale.hidden" = true ; + "extensions.ui.sitepermission.hidden" = true ; + "extensions.webcompat.enable_shims" = true ; + "extensions.webcompat.perform_injections" = true ; + "extensions.webcompat.perform_ua_overrides" = true ; + "findbar.highlightAll" = true ; + "font.name.serif.x-western" = "FreeSerif" ; + "font.size.variable.x-western" = 20 ; + "media.eme.enabled" = true ; + "pref.browser.homepage.disable_button.current_page" = false ; + "print_printer" = "Mozilla Save to PDF" ; + "privacy.annotate_channels.strict_list.enabled" = true ; + "privacy.clearOnShutdown.cookies" = true ; + "privacy.clearOnShutdown.downloads" = false ; + "privacy.clearOnShutdown.formdata" = false ; + "privacy.clearOnShutdown.history" = false ; + "privacy.clearOnShutdown.offlineApps" = true ; + "privacy.clearOnShutdown.sessions" = false ; + "privacy.donottrackheader.enabled" = true ; + "privacy.firstparty.isolate" = true ; + "privacy.history.custom" = true ; + "privacy.purge_trackers.date_in_cookie_database" = 0 ; + "privacy.trackingprotection.emailtracking.enabled" = true ; + "privacy.trackingprotection.enabled" = true ; + "privacy.trackingprotection.socialtracking.enabled" = true ; + }; + }; + } ; + } ; } diff --git a/hosts/lap2nix/home-manager/home.nix b/hosts/lap2nix/home-manager/home.nix index 56d2cae..35dfcb3 100644 --- a/hosts/lap2nix/home-manager/home.nix +++ b/hosts/lap2nix/home-manager/home.nix @@ -2,7 +2,7 @@ { imports = [ - ./home_firefox.nix + ./firefox.nix ./packages.nix ../../../modules/neovim.nix ../../../modules/emacs.nix diff --git a/hosts/lap2nix/home-manager/home_firefox.nix b/hosts/lap2nix/home-manager/home_firefox.nix deleted file mode 100644 index aedc2d6..0000000 --- a/hosts/lap2nix/home-manager/home_firefox.nix +++ /dev/null @@ -1,116 +0,0 @@ -{ config, lib, pkgs, ... }: -let - nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") { - inherit pkgs; - }; -in -{ - programs.firefox = { - enable = true ; - profiles.default = { - isDefault = true ; - extensions = lib.mkIf config.programs.firefox.enable - (with nur.repos.rycee.firefox-addons; [ - french-dictionary - i-dont-care-about-cookies - ublock-origin - privacy-badger - keepassxc-browser - clearurls - decentraleyes - floccus - ]); - search = { - force = true; - default = "Google"; - engines = { - "Nix Packages" = { - urls = [{ - template = "https://search.nixos.org/packages"; - params = [ - { name = "type"; value = "packages"; } - { name = "query"; value = "{searchTerms}"; } - ]; - }]; - icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; - definedAliases = [ "@np" ]; - }; - "NixOS Wiki" = { - urls = [{ template = "https://nixos.wiki/index.php?search={searchTerms}"; }]; - iconUpdateURL = "https://nixos.wiki/favicon.png"; - updateInterval = 24 * 60 * 60 * 1000; - definedAliases = [ "@nw" ]; - }; - "Wikipedia (en)".metaData.alias = "@wiki"; - "Google".metaData.hidden = false; - "Amazon.com".metaData.hidden = true; - "Bing".metaData.hidden = true; - "eBay".metaData.hidden = true; - }; - }; - - bookmarks = [ - { - name = "DRI"; - toolbar = true; - bookmarks = [ - { - name = "wiki"; - tags = [ "wiki" ]; - keyword = "wiki"; - url = "https://en.wikipedia.org/wiki/Special:Search?search="; - } - { - name = "AVV"; - url ="https://v2.produhost.net/panel/16148/dashboard"; - } - { - name = "David"; - url = "https://bbb.produhost.net/b/dav-5aj-hxx"; - } - ]; - } - ]; - - settings = { - settings = { - "browser.contentblocking.category" = "strict" ; - "browser.search.region" = "CH" ; - "browser.startup.homepage" = https://www.google.fr ; - "browser.toolbars.bookmarks.visibility" = "always"; - "dom.security.https_only_mode" = true ; - "dom.security.https_only_mode_ever_enabled" = true ; - "extensions.blocklist.pingCountVersion" = -1 ; - "extensions.databaseSchema" = 35 ; - "extensions.ui.dictionary.hidden" = false ; - "extensions.ui.extension.hidden" = false ; - "extensions.ui.locale.hidden" = true ; - "extensions.ui.sitepermission.hidden" = true ; - "extensions.webcompat.enable_shims" = true ; - "extensions.webcompat.perform_injections" = true ; - "extensions.webcompat.perform_ua_overrides" = true ; - "findbar.highlightAll" = true ; - "font.name.serif.x-western" = "FreeSerif" ; - "font.size.variable.x-western" = 20 ; - "media.eme.enabled" = true ; - "pref.browser.homepage.disable_button.current_page" = false ; - "print_printer" = "Mozilla Save to PDF" ; - "privacy.annotate_channels.strict_list.enabled" = true ; - "privacy.clearOnShutdown.cookies" = true ; - "privacy.clearOnShutdown.downloads" = false ; - "privacy.clearOnShutdown.formdata" = false ; - "privacy.clearOnShutdown.history" = false ; - "privacy.clearOnShutdown.offlineApps" = true ; - "privacy.clearOnShutdown.sessions" = false ; - "privacy.donottrackheader.enabled" = true ; - "privacy.firstparty.isolate" = true ; - "privacy.history.custom" = true ; - "privacy.purge_trackers.date_in_cookie_database" = 0 ; - "privacy.trackingprotection.emailtracking.enabled" = true ; - "privacy.trackingprotection.enabled" = true ; - "privacy.trackingprotection.socialtracking.enabled" = true ; - }; - }; - } ; - } ; -} diff --git a/hosts/lap2nix/nixos/configuration.nix b/hosts/lap2nix/nixos/configuration.nix index a695c92..16630db 100644 --- a/hosts/lap2nix/nixos/configuration.nix +++ b/hosts/lap2nix/nixos/configuration.nix @@ -143,6 +143,7 @@ nix.settings.auto-optimise-store = true; options = "--delete-older-than 10d"; }; + programs.hyprland.enable = true; programs = { htop = { enable = true; diff --git a/hosts/lap2nix/nixos/services.nix b/hosts/lap2nix/nixos/services.nix index ce9a993..3db4132 100644 --- a/hosts/lap2nix/nixos/services.nix +++ b/hosts/lap2nix/nixos/services.nix @@ -47,8 +47,9 @@ displayManager.gdm.enable = true; desktopManager.gnome.enable = true; }; + #ACTION=="remove", ENV{ID_VENDOR_ID}=="1050", ENV{ID_MODEL_ID}=="0407", ENV{DISPLAY}=":0", ENV{XAUTHORITY}="/home/alexandre/.Xauthority" RUN+="${pkgs.sudo}/bin/sudo -u alexandre ${pkgs.xdg-utils}/bin/xdg-screensaver lock" udev.extraRules = '' - ACTION=="remove", ENV{ID_VENDOR_ID}=="1050", ENV{ID_MODEL_ID}=="0407", ENV{DISPLAY}=":0", ENV{XAUTHORITY}="/home/alexandre/.Xauthority" RUN+="${pkgs.sudo}/bin/sudo -u alexandre ${pkgs.xdg-utils}/bin/xdg-screensaver lock" + ACTION=="remove", ENV{ID_VENDOR_ID}=="1050", ENV{ID_MODEL_ID}=="0407", RUN+="${pkgs.sudo}/bin/sudo -u alexandre ${pkgs.dbus}/bin/dbus-send --type=method_call --dest=org.gnome.ScreenSaver /org/gnome/ScreenSaver org.gnome.ScreenSaver.Lock" ''; }; }