From c755ef21b7f97222ff540fe9b7a61ac15b02fdc6 Mon Sep 17 00:00:00 2001 From: LUCAZEAU Alexandre Date: Wed, 25 Oct 2023 22:19:00 +0200 Subject: [PATCH] ADD packages ADD firefox configuration --- hosts/d2nix/home-manager/bat.nix | 8 ++ hosts/d2nix/home-manager/bat/default.nix | 7 ++ hosts/d2nix/home-manager/firefox.nix | 87 +++++++----------- hosts/d2nix/home-manager/home.nix | 2 +- hosts/d2nix/home-manager/home_firefox.nix | 105 ++++++++++++++++++++++ hosts/d2nix/home-manager/packages.nix | 46 ++++++++++ hosts/d2nix/nixos/configuration.nix | 4 +- hosts/d2nix/nixos/gnome.nix | 29 ++++++ 8 files changed, 232 insertions(+), 56 deletions(-) create mode 100644 hosts/d2nix/home-manager/bat.nix create mode 100644 hosts/d2nix/home-manager/bat/default.nix create mode 100644 hosts/d2nix/home-manager/home_firefox.nix create mode 100644 hosts/d2nix/home-manager/packages.nix create mode 100644 hosts/d2nix/nixos/gnome.nix diff --git a/hosts/d2nix/home-manager/bat.nix b/hosts/d2nix/home-manager/bat.nix new file mode 100644 index 0000000..835c47c --- /dev/null +++ b/hosts/d2nix/home-manager/bat.nix @@ -0,0 +1,8 @@ +{ config, pkgs, ... }: +{ + #configDir = "/home/alexandre/git/nixos-config/hosts/dell-5590/nixpkgs/"; + programs.bat = { + enable = true; + # } // (import "${configDir}/bat"); + } // (import "/home/alexandre/git/nixos-config/hosts/dell-5590/home-manager/bat"); +} diff --git a/hosts/d2nix/home-manager/bat/default.nix b/hosts/d2nix/home-manager/bat/default.nix new file mode 100644 index 0000000..fc6f712 --- /dev/null +++ b/hosts/d2nix/home-manager/bat/default.nix @@ -0,0 +1,7 @@ +{ + config = { + decorations = "auto"; + paging = "auto"; + theme = "Nord"; + }; +} diff --git a/hosts/d2nix/home-manager/firefox.nix b/hosts/d2nix/home-manager/firefox.nix index f9120b6..6c97799 100644 --- a/hosts/d2nix/home-manager/firefox.nix +++ b/hosts/d2nix/home-manager/firefox.nix @@ -1,10 +1,5 @@ -{ config, lib, pkgs, theme, ... }: -let - nur-no-pkgs = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") {}; -in +{ config, lib, pkgs, ... }: { -imports = lib.attrValues nur-no-pkgs.repos.moredhel.hmModules.rawModules; - programs.firefox = { enable = true; package = pkgs.wrapFirefox pkgs.firefox-unwrapped { @@ -64,56 +59,42 @@ imports = lib.attrValues nur-no-pkgs.repos.moredhel.hmModules.rawModules; }; }; - bookmarks { -[ - { - name = "wikipedia"; - tags = [ "wiki" ]; - keyword = "wiki"; - url = "https://en.wikipedia.org/wiki/Special:Search?search=%s&go=Go"; - } - { - name = "kernel.org"; - url = "https://www.kernel.org"; - } - { - name = "Nix sites"; - toolbar = true; - bookmarks = [ - { - name = "homepage"; - url = "https://nixos.org/"; - } - { - name = "wiki"; - tags = [ "wiki" "nix" ]; - url = "https://nixos.wiki/"; - } - ]; - } -] - - "https://v2.produhost.net/panel/16148/dashboard" - }; -"browser.toolbars.bookmarks.visibility" = "never"; - extensions = with pkgs.nur.repos.rycee.firefox-addons; [ - ublock-origin - privacy-badger - keepassxc-browser - clearurls - decentraleyes - floccus - languagetool - disconnect - ]; + 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); - # ''; + + extraConfig = '' + user_pref("full-screen-api.ignore-widgets", true); + user_pref("media.ffmpeg.vaapi.enabled", true); + user_pref("media.rdd-vpx.enabled", true); + ''; }; }; }; diff --git a/hosts/d2nix/home-manager/home.nix b/hosts/d2nix/home-manager/home.nix index a4b1f64..cc679f6 100644 --- a/hosts/d2nix/home-manager/home.nix +++ b/hosts/d2nix/home-manager/home.nix @@ -2,7 +2,7 @@ { imports = [ - ./firefox.nix + ./home_firefox.nix ./packages.nix ../../../modules/neovim.nix ../../../modules/tmux.nix diff --git a/hosts/d2nix/home-manager/home_firefox.nix b/hosts/d2nix/home-manager/home_firefox.nix new file mode 100644 index 0000000..5834843 --- /dev/null +++ b/hosts/d2nix/home-manager/home_firefox.nix @@ -0,0 +1,105 @@ +{ 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 = "wikipedia"; + tags = [ "wiki" ]; + keyword = "wiki"; + url = "https://en.wikipedia.org/wiki/Special:Search?search="; +} +{ + name = "kernel.org"; + url ="https://v2.produhost.net/panel/16148/dashboard"; +} +]; + + settings = { + + settings = { + "browser.contentblocking.category" = "strict" ; + "browser.search.region" = "CH" ; + "browser.startup.homepage" = https://www.google.fr ; + "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/d2nix/home-manager/packages.nix b/hosts/d2nix/home-manager/packages.nix new file mode 100644 index 0000000..bb07f26 --- /dev/null +++ b/hosts/d2nix/home-manager/packages.nix @@ -0,0 +1,46 @@ +{ pkgs, ... }: { + programs.go.enable = true; + home.packages = with pkgs; [ + jq + nextcloud-client + libreoffice + rofi + poppler_utils + brightnessctl + chromium + gimp + scrot + papirus-icon-theme + ganttproject-bin + audio-recorder + pandoc + hugo + whois + inkscape + feh + ispell + aspellDicts.fr + nix-direnv + keepassxc + direnv + texlive.combined.scheme-full + zola + exa + python3 + unar # like 7z + nmap + libnotify + sublime-music + drawio + lsd + guake + dig + vlc + pinta + # python39Packages.grip + linphone + graphviz + freecad + ]; + nixpkgs.config.permittedInsecurePackages = [ "ferdi-5.8.1" ]; +} diff --git a/hosts/d2nix/nixos/configuration.nix b/hosts/d2nix/nixos/configuration.nix index fb59527..9587412 100644 --- a/hosts/d2nix/nixos/configuration.nix +++ b/hosts/d2nix/nixos/configuration.nix @@ -71,7 +71,7 @@ description = "alexandre"; extraGroups = [ "wheel" "networkmanager" "docker" "libvirtd" "scanner" "plocate" "lp" ]; packages = with pkgs; [ - firefox + #firefox gitAndTools.gitFull ]; }; @@ -169,7 +169,7 @@ # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). system.stateVersion = "23.05"; # Did you read the comment? - nixpkgs.config.packageOverrides = pkgs: { + nixpkgs.config.packageOverrides = pkgs: { nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") { inherit pkgs; }; diff --git a/hosts/d2nix/nixos/gnome.nix b/hosts/d2nix/nixos/gnome.nix new file mode 100644 index 0000000..062c3d9 --- /dev/null +++ b/hosts/d2nix/nixos/gnome.nix @@ -0,0 +1,29 @@ +{ config, pkgs, ... }: +{ + +services.udev.packages = with pkgs; [ gnome.gnome-settings-daemon ]; + +environment.gnome.excludePackages = (with pkgs; [ + gnome-photos + gnome-tour +]) ++ (with pkgs.gnome; [ + cheese # webcam tool + gnome-music + gedit # text editor + epiphany # web browser + totem # video player + tali # poker game + iagno # go game + hitori # sudoku game + atomix # puzzle game +]); + +environment.systemPackages = with pkgs; [ + pkgs.gnome3.gnome-tweaks + gnomeExtensions.appindicator + gnomeExtensions.yakuake + gnomeExtensions.workspace-indicator-2 + gnomeExtensions.wireless-hid + gnomeExtensions.vitals +]; +}